Skip to content

Commit

Permalink
CodeGen from PR 25783 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge af94a88c21d1bffad796a4a445adee592aab5abc into d97207a38747c5174455721b93cd2b2c67200618
  • Loading branch information
SDKAuto committed Sep 15, 2023
1 parent ff1e01c commit 977f7c2
Show file tree
Hide file tree
Showing 340 changed files with 49,664 additions and 9,066 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "c7daa3d35baaaabece0dbc6f731eadbe426973b9",
"commit": "a2f1652a44f86c27277b025615c6ba98bfc3440f",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"autorest": "3.9.7",
"use": [
"@autorest/python@6.4.12",
"@autorest/modelerfour@4.24.3"
"@autorest/python@6.7.1",
"@autorest/modelerfour@4.26.2"
],
"autorest_command": "autorest specification/machinelearningservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
"autorest_command": "autorest specification/machinelearningservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
"readme": "specification/machinelearningservices/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ class MachineLearningServicesMgmtClientConfiguration(Configuration): # pylint:
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
default value may result in unsupported behavior.
:keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(MachineLearningServicesMgmtClientConfiguration, self).__init__(**kwargs)
api_version: str = kwargs.pop("api_version", "2023-04-01")
api_version: str = kwargs.pop("api_version", "2023-08-01-preview")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,18 @@
DatastoresOperations,
EnvironmentContainersOperations,
EnvironmentVersionsOperations,
FeaturesOperations,
FeaturesetContainersOperations,
FeaturesetVersionsOperations,
FeaturestoreEntityContainersOperations,
FeaturestoreEntityVersionsOperations,
InferenceEndpointsOperations,
InferenceGroupsOperations,
InferencePoolsOperations,
JobsOperations,
LabelingJobsOperations,
ManagedNetworkProvisionsOperations,
ManagedNetworkSettingsRuleOperations,
ModelContainersOperations,
ModelVersionsOperations,
OnlineDeploymentsOperations,
Expand All @@ -49,6 +60,7 @@
RegistryModelContainersOperations,
RegistryModelVersionsOperations,
SchedulesOperations,
ServerlessEndpointsOperations,
UsagesOperations,
VirtualMachineSizesOperations,
WorkspaceConnectionsOperations,
Expand All @@ -64,10 +76,6 @@
class MachineLearningServicesMgmtClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
"""These APIs allow end users to operate on Azure Machine Learning Workspace resources.
:ivar operations: Operations operations
:vartype operations: azure.mgmt.machinelearningservices.operations.Operations
:ivar workspaces: WorkspacesOperations operations
:vartype workspaces: azure.mgmt.machinelearningservices.operations.WorkspacesOperations
:ivar usages: UsagesOperations operations
:vartype usages: azure.mgmt.machinelearningservices.operations.UsagesOperations
:ivar virtual_machine_sizes: VirtualMachineSizesOperations operations
Expand All @@ -77,15 +85,6 @@ class MachineLearningServicesMgmtClient: # pylint: disable=client-accepts-api-v
:vartype quotas: azure.mgmt.machinelearningservices.operations.QuotasOperations
:ivar compute: ComputeOperations operations
:vartype compute: azure.mgmt.machinelearningservices.operations.ComputeOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.machinelearningservices.operations.PrivateEndpointConnectionsOperations
:ivar private_link_resources: PrivateLinkResourcesOperations operations
:vartype private_link_resources:
azure.mgmt.machinelearningservices.operations.PrivateLinkResourcesOperations
:ivar workspace_connections: WorkspaceConnectionsOperations operations
:vartype workspace_connections:
azure.mgmt.machinelearningservices.operations.WorkspaceConnectionsOperations
:ivar registry_code_containers: RegistryCodeContainersOperations operations
:vartype registry_code_containers:
azure.mgmt.machinelearningservices.operations.RegistryCodeContainersOperations
Expand Down Expand Up @@ -146,8 +145,33 @@ class MachineLearningServicesMgmtClient: # pylint: disable=client-accepts-api-v
:ivar environment_versions: EnvironmentVersionsOperations operations
:vartype environment_versions:
azure.mgmt.machinelearningservices.operations.EnvironmentVersionsOperations
:ivar featureset_containers: FeaturesetContainersOperations operations
:vartype featureset_containers:
azure.mgmt.machinelearningservices.operations.FeaturesetContainersOperations
:ivar features: FeaturesOperations operations
:vartype features: azure.mgmt.machinelearningservices.operations.FeaturesOperations
:ivar featureset_versions: FeaturesetVersionsOperations operations
:vartype featureset_versions:
azure.mgmt.machinelearningservices.operations.FeaturesetVersionsOperations
:ivar featurestore_entity_containers: FeaturestoreEntityContainersOperations operations
:vartype featurestore_entity_containers:
azure.mgmt.machinelearningservices.operations.FeaturestoreEntityContainersOperations
:ivar featurestore_entity_versions: FeaturestoreEntityVersionsOperations operations
:vartype featurestore_entity_versions:
azure.mgmt.machinelearningservices.operations.FeaturestoreEntityVersionsOperations
:ivar inference_pools: InferencePoolsOperations operations
:vartype inference_pools:
azure.mgmt.machinelearningservices.operations.InferencePoolsOperations
:ivar inference_groups: InferenceGroupsOperations operations
:vartype inference_groups:
azure.mgmt.machinelearningservices.operations.InferenceGroupsOperations
:ivar inference_endpoints: InferenceEndpointsOperations operations
:vartype inference_endpoints:
azure.mgmt.machinelearningservices.operations.InferenceEndpointsOperations
:ivar jobs: JobsOperations operations
:vartype jobs: azure.mgmt.machinelearningservices.operations.JobsOperations
:ivar labeling_jobs: LabelingJobsOperations operations
:vartype labeling_jobs: azure.mgmt.machinelearningservices.operations.LabelingJobsOperations
:ivar model_containers: ModelContainersOperations operations
:vartype model_containers:
azure.mgmt.machinelearningservices.operations.ModelContainersOperations
Expand All @@ -161,19 +185,41 @@ class MachineLearningServicesMgmtClient: # pylint: disable=client-accepts-api-v
azure.mgmt.machinelearningservices.operations.OnlineDeploymentsOperations
:ivar schedules: SchedulesOperations operations
:vartype schedules: azure.mgmt.machinelearningservices.operations.SchedulesOperations
:ivar serverless_endpoints: ServerlessEndpointsOperations operations
:vartype serverless_endpoints:
azure.mgmt.machinelearningservices.operations.ServerlessEndpointsOperations
:ivar registries: RegistriesOperations operations
:vartype registries: azure.mgmt.machinelearningservices.operations.RegistriesOperations
:ivar workspace_features: WorkspaceFeaturesOperations operations
:vartype workspace_features:
azure.mgmt.machinelearningservices.operations.WorkspaceFeaturesOperations
:ivar operations: Operations operations
:vartype operations: azure.mgmt.machinelearningservices.operations.Operations
:ivar workspaces: WorkspacesOperations operations
:vartype workspaces: azure.mgmt.machinelearningservices.operations.WorkspacesOperations
:ivar workspace_connections: WorkspaceConnectionsOperations operations
:vartype workspace_connections:
azure.mgmt.machinelearningservices.operations.WorkspaceConnectionsOperations
:ivar managed_network_settings_rule: ManagedNetworkSettingsRuleOperations operations
:vartype managed_network_settings_rule:
azure.mgmt.machinelearningservices.operations.ManagedNetworkSettingsRuleOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.machinelearningservices.operations.PrivateEndpointConnectionsOperations
:ivar private_link_resources: PrivateLinkResourcesOperations operations
:vartype private_link_resources:
azure.mgmt.machinelearningservices.operations.PrivateLinkResourcesOperations
:ivar managed_network_provisions: ManagedNetworkProvisionsOperations operations
:vartype managed_network_provisions:
azure.mgmt.machinelearningservices.operations.ManagedNetworkProvisionsOperations
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
default value may result in unsupported behavior.
:keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
Retry-After header is present.
Expand All @@ -195,23 +241,12 @@ def __init__(
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
self.usages = UsagesOperations(self._client, self._config, self._serialize, self._deserialize)
self.virtual_machine_sizes = VirtualMachineSizesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.quotas = QuotasOperations(self._client, self._config, self._serialize, self._deserialize)
self.compute = ComputeOperations(self._client, self._config, self._serialize, self._deserialize)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_link_resources = PrivateLinkResourcesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.workspace_connections = WorkspaceConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.registry_code_containers = RegistryCodeContainersOperations(
self._client, self._config, self._serialize, self._deserialize
)
Expand Down Expand Up @@ -263,7 +298,28 @@ def __init__(
self.environment_versions = EnvironmentVersionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.featureset_containers = FeaturesetContainersOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.features = FeaturesOperations(self._client, self._config, self._serialize, self._deserialize)
self.featureset_versions = FeaturesetVersionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.featurestore_entity_containers = FeaturestoreEntityContainersOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.featurestore_entity_versions = FeaturestoreEntityVersionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.inference_pools = InferencePoolsOperations(self._client, self._config, self._serialize, self._deserialize)
self.inference_groups = InferenceGroupsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.inference_endpoints = InferenceEndpointsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
self.labeling_jobs = LabelingJobsOperations(self._client, self._config, self._serialize, self._deserialize)
self.model_containers = ModelContainersOperations(
self._client, self._config, self._serialize, self._deserialize
)
Expand All @@ -275,10 +331,30 @@ def __init__(
self._client, self._config, self._serialize, self._deserialize
)
self.schedules = SchedulesOperations(self._client, self._config, self._serialize, self._deserialize)
self.serverless_endpoints = ServerlessEndpointsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.registries = RegistriesOperations(self._client, self._config, self._serialize, self._deserialize)
self.workspace_features = WorkspaceFeaturesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
self.workspace_connections = WorkspaceConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.managed_network_settings_rule = ManagedNetworkSettingsRuleOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_link_resources = PrivateLinkResourcesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.managed_network_provisions = ManagedNetworkProvisionsOperations(
self._client, self._config, self._serialize, self._deserialize
)

def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
"""Runs the network request through the client's chained policies.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
_serialized.update(_new_attr) # type: ignore
_new_attr = _new_attr[k] # type: ignore
_serialized = _serialized[k]
except ValueError:
continue
except ValueError as err:
if isinstance(err, SerializationError):
raise

