From 3534d2a01cb4574bd9b959c7a619876780ccb797 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 4 Feb 2021 21:52:27 +0000 Subject: [PATCH] CodeGen from PR 12859 in Azure/azure-rest-api-specs Merge 62e0c50085c877a80b63a7123b69063e59260631 into 32b7b579549d417d5a799b4d0527f5ad9dd73fc3 --- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 2 +- .../Microsoft.MachineLearningServices.json | 506 +++++++++++++++++- 13 files changed, 515 insertions(+), 15 deletions(-) diff --git a/schemas/2018-03-01-preview/Microsoft.MachineLearningServices.json b/schemas/2018-03-01-preview/Microsoft.MachineLearningServices.json index 27d7c284ec..cb753de29d 100644 --- a/schemas/2018-03-01-preview/Microsoft.MachineLearningServices.json +++ b/schemas/2018-03-01-preview/Microsoft.MachineLearningServices.json @@ -675,4 +675,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/computes" } } -} \ No newline at end of file +} diff --git a/schemas/2018-11-19/Microsoft.MachineLearningServices.json b/schemas/2018-11-19/Microsoft.MachineLearningServices.json index 5e58e58dbc..c4a6353fc6 100644 --- a/schemas/2018-11-19/Microsoft.MachineLearningServices.json +++ b/schemas/2018-11-19/Microsoft.MachineLearningServices.json @@ -848,4 +848,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/computes" } } -} \ No newline at end of file +} diff --git a/schemas/2019-05-01/Microsoft.MachineLearningServices.json b/schemas/2019-05-01/Microsoft.MachineLearningServices.json index 39425f5a51..2fe5c1e263 100644 --- a/schemas/2019-05-01/Microsoft.MachineLearningServices.json +++ b/schemas/2019-05-01/Microsoft.MachineLearningServices.json @@ -848,4 +848,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/computes" } } -} \ No newline at end of file +} diff --git a/schemas/2019-06-01/Microsoft.MachineLearningServices.json b/schemas/2019-06-01/Microsoft.MachineLearningServices.json index edd6c31920..eba9dc1ceb 100644 --- a/schemas/2019-06-01/Microsoft.MachineLearningServices.json +++ b/schemas/2019-06-01/Microsoft.MachineLearningServices.json @@ -864,4 +864,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/computes" } } -} \ No newline at end of file +} diff --git a/schemas/2019-11-01/Microsoft.MachineLearningServices.json b/schemas/2019-11-01/Microsoft.MachineLearningServices.json index 11637fb645..7c83f16bbd 100644 --- a/schemas/2019-11-01/Microsoft.MachineLearningServices.json +++ b/schemas/2019-11-01/Microsoft.MachineLearningServices.json @@ -911,4 +911,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/computes" } } -} \ No newline at end of file +} diff --git a/schemas/2020-01-01/Microsoft.MachineLearningServices.json b/schemas/2020-01-01/Microsoft.MachineLearningServices.json index 1903391d75..1e513321d9 100644 --- a/schemas/2020-01-01/Microsoft.MachineLearningServices.json +++ b/schemas/2020-01-01/Microsoft.MachineLearningServices.json @@ -1234,4 +1234,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" } } -} \ No newline at end of file +} diff --git a/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json b/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json index fd2d56e182..bb37d07667 100644 --- a/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json +++ b/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json @@ -1421,4 +1421,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" } } -} \ No newline at end of file +} diff --git a/schemas/2020-03-01/Microsoft.MachineLearningServices.json b/schemas/2020-03-01/Microsoft.MachineLearningServices.json index 7f31b076db..91ec31cf8a 100644 --- a/schemas/2020-03-01/Microsoft.MachineLearningServices.json +++ b/schemas/2020-03-01/Microsoft.MachineLearningServices.json @@ -1322,4 +1322,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" } } -} \ No newline at end of file +} diff --git a/schemas/2020-04-01/Microsoft.MachineLearningServices.json b/schemas/2020-04-01/Microsoft.MachineLearningServices.json index cd4004357a..9308013a04 100644 --- a/schemas/2020-04-01/Microsoft.MachineLearningServices.json +++ b/schemas/2020-04-01/Microsoft.MachineLearningServices.json @@ -1379,4 +1379,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" } } -} \ No newline at end of file +} diff --git a/schemas/2020-05-01-preview/Microsoft.MachineLearningServices.json b/schemas/2020-05-01-preview/Microsoft.MachineLearningServices.json index d6c1aa368a..aa3941f69d 100644 --- a/schemas/2020-05-01-preview/Microsoft.MachineLearningServices.json +++ b/schemas/2020-05-01-preview/Microsoft.MachineLearningServices.json @@ -3566,4 +3566,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/services" } } -} \ No newline at end of file +} diff --git a/schemas/2020-05-15-preview/Microsoft.MachineLearningServices.json b/schemas/2020-05-15-preview/Microsoft.MachineLearningServices.json index cf29ce8c05..69c490a194 100644 --- a/schemas/2020-05-15-preview/Microsoft.MachineLearningServices.json +++ b/schemas/2020-05-15-preview/Microsoft.MachineLearningServices.json @@ -2894,4 +2894,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/services" } } -} \ No newline at end of file +} diff --git a/schemas/2020-06-01/Microsoft.MachineLearningServices.json b/schemas/2020-06-01/Microsoft.MachineLearningServices.json index 8e37d77da2..427f8118e1 100644 --- a/schemas/2020-06-01/Microsoft.MachineLearningServices.json +++ b/schemas/2020-06-01/Microsoft.MachineLearningServices.json @@ -1469,4 +1469,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" } } -} \ No newline at end of file +} diff --git a/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json b/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json index f9ab9cc0aa..d2e4716733 100644 --- a/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json +++ b/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json @@ -47,6 +47,9 @@ "type": "array", "items": { "oneOf": [ + { + "$ref": "#/definitions/workspaces_labelingJobs_childResource" + }, { "$ref": "#/definitions/workspaces_computes_childResource" }, @@ -225,6 +228,45 @@ ], "description": "Microsoft.MachineLearningServices/workspaces/connections" }, + "workspaces_labelingJobs": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "name": { + "type": "string", + "description": "Name and identifier for LabelingJob." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/LabelingJobProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Definition of a labeling job." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.MachineLearningServices/workspaces/labelingJobs" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/labelingJobs" + }, "workspaces_linkedServices": { "type": "object", "properties": { @@ -719,7 +761,7 @@ ], "description": "Number of agents" }, - "agentVMSize": { + "agentVmSize": { "type": "string", "description": "Agent virtual machine size" }, @@ -1257,6 +1299,27 @@ }, "description": "Machine Learning compute object." }, + "ComputeBinding": { + "type": "object", + "properties": { + "computeId": { + "type": "string", + "description": "ID of the compute resource." + }, + "nodeCount": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Number of nodes." + } + }, + "description": "Compute binding definition." + }, "ComputeInstance": { "type": "object", "properties": { @@ -1326,6 +1389,17 @@ ], "description": "Settings for a personal compute instance." }, + "setupScripts": { + "oneOf": [ + { + "$ref": "#/definitions/SetupScripts" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Details of customized scripts to execute for setting up the cluster." + }, "sshSettings": { "oneOf": [ { @@ -1941,6 +2015,266 @@ "keyVaultArmId" ] }, + "LabelCategory": { + "type": "object", + "properties": { + "allowMultiSelect": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether it is allowed to select multiple classes in this category." + }, + "classes": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/LabelClass" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Dictionary of label classes in this category." + }, + "displayName": { + "type": "string", + "description": "Display name of the label category." + } + }, + "required": [ + "classes" + ], + "description": "Represents a category of labels in a labeling job." + }, + "LabelClass": { + "type": "object", + "properties": { + "displayName": { + "type": "string", + "description": "Display name of the label class." + }, + "subclasses": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/LabelClass" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Dictionary of subclasses of the label class." + } + }, + "description": "Represents a label or a category of labels in a labeling job." + }, + "LabelingDatasetConfiguration": { + "type": "object", + "properties": { + "assetName": { + "type": "string", + "description": "Name of the data asset to perform labeling." + }, + "datasetVersion": { + "type": "string", + "description": "AML dataset version." + }, + "enableIncrementalDatasetRefresh": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether to enable incremental dataset refresh." + } + }, + "required": [ + "assetName", + "datasetVersion" + ], + "description": "Represents configuration of dataset used in a labeling job." + }, + "LabelingJobImageProperties": { + "type": "object", + "properties": { + "additionalProperties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": {} + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Unmatched properties from the message are deserialized this collection" + }, + "annotationType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Classification", + "BoundingBox", + "InstanceSegmentation" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Annotation type of image labeling tasks." + }, + "mediaType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Image", + "Text" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Media type of data asset." + } + }, + "required": [ + "mediaType" + ], + "description": "Properties in an labeling job of image media." + }, + "LabelingJobInstructions": { + "type": "object", + "properties": { + "uri": { + "type": "string", + "description": "The link to a page with detailed labeling instructions for labelers." + } + }, + "description": "Instructions for a labeling job." + }, + "LabelingJobProperties": { + "type": "object", + "properties": { + "datasetConfiguration": { + "oneOf": [ + { + "$ref": "#/definitions/LabelingDatasetConfiguration" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Represents configuration of dataset used in a labeling job." + }, + "jobInstructions": { + "oneOf": [ + { + "$ref": "#/definitions/LabelingJobInstructions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Instructions for a labeling job." + }, + "labelCategories": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/LabelCategory" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Label categories of the job." + }, + "labelingJobMediaProperties": { + "oneOf": [ + { + "$ref": "#/definitions/LabelingJobImageProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties in an labeling job of image media." + }, + "mlAssistConfiguration": { + "oneOf": [ + { + "$ref": "#/definitions/MLAssistConfiguration" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Represents configuration for machine learning assisted features in a labeling job." + }, + "properties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The job property dictionary. Properties can be added, but not removed or altered." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The job tag dictionary. Tags can be added, removed, and updated." + } + }, + "required": [ + "datasetConfiguration", + "jobInstructions", + "labelCategories", + "labelingJobMediaProperties" + ], + "description": "Definition of a labeling job." + }, "LinkedServiceProps": { "type": "object", "properties": { @@ -1978,6 +2312,65 @@ ], "description": "LinkedService specific properties." }, + "MLAssistConfiguration": { + "type": "object", + "properties": { + "inferencingComputeBinding": { + "oneOf": [ + { + "$ref": "#/definitions/ComputeBinding" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Compute binding definition." + }, + "mlAssistEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether MLAssist feature is enabled." + }, + "modelNamePrefix": { + "type": "string", + "description": "Name prefix to use for machine learning model. For each iteration modelName will be appended with iteration e.g.{modelName}_{i}." + }, + "prelabelAccuracyThreshold": { + "oneOf": [ + { + "type": "number" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Prelabel accuracy threshold used in MLAssist feature." + }, + "trainingComputeBinding": { + "oneOf": [ + { + "$ref": "#/definitions/ComputeBinding" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Compute binding definition." + } + }, + "required": [ + "inferencingComputeBinding", + "modelNamePrefix", + "trainingComputeBinding" + ], + "description": "Represents configuration for machine learning assisted features in a labeling job." + }, "Model": { "type": "object", "properties": { @@ -2515,6 +2908,73 @@ ], "description": "scale settings for AML Compute" }, + "ScriptReference": { + "type": "object", + "properties": { + "scriptArguments": { + "type": "string", + "description": "Optional command line arguments passed to the script to run." + }, + "scriptData": { + "type": "string", + "description": "The location of scripts in the mounted volume." + }, + "scriptSource": { + "type": "string", + "description": "The storage source of the script: inline, workspace." + }, + "timeout": { + "type": "string", + "description": "Optional time period passed to timeout command." + } + }, + "description": "Script reference" + }, + "ScriptsToExecute": { + "type": "object", + "properties": { + "creationScript": { + "oneOf": [ + { + "$ref": "#/definitions/ScriptReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Script reference" + }, + "startupScript": { + "oneOf": [ + { + "$ref": "#/definitions/ScriptReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Script reference" + } + }, + "description": "Customized setup scripts" + }, + "SetupScripts": { + "type": "object", + "properties": { + "scripts": { + "oneOf": [ + { + "$ref": "#/definitions/ScriptsToExecute" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Customized setup scripts" + } + }, + "description": "Details of customized scripts to execute for setting up the cluster." + }, "SharedPrivateLinkResource": { "type": "object", "properties": { @@ -2620,7 +3080,8 @@ "type": "string", "enum": [ "Disabled", - "Enabled" + "Enabled", + "Auto" ] }, { @@ -2980,6 +3441,45 @@ ], "description": "Microsoft.MachineLearningServices/workspaces/connections" }, + "workspaces_labelingJobs_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "name": { + "type": "string", + "description": "Name and identifier for LabelingJob." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/LabelingJobProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Definition of a labeling job." + }, + "type": { + "type": "string", + "enum": [ + "labelingJobs" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/labelingJobs" + }, "workspaces_linkedServices_childResource": { "type": "object", "properties": { @@ -3211,4 +3711,4 @@ "description": "Microsoft.MachineLearningServices/workspaces/services" } } -} \ No newline at end of file +}