From 4fc530fa88ebaabb8622aeb4b0fd2cbf157da0d6 Mon Sep 17 00:00:00 2001 From: Mark Cowlishaw Date: Wed, 14 Oct 2020 20:08:55 -0700 Subject: [PATCH] Revert "2020-09-01-preview Batch endpoints and deployments (#11028)" This reverts commit 77edb736ff2d353506267e8a98cded8beeb7423c. --- .../2020-09-01-preview/batchInference.json | 982 ------------------ .../createOrUpdateBatchDeployment.json | 133 --- .../examples/createOrUpdateBatchEndpoint.json | 70 -- .../examples/deleteBatchDeployment.json | 14 - .../examples/deleteBatchEndpoint.json | 13 - .../examples/getBatchDeployment.json | 57 - .../examples/getBatchDeployments.json | 147 --- .../examples/getBatchEndpoint.json | 34 - .../examples/getBatchEndpoints.json | 80 -- .../examples/listKeysBatchEndpoint.json | 17 - .../resource-manager/readme.md | 1 - 11 files changed, 1548 deletions(-) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.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 deleted file mode 100644 index 86cc680427fc..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ /dev/null @@ -1,982 +0,0 @@ -{ - "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-09-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-long-running-operation": true, - "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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "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", - "x-ms-examples": { - "Create or update BatchDeployment": { - "$ref": "./examples/getBatchDeployment.json" - } - }, - "produces": [ - "text/plain", - "application/json", - "text/json" - ], - "parameters": [ - { - "$ref": "#/parameters/EndpointDeploymentIdParameter" - }, - { - "$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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/BatchDeploymentResource" - } - } - } - }, - "delete": { - "tags": [ - "BatchDeployment" - ], - "summary": "Delete Batch Inference deployment.", - "operationId": "BatchDeployments_Delete", - "x-ms-examples": { - "Delete BatchDeployment": { - "$ref": "./examples/deleteBatchDeployment.json" - } - }, - "produces": [ - "text/plain", - "application/json", - "text/json" - ], - "parameters": [ - { - "$ref": "#/parameters/EndpointDeploymentIdParameter" - }, - { - "$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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "200": { - "description": "Success" - }, - "204": { - "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 BatchDeployments": { - "$ref": "./examples/getBatchDeployments.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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "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-long-running-operation": true, - "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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "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", - "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" - }, - { - "$ref": "#/parameters/EndpointNameParameter" - } - ], - "responses": { - "default": { - "description": "Error", - "schema": { - "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/BatchEndpointResource" - } - } - } - }, - "delete": { - "tags": [ - "BatchEndpoint" - ], - "summary": "Delete Batch Inference Endpoint.", - "operationId": "BatchEndpoints_Delete", - "x-ms-examples": { - "Delete BatchEndpoint": { - "$ref": "./examples/deleteBatchEndpoint.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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "200": { - "description": "Success" - }, - "204": { - "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 BatchEndpoints": { - "$ref": "./examples/getBatchEndpoints.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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "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": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "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" - ], - "allOf": [ - { - "$ref": "machineLearningServices.json#/definitions/Resource" - } - ], - "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" - }, - "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" - } - } - } - }, - "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" - ], - "allOf": [ - { - "$ref": "machineLearningServices.json#/definitions/Resource" - } - ], - "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" - }, - "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" - } - } - } - }, - "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" - } - } - }, - "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" - }, - "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": { - "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": { - "description": "Endpoint URI", - "type": "string", - "readOnly": true - }, - "swaggerEndpoint": { - "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" - } - } - } - }, - "ComputeConfiguration": { - "description": "Compute Configuration of the endpoint.", - "type": "object", - "required": [ - "computeType" - ], - "properties": { - "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.", - "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" - } - } - } - } -} 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 deleted file mode 100644 index b8de6569d3f4..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", - "endpointName": "testEndpointName", - "deploymentId": "testBatchDeployment", - "properties": { - "location": "westus2euap", - "tags": {}, - "properties": { - "scaleSettings": { - "nodeCount": 1 - }, - "batchSettings": { - "computeId": "cluster-name", - "partitioningScheme": { - "miniBatchSize": 20 - }, - "outputConfiguration": { - "outputAction": "AppendRow" - }, - "errorThreshold": 5, - "retrySettings": { - "timeoutInSeconds": 30 - } - }, - "codeConfiguration": { - "command": [ - "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" - } - } - } - } -} 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 deleted file mode 100644 index 115a17f407b4..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", - "endpointName": "testBatchEndpoint", - "properties": { - "location": "westus2euap", - "tags": {}, - "properties": { - "name": "test9301", - "description": "Testing pipeline endpoint creation", - "authMode": "AMLTokenAuth", - "trafficRules": "{'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": { - "authMode": "AMLTokenAuth", - "provisioningState": "Succeeded", - "trafficRules": { - "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": { - "authMode": "AMLTokenAuth", - "provisioningState": "Succeeded", - "trafficRules": { - "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/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json deleted file mode 100644 index af642589108e..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "endpointName": "testBatchEndpoint", - "deploymentId": "testBatchDeployment", - "api-version": "2020-12-01-preview" - }, - "responses": { - "200": {}, - "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 deleted file mode 100644 index ae1161f741dc..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "endpointName": "testBatchEndpoint", - "api-version": "2020-12-01-preview" - }, - "responses": { - "200": {}, - "204": {} - } -} 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 deleted file mode 100644 index 817f84d77493..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "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" - } - } - } - } -} 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 deleted file mode 100644 index 911260591bb9..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "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" - } - } - } -} 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 deleted file mode 100644 index bea57cd9cb57..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "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": { - "authMode": "AMLTokenAuth", - "provisioningState": "Succeeded", - "trafficRules": { - "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/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json deleted file mode 100644 index 70947630b075..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "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": { - "authMode": "AMLTokenAuth", - "provisioningState": "Succeeded", - "trafficRules": { - "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": { - "authMode": "AMLTokenAuth", - "provisioningState": "Succeeded", - "trafficRules": { - "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": { - "authMode": "AMLTokenAuth", - "provisioningState": "Succeeded", - "trafficRules": { - "testDeployment1": 100, - "testDeployment2": 0 - }, - "computeConfiguration": { - "computeType": "AMLCompute" - }, - "properties": { - "description": "Testing pipeline endpoint creation" - } - } - } - ], - "nextLink": "nextLink" - } - } - } -} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json deleted file mode 100644 index da4bd2db7c83..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", - "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", - "endpointName": "testBatchEndpoint" - }, - "responses": { - "200": { - "body": { - "primaryKey": "primary key value...", - "secondaryKey": "secondary key value..." - } - } - } -} diff --git a/specification/machinelearningservices/resource-manager/readme.md b/specification/machinelearningservices/resource-manager/readme.md index a3009c9b4312..4870058be3a7 100644 --- a/specification/machinelearningservices/resource-manager/readme.md +++ b/specification/machinelearningservices/resource-manager/readme.md @@ -126,7 +126,6 @@ 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