From 54779387062152a0494b37a38a713d32361b867f Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Fri, 2 Oct 2020 16:34:39 -0700 Subject: [PATCH 1/9] API spec for AzureML Batch Endpoints and deployments --- .../2020-09-01-preview/batchInference.json | 790 ++++++++++++++++++ .../createOrUpdateBatchDeployment.json | 131 +++ .../examples/createOrUpdateBatchEndpoint.json | 72 ++ .../examples/getBatchDeployment.json | 58 ++ .../examples/getBatchDeployments.json | 147 ++++ .../examples/getBatchEndpoint.json | 36 + .../examples/getBatchEndpoints.json | 83 ++ .../examples/listKeysBatchEndpoints.json | 17 + 8 files changed, 1334 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json new file mode 100644 index 000000000000..93ef0d9d8262 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -0,0 +1,790 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Machine Learning Workspaces", + "description": "These APIs allow end users to operate on Azure Machine Learning Workspace resources.", + "version": "2020-12-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}": { + "put": { + "tags": [ + "BatchDeployment" + ], + "summary": "Creates a batch inference deployment.", + "operationId": "BatchDeployments_CreateOrUpdate", + "x-ms-examples": { + "Create or update BatchDeployment": { + "$ref": "./examples/createOrUpdateBatchDeployment.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference deployment definition object.", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + } + } + }, + "get": { + "tags": [ + "BatchDeployment" + ], + "summary": "Gets a batch inference deployment by id.", + "operationId": "BatchDeployments_Get", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "Version of Azure Machine Learning resource provider API.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + } + } + }, + "delete": { + "tags": [ + "BatchDeployment" + ], + "summary": "Delete Batch Inference deployment.", + "operationId": "BatchDeployments_Delete", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "API version.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success" + } + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments": { + "get": { + "tags": [ + "BatchDeployment" + ], + "summary": "Lists Batch inference deployments in the workspace.", + "operationId": "BatchDeployments_List", + "x-ms-examples": { + "Get BatchDeployment": { + "$ref": "./examples/getBatchDeployment.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "Version of Azure Machine Learning resource provider API.", + "type": "string" + }, + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchDeploymentResourcePaginatedResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}": { + "put": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Creates a batch inference endpoint.", + "operationId": "BatchEndpoints_CreateOrUpdate", + "x-ms-examples": { + "Create or update BatchEndpoint": { + "$ref": "./examples/createOrUpdateBatchEndpoint.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference endpoint definition object.", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + } + } + }, + "get": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Gets a batch inference endpoint by name.", + "operationId": "BatchEndpoints_Get", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "Version of Azure Machine Learning resource provider API.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + } + } + }, + "delete": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Delete Batch Inference Endpoint.", + "operationId": "BatchEndpoints_Delete", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "API version.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success" + } + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints": { + "get": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Lists Batch inference endpoint in the workspace.", + "operationId": "BatchEndpoints_List", + "x-ms-examples": { + "Get BatchEndpoint": { + "$ref": "./examples/getBatchEndpoint.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "in": "query", + "name": "$skipToken", + "description": "Continuation token for pagination.", + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchEndpointResourcePaginatedResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/listkeys": { + "post": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Lists batch Inference Endpoint keys.", + "operationId": "BatchEndpoints_ListKeys", + "x-ms-examples": { + "List Keys": { + "$ref": "./examples/listKeysBatchEndpoint.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/InferenceEndpointKeysResource" + } + } + } + } + } + }, + "parameters": { + "LocationNameParameter": { + "name": "locationName", + "description": "location of Azure Machine Learning workspace.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "EndpointNameParameter": { + "name": "endpointName", + "description": "Name of the Azure Machine Learning Batch Inference endpoint.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "EndpointDeploymentIdParameter": { + "name": "deploymentId", + "description": "Identifier of the Azure Machine Learning Batch Inference Deployment.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + } + }, + "definitions": { + "BatchDeploymentResource": { + "description": "Azure Resource Manager resource Envelope", + "required": [ + "properties" + ], + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "The resource URL of the entity (not URL encoded).", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The name of the resource entity.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The resource provider and type.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/BatchDeployment" + }, + "systemData": { + "$ref": "#/definitions/SystemData" + }, + "allOf": [ + { + "$ref": "types.json#/definitions/TrackedResource" + } + ] + } + }, + "BatchDeploymentResourcePaginatedResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/BatchDeploymentResource" + } + }, + "continuationToken": { + "type": "string" + }, + "nextLink": { + "type": "string" + } + } + }, + "BatchEndpointResource": { + "description": "Azure Resource Manager resource Envelope", + "required": [ + "properties" + ], + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "The resource URL of the entity (not URL encoded).", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The name of the resource entity.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The resource provider and type.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/BatchEndpoint" + }, + "systemData": { + "$ref": "#/definitions/SystemData" + }, + "allOf": [ + { + "$ref": "types.json#/definitions/TrackedResource" + } + ] + } + }, + "BatchEndpointResourcePaginatedResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/BatchEndpointResource" + } + }, + "continuationToken": { + "type": "string" + }, + "nextLink": { + "type": "string" + } + } + }, + "BatchRetrySettings": { + "description": "Retry settings for a batch inference operation.", + "type": "object", + "properties": { + "maximumRetries": { + "format": "int32", + "description": "Maximum retry count for a mini-batch", + "type": "integer" + }, + "timeoutInSeconds": { + "format": "int32", + "description": "Invocation timeout for a mini-batch, in seconds.", + "type": "integer" + } + } + }, + "BatchPartitioningScheme": { + "description": "Partitioning scheme for batch inference operation.", + "type": "object", + "properties": { + "partitioningKey": { + "description": "Partition key used for Named partitioning.", + "type": "string" + }, + "miniBatchSize": { + "format": "int64", + "description": "Size of the mini-batch passed to each batch invocation.\r\nFor FileDataset, this is the number of files per mini-batch.\r\nFor TabularDataset, this is the size of the records in bytes, per mini-batch.", + "type": "integer" + } + } + }, + "BatchLoggingLevel": { + "description": "Log verbosity for batch inferencing.\r\nIncreasing verbosity order for logging is : Warning, Info and Debug\r\nDefault value is Info.", + "enum": [ + "Info", + "Warning", + "Debug" + ], + "type": "string", + "x-ms-enum": { + "name": "BatchLoggingLevel", + "modelAsString": false + } + }, + "BatchOutputAction": { + "description": "Enum to determine how batch inferencing will handle output", + "enum": [ + "SummaryOnly", + "AppendRow" + ], + "type": "string", + "x-ms-enum": { + "name": "BatchOutputAction", + "modelAsString": false + } + }, + "BatchOutputConfiguration": { + "description": "Batch inference output configuration.", + "type": "object", + "properties": { + "outputAction": { + "$ref": "#/definitions/BatchOutputAction" + }, + "appendRowFileName": { + "description": "Customized output file name for append_row output action.", + "type": "string" + } + } + }, + "BatchDeploymentSettings": { + "description": "Batch inference specific settings per deployment.", + "type": "object", + "properties": { + "computeId": { + "description": "Compute artifact Identifier", + "type": "string" + }, + "errorThreshold": { + "format": "int32", + "description": "Error threshold, if the error count for the entire input goes above this value,\r\nthe batch inference will be aborted. Range is [-1, int.MaxValue]\r\n-1 value indicates, ignore all failures during batch inference\r\nFor FileDataset count of file failures\r\nFor TabularDataset, this is the count of record failures", + "type": "integer" + }, + "retrySettings": { + "$ref": "#/definitions/BatchRetrySettings" + }, + "partitioningScheme": { + "$ref": "#/definitions/BatchPartitioningScheme" + }, + "loggingLevel": { + "$ref": "#/definitions/BatchLoggingLevel" + }, + "outputConfiguration": { + "$ref": "#/definitions/BatchOutputConfiguration" + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json new file mode 100644 index 000000000000..09ce30834aec --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -0,0 +1,131 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testEndpointName", + "deploymentId": "testBatchDeployment", + "body": { + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId" : "cluster-name", + "partitioningScheme": { + "miniBatchSize": 20 + }, + "outputConfiguration": { + "outputAction": "AppendRow" + }, + "errorThreshold": 5, + "retrySettings": { + "timeoutInSeconds": 30 + } + }, + "codeConfiguration": { + "codeArtifactId": "some code artifact", + "startupCommand": "batch_scoring.py" + }, + "environmentId": "some environment", + "properties": { + "description": "string" + }, + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", + "name": "testBatchDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", + "name": "testBatchDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json new file mode 100644 index 000000000000..ff7fab0d242e --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "body": { + "location": "westus2euap", + "tags": {}, + "properties": { + "name": "test9301", + "description": "Testing pipeline endpoint creation", + "authMode": "AMLTokenAuth", + "trafficRoute": "{'testDeployment1': 100, 'testDeployment2': 0}", + "computeConfiguration": { + "computeType": "AMLCompute" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName", + "name": "testBatchEndpoint", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName", + "name": "testBatchEndpoint", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json new file mode 100644 index 000000000000..7bd3d6ef3cfa --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json @@ -0,0 +1,58 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", + "name": "testBatchDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json new file mode 100644 index 000000000000..622fdaf62039 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json @@ -0,0 +1,147 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment1", + "name": "testBatchDeployment1", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment2", + "name": "testBatchDeployment2", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment3", + "name": "testBatchDeployment3", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + } + ], + "nextLink": "nextLink" + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json new file mode 100644 index 000000000000..1f89d7c0f332 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName", + "name": "testBatchEndpoint", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json new file mode 100644 index 000000000000..46eb5633602c --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json @@ -0,0 +1,83 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName1", + "name": "testBatchEndpoint1", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName2", + "name": "testBatchEndpoint2", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName3", + "name": "testBatchEndpoint3", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + ], + "nextLink": "nextLink" + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json new file mode 100644 index 000000000000..ce3252cac832 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "primaryKey": "primary key value...", + "secondaryKey": "secondary key value...", + } + } +} From 00abc20bbfe0cf850656775f62d640a3c539d287 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Fri, 2 Oct 2020 16:43:28 -0700 Subject: [PATCH 2/9] Update readme --- .../preview/2020-09-01-preview/batchInference.json | 10 ---------- .../machinelearningservices/resource-manager/readme.md | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 93ef0d9d8262..ce60f204eb1b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -613,11 +613,6 @@ "systemData": { "$ref": "#/definitions/SystemData" }, - "allOf": [ - { - "$ref": "types.json#/definitions/TrackedResource" - } - ] } }, "BatchDeploymentResourcePaginatedResult": { @@ -666,11 +661,6 @@ "systemData": { "$ref": "#/definitions/SystemData" }, - "allOf": [ - { - "$ref": "types.json#/definitions/TrackedResource" - } - ] } }, "BatchEndpointResourcePaginatedResult": { diff --git a/specification/machinelearningservices/resource-manager/readme.md b/specification/machinelearningservices/resource-manager/readme.md index af746a0266f1..71d26044005e 100644 --- a/specification/machinelearningservices/resource-manager/readme.md +++ b/specification/machinelearningservices/resource-manager/readme.md @@ -117,6 +117,7 @@ These settings apply only when `--tag=package-2020-09-01-preview` is specified o ``` yaml $(tag) == 'package-2020-09-01-preview' input-file: - Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +- Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json ``` ### Tag: package-2020-05-01-preview From 4719434847c1d5fddf3c40a35f0b57da24533520 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Fri, 2 Oct 2020 22:44:00 -0700 Subject: [PATCH 3/9] Fix validation errors --- .../2020-09-01-preview/batchInference.json | 16 ++++++++++++--- .../createOrUpdateBatchDeployment.json | 9 +++++---- .../examples/deleteBatchDeployment.json | 20 +++++++++++++++++++ .../examples/deleteBatchEndpoint.json | 19 ++++++++++++++++++ .../examples/getBatchDeployment.json | 3 +-- .../examples/getBatchDeployments.json | 6 +++--- .../examples/getBatchEndpoint.json | 1 - .../examples/listKeysBatchEndpoints.json | 6 +++--- 8 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index ce60f204eb1b..414c803829fa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -167,6 +167,11 @@ ], "summary": "Delete Batch Inference deployment.", "operationId": "BatchDeployments_Delete", + "x-ms-examples": { + "Get BatchDeployment": { + "$ref": "./examples/deleteBatchDeployment.json" + } + }, "produces": [ "text/plain", "application/json", @@ -255,7 +260,7 @@ "name": "api-version", "description": "Version of Azure Machine Learning resource provider API.", "type": "string" - }, + } ], "responses": { "default": { @@ -403,6 +408,11 @@ ], "summary": "Delete Batch Inference Endpoint.", "operationId": "BatchEndpoints_Delete", + "x-ms-examples": { + "Get BatchDeployment": { + "$ref": "./examples/deleteBatchEndpoint.json" + } + }, "produces": [ "text/plain", "application/json", @@ -612,7 +622,7 @@ }, "systemData": { "$ref": "#/definitions/SystemData" - }, + } } }, "BatchDeploymentResourcePaginatedResult": { @@ -660,7 +670,7 @@ }, "systemData": { "$ref": "#/definitions/SystemData" - }, + } } }, "BatchEndpointResourcePaginatedResult": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index 09ce30834aec..f3e1fd33afac 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -33,7 +33,7 @@ "environmentId": "some environment", "properties": { "description": "string" - }, + } } } }, @@ -79,9 +79,10 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } - }, + } + }, "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", @@ -123,7 +124,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json new file mode 100644 index 000000000000..9b17cb1540ba --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": {}, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", + "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." + } + }, + "204": {} + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json new file mode 100644 index 000000000000..60eb65e37b95 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": {}, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", + "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." + } + }, + "204": {} + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json index 7bd3d6ef3cfa..97bb98792e7e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json @@ -3,7 +3,6 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "resourceGroup-1234", "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", "endpointName": "testBatchEndpoint", "deploymentId": "testBatchDeployment", "api-version": "2020-12-01-preview" @@ -50,7 +49,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json index 622fdaf62039..519755b773bb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json @@ -50,7 +50,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } }, { @@ -93,7 +93,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } }, { @@ -136,7 +136,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json index 1f89d7c0f332..ebdf4c342ab6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -3,7 +3,6 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "resourceGroup-1234", "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", "endpointName": "testBatchEndpoint", "api-version": "2020-12-01-preview" }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json index ce3252cac832..da4bd2db7c83 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json @@ -4,14 +4,14 @@ "resourceGroupName": "resourceGroup-1234", "workspaceName": "testworkspace", "api-version": "2020-09-01-preview", - "endpointName": "testBatchEndpoint", - "api-version": "2020-12-01-preview" + "endpointName": "testBatchEndpoint" }, "responses": { "200": { "body": { "primaryKey": "primary key value...", - "secondaryKey": "secondary key value...", + "secondaryKey": "secondary key value..." } + } } } From 9bfaf746e3273318433ac1d2e8a332590606c1d7 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 00:19:17 -0700 Subject: [PATCH 4/9] Validation fixes --- .../2020-09-01-preview/batchInference.json | 249 +++++++++++++++++- .../createOrUpdateBatchDeployment.json | 114 ++++---- .../examples/deleteBatchDeployment.json | 2 +- .../examples/deleteBatchEndpoint.json | 2 +- .../examples/getBatchDeployment.json | 46 ++-- .../examples/getBatchDeployments.json | 134 +++++----- .../examples/getBatchEndpoint.json | 2 +- .../examples/getBatchEndpoints.json | 2 +- ...points.json => listKeysBatchEndpoint.json} | 0 9 files changed, 388 insertions(+), 163 deletions(-) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/{listKeysBatchEndpoints.json => listKeysBatchEndpoint.json} (100%) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 414c803829fa..8764e104bf40 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -86,7 +86,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -150,7 +150,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -213,7 +213,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -266,7 +266,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -330,7 +330,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -391,7 +391,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -451,7 +451,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -501,7 +501,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -554,7 +554,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -621,7 +621,7 @@ "$ref": "#/definitions/BatchDeployment" }, "systemData": { - "$ref": "#/definitions/SystemData" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -669,7 +669,7 @@ "$ref": "#/definitions/BatchEndpoint" }, "systemData": { - "$ref": "#/definitions/SystemData" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -759,6 +759,231 @@ } } }, + "InferenceEndpointKeysResource": { + "description": "Inference endpoint keys.", + "type": "object", + "properties": { + "primaryKey": { + "description": "Primary key.", + "type": "string" + }, + "secondaryKey": { + "description": "Secondary key.", + "type": "string" + } + } + }, + "DeploymentScaleSettings": { + "type": "object", + "properties": { + "nodeCount": { + "format": "int32", + "description": "Number of Compute nodes to be used for running the deployment", + "type": "integer" + } + } + }, + "DeploymentProvisioningState": { + "enum": [ + "Creating", + "Deleting", + "Scaling", + "Updating", + "Succeeded", + "Failed" + ], + "type": "string", + "x-ms-enum": { + "name": "DeploymentProvisioningState", + "modelAsString": false + } + }, + "EndpointProvisioningState": { + "description": "State of endpoint provisioning.", + "enum": [ + "Creating", + "Deleting", + "Succeeded", + "Failed" + ], + "type": "string", + "x-ms-enum": { + "name": "EndpointProvisioningState", + "modelAsString": false + } + }, + "EndpointAuthModeType": { + "enum": [ + "AMLTokenAuth", + "KeyAuth" + ], + "type": "string", + "x-ms-enum": { + "name": "EndpointAuthModeType", + "modelAsString": false + } + }, + "BatchDeployment": { + "description": "Batch inference settings per deployment.", + "type": "object", + "properties": { + "scaleSettings": { + "$ref": "#/definitions/DeploymentScaleSettings" + }, + "batchSettings": { + "$ref": "#/definitions/BatchDeploymentSettings" + }, + "tags": { + "description": "Tag dictionary. Tags can be added, removed, and updated.", + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "create", + "read", + "update" + ] + }, + "description": { + "description": "Description of the endpoint deployment.", + "type": "string" + }, + "properties": { + "description": "Property dictionary. Properties can be added, but not removed or altered.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "modelId": { + "description": "Model identifier.", + "type": "string" + }, + "codeConfiguration": { + "$ref": "#/definitions/CodeConfiguration" + }, + "environmentId": { + "description": "Environment specification for the endpoint deployment.", + "type": "string" + }, + "provisioningState": { + "$ref": "#/definitions/DeploymentProvisioningState" + } + } + }, + "CommandType": { + "enum": [ + "Command", + "Python" + ], + "type": "string", + "x-ms-enum": { + "name": "CommandType", + "modelAsString": false + } + }, + "BatchEndpoint": { + "description": "Batch endpoint configuration", + "type": "object", + "properties": { + "tags": { + "description": "Tag dictionary. Tags can be added, removed, and updated.", + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "create", + "read", + "update" + ] + }, + "description": { + "description": "Description of the inference endpoint.", + "type": "string" + }, + "properties": { + "description": "Property dictionary. Properties can be added, but not removed or altered.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "trafficRules": { + "description": "Traffic rules on how the traffic will be routed across deployments.", + "type": "object", + "additionalProperties": { + "format": "int32", + "type": "integer" + } + }, + "computeConfiguration": { + "$ref": "#/definitions/ComputeConfiguration" + }, + "provisioningState": { + "$ref": "#/definitions/EndpointProvisioningState" + }, + "endpoint": { + "format": "uri", + "description": "Endpoint URI", + "type": "string", + "readOnly": true + }, + "swaggerEndpoint": { + "format": "uri", + "description": "Endpoint Swagger URI", + "type": "string", + "readOnly": true + }, + "authMode": { + "$ref": "#/definitions/EndpointAuthModeType" + } + } + }, + "CodeConfiguration": { + "required": [ + "command" + ], + "type": "object", + "properties": { + "commandType": { + "$ref": "#/definitions/CommandType" + }, + "codeArtifactId": { + "description": "The ID of the code asset.", + "type": "string" + }, + "command": { + "description": "The command to execute on startup of the job.", + "minLength": 1, + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "ComputeType": { + "enum": [ + "AMLCompute", + "AKS", + "ACI" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeType", + "modelAsString": false + } + }, + "ComputeConfiguration": { + "type": "object", + "properties": { + "computeType": { + "$ref": "#/definitions/ComputeType" + } + } + }, "BatchDeploymentSettings": { "description": "Batch inference specific settings per deployment.", "type": "object", @@ -787,4 +1012,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index f3e1fd33afac..4c01c8693ed7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -11,20 +11,20 @@ "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId" : "cluster-name", - "partitioningScheme": { - "miniBatchSize": 20 - }, - "outputConfiguration": { - "outputAction": "AppendRow" - }, - "errorThreshold": 5, - "retrySettings": { - "timeoutInSeconds": 30 - } + "computeId": "cluster-name", + "partitioningScheme": { + "miniBatchSize": 20 + }, + "outputConfiguration": { + "outputAction": "AppendRow" + }, + "errorThreshold": 5, + "retrySettings": { + "timeoutInSeconds": 30 + } }, "codeConfiguration": { "codeArtifactId": "some code artifact", @@ -44,27 +44,27 @@ "name": "testBatchDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -72,11 +72,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -89,27 +89,27 @@ "name": "testBatchDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -117,11 +117,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -129,4 +129,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json index 9b17cb1540ba..ed0a227a2907 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json @@ -17,4 +17,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json index 60eb65e37b95..e643ed287946 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json @@ -16,4 +16,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json index 97bb98792e7e..817f84d77493 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json @@ -14,27 +14,27 @@ "name": "testBatchDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -42,11 +42,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -54,4 +54,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json index 519755b773bb..911260591bb9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json @@ -15,27 +15,27 @@ "name": "testBatchDeployment1", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -43,11 +43,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -58,27 +58,27 @@ "name": "testBatchDeployment2", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -86,11 +86,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -101,27 +101,27 @@ "name": "testBatchDeployment3", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -129,11 +129,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -144,4 +144,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json index ebdf4c342ab6..71dde26d754d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json index 46eb5633602c..b180d6d76bc1 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json @@ -80,4 +80,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json similarity index 100% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json From 7419faa809a73baee5e7e01606f5b6a79f97e545 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 18:12:10 -0700 Subject: [PATCH 5/9] Fix validation errors --- .../2020-09-01-preview/batchInference.json | 39 ++++++++++++++++--- .../createOrUpdateBatchDeployment.json | 5 +-- .../examples/createOrUpdateBatchEndpoint.json | 2 +- .../examples/deleteBatchDeployment.json | 6 --- .../examples/deleteBatchEndpoint.json | 6 --- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 8764e104bf40..9d3657b94ae3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -168,7 +168,7 @@ "summary": "Delete Batch Inference deployment.", "operationId": "BatchDeployments_Delete", "x-ms-examples": { - "Get BatchDeployment": { + "Delete BatchDeployment": { "$ref": "./examples/deleteBatchDeployment.json" } }, @@ -218,6 +218,9 @@ }, "200": { "description": "Success" + }, + "204": { + "description": "Success" } } } @@ -230,8 +233,8 @@ "summary": "Lists Batch inference deployments in the workspace.", "operationId": "BatchDeployments_List", "x-ms-examples": { - "Get BatchDeployment": { - "$ref": "./examples/getBatchDeployment.json" + "Get BatchDeployments": { + "$ref": "./examples/getBatchDeployments.json" } }, "produces": [ @@ -353,6 +356,11 @@ ], "summary": "Gets a batch inference endpoint by name.", "operationId": "BatchEndpoints_Get", + "x-ms-examples": { + "Get BatchEndpoint": { + "$ref": "./examples/getBatchEndpoint.json" + } + }, "produces": [ "text/plain", "application/json", @@ -409,7 +417,7 @@ "summary": "Delete Batch Inference Endpoint.", "operationId": "BatchEndpoints_Delete", "x-ms-examples": { - "Get BatchDeployment": { + "Delete BatchEndpoint": { "$ref": "./examples/deleteBatchEndpoint.json" } }, @@ -456,6 +464,9 @@ }, "200": { "description": "Success" + }, + "204": { + "description": "Success" } } } @@ -468,8 +479,8 @@ "summary": "Lists Batch inference endpoint in the workspace.", "operationId": "BatchEndpoints_List", "x-ms-examples": { - "Get BatchEndpoint": { - "$ref": "./examples/getBatchEndpoint.json" + "Get BatchEndpoints": { + "$ref": "./examples/getBatchEndpoints.json" } }, "produces": [ @@ -599,6 +610,11 @@ "required": [ "properties" ], + "allOf": [ + { + "$ref": "machineLearningServices.json#/definitions/Resource" + } + ], "type": "object", "x-ms-azure-resource": true, "properties": { @@ -620,6 +636,17 @@ "properties": { "$ref": "#/definitions/BatchDeployment" }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" + }, + "tags": { + "description": "Contains resource tags defined as key/value pairs.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index 4c01c8693ed7..3bc0cebb35c4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -6,7 +6,7 @@ "api-version": "2020-09-01-preview", "endpointName": "testEndpointName", "deploymentId": "testBatchDeployment", - "body": { + "properties": { "location": "westus2euap", "tags": {}, "properties": { @@ -27,8 +27,7 @@ } }, "codeConfiguration": { - "codeArtifactId": "some code artifact", - "startupCommand": "batch_scoring.py" + "command": ["batch_scoring.py"] }, "environmentId": "some environment", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json index ff7fab0d242e..a0b83d07f86b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json @@ -5,7 +5,7 @@ "workspaceName": "testworkspace", "api-version": "2020-09-01-preview", "endpointName": "testBatchEndpoint", - "body": { + "properties": { "location": "westus2euap", "tags": {}, "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json index ed0a227a2907..af642589108e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json @@ -9,12 +9,6 @@ }, "responses": { "200": {}, - "202": { - "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", - "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." - } - }, "204": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json index e643ed287946..ae1161f741dc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json @@ -8,12 +8,6 @@ }, "responses": { "200": {}, - "202": { - "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", - "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." - } - }, "204": {} } } From 543f78eda4da7f99a6fc1ba88c0f92b680072f2b Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 22:24:18 -0700 Subject: [PATCH 6/9] Validation fixes part 2 --- .../2020-09-01-preview/batchInference.json | 47 +++++++++++++------ .../createOrUpdateBatchDeployment.json | 4 +- .../examples/createOrUpdateBatchEndpoint.json | 8 ++-- .../examples/getBatchEndpoint.json | 3 +- .../examples/getBatchEndpoints.json | 9 ++-- 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 9d3657b94ae3..a2f2127c1871 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -674,6 +674,11 @@ "required": [ "properties" ], + "allOf": [ + { + "$ref": "machineLearningServices.json#/definitions/Resource" + } + ], "type": "object", "x-ms-azure-resource": true, "properties": { @@ -695,6 +700,17 @@ "properties": { "$ref": "#/definitions/BatchEndpoint" }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" + }, + "tags": { + "description": "Contains resource tags defined as key/value pairs.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -991,25 +1007,28 @@ } } }, - "ComputeType": { - "enum": [ - "AMLCompute", - "AKS", - "ACI" - ], - "type": "string", - "x-ms-enum": { - "name": "ComputeType", - "modelAsString": false - } - }, "ComputeConfiguration": { + "description": "Compute Configuration of the endpoint.", "type": "object", + "required": [ + "computeType" + ], "properties": { "computeType": { - "$ref": "#/definitions/ComputeType" + "enum": [ + "ACI", + "AKS", + "AMLCompute" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeConfigurationType", + "modelAsString": true + }, + "description": "Compute Configuration type such as ACI, AKS, or AMLCompute" } - } + }, + "discriminator": "computeType" }, "BatchDeploymentSettings": { "description": "Batch inference specific settings per deployment.", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index 3bc0cebb35c4..b8de6569d3f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -27,7 +27,9 @@ } }, "codeConfiguration": { - "command": ["batch_scoring.py"] + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json index a0b83d07f86b..115a17f407b4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json @@ -12,7 +12,7 @@ "name": "test9301", "description": "Testing pipeline endpoint creation", "authMode": "AMLTokenAuth", - "trafficRoute": "{'testDeployment1': 100, 'testDeployment2': 0}", + "trafficRules": "{'testDeployment1': 100, 'testDeployment2': 0}", "computeConfiguration": { "computeType": "AMLCompute" } @@ -28,10 +28,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, @@ -52,10 +51,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json index 71dde26d754d..bea57cd9cb57 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -15,10 +15,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json index b180d6d76bc1..70947630b075 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json @@ -16,10 +16,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, @@ -38,10 +37,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, @@ -60,10 +58,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, From 81fd25c6049aa064dbefafbfde78854518a721b7 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 23:03:06 -0700 Subject: [PATCH 7/9] Fix spec errors --- .../2020-09-01-preview/batchInference.json | 111 +++++------------- 1 file changed, 27 insertions(+), 84 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index a2f2127c1871..3f1a6f108aba 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -109,6 +109,11 @@ ], "summary": "Gets a batch inference deployment by id.", "operationId": "BatchDeployments_Get", + "x-ms-examples": { + "Create or update BatchDeployment": { + "$ref": "./examples/getBatchDeployment.json" + } + }, "produces": [ "text/plain", "application/json", @@ -116,34 +121,22 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "#/parameters/EndpointDeploymentIdParameter" }, { - "$ref": "#/parameters/EndpointDeploymentIdParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "Version of Azure Machine Learning resource provider API.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -179,34 +172,22 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "#/parameters/EndpointDeploymentIdParameter" }, { - "$ref": "#/parameters/EndpointDeploymentIdParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "API version.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -257,12 +238,6 @@ }, { "$ref": "#/parameters/EndpointNameParameter" - }, - { - "in": "query", - "name": "api-version", - "description": "Version of Azure Machine Learning resource provider API.", - "type": "string" } ], "responses": { @@ -368,31 +343,19 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "Version of Azure Machine Learning resource provider API.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -428,31 +391,19 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "API version.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -646,9 +597,6 @@ "additionalProperties": { "type": "string" } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -710,9 +658,6 @@ "additionalProperties": { "type": "string" } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -968,13 +913,11 @@ "$ref": "#/definitions/EndpointProvisioningState" }, "endpoint": { - "format": "uri", "description": "Endpoint URI", "type": "string", "readOnly": true }, "swaggerEndpoint": { - "format": "uri", "description": "Endpoint Swagger URI", "type": "string", "readOnly": true From 8df3726a5657b41ae2b37e87ca10505d36fe9265 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 23:31:15 -0700 Subject: [PATCH 8/9] Fix version --- .../preview/2020-09-01-preview/batchInference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 3f1a6f108aba..7c5121b6992c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -3,7 +3,7 @@ "info": { "title": "Azure Machine Learning Workspaces", "description": "These APIs allow end users to operate on Azure Machine Learning Workspace resources.", - "version": "2020-12-01-preview" + "version": "2020-09-01-preview" }, "host": "management.azure.com", "schemes": [ From 42a3585bc8a477e8a4fbd5d50eeb52540474e3f2 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 8 Oct 2020 23:46:07 -0700 Subject: [PATCH 9/9] PR feedback from ARM API review --- .../2020-09-01-preview/batchInference.json | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 7c5121b6992c..86cc680427fc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -41,6 +41,7 @@ ], "summary": "Creates a batch inference deployment.", "operationId": "BatchDeployments_CreateOrUpdate", + "x-ms-long-running-operation": true, "x-ms-examples": { "Create or update BatchDeployment": { "$ref": "./examples/createOrUpdateBatchDeployment.json" @@ -266,6 +267,7 @@ ], "summary": "Creates a batch inference endpoint.", "operationId": "BatchEndpoints_CreateOrUpdate", + "x-ms-long-running-operation": true, "x-ms-examples": { "Create or update BatchEndpoint": { "$ref": "./examples/createOrUpdateBatchEndpoint.json" @@ -821,18 +823,6 @@ "batchSettings": { "$ref": "#/definitions/BatchDeploymentSettings" }, - "tags": { - "description": "Tag dictionary. Tags can be added, removed, and updated.", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "create", - "read", - "update" - ] - }, "description": { "description": "Description of the endpoint deployment.", "type": "string" @@ -875,18 +865,6 @@ "description": "Batch endpoint configuration", "type": "object", "properties": { - "tags": { - "description": "Tag dictionary. Tags can be added, removed, and updated.", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "create", - "read", - "update" - ] - }, "description": { "description": "Description of the inference endpoint.", "type": "string"