Skip to content

Commit

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

* Enabling java client (#1)

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

This reverts commit 26873d33199c64732735a5c0f92fe90f4044453e.

* 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 8ef3c1a75

* 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 4f67cdfb141cda745908a0d461206c43932e79c0.

* 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 3e07c4afed933628a86f3706803fcde31979c9aa.

* Revert "proper async marking for LabelingJobs_Resume"

This reverts commit b1112037d4f15b7bd220b19c9005899e56e4c4c3.

* change to 2020-09 to see if gate passes

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

This reverts commit a27c0e0447a7e375dabcdfe07616ca0bd0fbf2e0.

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

This reverts commit a0e0cf06731a5c3d2da3faea8ac5d556dd22e041.

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

This reverts commit 5e86dd04c13aba9fcc7e6572296f64c332596b0e.

* 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 2e7b88e17e4ac48d4890d74510580ad50a9a23c0.

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

This reverts commit 8ff82a19ed7afa00a7bb38a5dfa48263e0b8fad3.

* 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 (#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 12dc59a0283ad86aa73f756cbd9d0462c1a03357.

* 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
@harneetvirk @zhaomuzhi @j-so
6 people committed May 11, 2021
1 parent 4d0b93f commit 666a8fb
Show file tree
Hide file tree
Showing 28 changed files with 7,589 additions and 1,060 deletions.
2 changes: 1 addition & 1 deletion sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Microsoft
Copyright (c) 2021 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
114 changes: 10 additions & 104 deletions ...machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import * as msRest from "@azure/ms-rest-js";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as Parameters from "./models/parameters";
import * as operations from "./operations";
import { AzureMachineLearningWorkspacesContext } from "./azureMachineLearningWorkspacesContext";

Expand All @@ -20,14 +19,17 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte
operations: operations.Operations;
workspaces: operations.Workspaces;
workspaceFeatures: operations.WorkspaceFeatures;
notebooks: operations.Notebooks;
usages: operations.Usages;
virtualMachineSizes: operations.VirtualMachineSizes;
quotas: operations.Quotas;
workspaceConnections: operations.WorkspaceConnections;
machineLearningCompute: operations.MachineLearningCompute;
workspace: operations.WorkspaceOperations;
privateEndpointConnections: operations.PrivateEndpointConnections;
privateLinkResources: operations.PrivateLinkResources;
machineLearningService: operations.MachineLearningService;
notebooks: operations.Notebooks;
storageAccount: operations.StorageAccount;
workspaceConnections: operations.WorkspaceConnections;

/**
* Initializes a new instance of the AzureMachineLearningWorkspaces class.
Expand All @@ -40,117 +42,21 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte
this.operations = new operations.Operations(this);
this.workspaces = new operations.Workspaces(this);
this.workspaceFeatures = new operations.WorkspaceFeatures(this);
this.notebooks = new operations.Notebooks(this);
this.usages = new operations.Usages(this);
this.virtualMachineSizes = new operations.VirtualMachineSizes(this);
this.quotas = new operations.Quotas(this);
this.workspaceConnections = new operations.WorkspaceConnections(this);
this.machineLearningCompute = new operations.MachineLearningCompute(this);
this.workspace = new operations.WorkspaceOperations(this);
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
}

/**
* Lists all skus with associated features
* @param [options] The optional parameters
* @returns Promise<Models.ListSkusResponse>
*/
listSkus(options?: msRest.RequestOptionsBase): Promise<Models.ListSkusResponse>;
/**
* @param callback The callback
*/
listSkus(callback: msRest.ServiceCallback<Models.SkuListResult>): void;
/**
* @param options The optional parameters
* @param callback The callback
*/
listSkus(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
listSkus(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuListResult>, callback?: msRest.ServiceCallback<Models.SkuListResult>): Promise<Models.ListSkusResponse> {
return this.sendOperationRequest(
{
options
},
listSkusOperationSpec,
callback) as Promise<Models.ListSkusResponse>;
}

/**
* Lists all skus with associated features
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param [options] The optional parameters
* @returns Promise<Models.ListSkusNextResponse>
*/
listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ListSkusNextResponse>;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param callback The callback
*/
listSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param options The optional parameters
* @param callback The callback
*/
listSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuListResult>, callback?: msRest.ServiceCallback<Models.SkuListResult>): Promise<Models.ListSkusNextResponse> {
return this.sendOperationRequest(
{
nextPageLink,
options
},
listSkusNextOperationSpec,
callback) as Promise<Models.ListSkusNextResponse>;
this.machineLearningService = new operations.MachineLearningService(this);
this.notebooks = new operations.Notebooks(this);
this.storageAccount = new operations.StorageAccount(this);
this.workspaceConnections = new operations.WorkspaceConnections(this);
}
}

// Operation Specifications
const serializer = new msRest.Serializer(Mappers);
const listSkusOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces/skus",
urlParameters: [
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
responses: {
200: {
bodyMapper: Mappers.SkuListResult
},
default: {
bodyMapper: Mappers.MachineLearningServiceError
}
},
serializer
};

const listSkusNextOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
baseUrl: "https://management.azure.com",
path: "{nextLink}",
urlParameters: [
Parameters.nextPageLink
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
responses: {
200: {
bodyMapper: Mappers.SkuListResult
},
default: {
bodyMapper: Mappers.MachineLearningServiceError
}
},
serializer
};

export {
AzureMachineLearningWorkspaces,
Expand Down
2 changes: 1 addition & 1 deletion ...learningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ

super(credentials, options);

this.apiVersion = '2020-08-01';
this.apiVersion = '2021-04-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
Loading

0 comments on commit 666a8fb

Please sign in to comment.