Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.MachineLearningServices …
Browse files Browse the repository at this point in the history
…to add version preview/2021-03-01-preview (Azure#12554)

* Enabling java client (#1)

* Revert "Enabling java client (#1)" (#2)

This reverts commit 26873d3.

* Adds base for updating Microsoft.MachineLearningServices from version preview/2020-09-01-preview to version 2021-03-01-preview

* Updates readme

* Updates API version in new specs and examples

* migrate java to own md

* add mfe.json

* prettier

* fix example declarations in spec

* add preliminary examples

* update example api-version to 2021-03-01-preview

* fix example validation errors

* add mfe.json to 2021-03 readme

* add to custom-words

* Dictonary -> Dictionary

* merge muzhi newVersion20210101 8ef3c1a

* add java to swagger-to-sdk

* update mfe.json & examples to latest

* flatten nested properties

* wrap ref with AllOf

* prettier

* [TEMP] Isolate client gen bug for easier reporting

* Revert "[TEMP] Isolate client gen bug for easier reporting"

This reverts commit 4f67cdf.

* remove allOf wrapper for LongRunningNullResponseLongRunningOperationResponse

* add some descriptions

* OnlineDeploymentScaleSettings

* ExportSummary no longer a resource

* remove non PuP resources + add add async headers

* removed unused examples

* add format to integer type

* add x-ms extensions to async operations

* Add back LabelingJob for PuP, Add Docker discriminator definitions

* add back LabelingJob examples

* prettier

* update modelContainer examples

* added LabelingJobs_ListExportSummary

* add listExportSummaries example

* add missing discriminators

* update to stand alone ExportSummary Resource

* removed ExportSummary functionality, added remainder of missing discriminator definitions

* remove ExportSummary examples

* update pattern to [a-zA-Z0-9_]

* proper async marking for LabelingJobs_Resume

* prettier

* all in:body parameters are now required

* Revert "update pattern to [a-zA-Z0-9_]"

This reverts commit 3e07c4a.

* Revert "proper async marking for LabelingJobs_Resume"

This reverts commit b111203.

* change to 2020-09 to see if gate passes

* Revert "change to 2020-09 to see if gate passes"

This reverts commit a27c0e0.

* Revert "Revert "proper async marking for LabelingJobs_Resume""

This reverts commit a0e0cf0.

* Revert "Revert "update pattern to [a-zA-Z0-9_]""

This reverts commit 5e86dd0.

* add orderby and top to appropriate List APIs

* add LabelingJobs_ExportLabels to spec

* add exportLabels example

* update resume example

* update with latest changes + readOnly fix

* encompass non-discriminator schemas in AllOf

* prettier

* fix missing references + spelling error

* update spec to latest contracts + address AllOf issues

* reference common type api version, sub id, and rg name params

* reference common type Resource definition

* update mls spec to latest stable version

* reference common types.json sub id, rg name, api version definitions in mls.json

* reference common type systemData in mls.json

* reference common type resource in mls.json

* update examples to stable 2021 spec's examples

* remove dangling Resource definition in mls

* add pattern requirements for some parameters

* move identityConfiguration out of TrialComponent and into SweepJob

* remove default values from Retry-After definition

* remove unused RootError and InnerErrorResponse

* start deprecation of AssetPath -> Path

* AssetGenerator no longer readOnly

* add DockerImagePlatform usage

* add InferenceContainerProperties

* JobProvisioningState is ReadOnly

* add environmentVariables

* mark ServicePrincipalConfiguration.Properties.Secret as x-ms-secret

* add various missing 'x-ms-mutability' properties

* add AutoMLJob to spec

* add PipelineJob

* add ComponentContainer

* add ComponentVersion

* add datamodel, datapath, Explainability to custom-words.txt

* remove incorrect x-ms-mutability props

* move example to example prop

* add x-ms-mutability ['read'] when readOnly: true is present

* type -> dataType, enableDNNTraining -> enableDnnTraining

* description updates

* update examples

* remove AutoMLJob, PipelineJob, Component from spec

* remove Component examples

* fix incorrect host

* add OnlineEndpoint API + examples

* update EnvironmentSpecificationVersion examples

* add OnlineDeployment API + examples

* update OnlineEndpoint/Deployment example version to 2021-03-01-preview

* update LabelingJob example version to 2021-03-01-preview

* add BatchEndpoint API + examples

* decouple TrackedResource from OnlineEndpoint/OnlineDeployment

* add BatchDeployment API + examples

* update BatchEndpoint example api-version to 2021-03-01-preview

* prettier

* reference enum definitions instead of inlining them

* add skipValidation query param to Datastores_CreateOrUpdate

* Aks -> K8s

* remove AssetPath in favor of Path

* various contract updates

* update examples

* prettier

* ServicePrincipalCredentialsTEMP probe

* add PATCH Update to BatchEndpoint/Deployment

* description update

* label EndpointAuthKeys.PrimaryKey/SecondaryKey as secret

* label EndpointAuthToken.AccessToken as secret

* prettier

* remove clientSecretUrl from UserAssignedIdentityMeta

* add more descriptive descriptions to responses

* rename most 'type' properties to something more descriptive

* rename IdAssetReference's id -> assetId

* rename ResourceIdentityInArm's type -> identityType

* reorder responses in descending order

* add x-ms-async-operation-timeout where appropriate

* remove unreachable properties in Partial definitions

* have 'Partial' preceed definitions, where applicable

* add descriptions to various definitions/properties

* misc enum reorderings

* remove unusable JobType Enums (for polymorphic types)

* rename all *Credentials definitions to end with 'DatastoreCredentials'

* move Job definitions closer to their Polymorphic definitions

* add PartialBatchEndpoint.Traffic as updatable prop

* EndpointAuthKeys refactor for proper x-ms-secret usage

* BatchEndpoints_ListKeys should respond with just EndpointAuthKeys

* removed x-ms-secret prop from EndpointAuthToken.accessToken because EndpointAuthToken is only given directly in a post

* spelling fix

* redefine flavors prop to avoid anonymous type

* add PE connections

* add default response error

* add count query param to BatchEndpoints_List

* Move ComputeJobBase output to common ExperimentJobBase

* redefine ResourceIdentityInArm -> ResourceIdentity

* identityType -> type in examples

* update example to follow new Identity definition

* add missing comma to SystemAssignedUserAssigned

* ResourceIdentityType -> ResourceIdentityAssignment

* redefine to use FlavorData

* proper secrets definition for datastores

* add additional descriptions

* use machineLearningServices.json version 2021-01-01

* use machineLearningServices.json 2021-04-01

* Revert "use machineLearningServices.json 2021-04-01"

This reverts commit 2e7b88e.

* Revert "use machineLearningServices.json version 2021-01-01"

This reverts commit 8ff82a1.

* use 2020-09-01-preview machineLearningServices.json spec

* use common type definitions of sub id, rg name, and api version parameters

* migrate mls to common-type Resource

* remove unused example files

* description updates

* remove 'model' as a required property for online deployments

* update datastore secrets, again

* Update specification/machinelearningservices/resource-manager/readme.md

to point to proper .md

Co-authored-by: Jenny So <j-so@users.noreply.github.com>

* add PrivateEndpointConnections_List

* use 2021-04-01's machineLearningServices.json

* use common-types where applicable

* IdentityType -> IdentityConfigurationType

* add PrivateEndpointConnections_List

* prettier

* update description

* remove x-ms-client-flatten

* flatten polymorphic types for better docs

* update readme.java with changes

* remove unused IdentityType in mls.json

* Update with better examples (Azure#8)

* adding descriptions

* descriptions

* examples

* more descriptions

* Fixing more descriptions

* fix sweep

* interactionEndpoints type -> jobEndpointType

* remove extra properties wrapper from sweep get/list examples

* prettier

* fix flavorData representation

* add id name type to examples

Co-authored-by: Teddy <thtodoro@microsoft.com>

* fix credscan issues

* improve definition descriptions

* fix typo

* add unknown jobstatus enum

* fix more typos

* add examples and reorganize examples

* fix example folder name casing

* update descriptions

* improve examples

* prettier

* migrate mfe to common-types ErrorResponse

* migrate mls to common-types ErrorResponse

* split select operations to separate files

* fix model valiation

* operation ID changes

* correct readme Getting Started text

* move workspace skus list to separate file

* reorganize machineLearningServices.json examples

* reorganize services.json examples

* reorganize workspaceFeatures.json examples

* reorganize workspaceSkus.json examples

* bundle examples of same operation

* mls.json opId Compute_ -> Computes_

* services.json opId MachineLearningService_ -> MachineLearningServices_

* Revert "mls.json opId Compute_ -> Computes_"

This reverts commit 12dc59a.

* revert package-lock changes

* add 2021-03-01-preview tag in readme.go.md

* add 2021-03-01-preview tag in readme.java.md

* tag proper yaml in md

* preview package must be under 'preview' subdirectory

* change default tag back to package-2021-04-01

* change package-preview-2021-03 to package-2021-03-01-preview

* add 'tags' as an optional query parameter to Dataversions_List

* add asynchronous verbage to applicable descriptions

* description grammar fix

* add description to Datastores_ListSecrets response

* fix flipped descriptions

* use v2 common-types, not v1 for PrivateEndpointConnections_List

Co-authored-by: Harneet Virk <harnvir@microsoft.com>
Co-authored-by: Teddy Todorov <Teddy.Todorov@microsoft.com>
Co-authored-by: zhaomuzhi <zhaoweixiong521@gmail.com>
Co-authored-by: Jenny So <j-so@users.noreply.github.com>
Co-authored-by: Jenny So <jenns@microsoft.com>
  • Loading branch information
6 people authored May 11, 2021
1 parent b2bacb5 commit ecc8630
Show file tree
Hide file tree
Showing 143 changed files with 26,046 additions and 231 deletions.
8 changes: 8 additions & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ CRDs
creatable
createbsl
createconsumergroup
createdtime
createorupdate
createpreview
credativ
Expand Down Expand Up @@ -468,7 +469,10 @@ datalakeanalytics
datalakestore
Datamasking
datamigration
datamodel
datapath
datapoint
datapoints
dataschema
Dataset
datasetid
Expand Down Expand Up @@ -643,6 +647,7 @@ exceptiontype
exfiltrate
Exfiltration
experimentids
Explainability
explicitlist
exportconfiguration
exportdevices
Expand Down Expand Up @@ -764,6 +769,7 @@ GOARCH
GPUMIG
GPUP
GPUs
Grafana
Grammarly
GRANTACE
granularities
Expand Down Expand Up @@ -1122,6 +1128,7 @@ ML's
mlapi
mnist
modelmanagement
modifiedtime
MODIFYACLENTRIES
monitoringconfiguration
monitoringconfigurations
Expand Down Expand Up @@ -1874,6 +1881,7 @@ templated
templatelink
templeton
temporarydisk
Tensorboard
tensorflow
TEPCO's
teradata
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "resourceGroup-1234",
"workspaceName": "testworkspace",
"api-version": "2021-03-01-preview",
"endpointName": "testBatchEndpoint",
"deploymentName": "testBatchDeployment",
"body": {
"tags": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"location": "string",
"kind": "string",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myuseridentity": {
"principalId": "string",
"clientId": "string"
}
}
},
"properties": {
"compute": {
"target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/testcompute",
"instanceCount": 0,
"isLocal": false,
"location": "string",
"instanceType": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"errorThreshold": 0,
"retrySettings": {
"maxRetries": 0,
"timeout": "string"
},
"partitionKeys": [
"string"
],
"miniBatchSize": 0,
"loggingLevel": "Info",
"outputConfiguration": {
"outputAction": "SummaryOnly",
"appendRowFileName": "string"
},
"description": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"model": {
"referenceType": "Id",
"assetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/models/testmodel/versions/1"
},
"codeConfiguration": {
"codeId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/codes/testcode/versions/1",
"scoringScript": "score.py"
},
"environmentId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/environments/myenv",
"environmentVariables": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testBatchEndpoint/deployments/testBatchDeployment",
"name": "testBatchDeployment",
"type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments",
"tags": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"location": "string",
"kind": "string",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myuseridentity": {
"clientId": "string"
}
}
},
"properties": {
"compute": {
"target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/testcompute",
"instanceCount": 0,
"isLocal": false,
"location": "string",
"instanceType": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"errorThreshold": 0,
"retrySettings": {
"maxRetries": 0,
"timeout": "string"
},
"partitionKeys": [
"string"
],
"miniBatchSize": 0,
"loggingLevel": "Info",
"outputConfiguration": {
"outputAction": "SummaryOnly",
"appendRowFileName": "string"
},
"description": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"model": {
"referenceType": "Id",
"assetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/models/testmodel/versions/1"
},
"codeConfiguration": {
"codeId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/codes/testcode/versions/1",
"scoringScript": "score.py"
},
"environmentId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/environments/myenv",
"environmentVariables": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"systemData": {
"createdAt": "2021-03-25T20:46:47.062Z",
"createdBy": "string",
"createdByType": "User",
"lastModifiedAt": "2021-03-25T20:46:47.062Z",
"lastModifiedBy": "string",
"lastModifiedByType": "User"
}
}
},
"201": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testBatchEndpoint/deployments/testBatchDeployment",
"name": "testBatchDeployment",
"type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments",
"tags": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"location": "string",
"kind": "string",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myuseridentity": {
"clientId": "string"
}
}
},
"properties": {
"compute": {
"target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/testcompute",
"instanceCount": 0,
"isLocal": false,
"location": "string",
"instanceType": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"errorThreshold": 0,
"retrySettings": {
"maxRetries": 0,
"timeout": "string"
},
"partitionKeys": [
"string"
],
"miniBatchSize": 0,
"loggingLevel": "Info",
"outputConfiguration": {
"outputAction": "SummaryOnly",
"appendRowFileName": "string"
},
"description": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"model": {
"referenceType": "Id",
"assetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/models/testmodel/versions/1"
},
"codeConfiguration": {
"codeId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/codes/testcode/versions/1",
"scoringScript": "score.py"
},
"environmentId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/environments/myenv",
"environmentVariables": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"systemData": {
"createdAt": "2021-03-25T20:46:47.062Z",
"createdBy": "string",
"createdByType": "User",
"lastModifiedAt": "2021-03-25T20:46:47.062Z",
"lastModifiedBy": "string",
"lastModifiedByType": "User"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "resourceGroup-1234",
"workspaceName": "testworkspace",
"endpointName": "testBatchEndpoint",
"deploymentName": "testBatchDeployment",
"api-version": "2021-03-01-preview"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "resourceGroup-1234",
"workspaceName": "testworkspace",
"endpointName": "testBatchEndpoint",
"deploymentName": "testBatchDeployment",
"api-version": "2021-03-01-preview"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testBatchEndpoint/deployments/testBatchDeployment",
"name": "testBatchDeployment",
"type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments",
"tags": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"location": "string",
"kind": "string",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myuseridentity": {
"clientId": "string"
}
}
},
"properties": {
"compute": {
"target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/testcompute",
"instanceCount": 0,
"isLocal": false,
"location": "string",
"instanceType": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"errorThreshold": 0,
"retrySettings": {
"maxRetries": 0,
"timeout": "string"
},
"partitionKeys": [
"string"
],
"miniBatchSize": 0,
"loggingLevel": "Info",
"outputConfiguration": {
"outputAction": "SummaryOnly",
"appendRowFileName": "string"
},
"description": "string",
"properties": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
},
"model": {
"referenceType": "Id",
"assetId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/models/testmodel/versions/1"
},
"codeConfiguration": {
"codeId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/codes/testcode/versions/1",
"scoringScript": "score.py"
},
"environmentId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/environments/myenv",
"environmentVariables": {
"additionalProp1": "string",
"additionalProp2": "string",
"additionalProp3": "string"
}
},
"systemData": {
"createdAt": "2021-03-25T20:46:47.062Z",
"createdBy": "string",
"createdByType": "User",
"lastModifiedAt": "2021-03-25T20:46:47.062Z",
"lastModifiedBy": "string",
"lastModifiedByType": "User"
}
}
}
}
}
Loading

0 comments on commit ecc8630

Please sign in to comment.