Skip to content

Commit

Permalink
CodeGen from PR 21761 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history 
Machinelearningservices microsoft.machine learning services 2022 12 01 preview (Azure#21761)

* Adds base for updating Microsoft.MachineLearningServices from version preview/2022-10-01-preview to version 2022-12-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add Dec API Registries Swagger (Azure#21419)

* add december registries swagger + examples

* add status code 202 in examples

* fix 202 examples

* fixes

* fixes

* fix

* add 202 back in for put/patch

Co-authored-by: Komal Yadav <komalyadav@microsoft.com>

* remove location (Azure#21430)

Co-authored-by: Komal Yadav <komalyadav@microsoft.com>

* remove readonly flag on schedules property for CI (Azure#21653)

Co-authored-by: Naman Agarwal <naagarw@microsoft.com>

* add missing workspace properties (Azure#21725)

* December preview updating mfe.json specs (Azure#21510)

* December preview updating mfe.json specs

* MFE Dec 2022 Preview API - Adding logbase

* MFE 2022-12-01-preview swagger spec model validation fix

* MFE 2022-12-01-preview swagger spec model validation fix, add missing location

* MFE 2022-12-01-preview swagger spec model validation - typo fix

* MFE 2022-12-01-preview swagger spec model validation - fix api version in automljob example

* MFE 2022-12-01-preview swagger spec model validation - fix for multiselectenabled error

* MFE 2022-12-01-preview swagger spec model validation - fix for multiselectenabled error

* Fix  for 1006 - RemovedDefinition (RecurrenceTrigger,CronTrigger) (Azure#21822)

* fix ReadonlyPropertyChanged of MLC (Azure#21814)

Co-authored-by: Bingchen Li <bingchenli@microsoft.com>

* fixed custom-words conflict (Azure#21829)

* fix custom-words conflict merge (Azure#21830)

* example fix (INVALID_REQUEST_PARAMETER) (Azure#21832)

Co-authored-by: Ivaliy Ivanov <ivaliyivanov@Ivaliys-MacBook-Air.local>

* example fix, use correct api preview version  - (INVALID_REQUEST_PARAMETER) (Azure#21833)

Co-authored-by: Ivaliy Ivanov <ivaliyivanov@Ivaliys-MacBook-Air.local>

* Revert breaking change for MLC swagger 2022-12-01-preview (Azure#21885)

Co-authored-by: Bingchen Li <bingchenli@microsoft.com>

* Revert Connection Category back to enum. (Azure#21939)

* revert provisioning state change (Azure#21940)

* remove body (Azure#21978)

Co-authored-by: Komal Yadav <komalyadav@microsoft.com>

* Addressed comments, added x-ms-long-running-operation to a patch call (Azure#22005)

* Addressed comments, added x-ms-long-running-operation to a patch call

* fix examples for patch - remove body

* fixed formatting

* Ivalbert fix patch2 (Azure#22006)

* Addressed comments, added x-ms-long-running-operation to a patch call

* fix examples for patch - remove body

* fixed formatting

* fixed formatting

* Updated custom words (Azure#22262)

* Fixed prettier errors (Azure#22237)

* fixed examples for LRO_RESPONSE_HEADER check (Azure#22293)

* fixed examples for LRO_RESPONSE_HEADER check (Azure#22294)

* Example fix - OBJECT_MISSING_REQUIRED_PROPERTY - Missing required property: triggerType (Azure#22317)

---------

Co-authored-by: Komal Yadav <23komal.yadav23@gmail.com>
Co-authored-by: Komal Yadav <komalyadav@microsoft.com>
Co-authored-by: Naman Agarwal <namanag16@gmail.com>
Co-authored-by: Naman Agarwal <naagarw@microsoft.com>
Co-authored-by: ZhidaLiu <zhili@microsoft.com>
Co-authored-by: libc16 <88697960+libc16@users.noreply.github.com>
Co-authored-by: Bingchen Li <bingchenli@microsoft.com>
Co-authored-by: Ivaliy Ivanov <ivaliyivanov@Ivaliys-MacBook-Air.local>
  • Loading branch information
@komo23x @namanag16
@ZhidaLiu @libc16
9 people committed Feb 1, 2023
1 parent 40c8524 commit a6bcd1c
Show file tree
Hide file tree
Showing 799 changed files with 38,006 additions and 24,625 deletions.
4 changes: 3 additions & 1 deletion sdk/machinelearning/azure-resourcemanager-machinelearning/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release History

## 1.1.0-beta.1 (Unreleased)
## 1.0.0-beta.1 (2023-02-01)

- Azure Resource Manager Machine Learning client library for Java. This package contains Microsoft Azure SDK for Machine Learning Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-preview-2022-12. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

### Features Added

Expand Down
4 changes: 2 additions & 2 deletions sdk/machinelearning/azure-resourcemanager-machinelearning/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Azure Resource Manager Machine Learning client library for Java.

This package contains Microsoft Azure SDK for Machine Learning Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-10. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
This package contains Microsoft Azure SDK for Machine Learning Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-preview-2022-12. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

## We'd love to hear your feedback

Expand Down Expand Up @@ -32,7 +32,7 @@ Various documentation is available to help you get started
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-machinelearning</artifactId>
<version>1.0.0</version>
<version>1.1.0-beta.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2,617 changes: 2,251 additions & 366 deletions sdk/machinelearning/azure-resourcemanager-machinelearning/SAMPLE.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<packaging>jar</packaging>

<name>Microsoft Azure SDK for Machine Learning Management</name>
<description>This package contains Microsoft Azure SDK for Machine Learning Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-10.</description>
<description>This package contains Microsoft Azure SDK for Machine Learning Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-preview-2022-12.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>

<licenses>
Expand Down
196 changes: 181 additions & 15 deletions ...rning/src/main/java/com/azure/resourcemanager/machinelearning/MachineLearningManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import com.azure.core.management.profile.AzureProfile;
import com.azure.core.util.Configuration;
import com.azure.core.util.logging.ClientLogger;
import com.azure.resourcemanager.machinelearning.fluent.AzureMachineLearningWorkspaces;
import com.azure.resourcemanager.machinelearning.implementation.AzureMachineLearningWorkspacesBuilder;
import com.azure.resourcemanager.machinelearning.fluent.AzureMachineLearningServices;
import com.azure.resourcemanager.machinelearning.implementation.AzureMachineLearningServicesBuilder;
import com.azure.resourcemanager.machinelearning.implementation.BatchDeploymentsImpl;
import com.azure.resourcemanager.machinelearning.implementation.BatchEndpointsImpl;
import com.azure.resourcemanager.machinelearning.implementation.CodeContainersImpl;
Expand All @@ -38,6 +38,7 @@
import com.azure.resourcemanager.machinelearning.implementation.EnvironmentContainersImpl;
import com.azure.resourcemanager.machinelearning.implementation.EnvironmentVersionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.JobsImpl;
import com.azure.resourcemanager.machinelearning.implementation.LabelingJobsImpl;
import com.azure.resourcemanager.machinelearning.implementation.ModelContainersImpl;
import com.azure.resourcemanager.machinelearning.implementation.ModelVersionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.OnlineDeploymentsImpl;
Expand All @@ -46,6 +47,15 @@
import com.azure.resourcemanager.machinelearning.implementation.PrivateEndpointConnectionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.PrivateLinkResourcesImpl;
import com.azure.resourcemanager.machinelearning.implementation.QuotasImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistriesImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryCodeContainersImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryCodeVersionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryComponentContainersImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryComponentVersionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryEnvironmentContainersImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryEnvironmentVersionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryModelContainersImpl;
import com.azure.resourcemanager.machinelearning.implementation.RegistryModelVersionsImpl;
import com.azure.resourcemanager.machinelearning.implementation.SchedulesImpl;
import com.azure.resourcemanager.machinelearning.implementation.UsagesImpl;
import com.azure.resourcemanager.machinelearning.implementation.VirtualMachineSizesImpl;
Expand All @@ -65,6 +75,7 @@
import com.azure.resourcemanager.machinelearning.models.EnvironmentContainers;
import com.azure.resourcemanager.machinelearning.models.EnvironmentVersions;
import com.azure.resourcemanager.machinelearning.models.Jobs;
import com.azure.resourcemanager.machinelearning.models.LabelingJobs;
import com.azure.resourcemanager.machinelearning.models.ModelContainers;
import com.azure.resourcemanager.machinelearning.models.ModelVersions;
import com.azure.resourcemanager.machinelearning.models.OnlineDeployments;
Expand All @@ -73,6 +84,15 @@
import com.azure.resourcemanager.machinelearning.models.PrivateEndpointConnections;
import com.azure.resourcemanager.machinelearning.models.PrivateLinkResources;
import com.azure.resourcemanager.machinelearning.models.Quotas;
import com.azure.resourcemanager.machinelearning.models.Registries;
import com.azure.resourcemanager.machinelearning.models.RegistryCodeContainers;
import com.azure.resourcemanager.machinelearning.models.RegistryCodeVersions;
import com.azure.resourcemanager.machinelearning.models.RegistryComponentContainers;
import com.azure.resourcemanager.machinelearning.models.RegistryComponentVersions;
import com.azure.resourcemanager.machinelearning.models.RegistryEnvironmentContainers;
import com.azure.resourcemanager.machinelearning.models.RegistryEnvironmentVersions;
import com.azure.resourcemanager.machinelearning.models.RegistryModelContainers;
import com.azure.resourcemanager.machinelearning.models.RegistryModelVersions;
import com.azure.resourcemanager.machinelearning.models.Schedules;
import com.azure.resourcemanager.machinelearning.models.Usages;
import com.azure.resourcemanager.machinelearning.models.VirtualMachineSizes;
Expand Down Expand Up @@ -109,6 +129,22 @@ public final class MachineLearningManager {

private WorkspaceConnections workspaceConnections;

private RegistryCodeContainers registryCodeContainers;

private RegistryCodeVersions registryCodeVersions;

private RegistryComponentContainers registryComponentContainers;

private RegistryComponentVersions registryComponentVersions;

private RegistryEnvironmentContainers registryEnvironmentContainers;

private RegistryEnvironmentVersions registryEnvironmentVersions;

private RegistryModelContainers registryModelContainers;

private RegistryModelVersions registryModelVersions;

private BatchEndpoints batchEndpoints;

private BatchDeployments batchDeployments;
Expand All @@ -133,6 +169,8 @@ public final class MachineLearningManager {

private Jobs jobs;

private LabelingJobs labelingJobs;

private ModelContainers modelContainers;

private ModelVersions modelVersions;
Expand All @@ -143,15 +181,17 @@ public final class MachineLearningManager {

private Schedules schedules;

private Registries registries;

private WorkspaceFeatures workspaceFeatures;

private final AzureMachineLearningWorkspaces clientObject;
private final AzureMachineLearningServices clientObject;

private MachineLearningManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
Objects.requireNonNull(profile, "'profile' cannot be null.");
this.clientObject =
new AzureMachineLearningWorkspacesBuilder()
new AzureMachineLearningServicesBuilder()
.pipeline(httpPipeline)
.endpoint(profile.getEnvironment().getResourceManagerEndpoint())
.subscriptionId(profile.getSubscriptionId())
Expand Down Expand Up @@ -310,7 +350,7 @@ public MachineLearningManager authenticate(TokenCredential credential, AzureProf
.append("-")
.append("com.azure.resourcemanager.machinelearning")
.append("/")
.append("1.0.0");
.append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
Expand Down Expand Up @@ -477,6 +517,108 @@ public WorkspaceConnections workspaceConnections() {
return workspaceConnections;
}

/**
* Gets the resource collection API of RegistryCodeContainers. It manages CodeContainer.
*
* @return Resource collection API of RegistryCodeContainers.
*/
public RegistryCodeContainers registryCodeContainers() {
if (this.registryCodeContainers == null) {
this.registryCodeContainers =
new RegistryCodeContainersImpl(clientObject.getRegistryCodeContainers(), this);
}
return registryCodeContainers;
}

/**
* Gets the resource collection API of RegistryCodeVersions. It manages CodeVersion.
*
* @return Resource collection API of RegistryCodeVersions.
*/
public RegistryCodeVersions registryCodeVersions() {
if (this.registryCodeVersions == null) {
this.registryCodeVersions = new RegistryCodeVersionsImpl(clientObject.getRegistryCodeVersions(), this);
}
return registryCodeVersions;
}

/**
* Gets the resource collection API of RegistryComponentContainers. It manages ComponentContainer.
*
* @return Resource collection API of RegistryComponentContainers.
*/
public RegistryComponentContainers registryComponentContainers() {
if (this.registryComponentContainers == null) {
this.registryComponentContainers =
new RegistryComponentContainersImpl(clientObject.getRegistryComponentContainers(), this);
}
return registryComponentContainers;
}

/**
* Gets the resource collection API of RegistryComponentVersions. It manages ComponentVersion.
*
* @return Resource collection API of RegistryComponentVersions.
*/
public RegistryComponentVersions registryComponentVersions() {
if (this.registryComponentVersions == null) {
this.registryComponentVersions =
new RegistryComponentVersionsImpl(clientObject.getRegistryComponentVersions(), this);
}
return registryComponentVersions;
}

/**
* Gets the resource collection API of RegistryEnvironmentContainers. It manages EnvironmentContainer.
*
* @return Resource collection API of RegistryEnvironmentContainers.
*/
public RegistryEnvironmentContainers registryEnvironmentContainers() {
if (this.registryEnvironmentContainers == null) {
this.registryEnvironmentContainers =
new RegistryEnvironmentContainersImpl(clientObject.getRegistryEnvironmentContainers(), this);
}
return registryEnvironmentContainers;
}

/**
* Gets the resource collection API of RegistryEnvironmentVersions. It manages EnvironmentVersion.
*
* @return Resource collection API of RegistryEnvironmentVersions.
*/
public RegistryEnvironmentVersions registryEnvironmentVersions() {
if (this.registryEnvironmentVersions == null) {
this.registryEnvironmentVersions =
new RegistryEnvironmentVersionsImpl(clientObject.getRegistryEnvironmentVersions(), this);
}
return registryEnvironmentVersions;
}

/**
* Gets the resource collection API of RegistryModelContainers. It manages ModelContainer.
*
* @return Resource collection API of RegistryModelContainers.
*/
public RegistryModelContainers registryModelContainers() {
if (this.registryModelContainers == null) {
this.registryModelContainers =
new RegistryModelContainersImpl(clientObject.getRegistryModelContainers(), this);
}
return registryModelContainers;
}

/**
* Gets the resource collection API of RegistryModelVersions. It manages ModelVersion.
*
* @return Resource collection API of RegistryModelVersions.
*/
public RegistryModelVersions registryModelVersions() {
if (this.registryModelVersions == null) {
this.registryModelVersions = new RegistryModelVersionsImpl(clientObject.getRegistryModelVersions(), this);
}
return registryModelVersions;
}

/**
* Gets the resource collection API of BatchEndpoints. It manages BatchEndpoint.
*
Expand All @@ -502,7 +644,7 @@ public BatchDeployments batchDeployments() {
}

/**
* Gets the resource collection API of CodeContainers. It manages CodeContainer.
* Gets the resource collection API of CodeContainers.
*
* @return Resource collection API of CodeContainers.
*/
Expand All @@ -514,7 +656,7 @@ public CodeContainers codeContainers() {
}

/**
* Gets the resource collection API of CodeVersions. It manages CodeVersion.
* Gets the resource collection API of CodeVersions.
*
* @return Resource collection API of CodeVersions.
*/
Expand All @@ -526,7 +668,7 @@ public CodeVersions codeVersions() {
}

/**
* Gets the resource collection API of ComponentContainers. It manages ComponentContainer.
* Gets the resource collection API of ComponentContainers.
*
* @return Resource collection API of ComponentContainers.
*/
Expand All @@ -538,7 +680,7 @@ public ComponentContainers componentContainers() {
}

/**
* Gets the resource collection API of ComponentVersions. It manages ComponentVersion.
* Gets the resource collection API of ComponentVersions.
*
* @return Resource collection API of ComponentVersions.
*/
Expand Down Expand Up @@ -586,7 +728,7 @@ public Datastores datastores() {
}

/**
* Gets the resource collection API of EnvironmentContainers. It manages EnvironmentContainer.
* Gets the resource collection API of EnvironmentContainers.
*
* @return Resource collection API of EnvironmentContainers.
*/
Expand All @@ -598,7 +740,7 @@ public EnvironmentContainers environmentContainers() {
}

/**
* Gets the resource collection API of EnvironmentVersions. It manages EnvironmentVersion.
* Gets the resource collection API of EnvironmentVersions.
*
* @return Resource collection API of EnvironmentVersions.
*/
Expand All @@ -622,7 +764,19 @@ public Jobs jobs() {
}

/**
* Gets the resource collection API of ModelContainers. It manages ModelContainer.
* Gets the resource collection API of LabelingJobs. It manages LabelingJob.
*
* @return Resource collection API of LabelingJobs.
*/
public LabelingJobs labelingJobs() {
if (this.labelingJobs == null) {
this.labelingJobs = new LabelingJobsImpl(clientObject.getLabelingJobs(), this);
}
return labelingJobs;
}

/**
* Gets the resource collection API of ModelContainers.
*
* @return Resource collection API of ModelContainers.
*/
Expand All @@ -634,7 +788,7 @@ public ModelContainers modelContainers() {
}

/**
* Gets the resource collection API of ModelVersions. It manages ModelVersion.
* Gets the resource collection API of ModelVersions.
*
* @return Resource collection API of ModelVersions.
*/
Expand Down Expand Up @@ -681,6 +835,18 @@ public Schedules schedules() {
return schedules;
}

/**
* Gets the resource collection API of Registries. It manages Registry.
*
* @return Resource collection API of Registries.
*/
public Registries registries() {
if (this.registries == null) {
this.registries = new RegistriesImpl(clientObject.getRegistries(), this);
}
return registries;
}

/**
* Gets the resource collection API of WorkspaceFeatures.
*
Expand All @@ -694,10 +860,10 @@ public WorkspaceFeatures workspaceFeatures() {
}

/**
* @return Wrapped service client AzureMachineLearningWorkspaces providing direct access to the underlying
* @return Wrapped service client AzureMachineLearningServices providing direct access to the underlying
* auto-generated API implementation, based on Azure REST API.
*/
public AzureMachineLearningWorkspaces serviceClient() {
public AzureMachineLearningServices serviceClient() {
return this.clientObject;
}
}
Loading

0 comments on commit a6bcd1c

Please sign in to comment.