except (AttributeError, KeyError, TypeError) as err:
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
Expand Down Expand Up @@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
:param data: The data to be serialized.
:param str data_type: The type to be serialized from.
:keyword bool skip_quote: Whether to skip quote the serialized result.
Defaults to False.
:rtype: str
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
Expand All @@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
# Treat the list aside, since we don't want to encode the div separator
if data_type.startswith("["):
internal_data_type = data_type[1:-1]
data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
if not kwargs.get("skip_quote", False):
data = [quote(str(d), safe="") for d in data]
return str(self.serialize_iter(data, internal_data_type, **kwargs))
do_quote = not kwargs.get("skip_quote", False)
return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))

# Not a list, regular serialization
output = self.serialize_data(data, data_type, **kwargs)
Expand Down Expand Up @@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
not be None or empty.
:param str div: If set, this str will be used to combine the elements
in the iterable into a combined string. Default is 'None'.
:keyword bool do_quote: Whether to quote the serialized result of each iterable element.
Defaults to False.
:rtype: list, str
"""
if isinstance(data, str):
Expand All @@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
for d in data:
try:
serialized.append(self.serialize_data(d, iter_type, **kwargs))
except ValueError:
except ValueError as err:
if isinstance(err, SerializationError):
raise
serialized.append(None)

if kwargs.get("do_quote", False):
serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]

if div:
serialized = ["" if s is None else str(s) for s in serialized]
serialized = div.join(serialized)
Expand Down Expand Up @@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
for key, value in attr.items():
try:
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
except ValueError:
except ValueError as err:
if isinstance(err, SerializationError):
raise
serialized[self.serialize_unicode(key)] = None

if "xml" in serialization_ctxt:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import List, cast

from azure.core.pipeline.transport import HttpRequest


Expand All @@ -16,15 +14,3 @@ def _convert_request(request, files=None):
if files:
request.set_formdata_body(files)
return request


def _format_url_section(template, **kwargs):
components = template.split("/")
while components:
try:
return template.format(**kwargs)
except KeyError as key:
# Need the cast, as for some reasons "split" is typed as list[str | Any]
formatted_components = cast(List[str], template.split("/"))
components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
template = "/".join(components)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "2.0.0b2"
VERSION = "1.0.0b1"
Loading

0 comments on commit 977f7c2

Please sign in to comment.