From 8f28d9b1266752c9612e8fed718659fcb614d8e9 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Thu, 18 May 2023 11:42:20 -0500 Subject: [PATCH 1/9] Updated mfe.json --- .../preview/2023-06-01-preview/mfe.json | 1112 +++++++++++++---- 1 file changed, 900 insertions(+), 212 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json index fea7d8a671ba..167c3aa855aa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json @@ -161,8 +161,7 @@ "name": "codeName", "description": "Container name.", "required": true, - "type": "string", - "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + "type": "string" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -370,8 +369,7 @@ "name": "codeName", "description": "Container name.", "required": true, - "type": "string", - "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + "type": "string" }, { "in": "path", @@ -940,8 +938,7 @@ "name": "componentName", "description": "Container name.", "required": true, - "type": "string", - "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + "type": "string" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -2286,6 +2283,12 @@ } ] } + }, + { + "in": "query", + "name": "stage", + "description": "Stage for including/excluding (for example) archived entities. Takes priority over listViewType", + "type": "string" } ], "responses": { @@ -3193,6 +3196,98 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}/package": { + "post": { + "tags": [ + "ModelVersion" + ], + "summary": "Model Version Package operation.", + "operationId": "RegistryModelVersions_Package", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "registries.json#/parameters/RegistryNameParameter" + }, + { + "in": "path", + "name": "modelName", + "description": "Container name. This is case-sensitive.", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "in": "path", + "name": "version", + "description": "Version identifier. This is case-sensitive.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "body", + "description": "Package operation request body.", + "required": true, + "schema": { + "$ref": "#/definitions/PackageRequest" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/PackageResponse" + } + }, + "202": { + "description": "Accepted", + "headers": { + "Location": { + "description": "URI to poll for asynchronous operation result.", + "type": "string" + }, + "Retry-After": { + "description": "Duration the client should wait between requests, in seconds.", + "type": "integer", + "format": "int32", + "maximum": 600, + "minimum": 10 + } + } + } + }, + "x-ms-examples": { + "Package Registry Model Version.": { + "$ref": "./examples/Registry/ModelVersion/package.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}/startPendingUpload": { "post": { "tags": [ @@ -6386,6 +6481,12 @@ } ] } + }, + { + "in": "query", + "name": "stage", + "description": "Stage for including/excluding (for example) archived entities. Takes priority over listViewType", + "type": "string" } ], "responses": { @@ -6770,7 +6871,7 @@ { "in": "query", "name": "description", - "description": "Description of the featureset.", + "description": "description.", "type": "string" } ], @@ -11405,6 +11506,16 @@ "x-ms-discriminator-value": "AMLToken", "additionalProperties": false }, + "AmlTokenComputeIdentity": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitorComputeIdentityBase" + } + ], + "x-ms-discriminator-value": "AmlToken", + "additionalProperties": false + }, "AssetBase": { "type": "object", "allOf": [ @@ -12981,8 +13092,7 @@ "enum": [ "Accuracy", "Precision", - "Recall", - "F1Score" + "Recall" ], "type": "string", "x-ms-enum": { @@ -13000,10 +13110,6 @@ { "value": "Recall", "description": "Calculates the recall of the model predictions." - }, - { - "value": "F1Score", - "description": "Calculates the F1 score of the model predictions." } ] }, @@ -14022,7 +14128,8 @@ "CustomMonitoringSignal": { "required": [ "componentId", - "metricThresholds" + "metricThresholds", + "workspaceConnection" ], "type": "object", "allOf": [ @@ -14045,7 +14152,21 @@ "description": "Monitoring assets to take as input. Key is the component input port name, value is the data asset.", "type": "object", "additionalProperties": { - "$ref": "#/definitions/MonitoringInputData", + "$ref": "#/definitions/MonitoringInputDataBase", + "x-nullable": true + }, + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "inputs": { + "description": "Extra component parameters to take as input. Key is the component literal input port name, value is the parameter value.", + "type": "object", + "additionalProperties": { + "description": "Command job definition.", + "$ref": "#/definitions/JobInput", "x-nullable": true }, "x-ms-mutability": [ @@ -14065,6 +14186,14 @@ "read" ], "x-ms-identifiers": [] + }, + "workspaceConnection": { + "description": "[Required] A list of metrics to calculate and their associated thresholds.", + "$ref": "#/definitions/MonitoringWorkspaceConnection", + "x-ms-mutability": [ + "create", + "read" + ] } }, "x-ms-discriminator-value": "Custom", @@ -14291,9 +14420,9 @@ }, "DataDriftMonitoringSignal": { "required": [ - "baselineData", "metricThresholds", - "targetData" + "productionData", + "referenceData" ], "type": "object", "allOf": [ @@ -14302,17 +14431,21 @@ } ], "properties": { - "baselineData": { - "description": "[Required] The data to calculate drift against.", - "$ref": "#/definitions/MonitoringInputData", + "dataSegment": { + "description": "The data segment used for scoping on a subset of the data population.", + "$ref": "#/definitions/MonitoringDataSegment", "x-ms-mutability": [ "create", "read" - ] + ], + "x-nullable": true }, - "dataSegment": { - "description": "The data segment used for scoping on a subset of the data population.", - "$ref": "#/definitions/MonitoringDataSegment", + "featureDataTypeOverride": { + "description": "A dictionary that maps feature names to their respective data types.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/MonitoringFeatureDataType" + }, "x-ms-mutability": [ "create", "read" @@ -14340,9 +14473,17 @@ ], "x-ms-identifiers": [] }, - "targetData": { + "productionData": { "description": "[Required] The data which drift will be calculated for.", - "$ref": "#/definitions/MonitoringInputData", + "$ref": "#/definitions/MonitoringInputDataBase", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "referenceData": { + "description": "[Required] The data to calculate drift against.", + "$ref": "#/definitions/MonitoringInputDataBase", "x-ms-mutability": [ "create", "read" @@ -14468,9 +14609,9 @@ }, "DataQualityMonitoringSignal": { "required": [ - "baselineData", "metricThresholds", - "targetData" + "productionData", + "referenceData" ], "type": "object", "allOf": [ @@ -14479,13 +14620,17 @@ } ], "properties": { - "baselineData": { - "description": "[Required] The data to calculate drift against.", - "$ref": "#/definitions/MonitoringInputData", + "featureDataTypeOverride": { + "description": "A dictionary that maps feature names to their respective data types.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/MonitoringFeatureDataType" + }, "x-ms-mutability": [ "create", "read" - ] + ], + "x-nullable": true }, "features": { "description": "The features to calculate drift over.", @@ -14508,9 +14653,17 @@ ], "x-ms-identifiers": [] }, - "targetData": { + "productionData": { "description": "[Required] The data produced by the production service which drift will be calculated for.", - "$ref": "#/definitions/MonitoringInputData", + "$ref": "#/definitions/MonitoringInputDataBase", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "referenceData": { + "description": "[Required] The data to calculate drift against.", + "$ref": "#/definitions/MonitoringInputDataBase", "x-ms-mutability": [ "create", "read" @@ -15676,10 +15829,9 @@ }, "FeatureAttributionDriftMonitoringSignal": { "required": [ - "baselineData", "metricThreshold", - "modelType", - "targetData" + "productionData", + "referenceData" ], "type": "object", "allOf": [ @@ -15688,14 +15840,6 @@ } ], "properties": { - "baselineData": { - "description": "[Required] The data to calculate drift against.", - "$ref": "#/definitions/MonitoringInputData", - "x-ms-mutability": [ - "create", - "read" - ] - }, "metricThreshold": { "description": "[Required] A list of metrics to calculate and their associated thresholds.", "$ref": "#/definitions/FeatureAttributionMetricThreshold", @@ -15704,17 +15848,21 @@ "read" ] }, - "modelType": { - "description": "[Required] The type of task the model performs.", - "$ref": "#/definitions/MonitoringModelType", + "productionData": { + "description": "[Required] The data which drift will be calculated for.", + "type": "array", + "items": { + "$ref": "#/definitions/MonitoringInputDataBase" + }, "x-ms-mutability": [ "create", "read" - ] + ], + "x-ms-identifiers": [] }, - "targetData": { - "description": "[Required] The data which drift will be calculated for.", - "$ref": "#/definitions/MonitoringInputData", + "referenceData": { + "description": "[Required] The data to calculate drift against.", + "$ref": "#/definitions/MonitoringInputDataBase", "x-ms-mutability": [ "create", "read" @@ -16397,6 +16545,16 @@ "x-ms-discriminator-value": "file_system", "additionalProperties": false }, + "FixedInputData": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitoringInputDataBase" + } + ], + "x-ms-discriminator-value": "Fixed", + "additionalProperties": false + }, "FlavorData": { "type": "object", "properties": { @@ -16737,59 +16895,288 @@ }, "additionalProperties": false }, - "Goal": { - "description": "Defines supported metric goals for hyperparameter tuning", + "GenerationSafetyQualityMetric": { "enum": [ - "Minimize", - "Maximize" + "AcceptableGroundednessScorePerInstance", + "AggregatedGroundednessPassRate", + "AcceptableCoherenceScorePerInstance", + "AggregatedCoherencePassRate", + "AcceptableFluencyScorePerInstance", + "AggregatedFluencyPassRate", + "AcceptableSimilarityScorePerInstance", + "AggregatedSimilarityPassRate", + "AcceptableRelevanceScorePerInstance", + "AggregatedRelevancePassRate" ], "type": "string", "x-ms-enum": { - "name": "Goal", + "name": "GenerationSafetyQualityMetric", "modelAsString": true, "values": [ { - "value": "Minimize" + "value": "AcceptableGroundednessScorePerInstance" }, { - "value": "Maximize" + "value": "AggregatedGroundednessPassRate" + }, + { + "value": "AcceptableCoherenceScorePerInstance" + }, + { + "value": "AggregatedCoherencePassRate" + }, + { + "value": "AcceptableFluencyScorePerInstance" + }, + { + "value": "AggregatedFluencyPassRate" + }, + { + "value": "AcceptableSimilarityScorePerInstance" + }, + { + "value": "AggregatedSimilarityPassRate" + }, + { + "value": "AcceptableRelevanceScorePerInstance" + }, + { + "value": "AggregatedRelevancePassRate" } ] }, "additionalProperties": false }, - "GridSamplingAlgorithm": { - "description": "Defines a Sampling Algorithm that exhaustively generates every value combination in the space", + "GenerationSafetyQualityMetricThreshold": { + "required": [ + "metric" + ], "type": "object", - "allOf": [ - { - "$ref": "#/definitions/SamplingAlgorithm" + "properties": { + "metric": { + "description": "[Required] Gets or sets the feature attribution metric to calculate.", + "$ref": "#/definitions/GenerationSafetyQualityMetric", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "threshold": { + "description": "Gets or sets the threshold value.\r\nIf null, a default value will be set depending on the selected metric.", + "$ref": "#/definitions/MonitoringThreshold", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true } - ], - "x-ms-discriminator-value": "Grid", + }, "additionalProperties": false }, - "HdfsDatastore": { + "GenerationSafetyQualityMonitoringSignal": { "required": [ - "nameNodeAddress" + "metricThresholds", + "samplingRate" ], "type": "object", "allOf": [ { - "$ref": "#/definitions/Datastore" + "$ref": "#/definitions/MonitoringSignalBase" } ], "properties": { - "hdfsServerCertificate": { - "description": "The TLS cert of the HDFS server. Needs to be a base64 encoded string. Required if \"Https\" protocol is selected.", - "type": "string", + "metricThresholds": { + "description": "[Required] Gets or sets the metrics to calculate and the corresponding thresholds.", + "type": "array", + "items": { + "$ref": "#/definitions/GenerationSafetyQualityMetricThreshold" + }, "x-ms-mutability": [ "create", "read" ], - "x-nullable": true + "x-ms-identifiers": [] }, - "nameNodeAddress": { + "productionData": { + "description": "Gets or sets the target data for computing metrics.", + "type": "array", + "items": { + "$ref": "#/definitions/MonitoringInputDataBase" + }, + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true, + "x-ms-identifiers": [] + }, + "samplingRate": { + "format": "double", + "description": "[Required] The sample rate of the target data, should be greater than 0 and at most 1.", + "type": "number", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "workspaceConnectionId": { + "description": "Gets or sets the workspace connection ID used to connect to the content generation endpoint.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + } + }, + "x-ms-discriminator-value": "GenerationSafetyQuality", + "additionalProperties": false + }, + "GenerationTokenStatisticsMetric": { + "enum": [ + "TotalTokenCount", + "TotalTokenCountPerGroup" + ], + "type": "string", + "x-ms-enum": { + "name": "GenerationTokenStatisticsMetric", + "modelAsString": true, + "values": [ + { + "value": "TotalTokenCount" + }, + { + "value": "TotalTokenCountPerGroup" + } + ] + }, + "additionalProperties": false + }, + "GenerationTokenStatisticsMetricThreshold": { + "required": [ + "metric" + ], + "type": "object", + "properties": { + "metric": { + "description": "[Required] Gets or sets the feature attribution metric to calculate.", + "$ref": "#/definitions/GenerationTokenStatisticsMetric", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "threshold": { + "description": "Gets or sets the threshold value.\r\nIf null, a default value will be set depending on the selected metric.", + "$ref": "#/definitions/MonitoringThreshold", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + } + }, + "additionalProperties": false + }, + "GenerationTokenStatisticsSignal": { + "required": [ + "metricThresholds", + "samplingRate" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitoringSignalBase" + } + ], + "properties": { + "metricThresholds": { + "description": "[Required] Gets or sets the metrics to calculate and the corresponding thresholds.", + "type": "array", + "items": { + "$ref": "#/definitions/GenerationTokenStatisticsMetricThreshold" + }, + "x-ms-mutability": [ + "create", + "read" + ], + "x-ms-identifiers": [] + }, + "productionData": { + "description": "Gets or sets the target data for computing metrics.", + "$ref": "#/definitions/MonitoringInputDataBase", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "samplingRate": { + "format": "double", + "description": "[Required] The sample rate of the target data, should be greater than 0 and at most 1.", + "type": "number", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "x-ms-discriminator-value": "GenerationTokenStatistics", + "additionalProperties": false + }, + "Goal": { + "description": "Defines supported metric goals for hyperparameter tuning", + "enum": [ + "Minimize", + "Maximize" + ], + "type": "string", + "x-ms-enum": { + "name": "Goal", + "modelAsString": true, + "values": [ + { + "value": "Minimize" + }, + { + "value": "Maximize" + } + ] + }, + "additionalProperties": false + }, + "GridSamplingAlgorithm": { + "description": "Defines a Sampling Algorithm that exhaustively generates every value combination in the space", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/SamplingAlgorithm" + } + ], + "x-ms-discriminator-value": "Grid", + "additionalProperties": false + }, + "HdfsDatastore": { + "required": [ + "nameNodeAddress" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Datastore" + } + ], + "properties": { + "hdfsServerCertificate": { + "description": "The TLS cert of the HDFS server. Needs to be a base64 encoded string. Required if \"Https\" protocol is selected.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "nameNodeAddress": { "description": "[Required] IP Address or DNS HostName.", "minLength": 1, "pattern": "[a-zA-Z0-9_]", @@ -18528,6 +18915,7 @@ "JobTier": { "description": "Enum to determine the job tier.", "enum": [ + "Null", "Spot", "Basic", "Standard", @@ -18538,6 +18926,9 @@ "name": "JobTier", "modelAsString": true, "values": [ + { + "value": "Null" + }, { "value": "Spot" }, @@ -19443,6 +19834,23 @@ "x-ms-discriminator-value": "mltable", "additionalProperties": false }, + "ManagedComputeIdentity": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitorComputeIdentityBase" + } + ], + "properties": { + "identity": { + "description": "Managed service identity (system assigned and/or user assigned identities)", + "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity", + "x-nullable": true + } + }, + "x-ms-discriminator-value": "ManagedIdentity", + "additionalProperties": false + }, "ManagedIdentity": { "description": "Managed identity configuration.", "type": "object", @@ -19692,7 +20100,7 @@ }, "mode": { "description": "Input delivery mode of the input.", - "default": "ReadOnlyMount", + "default": "Copy", "$ref": "#/definitions/PackageInputDeliveryMode" }, "mountPath": { @@ -19733,11 +20141,11 @@ }, "discriminator": "modelType" }, - "ModelPerformanceSignalBase": { + "ModelPerformanceSignal": { "required": [ - "baselineData", "metricThreshold", - "targetData" + "productionData", + "referenceData" ], "type": "object", "allOf": [ @@ -19746,14 +20154,6 @@ } ], "properties": { - "baselineData": { - "description": "[Required] The data to calculate drift against.", - "$ref": "#/definitions/MonitoringInputData", - "x-ms-mutability": [ - "create", - "read" - ] - }, "dataSegment": { "description": "The data segment.", "$ref": "#/definitions/MonitoringDataSegment", @@ -19771,9 +20171,21 @@ "read" ] }, - "targetData": { + "productionData": { "description": "[Required] The data produced by the production service which drift will be calculated for.", - "$ref": "#/definitions/MonitoringInputData", + "type": "array", + "items": { + "$ref": "#/definitions/MonitoringInputDataBase" + }, + "x-ms-mutability": [ + "create", + "read" + ], + "x-ms-identifiers": [] + }, + "referenceData": { + "description": "[Required] The data to calculate drift against.", + "$ref": "#/definitions/MonitoringInputDataBase", "x-ms-mutability": [ "create", "read" @@ -19821,6 +20233,30 @@ }, "additionalProperties": false }, + "ModelTaskType": { + "enum": [ + "Classification", + "Regression", + "QuestionAnswering" + ], + "type": "string", + "x-ms-enum": { + "name": "ModelTaskType", + "modelAsString": true, + "values": [ + { + "value": "Classification" + }, + { + "value": "Regression" + }, + { + "value": "QuestionAnswering" + } + ] + }, + "additionalProperties": false + }, "ModelVersion": { "description": "Model asset version details.", "type": "object", @@ -19918,24 +20354,150 @@ }, "additionalProperties": false }, - "MonitorDefinition": { + "MonitorComputeConfigurationBase": { + "required": [ + "computeType" + ], + "type": "object", + "properties": { + "computeType": { + "description": "[Required] Specifies the type of signal to monitor.", + "$ref": "#/definitions/MonitorComputeType", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "discriminator": "computeType" + }, + "MonitorComputeIdentityBase": { + "required": [ + "computeIdentityType" + ], + "type": "object", + "properties": { + "computeIdentityType": { + "description": "[Required] ", + "$ref": "#/definitions/MonitorComputeIdentityType", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "discriminator": "computeIdentityType" + }, + "MonitorComputeIdentityType": { + "enum": [ + "AmlToken", + "ManagedIdentity" + ], + "type": "string", + "x-ms-enum": { + "name": "MonitorComputeIdentityType", + "modelAsString": true, + "values": [ + { + "value": "AmlToken", + "description": "Authenticates through user's AML token." + }, + { + "value": "ManagedIdentity", + "description": "Authenticates through a user-provided managed identity." + } + ] + }, + "additionalProperties": false + }, + "MonitorComputeType": { + "enum": [ + "ServerlessSpark" + ], + "type": "string", + "x-ms-enum": { + "name": "MonitorComputeType", + "modelAsString": true, + "values": [ + { + "value": "ServerlessSpark", + "description": "Serverless Spark compute." + } + ] + }, + "additionalProperties": false + }, + "MonitorDefinition": { + "required": [ + "computeConfiguration", + "signals" + ], + "type": "object", + "properties": { + "alertNotificationSetting": { + "description": "The monitor's notification settings.", + "$ref": "#/definitions/MonitoringAlertNotificationSettingsBase", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "computeConfiguration": { + "description": "[Required] The ARM resource ID of the compute resource to run the monitoring job on.", + "$ref": "#/definitions/MonitorComputeConfigurationBase", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "monitoringTarget": { + "description": "The ARM resource ID of either the model or deployment targeted by this monitor.", + "$ref": "#/definitions/MonitoringTarget", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "signals": { + "description": "[Required] The signals to monitor.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/MonitoringSignalBase", + "x-nullable": true + }, + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "additionalProperties": false + }, + "MonitorServerlessSparkCompute": { "required": [ - "computeId", - "signals" + "computeIdentity", + "instanceType", + "runtimeVersion" ], "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitorComputeConfigurationBase" + } + ], "properties": { - "alertNotificationSetting": { - "description": "The monitor's notification settings.", - "$ref": "#/definitions/MonitoringAlertNotificationSettingsBase", + "computeIdentity": { + "description": "[Required] The identity scheme leveraged to by the spark jobs running on serverless Spark.", + "$ref": "#/definitions/MonitorComputeIdentityBase", "x-ms-mutability": [ "create", "read" - ], - "x-nullable": true + ] }, - "computeId": { - "description": "[Required] The ARM resource ID of the compute resource to run the monitoring job on.", + "instanceType": { + "description": "[Required] The instance type running the Spark job.", "minLength": 1, "pattern": "[a-zA-Z0-9_]", "type": "string", @@ -19944,28 +20506,18 @@ "read" ] }, - "monitoringTarget": { - "description": "The ARM resource ID of either the model or deployment targeted by this monitor.", + "runtimeVersion": { + "description": "[Required] The Spark runtime version.", + "minLength": 1, + "pattern": "[a-zA-Z0-9_]", "type": "string", - "x-ms-mutability": [ - "create", - "read" - ], - "x-nullable": true - }, - "signals": { - "description": "[Required] The signals to monitor.", - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/MonitoringSignalBase", - "x-nullable": true - }, "x-ms-mutability": [ "create", "read" ] } }, + "x-ms-discriminator-value": "ServerlessSpark", "additionalProperties": false }, "MonitoringAlertNotificationSettingsBase": { @@ -20100,14 +20652,21 @@ }, "additionalProperties": false }, - "MonitoringInputData": { + "MonitoringInputDataBase": { "required": [ - "dataContext" + "inputDataType", + "jobInputType", + "uri" ], "type": "object", "properties": { - "asset": { - "description": "The data asset input to be leveraged by the monitoring job..", + "columns": { + "description": "Mapping of column names to special uses.", + "type": "object", + "additionalProperties": { + "type": "string", + "x-nullable": true + }, "x-ms-mutability": [ "create", "read" @@ -20115,71 +20674,65 @@ "x-nullable": true }, "dataContext": { - "description": "[Required] The context of the data source.", - "$ref": "#/definitions/MonitoringInputDataContext", + "description": "The context metadata of the data source.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "inputDataType": { + "description": "[Required] Specifies the type of signal to monitor.", + "$ref": "#/definitions/MonitoringInputDataType", "x-ms-mutability": [ "create", "read" ] }, - "preprocessingComponentId": { - "description": "The ARM resource ID of the component resource used to preprocess the data.", - "type": "string", + "jobInputType": { + "description": "[Required] Specifies the type of job.", + "$ref": "#/definitions/JobInputType", "x-ms-mutability": [ "create", "read" - ], - "x-nullable": true + ] }, - "targetColumnName": { - "description": "The target column in the given data asset to leverage.", + "uri": { + "description": "[Required] Input Asset URI.", + "minLength": 1, + "pattern": "[a-zA-Z0-9_]", "type": "string", "x-ms-mutability": [ "create", "read" - ], - "x-nullable": true + ] } }, - "additionalProperties": false + "discriminator": "inputDataType" }, - "MonitoringInputDataContext": { + "MonitoringInputDataType": { "enum": [ - "ModelInputs", - "ModelOutputs", - "Training", - "Test", - "Validation", - "GroundTruth" + "Static", + "Trailing", + "Fixed" ], "type": "string", "x-ms-enum": { - "name": "MonitoringInputDataContext", + "name": "MonitoringInputDataType", "modelAsString": true, "values": [ { - "value": "ModelInputs", - "description": "A dataset containing the feature input to the model." - }, - { - "value": "ModelOutputs", - "description": "A dataset containing the inferred results of the model." - }, - { - "value": "Training", - "description": "A dataset containing the data used for training the model." - }, - { - "value": "Test", - "description": "A dataset leveraged to test the model." + "value": "Static", + "description": "An input data with a fixed window size." }, { - "value": "Validation", - "description": "A dataset leveraged for model validation." + "value": "Trailing", + "description": "An input data which trailing relatively to the monitor's current run." }, { - "value": "GroundTruth", - "description": "A dataset containing the ground truth data." + "value": "Fixed", + "description": "An input data with tabular format which doesn't require preprocessing." } ] }, @@ -20235,16 +20788,6 @@ ], "type": "object", "properties": { - "lookbackPeriod": { - "format": "duration", - "description": "The amount of time a single monitor should look back over the target data on a given run.", - "type": "string", - "x-ms-mutability": [ - "create", - "read" - ], - "x-nullable": true - }, "mode": { "description": "The current notification mode for this signal.", "default": "Disabled", @@ -20254,6 +20797,15 @@ "read" ] }, + "properties": { + "description": "Property dictionary. Properties can be added, but not removed or altered.", + "type": "object", + "additionalProperties": { + "type": "string", + "x-nullable": true + }, + "x-nullable": true + }, "signalType": { "description": "[Required] Specifies the type of signal to monitor.", "$ref": "#/definitions/MonitoringSignalType", @@ -20272,7 +20824,9 @@ "DataQuality", "FeatureAttributionDrift", "Custom", - "ModelPerformance" + "ModelPerformance", + "GenerationSafetyQuality", + "GenerationTokenStatistics" ], "type": "string", "x-ms-enum": { @@ -20302,11 +20856,54 @@ { "value": "ModelPerformance", "description": "Tracks model performance based on ground truth data." + }, + { + "value": "GenerationSafetyQuality", + "description": "Tracks the safety and quality of generated content." + }, + { + "value": "GenerationTokenStatistics", + "description": "Tracks the token usage of generative endpoints." } ] }, "additionalProperties": false }, + "MonitoringTarget": { + "required": [ + "taskType" + ], + "type": "object", + "properties": { + "deploymentId": { + "description": "The ARM resource ID of either the deployment targeted by this monitor.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "modelId": { + "description": "The ARM resource ID of either the model targeted by this monitor.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "taskType": { + "description": "[Required] The machine learning task type of the model.", + "$ref": "#/definitions/ModelTaskType", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "additionalProperties": false + }, "MonitoringThreshold": { "type": "object", "properties": { @@ -20323,6 +20920,38 @@ }, "additionalProperties": false }, + "MonitoringWorkspaceConnection": { + "type": "object", + "properties": { + "environmentVariables": { + "description": "The properties of a workspace service connection to store as environment variables in the submitted jobs.\r\nKey is workspace connection property path, name is environment variable key.", + "type": "object", + "additionalProperties": { + "type": "string", + "x-nullable": true + }, + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "secrets": { + "description": "The properties of a workspace service connection to store as secrets in the submitted jobs.\r\nKey is workspace connection property path, name is secret key.", + "type": "object", + "additionalProperties": { + "type": "string", + "x-nullable": true + }, + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + } + }, + "additionalProperties": false + }, "Mpi": { "description": "MPI distribution configuration.", "type": "object", @@ -21502,7 +22131,7 @@ "PackageInputDeliveryMode": { "description": "Mounting type of the model or the inputs", "enum": [ - "ReadOnlyMount", + "Copy", "Download" ], "type": "string", @@ -21511,7 +22140,7 @@ "modelAsString": true, "values": [ { - "value": "ReadOnlyMount" + "value": "Copy" }, { "value": "Download" @@ -21617,7 +22246,7 @@ "description": "Model package operation request properties.", "required": [ "inferencingServer", - "targetEnvironmentName" + "targetEnvironmentId" ], "type": "object", "properties": { @@ -21686,8 +22315,8 @@ ], "x-nullable": true }, - "targetEnvironmentName": { - "description": "[Required] Target environment name to be generated by package.", + "targetEnvironmentId": { + "description": "[Required] Arm ID of the target environment to be created by package operation.", "minLength": 1, "pattern": "[a-zA-Z0-9_]", "type": "string", @@ -21695,15 +22324,6 @@ "create", "read" ] - }, - "targetEnvironmentVersion": { - "description": "Target environment version to be generated by package.", - "type": "string", - "x-ms-mutability": [ - "create", - "read" - ], - "x-nullable": true } }, "additionalProperties": false @@ -21812,24 +22432,6 @@ "read" ], "x-nullable": true - }, - "targetEnvironmentName": { - "description": "Target environment name to be generated by package.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ], - "x-nullable": true - }, - "targetEnvironmentVersion": { - "description": "Target environment version to be generated by package.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ], - "x-nullable": true } }, "additionalProperties": false @@ -22190,10 +22792,10 @@ }, "PredictionDriftMonitoringSignal": { "required": [ - "baselineData", "metricThresholds", "modelType", - "targetData" + "productionData", + "referenceData" ], "type": "object", "allOf": [ @@ -22202,14 +22804,6 @@ } ], "properties": { - "baselineData": { - "description": "[Required] The data to calculate drift against.", - "$ref": "#/definitions/MonitoringInputData", - "x-ms-mutability": [ - "create", - "read" - ] - }, "metricThresholds": { "description": "[Required] A list of metrics to calculate and their associated thresholds.", "type": "array", @@ -22230,9 +22824,17 @@ "read" ] }, - "targetData": { + "productionData": { "description": "[Required] The data which drift will be calculated for.", - "$ref": "#/definitions/MonitoringInputData", + "$ref": "#/definitions/MonitoringInputDataBase", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "referenceData": { + "description": "[Required] The data to calculate drift against.", + "$ref": "#/definitions/MonitoringInputDataBase", "x-ms-mutability": [ "create", "read" @@ -22393,8 +22995,8 @@ "type": "object", "properties": { "jobTier": { - "description": "Enum to determine the job tier.", - "default": "Standard", + "description": "Controls the compute job tier", + "default": "Null", "$ref": "#/definitions/JobTier", "x-ms-mutability": [ "create", @@ -24044,6 +24646,49 @@ }, "additionalProperties": false }, + "StaticInputData": { + "required": [ + "windowEnd", + "windowStart" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitoringInputDataBase" + } + ], + "properties": { + "preprocessingComponentId": { + "description": "The ARM resource ID of the component resource used to preprocess the data.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "windowEnd": { + "format": "date-time", + "description": "[Required] The end date of the data window.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "windowStart": { + "format": "date-time", + "description": "[Required] The start date of the data window.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "x-ms-discriminator-value": "Static", + "additionalProperties": false + }, "StatusMessage": { "description": "Active message associated with project", "type": "object", @@ -25055,6 +25700,49 @@ "x-ms-discriminator-value": "TopNByAttribution", "additionalProperties": false }, + "TrailingInputData": { + "required": [ + "windowOffset", + "windowSize" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MonitoringInputDataBase" + } + ], + "properties": { + "preprocessingComponentId": { + "description": "The ARM resource ID of the component resource used to preprocess the data.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ], + "x-nullable": true + }, + "windowOffset": { + "format": "duration", + "description": "[Required] The time offset between the end of the data window and the monitor's current run time.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "windowSize": { + "format": "duration", + "description": "[Required] The size of the trailing data window.", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "x-ms-discriminator-value": "Trailing", + "additionalProperties": false + }, "TrainingMode": { "description": "Training mode dictates whether to use distributed training or not", "enum": [ From 371690806f9624f168603efb5007b1dfb723ae9b Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Thu, 18 May 2023 14:20:02 -0500 Subject: [PATCH 2/9] Added package example --- .../Registry/ModelVersion/package.json | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json new file mode 100644 index 000000000000..277ee3aa13d8 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json @@ -0,0 +1,79 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", + "registryName": "my-aml-registry", + "modelName": "string", + "version": "string", + "api-version": "2023-06-01-preview", + "body": { + "baseEnvironmentSource": { + "baseEnvironmentSourceType": "EnvironmentAsset" + }, + "environmentVariables": { + "string": "string" + }, + "inferencingServer": { + "serverType": "AzureMLOnline" + }, + "inputs": [ + { + "inputType": "UriFile", + "mode": "Copy", + "mountPath": "string", + "path": { + "inputPathType": "Url" + } + } + ], + "modelConfiguration": { + "mode": "Copy", + "mountPath": "string" + }, + "tags": { + "string": "string" + }, + "targetEnvironmentId": "string" + } + }, + "responses": { + "200": { + "baseEnvironmentSource": { + "baseEnvironmentSourceType": "EnvironmentAsset" + }, + "buildId": "string", + "buildState": "NotStarted", + "environmentVariables": { + "string": "string" + }, + "inferencingServer": { + "serverType": "AzureMLOnline" + }, + "inputs": [ + { + "inputType": "UriFile", + "mode": "Copy", + "mountPath": "string", + "path": { + "inputPathType": "Url" + } + } + ], + "logUrl": "string", + "modelConfiguration": { + "mode": "Copy", + "mountPath": "string" + }, + "tags": { + "string": "string" + }, + "targetEnvironmentId": "string" + }, + "202": { + "headers": { + "Location": "example_location", + "Retry-After": 100 + } + } + } +} From 612197444d37965fe49ab1e1ce58746c5585772b Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Thu, 18 May 2023 14:25:58 -0500 Subject: [PATCH 3/9] Updated custom-words.txt --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index f8646530eb40..e460d7f7ad01 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -909,6 +909,7 @@ GRANTACE granularities graphrbac Greenplum +Groundedness groundstation Groupby groupedby From 6cd7ea857bc45211169a0b481dbfab7465f29cca Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Thu, 18 May 2023 14:41:48 -0500 Subject: [PATCH 4/9] Updated package examples --- .../Registry/ModelVersion/package.json | 98 +++++++++++-------- .../Workspace/ModelVersion/package.json | 7 +- 2 files changed, 58 insertions(+), 47 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json index 277ee3aa13d8..8288be5a39f1 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registry/ModelVersion/package.json @@ -8,28 +8,34 @@ "api-version": "2023-06-01-preview", "body": { "baseEnvironmentSource": { - "baseEnvironmentSourceType": "EnvironmentAsset" + "baseEnvironmentSourceType": "EnvironmentAsset", + "resourceId": "string" + }, + "inferencingServer": { + "serverType": "AzureMLBatch", + "codeConfiguration": { + "codeId": "string", + "scoringScript": "string" + } }, "environmentVariables": { "string": "string" }, - "inferencingServer": { - "serverType": "AzureMLOnline" + "modelConfiguration": { + "mode": "ReadOnlyMount", + "mountPath": "string" }, "inputs": [ { "inputType": "UriFile", - "mode": "Copy", - "mountPath": "string", + "mode": "Download", "path": { - "inputPathType": "Url" - } + "inputPathType": "Url", + "url": "string" + }, + "mountPath": "string" } ], - "modelConfiguration": { - "mode": "Copy", - "mountPath": "string" - }, "tags": { "string": "string" }, @@ -38,41 +44,49 @@ }, "responses": { "200": { - "baseEnvironmentSource": { - "baseEnvironmentSourceType": "EnvironmentAsset" - }, - "buildId": "string", - "buildState": "NotStarted", - "environmentVariables": { - "string": "string" - }, - "inferencingServer": { - "serverType": "AzureMLOnline" - }, - "inputs": [ - { - "inputType": "UriFile", - "mode": "Copy", - "mountPath": "string", - "path": { - "inputPathType": "Url" + "headers": {}, + "body": { + "baseEnvironmentSource": { + "baseEnvironmentSourceType": "EnvironmentAsset", + "resourceId": "string" + }, + "inferencingServer": { + "serverType": "AzureMLBatch", + "codeConfiguration": { + "codeId": "string", + "scoringScript": "string" } - } - ], - "logUrl": "string", - "modelConfiguration": { - "mode": "Copy", - "mountPath": "string" - }, - "tags": { - "string": "string" - }, - "targetEnvironmentId": "string" + }, + "environmentVariables": { + "string": "string" + }, + "modelConfiguration": { + "mode": "ReadOnlyMount", + "mountPath": "string" + }, + "inputs": [ + { + "inputType": "UriFile", + "mode": "Download", + "path": { + "inputPathType": "Url", + "url": "string" + }, + "mountPath": "string" + } + ], + "tags": { + "string": "string" + }, + "targetEnvironmentId": "string", + "logUrl": "string", + "buildId": "string", + "buildState": "NotStarted" + } }, "202": { "headers": { - "Location": "example_location", - "Retry-After": 100 + "Location": "example_location" } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Workspace/ModelVersion/package.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Workspace/ModelVersion/package.json index 7e5947e82bee..2872a9767c22 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Workspace/ModelVersion/package.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Workspace/ModelVersion/package.json @@ -7,8 +7,6 @@ "version": "string", "api-version": "2023-06-01-preview", "body": { - "targetEnvironmentName": "string", - "targetEnvironmentVersion": "string", "baseEnvironmentSource": { "baseEnvironmentSourceType": "EnvironmentAsset", "resourceId": "string" @@ -40,15 +38,14 @@ ], "tags": { "string": "string" - } + }, + "targetEnvironmentId": "string" } }, "responses": { "200": { "headers": {}, "body": { - "targetEnvironmentName": "string", - "targetEnvironmentVersion": "string", "baseEnvironmentSource": { "baseEnvironmentSourceType": "EnvironmentAsset", "resourceId": "string" From 6db0a8bfbefcf4ca6fcbb654423d6114b4754d55 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Fri, 19 May 2023 09:25:54 -0500 Subject: [PATCH 5/9] Added pattern retriction to resource name parameters --- .../preview/2023-06-01-preview/mfe.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json index 167c3aa855aa..de82c1ca31da 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json @@ -369,7 +369,8 @@ "name": "codeName", "description": "Container name.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" }, { "in": "path", @@ -938,7 +939,8 @@ "name": "componentName", "description": "Container name.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" From 4bc26355ac68ae26bd15a24186b0485f1c6f8509 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Fri, 19 May 2023 14:06:31 -0500 Subject: [PATCH 6/9] Fixed cross-api breaking changes --- .../preview/2023-06-01-preview/mfe.json | 71 ++++++++++--------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json index de82c1ca31da..8dd393fa6bfc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json @@ -161,7 +161,8 @@ "name": "codeName", "description": "Container name.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -2238,7 +2239,8 @@ "name": "environmentName", "description": "Container name. This is case-sensitive.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -2730,7 +2732,8 @@ "name": "modelName", "description": "Container name. This is case-sensitive.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -5028,12 +5031,6 @@ { "$ref": "machineLearningServices.json#/parameters/PaginationParameter" }, - { - "in": "query", - "name": "stage", - "description": "Component stage.", - "type": "string" - }, { "in": "query", "name": "listViewType", @@ -5060,6 +5057,12 @@ } ] } + }, + { + "in": "query", + "name": "stage", + "description": "Component stage.", + "type": "string" } ], "responses": { @@ -5579,12 +5582,6 @@ "description": "Comma-separated list of tag names (and optionally values). Example: tag1,tag2=value2", "type": "string" }, - { - "in": "query", - "name": "stage", - "description": "data stage", - "type": "string" - }, { "in": "query", "name": "listViewType", @@ -5611,6 +5608,12 @@ } ] } + }, + { + "in": "query", + "name": "stage", + "description": "data stage", + "type": "string" } ], "responses": { @@ -9633,13 +9636,6 @@ "description": "Model description.", "type": "string" }, - { - "in": "query", - "name": "offset", - "description": "Number of initial results to skip.", - "type": "integer", - "format": "int32" - }, { "in": "query", "name": "tags", @@ -9652,18 +9648,6 @@ "description": "Comma-separated list of property names (and optionally values). Example: prop1,prop2=value2", "type": "string" }, - { - "in": "query", - "name": "feed", - "description": "Name of the feed.", - "type": "string" - }, - { - "in": "query", - "name": "stage", - "description": "Model stage", - "type": "string" - }, { "in": "query", "name": "listViewType", @@ -9690,6 +9674,25 @@ } ] } + }, + { + "in": "query", + "name": "offset", + "description": "Number of initial results to skip.", + "type": "integer", + "format": "int32" + }, + { + "in": "query", + "name": "feed", + "description": "Name of the feed.", + "type": "string" + }, + { + "in": "query", + "name": "stage", + "description": "Model stage", + "type": "string" } ], "responses": { From 1fabfcf654752a0f3d77cec43d9e3921b6f77f0e Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Mon, 22 May 2023 11:57:06 -0500 Subject: [PATCH 7/9] Fixed cross-api breaking changes --- .../preview/2023-06-01-preview/mfe.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json index 8dd393fa6bfc..8643a77a6b41 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json @@ -9636,6 +9636,13 @@ "description": "Model description.", "type": "string" }, + { + "in": "query", + "name": "offset", + "description": "Number of initial results to skip.", + "type": "integer", + "format": "int32" + }, { "in": "query", "name": "tags", @@ -9648,6 +9655,12 @@ "description": "Comma-separated list of property names (and optionally values). Example: prop1,prop2=value2", "type": "string" }, + { + "in": "query", + "name": "feed", + "description": "Name of the feed.", + "type": "string" + }, { "in": "query", "name": "listViewType", @@ -9675,19 +9688,6 @@ ] } }, - { - "in": "query", - "name": "offset", - "description": "Number of initial results to skip.", - "type": "integer", - "format": "int32" - }, - { - "in": "query", - "name": "feed", - "description": "Name of the feed.", - "type": "string" - }, { "in": "query", "name": "stage", From 609bbb10834b4c0ff5006eb518236c3b49110fc8 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Tue, 23 May 2023 12:12:11 -0500 Subject: [PATCH 8/9] Added descriptions --- .../preview/2023-06-01-preview/mfe.json | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json index 8643a77a6b41..81c843ec94b2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json @@ -6876,7 +6876,7 @@ { "in": "query", "name": "description", - "description": "description.", + "description": "Description of the featureset.", "type": "string" } ], @@ -11512,6 +11512,7 @@ "additionalProperties": false }, "AmlTokenComputeIdentity": { + "description": "AML token compute identity definition.", "type": "object", "allOf": [ { @@ -14157,6 +14158,7 @@ "description": "Monitoring assets to take as input. Key is the component input port name, value is the data asset.", "type": "object", "additionalProperties": { + "description": "Monitoring input data base definition.", "$ref": "#/definitions/MonitoringInputDataBase", "x-nullable": true }, @@ -15857,6 +15859,7 @@ "description": "[Required] The data which drift will be calculated for.", "type": "array", "items": { + "description": "Monitoring input data base definition.", "$ref": "#/definitions/MonitoringInputDataBase" }, "x-ms-mutability": [ @@ -16551,6 +16554,7 @@ "additionalProperties": false }, "FixedInputData": { + "description": "Fixed input data definition.", "type": "object", "allOf": [ { @@ -16953,6 +16957,7 @@ "additionalProperties": false }, "GenerationSafetyQualityMetricThreshold": { + "description": "Generation safety quality metric threshold definition.", "required": [ "metric" ], @@ -16979,6 +16984,7 @@ "additionalProperties": false }, "GenerationSafetyQualityMonitoringSignal": { + "description": "Generation safety quality monitoring signal definition.", "required": [ "metricThresholds", "samplingRate" @@ -17006,6 +17012,7 @@ "description": "Gets or sets the target data for computing metrics.", "type": "array", "items": { + "description": "Monitoring input data base definition.", "$ref": "#/definitions/MonitoringInputDataBase" }, "x-ms-mutability": [ @@ -17038,6 +17045,7 @@ "additionalProperties": false }, "GenerationTokenStatisticsMetric": { + "description": "Generation token statistics metric enum.", "enum": [ "TotalTokenCount", "TotalTokenCountPerGroup" @@ -17058,6 +17066,7 @@ "additionalProperties": false }, "GenerationTokenStatisticsMetricThreshold": { + "description": "Generation token statistics metric threshold definition.", "required": [ "metric" ], @@ -17084,6 +17093,7 @@ "additionalProperties": false }, "GenerationTokenStatisticsSignal": { + "description": "Generation token statistics signal definition.", "required": [ "metricThresholds", "samplingRate" @@ -19840,6 +19850,7 @@ "additionalProperties": false }, "ManagedComputeIdentity": { + "description": "Managed compute identity definition.", "type": "object", "allOf": [ { @@ -20147,6 +20158,7 @@ "discriminator": "modelType" }, "ModelPerformanceSignal": { + "description": "Model performance signal definition.", "required": [ "metricThreshold", "productionData", @@ -20180,6 +20192,7 @@ "description": "[Required] The data produced by the production service which drift will be calculated for.", "type": "array", "items": { + "description": "Monitoring input data base definition.", "$ref": "#/definitions/MonitoringInputDataBase" }, "x-ms-mutability": [ @@ -20239,6 +20252,7 @@ "additionalProperties": false }, "ModelTaskType": { + "description": "Model task type enum.", "enum": [ "Classification", "Regression", @@ -20360,6 +20374,7 @@ "additionalProperties": false }, "MonitorComputeConfigurationBase": { + "description": "Monitor compute configuration base definition.", "required": [ "computeType" ], @@ -20377,13 +20392,14 @@ "discriminator": "computeType" }, "MonitorComputeIdentityBase": { + "description": "Monitor compute identity base definition.", "required": [ "computeIdentityType" ], "type": "object", "properties": { "computeIdentityType": { - "description": "[Required] ", + "description": "[Required] Monitor compute identity type enum.", "$ref": "#/definitions/MonitorComputeIdentityType", "x-ms-mutability": [ "create", @@ -20394,6 +20410,7 @@ "discriminator": "computeIdentityType" }, "MonitorComputeIdentityType": { + "description": "Monitor compute identity type enum.", "enum": [ "AmlToken", "ManagedIdentity" @@ -20416,6 +20433,7 @@ "additionalProperties": false }, "MonitorComputeType": { + "description": "Monitor compute type enum.", "enum": [ "ServerlessSpark" ], @@ -20481,6 +20499,7 @@ "additionalProperties": false }, "MonitorServerlessSparkCompute": { + "description": "Monitor serverless spark compute definition.", "required": [ "computeIdentity", "instanceType", @@ -20658,6 +20677,7 @@ "additionalProperties": false }, "MonitoringInputDataBase": { + "description": "Monitoring input data base definition.", "required": [ "inputDataType", "jobInputType", @@ -20717,6 +20737,7 @@ "discriminator": "inputDataType" }, "MonitoringInputDataType": { + "description": "Monitoring input data type enum.", "enum": [ "Static", "Trailing", @@ -20875,6 +20896,7 @@ "additionalProperties": false }, "MonitoringTarget": { + "description": "Monitoring target definition.", "required": [ "taskType" ], @@ -20926,6 +20948,7 @@ "additionalProperties": false }, "MonitoringWorkspaceConnection": { + "description": "Monitoring workspace connection definition.", "type": "object", "properties": { "environmentVariables": { @@ -24652,6 +24675,7 @@ "additionalProperties": false }, "StaticInputData": { + "description": "Static input data definition.", "required": [ "windowEnd", "windowStart" @@ -25706,6 +25730,7 @@ "additionalProperties": false }, "TrailingInputData": { + "description": "Trailing input data definition.", "required": [ "windowOffset", "windowSize" From 6c5e8a4a112a14462de74c22c7e03ddd0f650e82 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Tue, 23 May 2023 13:06:47 -0500 Subject: [PATCH 9/9] Added description --- .../preview/2023-06-01-preview/mfe.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json index 81c843ec94b2..18cbf401feb6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/mfe.json @@ -16905,6 +16905,7 @@ "additionalProperties": false }, "GenerationSafetyQualityMetric": { + "description": "Generation safety quality metric enum.", "enum": [ "AcceptableGroundednessScorePerInstance", "AggregatedGroundednessPassRate",