From b20085673044364e612039cab65f3ad38210971d Mon Sep 17 00:00:00 2001 From: Hanchi Wang Date: Tue, 18 Oct 2022 12:54:30 -0700 Subject: [PATCH] Update auto-gen code for 2022-10-01-preview API version (#26873) * Update autorest code for 2022-10-01-preview API version --- .../_registry_code_containers_operations.py | 46 +- .../_registry_code_versions_operations.py | 58 +- ...egistry_component_containers_operations.py | 46 +- ..._registry_component_versions_operations.py | 58 +- ...istry_environment_containers_operations.py | 46 +- ...egistry_environment_versions_operations.py | 58 +- .../_registry_model_containers_operations.py | 46 +- .../_registry_model_versions_operations.py | 58 +- .../v2022_10_01_preview/models/__init__.py | 28 +- ...azure_machine_learning_workspaces_enums.py | 23 +- .../v2022_10_01_preview/models/_models.py | 671 +++++++++++---- .../v2022_10_01_preview/models/_models_py3.py | 764 +++++++++++++----- .../_registry_code_containers_operations.py | 64 +- .../_registry_code_versions_operations.py | 82 +- ...egistry_component_containers_operations.py | 64 +- ..._registry_component_versions_operations.py | 82 +- ...istry_environment_containers_operations.py | 64 +- ...egistry_environment_versions_operations.py | 82 +- .../_registry_model_containers_operations.py | 64 +- .../_registry_model_versions_operations.py | 82 +- .../regenerate_restclient.py | 2 +- .../machineLearningServices.json | 219 ++++- .../preview/2022-10-01-preview/mfe.json | 166 ++-- 23 files changed, 1932 insertions(+), 941 deletions(-) rename sdk/ml/azure-ai-ml/{swagger => scripts}/regenerate_restclient.py (96%) diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_containers_operations.py index e0e6f07ef7c3..29626af6ce4a 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_containers_operations.py @@ -142,7 +142,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] @@ -158,7 +158,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -186,7 +186,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore @distributed_trace_async @@ -194,7 +194,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete container. @@ -205,8 +205,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -231,7 +231,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -243,7 +243,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -255,14 +255,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, **kwargs: Any ) -> "_models.CodeContainer": """Get container. @@ -273,8 +273,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: CodeContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.CodeContainer @@ -293,7 +293,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -319,14 +319,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, body: "_models.CodeContainer", **kwargs: Any ) -> "_models.CodeContainer": @@ -345,7 +345,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, content_type=content_type, json=_json, @@ -380,7 +380,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore @distributed_trace_async @@ -388,7 +388,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, body: "_models.CodeContainer", **kwargs: Any ) -> AsyncLROPoller["_models.CodeContainer"]: @@ -400,8 +400,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.CodeContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -431,7 +431,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, body=body, api_version=api_version, content_type=content_type, @@ -448,7 +448,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -460,4 +460,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_versions_operations.py index 2fe62405587d..cd048ea6d788 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_code_versions_operations.py @@ -52,7 +52,7 @@ def list( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, order_by: Optional[str] = None, top: Optional[int] = None, skip: Optional[str] = None, @@ -66,8 +66,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param order_by: Ordering of list. :type order_by: str :param top: Maximum number of records to return. @@ -95,7 +95,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, order_by=order_by, top=top, @@ -111,7 +111,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, order_by=order_by, top=top, @@ -151,13 +151,13 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, version: str, **kwargs: Any ) -> None: @@ -174,7 +174,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -203,7 +203,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -211,7 +211,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, version: str, **kwargs: Any ) -> AsyncLROPoller[None]: @@ -223,8 +223,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -251,7 +251,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -264,7 +264,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -276,14 +276,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, version: str, **kwargs: Any ) -> "_models.CodeVersion": @@ -295,8 +295,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -317,7 +317,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -344,14 +344,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, version: str, body: "_models.CodeVersion", **kwargs: Any @@ -371,7 +371,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, content_type=content_type, @@ -407,7 +407,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -415,7 +415,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + code_name: str, version: str, body: "_models.CodeVersion", **kwargs: Any @@ -428,8 +428,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -461,7 +461,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, body=body, api_version=api_version, @@ -479,7 +479,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -491,4 +491,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_containers_operations.py index 0dfb849b76a6..1889749353ea 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_containers_operations.py @@ -142,7 +142,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] @@ -158,7 +158,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -186,7 +186,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore @distributed_trace_async @@ -194,7 +194,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete container. @@ -205,8 +205,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -231,7 +231,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -243,7 +243,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -255,14 +255,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, **kwargs: Any ) -> "_models.ComponentContainer": """Get container. @@ -273,8 +273,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ComponentContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.ComponentContainer @@ -293,7 +293,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -319,14 +319,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, body: "_models.ComponentContainer", **kwargs: Any ) -> "_models.ComponentContainer": @@ -345,7 +345,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, content_type=content_type, json=_json, @@ -380,7 +380,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore @distributed_trace_async @@ -388,7 +388,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, body: "_models.ComponentContainer", **kwargs: Any ) -> AsyncLROPoller["_models.ComponentContainer"]: @@ -400,8 +400,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.ComponentContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -431,7 +431,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, body=body, api_version=api_version, content_type=content_type, @@ -448,7 +448,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -460,4 +460,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_versions_operations.py index 5626f3374fac..6267a8df8873 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_component_versions_operations.py @@ -52,7 +52,7 @@ def list( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, order_by: Optional[str] = None, top: Optional[int] = None, skip: Optional[str] = None, @@ -66,8 +66,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param order_by: Ordering of list. :type order_by: str :param top: Maximum number of records to return. @@ -95,7 +95,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, order_by=order_by, top=top, @@ -111,7 +111,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, order_by=order_by, top=top, @@ -151,13 +151,13 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, version: str, **kwargs: Any ) -> None: @@ -174,7 +174,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -203,7 +203,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -211,7 +211,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, version: str, **kwargs: Any ) -> AsyncLROPoller[None]: @@ -223,8 +223,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -251,7 +251,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -264,7 +264,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -276,14 +276,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, version: str, **kwargs: Any ) -> "_models.ComponentVersion": @@ -295,8 +295,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -317,7 +317,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -344,14 +344,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, version: str, body: "_models.ComponentVersion", **kwargs: Any @@ -371,7 +371,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, content_type=content_type, @@ -407,7 +407,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -415,7 +415,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + component_name: str, version: str, body: "_models.ComponentVersion", **kwargs: Any @@ -428,8 +428,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -461,7 +461,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, body=body, api_version=api_version, @@ -479,7 +479,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -491,4 +491,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_containers_operations.py index 8b8ced6bfdfa..6231b1e8ca77 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_containers_operations.py @@ -147,7 +147,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] @@ -163,7 +163,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -191,7 +191,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore @distributed_trace_async @@ -199,7 +199,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete container. @@ -210,8 +210,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -236,7 +236,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -248,7 +248,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -260,14 +260,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, **kwargs: Any ) -> "_models.EnvironmentContainer": """Get container. @@ -278,8 +278,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param environment_name: Container name. This is case-sensitive. + :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: EnvironmentContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.EnvironmentContainer @@ -298,7 +298,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -324,14 +324,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, body: "_models.EnvironmentContainer", **kwargs: Any ) -> "_models.EnvironmentContainer": @@ -350,7 +350,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, content_type=content_type, json=_json, @@ -385,7 +385,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore @distributed_trace_async @@ -393,7 +393,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, body: "_models.EnvironmentContainer", **kwargs: Any ) -> AsyncLROPoller["_models.EnvironmentContainer"]: @@ -405,8 +405,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.EnvironmentContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -436,7 +436,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, body=body, api_version=api_version, content_type=content_type, @@ -453,7 +453,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -465,4 +465,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_versions_operations.py index 239914f864d2..0f53286a5fd7 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_environment_versions_operations.py @@ -52,7 +52,7 @@ def list( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, order_by: Optional[str] = None, top: Optional[int] = None, skip: Optional[str] = None, @@ -67,8 +67,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param environment_name: Container name. This is case-sensitive. + :type environment_name: str :param order_by: Ordering of list. :type order_by: str :param top: Maximum number of records to return. @@ -98,7 +98,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, order_by=order_by, top=top, @@ -115,7 +115,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, order_by=order_by, top=top, @@ -156,13 +156,13 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, version: str, **kwargs: Any ) -> None: @@ -179,7 +179,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -208,7 +208,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -216,7 +216,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, version: str, **kwargs: Any ) -> AsyncLROPoller[None]: @@ -228,8 +228,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -256,7 +256,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -269,7 +269,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -281,14 +281,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, version: str, **kwargs: Any ) -> "_models.EnvironmentVersion": @@ -300,8 +300,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param environment_name: Container name. This is case-sensitive. + :type environment_name: str :param version: Version identifier. This is case-sensitive. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -322,7 +322,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -349,14 +349,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, version: str, body: "_models.EnvironmentVersion", **kwargs: Any @@ -376,7 +376,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, content_type=content_type, @@ -412,7 +412,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -420,7 +420,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + environment_name: str, version: str, body: "_models.EnvironmentVersion", **kwargs: Any @@ -433,8 +433,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -466,7 +466,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, body=body, api_version=api_version, @@ -484,7 +484,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -496,4 +496,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_containers_operations.py index 919decb21ad7..649666a304d2 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_containers_operations.py @@ -147,7 +147,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] @@ -163,7 +163,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -191,7 +191,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore @distributed_trace_async @@ -199,7 +199,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete container. @@ -210,8 +210,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -236,7 +236,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -248,7 +248,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -260,14 +260,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, **kwargs: Any ) -> "_models.ModelContainer": """Get container. @@ -278,8 +278,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param model_name: Container name. This is case-sensitive. + :type model_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ModelContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.ModelContainer @@ -298,7 +298,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -324,14 +324,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, body: "_models.ModelContainer", **kwargs: Any ) -> "_models.ModelContainer": @@ -350,7 +350,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, content_type=content_type, json=_json, @@ -385,7 +385,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore @distributed_trace_async @@ -393,7 +393,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, body: "_models.ModelContainer", **kwargs: Any ) -> AsyncLROPoller["_models.ModelContainer"]: @@ -405,8 +405,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.ModelContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -436,7 +436,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, body=body, api_version=api_version, content_type=content_type, @@ -453,7 +453,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -465,4 +465,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_versions_operations.py index d60638f39eaa..fe53e30507b3 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/aio/operations/_registry_model_versions_operations.py @@ -52,7 +52,7 @@ def list( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, skip: Optional[str] = None, order_by: Optional[str] = None, top: Optional[int] = None, @@ -71,8 +71,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param model_name: Container name. This is case-sensitive. + :type model_name: str :param skip: Continuation token for pagination. :type skip: str :param order_by: Ordering of list. @@ -112,7 +112,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, skip=skip, order_by=order_by, @@ -133,7 +133,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, skip=skip, order_by=order_by, @@ -178,13 +178,13 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, version: str, **kwargs: Any ) -> None: @@ -201,7 +201,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -230,7 +230,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -238,7 +238,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, version: str, **kwargs: Any ) -> AsyncLROPoller[None]: @@ -250,8 +250,8 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -278,7 +278,7 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = await self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -291,7 +291,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -303,14 +303,14 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore @distributed_trace_async async def get( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, version: str, **kwargs: Any ) -> "_models.ModelVersion": @@ -322,8 +322,8 @@ async def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param model_name: Container name. This is case-sensitive. + :type model_name: str :param version: Version identifier. This is case-sensitive. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -344,7 +344,7 @@ async def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -371,14 +371,14 @@ async def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, version: str, body: "_models.ModelVersion", **kwargs: Any @@ -398,7 +398,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, content_type=content_type, @@ -434,7 +434,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore @distributed_trace_async @@ -442,7 +442,7 @@ async def begin_create_or_update( self, resource_group_name: str, registry_name: str, - name: str, + model_name: str, version: str, body: "_models.ModelVersion", **kwargs: Any @@ -455,8 +455,8 @@ async def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -488,7 +488,7 @@ async def begin_create_or_update( raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, body=body, api_version=api_version, @@ -506,7 +506,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = AsyncARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = AsyncNoPolling() else: polling_method = polling if cont_token: @@ -518,4 +518,4 @@ def get_long_running_output(pipeline_response): ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/__init__.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/__init__.py index 193871b9c416..4da32226fd56 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/__init__.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/__init__.py @@ -10,6 +10,7 @@ from ._models_py3 import AKS from ._models_py3 import AKSSchema from ._models_py3 import AKSSchemaProperties + from ._models_py3 import AccessKeyAuthTypeWorkspaceConnectionProperties from ._models_py3 import AccountKeyDatastoreCredentials from ._models_py3 import AccountKeyDatastoreSecrets from ._models_py3 import AcrDetails @@ -86,6 +87,7 @@ from ._models_py3 import Compute from ._models_py3 import ComputeInstance from ._models_py3 import ComputeInstanceApplication + from ._models_py3 import ComputeInstanceAutologgerSettings from ._models_py3 import ComputeInstanceConnectivityEndpoints from ._models_py3 import ComputeInstanceContainer from ._models_py3 import ComputeInstanceCreatedBy @@ -105,6 +107,7 @@ from ._models_py3 import ContainerResourceRequirements from ._models_py3 import ContainerResourceSettings from ._models_py3 import CosmosDbSettings + from ._models_py3 import Cron from ._models_py3 import CronTrigger from ._models_py3 import CsvExportSummary from ._models_py3 import CustomForecastHorizon @@ -198,6 +201,7 @@ from ._models_py3 import ImageClassificationMultilabel from ._models_py3 import ImageInstanceSegmentation from ._models_py3 import ImageLimitSettings + from ._models_py3 import ImageMetadata from ._models_py3 import ImageModelDistributionSettings from ._models_py3 import ImageModelDistributionSettingsClassification from ._models_py3 import ImageModelDistributionSettingsObjectDetection @@ -315,6 +319,7 @@ from ._models_py3 import QuotaBaseProperties from ._models_py3 import QuotaUpdateParameters from ._models_py3 import RandomSamplingAlgorithm + from ._models_py3 import Recurrence from ._models_py3 import RecurrenceSchedule from ._models_py3 import RecurrenceTrigger from ._models_py3 import RegenerateEndpointKeysRequest @@ -347,6 +352,7 @@ from ._models_py3 import ScriptsToExecute from ._models_py3 import Seasonality from ._models_py3 import ServiceManagedResourcesSettings + from ._models_py3 import ServicePrincipalAuthTypeWorkspaceConnectionProperties from ._models_py3 import ServicePrincipalDatastoreCredentials from ._models_py3 import ServicePrincipalDatastoreSecrets from ._models_py3 import SetupScripts @@ -422,11 +428,13 @@ from ._models_py3 import VolumeDefinition from ._models_py3 import VolumeOptions from ._models_py3 import Workspace + from ._models_py3 import WorkspaceConnectionAccessKey from ._models_py3 import WorkspaceConnectionManagedIdentity from ._models_py3 import WorkspaceConnectionPersonalAccessToken from ._models_py3 import WorkspaceConnectionPropertiesV2 from ._models_py3 import WorkspaceConnectionPropertiesV2BasicResource from ._models_py3 import WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult + from ._models_py3 import WorkspaceConnectionServicePrincipal from ._models_py3 import WorkspaceConnectionSharedAccessSignature from ._models_py3 import WorkspaceConnectionUsernamePassword from ._models_py3 import WorkspaceListResult @@ -435,6 +443,7 @@ from ._models import AKS # type: ignore from ._models import AKSSchema # type: ignore from ._models import AKSSchemaProperties # type: ignore + from ._models import AccessKeyAuthTypeWorkspaceConnectionProperties # type: ignore from ._models import AccountKeyDatastoreCredentials # type: ignore from ._models import AccountKeyDatastoreSecrets # type: ignore from ._models import AcrDetails # type: ignore @@ -511,6 +520,7 @@ from ._models import Compute # type: ignore from ._models import ComputeInstance # type: ignore from ._models import ComputeInstanceApplication # type: ignore + from ._models import ComputeInstanceAutologgerSettings # type: ignore from ._models import ComputeInstanceConnectivityEndpoints # type: ignore from ._models import ComputeInstanceContainer # type: ignore from ._models import ComputeInstanceCreatedBy # type: ignore @@ -530,6 +540,7 @@ from ._models import ContainerResourceRequirements # type: ignore from ._models import ContainerResourceSettings # type: ignore from ._models import CosmosDbSettings # type: ignore + from ._models import Cron # type: ignore from ._models import CronTrigger # type: ignore from ._models import CsvExportSummary # type: ignore from ._models import CustomForecastHorizon # type: ignore @@ -623,6 +634,7 @@ from ._models import ImageClassificationMultilabel # type: ignore from ._models import ImageInstanceSegmentation # type: ignore from ._models import ImageLimitSettings # type: ignore + from ._models import ImageMetadata # type: ignore from ._models import ImageModelDistributionSettings # type: ignore from ._models import ImageModelDistributionSettingsClassification # type: ignore from ._models import ImageModelDistributionSettingsObjectDetection # type: ignore @@ -740,6 +752,7 @@ from ._models import QuotaBaseProperties # type: ignore from ._models import QuotaUpdateParameters # type: ignore from ._models import RandomSamplingAlgorithm # type: ignore + from ._models import Recurrence # type: ignore from ._models import RecurrenceSchedule # type: ignore from ._models import RecurrenceTrigger # type: ignore from ._models import RegenerateEndpointKeysRequest # type: ignore @@ -772,6 +785,7 @@ from ._models import ScriptsToExecute # type: ignore from ._models import Seasonality # type: ignore from ._models import ServiceManagedResourcesSettings # type: ignore + from ._models import ServicePrincipalAuthTypeWorkspaceConnectionProperties # type: ignore from ._models import ServicePrincipalDatastoreCredentials # type: ignore from ._models import ServicePrincipalDatastoreSecrets # type: ignore from ._models import SetupScripts # type: ignore @@ -847,11 +861,13 @@ from ._models import VolumeDefinition # type: ignore from ._models import VolumeOptions # type: ignore from ._models import Workspace # type: ignore + from ._models import WorkspaceConnectionAccessKey # type: ignore from ._models import WorkspaceConnectionManagedIdentity # type: ignore from ._models import WorkspaceConnectionPersonalAccessToken # type: ignore from ._models import WorkspaceConnectionPropertiesV2 # type: ignore from ._models import WorkspaceConnectionPropertiesV2BasicResource # type: ignore from ._models import WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult # type: ignore + from ._models import WorkspaceConnectionServicePrincipal # type: ignore from ._models import WorkspaceConnectionSharedAccessSignature # type: ignore from ._models import WorkspaceConnectionUsernamePassword # type: ignore from ._models import WorkspaceListResult # type: ignore @@ -877,7 +893,6 @@ ComputeProvisioningState, ComputeType, ConnectionAuthType, - ConnectionCategory, ContainerType, CreatedByType, CredentialsType, @@ -921,6 +936,7 @@ MLFlowAutologgerState, ManagedServiceIdentityType, MediaType, + MlflowAutologger, ModelSize, MountAction, MountState, @@ -996,6 +1012,7 @@ 'AKS', 'AKSSchema', 'AKSSchemaProperties', + 'AccessKeyAuthTypeWorkspaceConnectionProperties', 'AccountKeyDatastoreCredentials', 'AccountKeyDatastoreSecrets', 'AcrDetails', @@ -1072,6 +1089,7 @@ 'Compute', 'ComputeInstance', 'ComputeInstanceApplication', + 'ComputeInstanceAutologgerSettings', 'ComputeInstanceConnectivityEndpoints', 'ComputeInstanceContainer', 'ComputeInstanceCreatedBy', @@ -1091,6 +1109,7 @@ 'ContainerResourceRequirements', 'ContainerResourceSettings', 'CosmosDbSettings', + 'Cron', 'CronTrigger', 'CsvExportSummary', 'CustomForecastHorizon', @@ -1184,6 +1203,7 @@ 'ImageClassificationMultilabel', 'ImageInstanceSegmentation', 'ImageLimitSettings', + 'ImageMetadata', 'ImageModelDistributionSettings', 'ImageModelDistributionSettingsClassification', 'ImageModelDistributionSettingsObjectDetection', @@ -1301,6 +1321,7 @@ 'QuotaBaseProperties', 'QuotaUpdateParameters', 'RandomSamplingAlgorithm', + 'Recurrence', 'RecurrenceSchedule', 'RecurrenceTrigger', 'RegenerateEndpointKeysRequest', @@ -1333,6 +1354,7 @@ 'ScriptsToExecute', 'Seasonality', 'ServiceManagedResourcesSettings', + 'ServicePrincipalAuthTypeWorkspaceConnectionProperties', 'ServicePrincipalDatastoreCredentials', 'ServicePrincipalDatastoreSecrets', 'SetupScripts', @@ -1408,11 +1430,13 @@ 'VolumeDefinition', 'VolumeOptions', 'Workspace', + 'WorkspaceConnectionAccessKey', 'WorkspaceConnectionManagedIdentity', 'WorkspaceConnectionPersonalAccessToken', 'WorkspaceConnectionPropertiesV2', 'WorkspaceConnectionPropertiesV2BasicResource', 'WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult', + 'WorkspaceConnectionServicePrincipal', 'WorkspaceConnectionSharedAccessSignature', 'WorkspaceConnectionUsernamePassword', 'WorkspaceListResult', @@ -1436,7 +1460,6 @@ 'ComputeProvisioningState', 'ComputeType', 'ConnectionAuthType', - 'ConnectionCategory', 'ContainerType', 'CreatedByType', 'CredentialsType', @@ -1480,6 +1503,7 @@ 'MLFlowAutologgerState', 'ManagedServiceIdentityType', 'MediaType', + 'MlflowAutologger', 'ModelSize', 'MountAction', 'MountState', diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_azure_machine_learning_workspaces_enums.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_azure_machine_learning_workspaces_enums.py index 4c6316334ef1..bfa451fb7949 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_azure_machine_learning_workspaces_enums.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_azure_machine_learning_workspaces_enums.py @@ -251,7 +251,7 @@ class ComputeInstanceState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): UNUSABLE = "Unusable" class ComputePowerAction(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The compute power action. + """[Required] The compute power action. """ START = "Start" @@ -294,14 +294,8 @@ class ConnectionAuthType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): USERNAME_PASSWORD = "UsernamePassword" NONE = "None" SAS = "SAS" - -class ConnectionCategory(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Category of the connection - """ - - PYTHON_FEED = "PythonFeed" - CONTAINER_REGISTRY = "ContainerRegistry" - GIT = "Git" + SERVICE_PRINCIPAL = "ServicePrincipal" + ACCESS_KEY = "AccessKey" class ContainerType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): @@ -774,6 +768,13 @@ class MLAssistConfigurationType(with_metaclass(CaseInsensitiveEnumMeta, str, Enu ENABLED = "Enabled" DISABLED = "Disabled" +class MlflowAutologger(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """Indicates whether mlflow autologger is enabled for notebooks. + """ + + ENABLED = "Enabled" + DISABLED = "Disabled" + class MLFlowAutologgerState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """Enum to determine the state of mlflow autologger. """ @@ -1119,6 +1120,8 @@ class ScheduleListViewType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): ALL = "All" class ScheduleProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """The current deployment state of schedule. + """ COMPLETED = "Completed" PROVISIONING = "Provisioning" @@ -1134,6 +1137,8 @@ class ScheduleProvisioningStatus(with_metaclass(CaseInsensitiveEnumMeta, str, En CANCELED = "Canceled" class ScheduleStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """Is the schedule enabled or disabled? + """ ENABLED = "Enabled" DISABLED = "Disabled" diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models.py index cb054ec13ba9..3a1181cb97d5 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models.py @@ -10,6 +10,123 @@ import msrest.serialization +class WorkspaceConnectionPropertiesV2(msrest.serialization.Model): + """WorkspaceConnectionPropertiesV2. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: AccessKeyAuthTypeWorkspaceConnectionProperties, ManagedIdentityAuthTypeWorkspaceConnectionProperties, NoneAuthTypeWorkspaceConnectionProperties, PATAuthTypeWorkspaceConnectionProperties, SASAuthTypeWorkspaceConnectionProperties, ServicePrincipalAuthTypeWorkspaceConnectionProperties, UsernamePasswordAuthTypeWorkspaceConnectionProperties. + + All required parameters must be populated in order to send to Azure. + + :ivar auth_type: Required. Authentication type of the connection target.Constant filled by + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". + :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType + :ivar category: Category of the connection. + :vartype category: str + :ivar target: + :vartype target: str + :ivar value: Value details of the workspace connection. + :vartype value: str + :ivar value_format: format for the workspace connection value. Possible values include: "JSON". + :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + """ + + _validation = { + 'auth_type': {'required': True}, + } + + _attribute_map = { + 'auth_type': {'key': 'authType', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'target': {'key': 'target', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'value_format': {'key': 'valueFormat', 'type': 'str'}, + } + + _subtype_map = { + 'auth_type': {'AccessKey': 'AccessKeyAuthTypeWorkspaceConnectionProperties', 'ManagedIdentity': 'ManagedIdentityAuthTypeWorkspaceConnectionProperties', 'None': 'NoneAuthTypeWorkspaceConnectionProperties', 'PAT': 'PATAuthTypeWorkspaceConnectionProperties', 'SAS': 'SASAuthTypeWorkspaceConnectionProperties', 'ServicePrincipal': 'ServicePrincipalAuthTypeWorkspaceConnectionProperties', 'UsernamePassword': 'UsernamePasswordAuthTypeWorkspaceConnectionProperties'} + } + + def __init__( + self, + **kwargs + ): + """ + :keyword category: Category of the connection. + :paramtype category: str + :keyword target: + :paramtype target: str + :keyword value: Value details of the workspace connection. + :paramtype value: str + :keyword value_format: format for the workspace connection value. Possible values include: + "JSON". + :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + """ + super(WorkspaceConnectionPropertiesV2, self).__init__(**kwargs) + self.auth_type = None # type: Optional[str] + self.category = kwargs.get('category', None) + self.target = kwargs.get('target', None) + self.value = kwargs.get('value', None) + self.value_format = kwargs.get('value_format', None) + + +class AccessKeyAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): + """AccessKeyAuthTypeWorkspaceConnectionProperties. + + All required parameters must be populated in order to send to Azure. + + :ivar auth_type: Required. Authentication type of the connection target.Constant filled by + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". + :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType + :ivar category: Category of the connection. + :vartype category: str + :ivar target: + :vartype target: str + :ivar value: Value details of the workspace connection. + :vartype value: str + :ivar value_format: format for the workspace connection value. Possible values include: "JSON". + :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :ivar credentials: + :vartype credentials: ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionAccessKey + """ + + _validation = { + 'auth_type': {'required': True}, + } + + _attribute_map = { + 'auth_type': {'key': 'authType', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'target': {'key': 'target', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'value_format': {'key': 'valueFormat', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'WorkspaceConnectionAccessKey'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword category: Category of the connection. + :paramtype category: str + :keyword target: + :paramtype target: str + :keyword value: Value details of the workspace connection. + :paramtype value: str + :keyword value_format: format for the workspace connection value. Possible values include: + "JSON". + :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :keyword credentials: + :paramtype credentials: ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionAccessKey + """ + super(AccessKeyAuthTypeWorkspaceConnectionProperties, self).__init__(**kwargs) + self.auth_type = 'AccessKey' # type: str + self.credentials = kwargs.get('credentials', None) + + class DatastoreCredentials(msrest.serialization.Model): """Base definition for datastore credentials. @@ -256,6 +373,7 @@ class Compute(msrest.serialization.Model): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -284,9 +402,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(Compute, self).__init__(**kwargs) self.compute_type = None # type: Optional[str] @@ -298,7 +413,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class AKS(Compute, AKSSchema): @@ -347,6 +462,7 @@ class AKS(Compute, AKSSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -374,9 +490,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(AKS, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -389,7 +502,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class AksComputeSecretsProperties(msrest.serialization.Model): @@ -786,6 +899,7 @@ class AmlCompute(Compute, AmlComputeSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -813,9 +927,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(AmlCompute, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -828,7 +939,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class AmlComputeNodeInformation(msrest.serialization.Model): @@ -1640,18 +1751,18 @@ class AutologgerSettings(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. - :ivar ml_flow_autologger: Required. [Required] Indicates whether mlflow autologger is enabled. + :ivar mlflow_autologger: Required. [Required] Indicates whether mlflow autologger is enabled. Possible values include: "Enabled", "Disabled". - :vartype ml_flow_autologger: str or + :vartype mlflow_autologger: str or ~azure.mgmt.machinelearningservices.models.MLFlowAutologgerState """ _validation = { - 'ml_flow_autologger': {'required': True}, + 'mlflow_autologger': {'required': True}, } _attribute_map = { - 'ml_flow_autologger': {'key': 'mlFlowAutologger', 'type': 'str'}, + 'mlflow_autologger': {'key': 'mlflowAutologger', 'type': 'str'}, } def __init__( @@ -1659,13 +1770,13 @@ def __init__( **kwargs ): """ - :keyword ml_flow_autologger: Required. [Required] Indicates whether mlflow autologger is + :keyword mlflow_autologger: Required. [Required] Indicates whether mlflow autologger is enabled. Possible values include: "Enabled", "Disabled". - :paramtype ml_flow_autologger: str or + :paramtype mlflow_autologger: str or ~azure.mgmt.machinelearningservices.models.MLFlowAutologgerState """ super(AutologgerSettings, self).__init__(**kwargs) - self.ml_flow_autologger = kwargs['ml_flow_autologger'] + self.mlflow_autologger = kwargs['mlflow_autologger'] class JobBaseProperties(ResourceBase): @@ -5408,6 +5519,7 @@ class ComputeInstance(Compute, ComputeInstanceSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -5435,9 +5547,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(ComputeInstance, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -5450,7 +5559,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class ComputeInstanceApplication(msrest.serialization.Model): @@ -5482,6 +5591,32 @@ def __init__( self.endpoint_uri = kwargs.get('endpoint_uri', None) +class ComputeInstanceAutologgerSettings(msrest.serialization.Model): + """Specifies settings for autologger. + + :ivar mlflow_autologger: Indicates whether mlflow autologger is enabled for notebooks. Possible + values include: "Enabled", "Disabled". + :vartype mlflow_autologger: str or ~azure.mgmt.machinelearningservices.models.MlflowAutologger + """ + + _attribute_map = { + 'mlflow_autologger': {'key': 'mlflowAutologger', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword mlflow_autologger: Indicates whether mlflow autologger is enabled for notebooks. + Possible values include: "Enabled", "Disabled". + :paramtype mlflow_autologger: str or + ~azure.mgmt.machinelearningservices.models.MlflowAutologger + """ + super(ComputeInstanceAutologgerSettings, self).__init__(**kwargs) + self.mlflow_autologger = kwargs.get('mlflow_autologger', None) + + class ComputeInstanceConnectivityEndpoints(msrest.serialization.Model): """Defines all connectivity endpoints and properties for an ComputeInstance. @@ -5826,10 +5961,16 @@ class ComputeInstanceProperties(msrest.serialization.Model): value: "Shared". :vartype application_sharing_policy: str or ~azure.mgmt.machinelearningservices.models.ApplicationSharingPolicy + :ivar autologger_settings: Specifies settings for autologger. + :vartype autologger_settings: + ~azure.mgmt.machinelearningservices.models.ComputeInstanceAutologgerSettings :ivar ssh_settings: Specifies policy and settings for SSH access. :vartype ssh_settings: ~azure.mgmt.machinelearningservices.models.ComputeInstanceSshSettings :ivar custom_services: List of Custom Services added to the compute. :vartype custom_services: list[~azure.mgmt.machinelearningservices.models.CustomService] + :ivar os_image_metadata: Returns metadata about the operating system image for this compute + instance. + :vartype os_image_metadata: ~azure.mgmt.machinelearningservices.models.ImageMetadata :ivar connectivity_endpoints: Describes all connectivity endpoints available for this ComputeInstance. :vartype connectivity_endpoints: @@ -5879,6 +6020,7 @@ class ComputeInstanceProperties(msrest.serialization.Model): """ _validation = { + 'os_image_metadata': {'readonly': True}, 'connectivity_endpoints': {'readonly': True}, 'applications': {'readonly': True}, 'created_by': {'readonly': True}, @@ -5896,8 +6038,10 @@ class ComputeInstanceProperties(msrest.serialization.Model): 'vm_size': {'key': 'vmSize', 'type': 'str'}, 'subnet': {'key': 'subnet', 'type': 'ResourceId'}, 'application_sharing_policy': {'key': 'applicationSharingPolicy', 'type': 'str'}, + 'autologger_settings': {'key': 'autologgerSettings', 'type': 'ComputeInstanceAutologgerSettings'}, 'ssh_settings': {'key': 'sshSettings', 'type': 'ComputeInstanceSshSettings'}, 'custom_services': {'key': 'customServices', 'type': '[CustomService]'}, + 'os_image_metadata': {'key': 'osImageMetadata', 'type': 'ImageMetadata'}, 'connectivity_endpoints': {'key': 'connectivityEndpoints', 'type': 'ComputeInstanceConnectivityEndpoints'}, 'applications': {'key': 'applications', 'type': '[ComputeInstanceApplication]'}, 'created_by': {'key': 'createdBy', 'type': 'ComputeInstanceCreatedBy'}, @@ -5932,6 +6076,9 @@ def __init__( value: "Shared". :paramtype application_sharing_policy: str or ~azure.mgmt.machinelearningservices.models.ApplicationSharingPolicy + :keyword autologger_settings: Specifies settings for autologger. + :paramtype autologger_settings: + ~azure.mgmt.machinelearningservices.models.ComputeInstanceAutologgerSettings :keyword ssh_settings: Specifies policy and settings for SSH access. :paramtype ssh_settings: ~azure.mgmt.machinelearningservices.models.ComputeInstanceSshSettings :keyword custom_services: List of Custom Services added to the compute. @@ -5959,8 +6106,10 @@ def __init__( self.vm_size = kwargs.get('vm_size', None) self.subnet = kwargs.get('subnet', None) self.application_sharing_policy = kwargs.get('application_sharing_policy', "Shared") + self.autologger_settings = kwargs.get('autologger_settings', None) self.ssh_settings = kwargs.get('ssh_settings', None) self.custom_services = kwargs.get('custom_services', None) + self.os_image_metadata = None self.connectivity_endpoints = None self.applications = None self.created_by = None @@ -6182,15 +6331,24 @@ class ComputeStartStopSchedule(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Schedule id. + :ivar id: A system assigned id for the schedule. :vartype id: str :ivar provisioning_status: The current deployment state of schedule. Possible values include: "Completed", "Provisioning", "Failed". :vartype provisioning_status: str or ~azure.mgmt.machinelearningservices.models.ProvisioningStatus - :ivar action: The compute power action. Possible values include: "Start", "Stop". + :ivar status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". + :vartype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus + :ivar action: [Required] The compute power action. Possible values include: "Start", "Stop". :vartype action: str or ~azure.mgmt.machinelearningservices.models.ComputePowerAction - :ivar schedule: + :ivar trigger_type: Possible values include: "Recurrence", "Cron". + :vartype trigger_type: str or ~azure.mgmt.machinelearningservices.models.TriggerType + :ivar recurrence: The workflow trigger recurrence for ComputeStartStop schedule type. + :vartype recurrence: ~azure.mgmt.machinelearningservices.models.Recurrence + :ivar cron: The workflow trigger cron for ComputeStartStop schedule type. + :vartype cron: ~azure.mgmt.machinelearningservices.models.Cron + :ivar schedule: [Deprecated] Not used any more. :vartype schedule: ~azure.mgmt.machinelearningservices.models.ScheduleBase """ @@ -6202,7 +6360,11 @@ class ComputeStartStopSchedule(msrest.serialization.Model): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'provisioning_status': {'key': 'provisioningStatus', 'type': 'str'}, + 'status': {'key': 'status', 'type': 'str'}, 'action': {'key': 'action', 'type': 'str'}, + 'trigger_type': {'key': 'triggerType', 'type': 'str'}, + 'recurrence': {'key': 'recurrence', 'type': 'Recurrence'}, + 'cron': {'key': 'cron', 'type': 'Cron'}, 'schedule': {'key': 'schedule', 'type': 'ScheduleBase'}, } @@ -6211,15 +6373,28 @@ def __init__( **kwargs ): """ - :keyword action: The compute power action. Possible values include: "Start", "Stop". + :keyword status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". + :paramtype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus + :keyword action: [Required] The compute power action. Possible values include: "Start", "Stop". :paramtype action: str or ~azure.mgmt.machinelearningservices.models.ComputePowerAction - :keyword schedule: + :keyword trigger_type: Possible values include: "Recurrence", "Cron". + :paramtype trigger_type: str or ~azure.mgmt.machinelearningservices.models.TriggerType + :keyword recurrence: The workflow trigger recurrence for ComputeStartStop schedule type. + :paramtype recurrence: ~azure.mgmt.machinelearningservices.models.Recurrence + :keyword cron: The workflow trigger cron for ComputeStartStop schedule type. + :paramtype cron: ~azure.mgmt.machinelearningservices.models.Cron + :keyword schedule: [Deprecated] Not used any more. :paramtype schedule: ~azure.mgmt.machinelearningservices.models.ScheduleBase """ super(ComputeStartStopSchedule, self).__init__(**kwargs) self.id = None self.provisioning_status = None + self.status = kwargs.get('status', None) self.action = kwargs.get('action', None) + self.trigger_type = kwargs.get('trigger_type', None) + self.recurrence = kwargs.get('recurrence', None) + self.cron = kwargs.get('cron', None) self.schedule = kwargs.get('schedule', None) @@ -6320,6 +6495,47 @@ def __init__( self.collections_throughput = kwargs.get('collections_throughput', None) +class Cron(msrest.serialization.Model): + """The workflow trigger cron for ComputeStartStop schedule type. + + :ivar start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :vartype start_time: str + :ivar time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :vartype time_zone: str + :ivar expression: [Required] Specifies cron expression of schedule. + The expression should follow NCronTab format. + :vartype expression: str + """ + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'str'}, + 'time_zone': {'key': 'timeZone', 'type': 'str'}, + 'expression': {'key': 'expression', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :paramtype start_time: str + :keyword time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :paramtype time_zone: str + :keyword expression: [Required] Specifies cron expression of schedule. + The expression should follow NCronTab format. + :paramtype expression: str + """ + super(Cron, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.time_zone = kwargs.get('time_zone', "UTC") + self.expression = kwargs.get('expression', None) + + class TriggerBase(msrest.serialization.Model): """TriggerBase. @@ -6995,6 +7211,7 @@ class Databricks(Compute, DatabricksSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -7022,9 +7239,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(Databricks, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -7037,7 +7251,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class DatabricksComputeSecretsProperties(msrest.serialization.Model): @@ -7313,6 +7527,7 @@ class DataFactory(Compute): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -7337,9 +7552,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(DataFactory, self).__init__(**kwargs) self.compute_type = 'DataFactory' # type: str @@ -7417,6 +7629,7 @@ class DataLakeAnalytics(Compute, DataLakeAnalyticsSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -7445,9 +7658,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(DataLakeAnalytics, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -7460,7 +7670,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class DataLakeAnalyticsSchemaProperties(msrest.serialization.Model): @@ -9981,6 +10191,7 @@ class HDInsight(Compute, HDInsightSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -10008,9 +10219,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(HDInsight, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -10023,7 +10231,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class HDInsightProperties(msrest.serialization.Model): @@ -10753,6 +10961,45 @@ def __init__( self.timeout = kwargs.get('timeout', "P7D") +class ImageMetadata(msrest.serialization.Model): + """Returns metadata about the operating system image for this compute instance. + + :ivar current_image_version: Specifies the current operating system image version this compute + instance is running on. + :vartype current_image_version: str + :ivar latest_image_version: Specifies the latest available operating system image version. + :vartype latest_image_version: str + :ivar is_latest_os_image_version: Specifies whether this compute instance is running on the + latest operating system image. + :vartype is_latest_os_image_version: bool + """ + + _attribute_map = { + 'current_image_version': {'key': 'currentImageVersion', 'type': 'str'}, + 'latest_image_version': {'key': 'latestImageVersion', 'type': 'str'}, + 'is_latest_os_image_version': {'key': 'isLatestOsImageVersion', 'type': 'bool'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword current_image_version: Specifies the current operating system image version this + compute instance is running on. + :paramtype current_image_version: str + :keyword latest_image_version: Specifies the latest available operating system image version. + :paramtype latest_image_version: str + :keyword is_latest_os_image_version: Specifies whether this compute instance is running on the + latest operating system image. + :paramtype is_latest_os_image_version: bool + """ + super(ImageMetadata, self).__init__(**kwargs) + self.current_image_version = kwargs.get('current_image_version', None) + self.latest_image_version = kwargs.get('latest_image_version', None) + self.is_latest_os_image_version = kwargs.get('is_latest_os_image_version', None) + + class ImageModelDistributionSettings(msrest.serialization.Model): """Distribution expressions to sweep over values of model settings. @@ -13265,6 +13512,7 @@ class Kubernetes(Compute, KubernetesSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -13292,9 +13540,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(Kubernetes, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -13307,7 +13552,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class OnlineDeploymentProperties(EndpointDeploymentPropertiesBase): @@ -14418,79 +14663,17 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) -class WorkspaceConnectionPropertiesV2(msrest.serialization.Model): - """WorkspaceConnectionPropertiesV2. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: ManagedIdentityAuthTypeWorkspaceConnectionProperties, NoneAuthTypeWorkspaceConnectionProperties, PATAuthTypeWorkspaceConnectionProperties, SASAuthTypeWorkspaceConnectionProperties, UsernamePasswordAuthTypeWorkspaceConnectionProperties. - - All required parameters must be populated in order to send to Azure. - - :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". - :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory - :ivar target: - :vartype target: str - :ivar value: Value details of the workspace connection. - :vartype value: str - :ivar value_format: format for the workspace connection value. Possible values include: "JSON". - :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat - """ - - _validation = { - 'auth_type': {'required': True}, - } - - _attribute_map = { - 'auth_type': {'key': 'authType', 'type': 'str'}, - 'category': {'key': 'category', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - 'value_format': {'key': 'valueFormat', 'type': 'str'}, - } - - _subtype_map = { - 'auth_type': {'ManagedIdentity': 'ManagedIdentityAuthTypeWorkspaceConnectionProperties', 'None': 'NoneAuthTypeWorkspaceConnectionProperties', 'PAT': 'PATAuthTypeWorkspaceConnectionProperties', 'SAS': 'SASAuthTypeWorkspaceConnectionProperties', 'UsernamePassword': 'UsernamePasswordAuthTypeWorkspaceConnectionProperties'} - } - - def __init__( - self, - **kwargs - ): - """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory - :keyword target: - :paramtype target: str - :keyword value: Value details of the workspace connection. - :paramtype value: str - :keyword value_format: format for the workspace connection value. Possible values include: - "JSON". - :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat - """ - super(WorkspaceConnectionPropertiesV2, self).__init__(**kwargs) - self.auth_type = None # type: Optional[str] - self.category = kwargs.get('category', None) - self.target = kwargs.get('target', None) - self.value = kwargs.get('value', None) - self.value_format = kwargs.get('value_format', None) - - class ManagedIdentityAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): """ManagedIdentityAuthTypeWorkspaceConnectionProperties. All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -14520,9 +14703,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -15847,11 +16029,11 @@ class NoneAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2) All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -15877,9 +16059,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -16845,11 +17026,11 @@ class PATAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -16879,9 +17060,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -17574,6 +17754,59 @@ def __init__( self.seed = kwargs.get('seed', None) +class Recurrence(msrest.serialization.Model): + """The workflow trigger recurrence for ComputeStartStop schedule type. + + :ivar frequency: [Required] The frequency to trigger schedule. Possible values include: + "Minute", "Hour", "Day", "Week", "Month". + :vartype frequency: str or ~azure.mgmt.machinelearningservices.models.RecurrenceFrequency + :ivar interval: [Required] Specifies schedule interval in conjunction with frequency. + :vartype interval: int + :ivar start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :vartype start_time: str + :ivar time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :vartype time_zone: str + :ivar schedule: [Required] The recurrence schedule. + :vartype schedule: ~azure.mgmt.machinelearningservices.models.RecurrenceSchedule + """ + + _attribute_map = { + 'frequency': {'key': 'frequency', 'type': 'str'}, + 'interval': {'key': 'interval', 'type': 'int'}, + 'start_time': {'key': 'startTime', 'type': 'str'}, + 'time_zone': {'key': 'timeZone', 'type': 'str'}, + 'schedule': {'key': 'schedule', 'type': 'RecurrenceSchedule'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword frequency: [Required] The frequency to trigger schedule. Possible values include: + "Minute", "Hour", "Day", "Week", "Month". + :paramtype frequency: str or ~azure.mgmt.machinelearningservices.models.RecurrenceFrequency + :keyword interval: [Required] Specifies schedule interval in conjunction with frequency. + :paramtype interval: int + :keyword start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :paramtype start_time: str + :keyword time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :paramtype time_zone: str + :keyword schedule: [Required] The recurrence schedule. + :paramtype schedule: ~azure.mgmt.machinelearningservices.models.RecurrenceSchedule + """ + super(Recurrence, self).__init__(**kwargs) + self.frequency = kwargs.get('frequency', None) + self.interval = kwargs.get('interval', None) + self.start_time = kwargs.get('start_time', None) + self.time_zone = kwargs.get('time_zone', "UTC") + self.schedule = kwargs.get('schedule', None) + + class RecurrenceSchedule(msrest.serialization.Model): """RecurrenceSchedule. @@ -18399,11 +18632,11 @@ class SASAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -18433,9 +18666,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -18642,12 +18874,14 @@ def __init__( class ScheduleBase(msrest.serialization.Model): """ScheduleBase. - :ivar id: + :ivar id: A system assigned id for the schedule. :vartype id: str - :ivar provisioning_status: Possible values include: "Completed", "Provisioning", "Failed". + :ivar provisioning_status: The current deployment state of schedule. Possible values include: + "Completed", "Provisioning", "Failed". :vartype provisioning_status: str or ~azure.mgmt.machinelearningservices.models.ScheduleProvisioningState - :ivar status: Possible values include: "Enabled", "Disabled". + :ivar status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". :vartype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus """ @@ -18662,12 +18896,14 @@ def __init__( **kwargs ): """ - :keyword id: + :keyword id: A system assigned id for the schedule. :paramtype id: str - :keyword provisioning_status: Possible values include: "Completed", "Provisioning", "Failed". + :keyword provisioning_status: The current deployment state of schedule. Possible values + include: "Completed", "Provisioning", "Failed". :paramtype provisioning_status: str or ~azure.mgmt.machinelearningservices.models.ScheduleProvisioningState - :keyword status: Possible values include: "Enabled", "Disabled". + :keyword status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". :paramtype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus """ super(ScheduleBase, self).__init__(**kwargs) @@ -18782,7 +19018,7 @@ def __init__( class ScriptReference(msrest.serialization.Model): """Script reference. - :ivar script_source: The storage source of the script: inline, workspace. + :ivar script_source: The storage source of the script: workspace. :vartype script_source: str :ivar script_data: The location of scripts in the mounted volume. :vartype script_data: str @@ -18804,7 +19040,7 @@ def __init__( **kwargs ): """ - :keyword script_source: The storage source of the script: inline, workspace. + :keyword script_source: The storage source of the script: workspace. :paramtype script_source: str :keyword script_data: The location of scripts in the mounted volume. :paramtype script_data: str @@ -18872,6 +19108,64 @@ def __init__( self.cosmos_db = kwargs.get('cosmos_db', None) +class ServicePrincipalAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): + """ServicePrincipalAuthTypeWorkspaceConnectionProperties. + + All required parameters must be populated in order to send to Azure. + + :ivar auth_type: Required. Authentication type of the connection target.Constant filled by + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". + :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType + :ivar category: Category of the connection. + :vartype category: str + :ivar target: + :vartype target: str + :ivar value: Value details of the workspace connection. + :vartype value: str + :ivar value_format: format for the workspace connection value. Possible values include: "JSON". + :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :ivar credentials: + :vartype credentials: + ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionServicePrincipal + """ + + _validation = { + 'auth_type': {'required': True}, + } + + _attribute_map = { + 'auth_type': {'key': 'authType', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'target': {'key': 'target', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'value_format': {'key': 'valueFormat', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'WorkspaceConnectionServicePrincipal'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword category: Category of the connection. + :paramtype category: str + :keyword target: + :paramtype target: str + :keyword value: Value details of the workspace connection. + :paramtype value: str + :keyword value_format: format for the workspace connection value. Possible values include: + "JSON". + :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :keyword credentials: + :paramtype credentials: + ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionServicePrincipal + """ + super(ServicePrincipalAuthTypeWorkspaceConnectionProperties, self).__init__(**kwargs) + self.auth_type = 'ServicePrincipal' # type: str + self.credentials = kwargs.get('credentials', None) + + class ServicePrincipalDatastoreCredentials(DatastoreCredentials): """Service Principal datastore credentials configuration. @@ -19997,6 +20291,7 @@ class SynapseSpark(Compute): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -20022,9 +20317,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool :keyword properties: :paramtype properties: ~azure.mgmt.machinelearningservices.models.SynapseSparkProperties """ @@ -22057,11 +22349,11 @@ class UsernamePasswordAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionP All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -22091,9 +22383,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -22180,6 +22471,7 @@ class VirtualMachine(Compute, VirtualMachineSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -22208,9 +22500,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(VirtualMachine, self).__init__(**kwargs) self.properties = kwargs.get('properties', None) @@ -22223,7 +22512,7 @@ def __init__( self.resource_id = kwargs.get('resource_id', None) self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = kwargs.get('disable_local_auth', None) + self.disable_local_auth = None class VirtualMachineImage(msrest.serialization.Model): @@ -22861,6 +23150,35 @@ def __init__( self.scheduled_purge_date = None +class WorkspaceConnectionAccessKey(msrest.serialization.Model): + """WorkspaceConnectionAccessKey. + + :ivar access_key_id: + :vartype access_key_id: str + :ivar secret_access_key: + :vartype secret_access_key: str + """ + + _attribute_map = { + 'access_key_id': {'key': 'accessKeyId', 'type': 'str'}, + 'secret_access_key': {'key': 'secretAccessKey', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword access_key_id: + :paramtype access_key_id: str + :keyword secret_access_key: + :paramtype secret_access_key: str + """ + super(WorkspaceConnectionAccessKey, self).__init__(**kwargs) + self.access_key_id = kwargs.get('access_key_id', None) + self.secret_access_key = kwargs.get('secret_access_key', None) + + class WorkspaceConnectionManagedIdentity(msrest.serialization.Model): """WorkspaceConnectionManagedIdentity. @@ -22999,6 +23317,41 @@ def __init__( self.next_link = None +class WorkspaceConnectionServicePrincipal(msrest.serialization.Model): + """WorkspaceConnectionServicePrincipal. + + :ivar client_id: + :vartype client_id: str + :ivar client_secret: + :vartype client_secret: str + :ivar tenant_id: + :vartype tenant_id: str + """ + + _attribute_map = { + 'client_id': {'key': 'clientId', 'type': 'str'}, + 'client_secret': {'key': 'clientSecret', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + """ + :keyword client_id: + :paramtype client_id: str + :keyword client_secret: + :paramtype client_secret: str + :keyword tenant_id: + :paramtype tenant_id: str + """ + super(WorkspaceConnectionServicePrincipal, self).__init__(**kwargs) + self.client_id = kwargs.get('client_id', None) + self.client_secret = kwargs.get('client_secret', None) + self.tenant_id = kwargs.get('tenant_id', None) + + class WorkspaceConnectionSharedAccessSignature(msrest.serialization.Model): """WorkspaceConnectionSharedAccessSignature. diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models_py3.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models_py3.py index 10bb1d46fc96..fb0d5ecd8312 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models_py3.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/models/_models_py3.py @@ -15,6 +15,134 @@ from ._azure_machine_learning_workspaces_enums import * +class WorkspaceConnectionPropertiesV2(msrest.serialization.Model): + """WorkspaceConnectionPropertiesV2. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: AccessKeyAuthTypeWorkspaceConnectionProperties, ManagedIdentityAuthTypeWorkspaceConnectionProperties, NoneAuthTypeWorkspaceConnectionProperties, PATAuthTypeWorkspaceConnectionProperties, SASAuthTypeWorkspaceConnectionProperties, ServicePrincipalAuthTypeWorkspaceConnectionProperties, UsernamePasswordAuthTypeWorkspaceConnectionProperties. + + All required parameters must be populated in order to send to Azure. + + :ivar auth_type: Required. Authentication type of the connection target.Constant filled by + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". + :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType + :ivar category: Category of the connection. + :vartype category: str + :ivar target: + :vartype target: str + :ivar value: Value details of the workspace connection. + :vartype value: str + :ivar value_format: format for the workspace connection value. Possible values include: "JSON". + :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + """ + + _validation = { + 'auth_type': {'required': True}, + } + + _attribute_map = { + 'auth_type': {'key': 'authType', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'target': {'key': 'target', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'value_format': {'key': 'valueFormat', 'type': 'str'}, + } + + _subtype_map = { + 'auth_type': {'AccessKey': 'AccessKeyAuthTypeWorkspaceConnectionProperties', 'ManagedIdentity': 'ManagedIdentityAuthTypeWorkspaceConnectionProperties', 'None': 'NoneAuthTypeWorkspaceConnectionProperties', 'PAT': 'PATAuthTypeWorkspaceConnectionProperties', 'SAS': 'SASAuthTypeWorkspaceConnectionProperties', 'ServicePrincipal': 'ServicePrincipalAuthTypeWorkspaceConnectionProperties', 'UsernamePassword': 'UsernamePasswordAuthTypeWorkspaceConnectionProperties'} + } + + def __init__( + self, + *, + category: Optional[str] = None, + target: Optional[str] = None, + value: Optional[str] = None, + value_format: Optional[Union[str, "ValueFormat"]] = None, + **kwargs + ): + """ + :keyword category: Category of the connection. + :paramtype category: str + :keyword target: + :paramtype target: str + :keyword value: Value details of the workspace connection. + :paramtype value: str + :keyword value_format: format for the workspace connection value. Possible values include: + "JSON". + :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + """ + super(WorkspaceConnectionPropertiesV2, self).__init__(**kwargs) + self.auth_type = None # type: Optional[str] + self.category = category + self.target = target + self.value = value + self.value_format = value_format + + +class AccessKeyAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): + """AccessKeyAuthTypeWorkspaceConnectionProperties. + + All required parameters must be populated in order to send to Azure. + + :ivar auth_type: Required. Authentication type of the connection target.Constant filled by + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". + :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType + :ivar category: Category of the connection. + :vartype category: str + :ivar target: + :vartype target: str + :ivar value: Value details of the workspace connection. + :vartype value: str + :ivar value_format: format for the workspace connection value. Possible values include: "JSON". + :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :ivar credentials: + :vartype credentials: ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionAccessKey + """ + + _validation = { + 'auth_type': {'required': True}, + } + + _attribute_map = { + 'auth_type': {'key': 'authType', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'target': {'key': 'target', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'value_format': {'key': 'valueFormat', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'WorkspaceConnectionAccessKey'}, + } + + def __init__( + self, + *, + category: Optional[str] = None, + target: Optional[str] = None, + value: Optional[str] = None, + value_format: Optional[Union[str, "ValueFormat"]] = None, + credentials: Optional["WorkspaceConnectionAccessKey"] = None, + **kwargs + ): + """ + :keyword category: Category of the connection. + :paramtype category: str + :keyword target: + :paramtype target: str + :keyword value: Value details of the workspace connection. + :paramtype value: str + :keyword value_format: format for the workspace connection value. Possible values include: + "JSON". + :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :keyword credentials: + :paramtype credentials: ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionAccessKey + """ + super(AccessKeyAuthTypeWorkspaceConnectionProperties, self).__init__(category=category, target=target, value=value, value_format=value_format, **kwargs) + self.auth_type = 'AccessKey' # type: str + self.credentials = credentials + + class DatastoreCredentials(msrest.serialization.Model): """Base definition for datastore credentials. @@ -270,6 +398,7 @@ class Compute(msrest.serialization.Model): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -294,7 +423,6 @@ def __init__( *, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -302,9 +430,6 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ super(Compute, self).__init__(**kwargs) self.compute_type = None # type: Optional[str] @@ -316,7 +441,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class AKS(Compute, AKSSchema): @@ -365,6 +490,7 @@ class AKS(Compute, AKSSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -387,7 +513,6 @@ def __init__( properties: Optional["AKSSchemaProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -397,11 +522,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(AKS, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(AKS, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'AKS' # type: str self.compute_location = None @@ -412,7 +534,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class AksComputeSecretsProperties(msrest.serialization.Model): @@ -833,6 +955,7 @@ class AmlCompute(Compute, AmlComputeSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -855,7 +978,6 @@ def __init__( properties: Optional["AmlComputeProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -865,11 +987,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(AmlCompute, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(AmlCompute, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'AmlCompute' # type: str self.compute_location = None @@ -880,7 +999,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class AmlComputeNodeInformation(msrest.serialization.Model): @@ -1745,34 +1864,34 @@ class AutologgerSettings(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. - :ivar ml_flow_autologger: Required. [Required] Indicates whether mlflow autologger is enabled. + :ivar mlflow_autologger: Required. [Required] Indicates whether mlflow autologger is enabled. Possible values include: "Enabled", "Disabled". - :vartype ml_flow_autologger: str or + :vartype mlflow_autologger: str or ~azure.mgmt.machinelearningservices.models.MLFlowAutologgerState """ _validation = { - 'ml_flow_autologger': {'required': True}, + 'mlflow_autologger': {'required': True}, } _attribute_map = { - 'ml_flow_autologger': {'key': 'mlFlowAutologger', 'type': 'str'}, + 'mlflow_autologger': {'key': 'mlflowAutologger', 'type': 'str'}, } def __init__( self, *, - ml_flow_autologger: Union[str, "MLFlowAutologgerState"], + mlflow_autologger: Union[str, "MLFlowAutologgerState"], **kwargs ): """ - :keyword ml_flow_autologger: Required. [Required] Indicates whether mlflow autologger is + :keyword mlflow_autologger: Required. [Required] Indicates whether mlflow autologger is enabled. Possible values include: "Enabled", "Disabled". - :paramtype ml_flow_autologger: str or + :paramtype mlflow_autologger: str or ~azure.mgmt.machinelearningservices.models.MLFlowAutologgerState """ super(AutologgerSettings, self).__init__(**kwargs) - self.ml_flow_autologger = ml_flow_autologger + self.mlflow_autologger = mlflow_autologger class JobBaseProperties(ResourceBase): @@ -5820,6 +5939,7 @@ class ComputeInstance(Compute, ComputeInstanceSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -5842,7 +5962,6 @@ def __init__( properties: Optional["ComputeInstanceProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -5852,11 +5971,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(ComputeInstance, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(ComputeInstance, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'ComputeInstance' # type: str self.compute_location = None @@ -5867,7 +5983,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class ComputeInstanceApplication(msrest.serialization.Model): @@ -5902,6 +6018,34 @@ def __init__( self.endpoint_uri = endpoint_uri +class ComputeInstanceAutologgerSettings(msrest.serialization.Model): + """Specifies settings for autologger. + + :ivar mlflow_autologger: Indicates whether mlflow autologger is enabled for notebooks. Possible + values include: "Enabled", "Disabled". + :vartype mlflow_autologger: str or ~azure.mgmt.machinelearningservices.models.MlflowAutologger + """ + + _attribute_map = { + 'mlflow_autologger': {'key': 'mlflowAutologger', 'type': 'str'}, + } + + def __init__( + self, + *, + mlflow_autologger: Optional[Union[str, "MlflowAutologger"]] = None, + **kwargs + ): + """ + :keyword mlflow_autologger: Indicates whether mlflow autologger is enabled for notebooks. + Possible values include: "Enabled", "Disabled". + :paramtype mlflow_autologger: str or + ~azure.mgmt.machinelearningservices.models.MlflowAutologger + """ + super(ComputeInstanceAutologgerSettings, self).__init__(**kwargs) + self.mlflow_autologger = mlflow_autologger + + class ComputeInstanceConnectivityEndpoints(msrest.serialization.Model): """Defines all connectivity endpoints and properties for an ComputeInstance. @@ -6275,10 +6419,16 @@ class ComputeInstanceProperties(msrest.serialization.Model): value: "Shared". :vartype application_sharing_policy: str or ~azure.mgmt.machinelearningservices.models.ApplicationSharingPolicy + :ivar autologger_settings: Specifies settings for autologger. + :vartype autologger_settings: + ~azure.mgmt.machinelearningservices.models.ComputeInstanceAutologgerSettings :ivar ssh_settings: Specifies policy and settings for SSH access. :vartype ssh_settings: ~azure.mgmt.machinelearningservices.models.ComputeInstanceSshSettings :ivar custom_services: List of Custom Services added to the compute. :vartype custom_services: list[~azure.mgmt.machinelearningservices.models.CustomService] + :ivar os_image_metadata: Returns metadata about the operating system image for this compute + instance. + :vartype os_image_metadata: ~azure.mgmt.machinelearningservices.models.ImageMetadata :ivar connectivity_endpoints: Describes all connectivity endpoints available for this ComputeInstance. :vartype connectivity_endpoints: @@ -6328,6 +6478,7 @@ class ComputeInstanceProperties(msrest.serialization.Model): """ _validation = { + 'os_image_metadata': {'readonly': True}, 'connectivity_endpoints': {'readonly': True}, 'applications': {'readonly': True}, 'created_by': {'readonly': True}, @@ -6345,8 +6496,10 @@ class ComputeInstanceProperties(msrest.serialization.Model): 'vm_size': {'key': 'vmSize', 'type': 'str'}, 'subnet': {'key': 'subnet', 'type': 'ResourceId'}, 'application_sharing_policy': {'key': 'applicationSharingPolicy', 'type': 'str'}, + 'autologger_settings': {'key': 'autologgerSettings', 'type': 'ComputeInstanceAutologgerSettings'}, 'ssh_settings': {'key': 'sshSettings', 'type': 'ComputeInstanceSshSettings'}, 'custom_services': {'key': 'customServices', 'type': '[CustomService]'}, + 'os_image_metadata': {'key': 'osImageMetadata', 'type': 'ImageMetadata'}, 'connectivity_endpoints': {'key': 'connectivityEndpoints', 'type': 'ComputeInstanceConnectivityEndpoints'}, 'applications': {'key': 'applications', 'type': '[ComputeInstanceApplication]'}, 'created_by': {'key': 'createdBy', 'type': 'ComputeInstanceCreatedBy'}, @@ -6371,6 +6524,7 @@ def __init__( vm_size: Optional[str] = None, subnet: Optional["ResourceId"] = None, application_sharing_policy: Optional[Union[str, "ApplicationSharingPolicy"]] = "Shared", + autologger_settings: Optional["ComputeInstanceAutologgerSettings"] = None, ssh_settings: Optional["ComputeInstanceSshSettings"] = None, custom_services: Optional[List["CustomService"]] = None, compute_instance_authorization_type: Optional[Union[str, "ComputeInstanceAuthorizationType"]] = "personal", @@ -6392,6 +6546,9 @@ def __init__( value: "Shared". :paramtype application_sharing_policy: str or ~azure.mgmt.machinelearningservices.models.ApplicationSharingPolicy + :keyword autologger_settings: Specifies settings for autologger. + :paramtype autologger_settings: + ~azure.mgmt.machinelearningservices.models.ComputeInstanceAutologgerSettings :keyword ssh_settings: Specifies policy and settings for SSH access. :paramtype ssh_settings: ~azure.mgmt.machinelearningservices.models.ComputeInstanceSshSettings :keyword custom_services: List of Custom Services added to the compute. @@ -6419,8 +6576,10 @@ def __init__( self.vm_size = vm_size self.subnet = subnet self.application_sharing_policy = application_sharing_policy + self.autologger_settings = autologger_settings self.ssh_settings = ssh_settings self.custom_services = custom_services + self.os_image_metadata = None self.connectivity_endpoints = None self.applications = None self.created_by = None @@ -6657,15 +6816,24 @@ class ComputeStartStopSchedule(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Schedule id. + :ivar id: A system assigned id for the schedule. :vartype id: str :ivar provisioning_status: The current deployment state of schedule. Possible values include: "Completed", "Provisioning", "Failed". :vartype provisioning_status: str or ~azure.mgmt.machinelearningservices.models.ProvisioningStatus - :ivar action: The compute power action. Possible values include: "Start", "Stop". + :ivar status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". + :vartype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus + :ivar action: [Required] The compute power action. Possible values include: "Start", "Stop". :vartype action: str or ~azure.mgmt.machinelearningservices.models.ComputePowerAction - :ivar schedule: + :ivar trigger_type: Possible values include: "Recurrence", "Cron". + :vartype trigger_type: str or ~azure.mgmt.machinelearningservices.models.TriggerType + :ivar recurrence: The workflow trigger recurrence for ComputeStartStop schedule type. + :vartype recurrence: ~azure.mgmt.machinelearningservices.models.Recurrence + :ivar cron: The workflow trigger cron for ComputeStartStop schedule type. + :vartype cron: ~azure.mgmt.machinelearningservices.models.Cron + :ivar schedule: [Deprecated] Not used any more. :vartype schedule: ~azure.mgmt.machinelearningservices.models.ScheduleBase """ @@ -6677,27 +6845,48 @@ class ComputeStartStopSchedule(msrest.serialization.Model): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'provisioning_status': {'key': 'provisioningStatus', 'type': 'str'}, + 'status': {'key': 'status', 'type': 'str'}, 'action': {'key': 'action', 'type': 'str'}, + 'trigger_type': {'key': 'triggerType', 'type': 'str'}, + 'recurrence': {'key': 'recurrence', 'type': 'Recurrence'}, + 'cron': {'key': 'cron', 'type': 'Cron'}, 'schedule': {'key': 'schedule', 'type': 'ScheduleBase'}, } def __init__( self, *, + status: Optional[Union[str, "ScheduleStatus"]] = None, action: Optional[Union[str, "ComputePowerAction"]] = None, + trigger_type: Optional[Union[str, "TriggerType"]] = None, + recurrence: Optional["Recurrence"] = None, + cron: Optional["Cron"] = None, schedule: Optional["ScheduleBase"] = None, **kwargs ): """ - :keyword action: The compute power action. Possible values include: "Start", "Stop". + :keyword status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". + :paramtype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus + :keyword action: [Required] The compute power action. Possible values include: "Start", "Stop". :paramtype action: str or ~azure.mgmt.machinelearningservices.models.ComputePowerAction - :keyword schedule: + :keyword trigger_type: Possible values include: "Recurrence", "Cron". + :paramtype trigger_type: str or ~azure.mgmt.machinelearningservices.models.TriggerType + :keyword recurrence: The workflow trigger recurrence for ComputeStartStop schedule type. + :paramtype recurrence: ~azure.mgmt.machinelearningservices.models.Recurrence + :keyword cron: The workflow trigger cron for ComputeStartStop schedule type. + :paramtype cron: ~azure.mgmt.machinelearningservices.models.Cron + :keyword schedule: [Deprecated] Not used any more. :paramtype schedule: ~azure.mgmt.machinelearningservices.models.ScheduleBase """ super(ComputeStartStopSchedule, self).__init__(**kwargs) self.id = None self.provisioning_status = None + self.status = status self.action = action + self.trigger_type = trigger_type + self.recurrence = recurrence + self.cron = cron self.schedule = schedule @@ -6807,6 +6996,51 @@ def __init__( self.collections_throughput = collections_throughput +class Cron(msrest.serialization.Model): + """The workflow trigger cron for ComputeStartStop schedule type. + + :ivar start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :vartype start_time: str + :ivar time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :vartype time_zone: str + :ivar expression: [Required] Specifies cron expression of schedule. + The expression should follow NCronTab format. + :vartype expression: str + """ + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'str'}, + 'time_zone': {'key': 'timeZone', 'type': 'str'}, + 'expression': {'key': 'expression', 'type': 'str'}, + } + + def __init__( + self, + *, + start_time: Optional[str] = None, + time_zone: Optional[str] = "UTC", + expression: Optional[str] = None, + **kwargs + ): + """ + :keyword start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :paramtype start_time: str + :keyword time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :paramtype time_zone: str + :keyword expression: [Required] Specifies cron expression of schedule. + The expression should follow NCronTab format. + :paramtype expression: str + """ + super(Cron, self).__init__(**kwargs) + self.start_time = start_time + self.time_zone = time_zone + self.expression = expression + + class TriggerBase(msrest.serialization.Model): """TriggerBase. @@ -7523,6 +7757,7 @@ class Databricks(Compute, DatabricksSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -7545,7 +7780,6 @@ def __init__( properties: Optional["DatabricksProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -7555,11 +7789,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(Databricks, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(Databricks, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'Databricks' # type: str self.compute_location = None @@ -7570,7 +7801,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class DatabricksComputeSecretsProperties(msrest.serialization.Model): @@ -7864,6 +8095,7 @@ class DataFactory(Compute): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -7884,7 +8116,6 @@ def __init__( *, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -7892,11 +8123,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(DataFactory, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, **kwargs) + super(DataFactory, self).__init__(description=description, resource_id=resource_id, **kwargs) self.compute_type = 'DataFactory' # type: str @@ -7974,6 +8202,7 @@ class DataLakeAnalytics(Compute, DataLakeAnalyticsSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -7996,7 +8225,6 @@ def __init__( properties: Optional["DataLakeAnalyticsSchemaProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -8007,11 +8235,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(DataLakeAnalytics, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(DataLakeAnalytics, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'DataLakeAnalytics' # type: str self.compute_location = None @@ -8022,7 +8247,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class DataLakeAnalyticsSchemaProperties(msrest.serialization.Model): @@ -10742,6 +10967,7 @@ class HDInsight(Compute, HDInsightSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -10764,7 +10990,6 @@ def __init__( properties: Optional["HDInsightProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -10774,11 +10999,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(HDInsight, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(HDInsight, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'HDInsight' # type: str self.compute_location = None @@ -10789,7 +11011,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class HDInsightProperties(msrest.serialization.Model): @@ -11589,6 +11811,49 @@ def __init__( self.timeout = timeout +class ImageMetadata(msrest.serialization.Model): + """Returns metadata about the operating system image for this compute instance. + + :ivar current_image_version: Specifies the current operating system image version this compute + instance is running on. + :vartype current_image_version: str + :ivar latest_image_version: Specifies the latest available operating system image version. + :vartype latest_image_version: str + :ivar is_latest_os_image_version: Specifies whether this compute instance is running on the + latest operating system image. + :vartype is_latest_os_image_version: bool + """ + + _attribute_map = { + 'current_image_version': {'key': 'currentImageVersion', 'type': 'str'}, + 'latest_image_version': {'key': 'latestImageVersion', 'type': 'str'}, + 'is_latest_os_image_version': {'key': 'isLatestOsImageVersion', 'type': 'bool'}, + } + + def __init__( + self, + *, + current_image_version: Optional[str] = None, + latest_image_version: Optional[str] = None, + is_latest_os_image_version: Optional[bool] = None, + **kwargs + ): + """ + :keyword current_image_version: Specifies the current operating system image version this + compute instance is running on. + :paramtype current_image_version: str + :keyword latest_image_version: Specifies the latest available operating system image version. + :paramtype latest_image_version: str + :keyword is_latest_os_image_version: Specifies whether this compute instance is running on the + latest operating system image. + :paramtype is_latest_os_image_version: bool + """ + super(ImageMetadata, self).__init__(**kwargs) + self.current_image_version = current_image_version + self.latest_image_version = latest_image_version + self.is_latest_os_image_version = is_latest_os_image_version + + class ImageModelDistributionSettings(msrest.serialization.Model): """Distribution expressions to sweep over values of model settings. @@ -14384,6 +14649,7 @@ class Kubernetes(Compute, KubernetesSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -14406,7 +14672,6 @@ def __init__( properties: Optional["KubernetesProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -14416,11 +14681,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(Kubernetes, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(Kubernetes, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'Kubernetes' # type: str self.compute_location = None @@ -14431,7 +14693,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class OnlineDeploymentProperties(EndpointDeploymentPropertiesBase): @@ -15626,84 +15888,17 @@ def __init__( self.resource_id = resource_id -class WorkspaceConnectionPropertiesV2(msrest.serialization.Model): - """WorkspaceConnectionPropertiesV2. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: ManagedIdentityAuthTypeWorkspaceConnectionProperties, NoneAuthTypeWorkspaceConnectionProperties, PATAuthTypeWorkspaceConnectionProperties, SASAuthTypeWorkspaceConnectionProperties, UsernamePasswordAuthTypeWorkspaceConnectionProperties. - - All required parameters must be populated in order to send to Azure. - - :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". - :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory - :ivar target: - :vartype target: str - :ivar value: Value details of the workspace connection. - :vartype value: str - :ivar value_format: format for the workspace connection value. Possible values include: "JSON". - :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat - """ - - _validation = { - 'auth_type': {'required': True}, - } - - _attribute_map = { - 'auth_type': {'key': 'authType', 'type': 'str'}, - 'category': {'key': 'category', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - 'value_format': {'key': 'valueFormat', 'type': 'str'}, - } - - _subtype_map = { - 'auth_type': {'ManagedIdentity': 'ManagedIdentityAuthTypeWorkspaceConnectionProperties', 'None': 'NoneAuthTypeWorkspaceConnectionProperties', 'PAT': 'PATAuthTypeWorkspaceConnectionProperties', 'SAS': 'SASAuthTypeWorkspaceConnectionProperties', 'UsernamePassword': 'UsernamePasswordAuthTypeWorkspaceConnectionProperties'} - } - - def __init__( - self, - *, - category: Optional[Union[str, "ConnectionCategory"]] = None, - target: Optional[str] = None, - value: Optional[str] = None, - value_format: Optional[Union[str, "ValueFormat"]] = None, - **kwargs - ): - """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory - :keyword target: - :paramtype target: str - :keyword value: Value details of the workspace connection. - :paramtype value: str - :keyword value_format: format for the workspace connection value. Possible values include: - "JSON". - :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat - """ - super(WorkspaceConnectionPropertiesV2, self).__init__(**kwargs) - self.auth_type = None # type: Optional[str] - self.category = category - self.target = target - self.value = value - self.value_format = value_format - - class ManagedIdentityAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): """ManagedIdentityAuthTypeWorkspaceConnectionProperties. All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -15731,7 +15926,7 @@ class ManagedIdentityAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPr def __init__( self, *, - category: Optional[Union[str, "ConnectionCategory"]] = None, + category: Optional[str] = None, target: Optional[str] = None, value: Optional[str] = None, value_format: Optional[Union[str, "ValueFormat"]] = None, @@ -15739,9 +15934,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -17179,11 +17373,11 @@ class NoneAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2) All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -17207,16 +17401,15 @@ class NoneAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2) def __init__( self, *, - category: Optional[Union[str, "ConnectionCategory"]] = None, + category: Optional[str] = None, target: Optional[str] = None, value: Optional[str] = None, value_format: Optional[Union[str, "ValueFormat"]] = None, **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -18260,11 +18453,11 @@ class PATAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -18292,7 +18485,7 @@ class PATAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): def __init__( self, *, - category: Optional[Union[str, "ConnectionCategory"]] = None, + category: Optional[str] = None, target: Optional[str] = None, value: Optional[str] = None, value_format: Optional[Union[str, "ValueFormat"]] = None, @@ -18300,9 +18493,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -19053,6 +19245,65 @@ def __init__( self.seed = seed +class Recurrence(msrest.serialization.Model): + """The workflow trigger recurrence for ComputeStartStop schedule type. + + :ivar frequency: [Required] The frequency to trigger schedule. Possible values include: + "Minute", "Hour", "Day", "Week", "Month". + :vartype frequency: str or ~azure.mgmt.machinelearningservices.models.RecurrenceFrequency + :ivar interval: [Required] Specifies schedule interval in conjunction with frequency. + :vartype interval: int + :ivar start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :vartype start_time: str + :ivar time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :vartype time_zone: str + :ivar schedule: [Required] The recurrence schedule. + :vartype schedule: ~azure.mgmt.machinelearningservices.models.RecurrenceSchedule + """ + + _attribute_map = { + 'frequency': {'key': 'frequency', 'type': 'str'}, + 'interval': {'key': 'interval', 'type': 'int'}, + 'start_time': {'key': 'startTime', 'type': 'str'}, + 'time_zone': {'key': 'timeZone', 'type': 'str'}, + 'schedule': {'key': 'schedule', 'type': 'RecurrenceSchedule'}, + } + + def __init__( + self, + *, + frequency: Optional[Union[str, "RecurrenceFrequency"]] = None, + interval: Optional[int] = None, + start_time: Optional[str] = None, + time_zone: Optional[str] = "UTC", + schedule: Optional["RecurrenceSchedule"] = None, + **kwargs + ): + """ + :keyword frequency: [Required] The frequency to trigger schedule. Possible values include: + "Minute", "Hour", "Day", "Week", "Month". + :paramtype frequency: str or ~azure.mgmt.machinelearningservices.models.RecurrenceFrequency + :keyword interval: [Required] Specifies schedule interval in conjunction with frequency. + :paramtype interval: int + :keyword start_time: The start time in yyyy-MM-ddTHH:mm:ss format. + :paramtype start_time: str + :keyword time_zone: Specifies time zone in which the schedule runs. + TimeZone should follow Windows time zone format. Refer: + https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11. + :paramtype time_zone: str + :keyword schedule: [Required] The recurrence schedule. + :paramtype schedule: ~azure.mgmt.machinelearningservices.models.RecurrenceSchedule + """ + super(Recurrence, self).__init__(**kwargs) + self.frequency = frequency + self.interval = interval + self.start_time = start_time + self.time_zone = time_zone + self.schedule = schedule + + class RecurrenceSchedule(msrest.serialization.Model): """RecurrenceSchedule. @@ -19953,11 +20204,11 @@ class SASAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -19985,7 +20236,7 @@ class SASAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): def __init__( self, *, - category: Optional[Union[str, "ConnectionCategory"]] = None, + category: Optional[str] = None, target: Optional[str] = None, value: Optional[str] = None, value_format: Optional[Union[str, "ValueFormat"]] = None, @@ -19993,9 +20244,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -20214,12 +20464,14 @@ def __init__( class ScheduleBase(msrest.serialization.Model): """ScheduleBase. - :ivar id: + :ivar id: A system assigned id for the schedule. :vartype id: str - :ivar provisioning_status: Possible values include: "Completed", "Provisioning", "Failed". + :ivar provisioning_status: The current deployment state of schedule. Possible values include: + "Completed", "Provisioning", "Failed". :vartype provisioning_status: str or ~azure.mgmt.machinelearningservices.models.ScheduleProvisioningState - :ivar status: Possible values include: "Enabled", "Disabled". + :ivar status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". :vartype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus """ @@ -20238,12 +20490,14 @@ def __init__( **kwargs ): """ - :keyword id: + :keyword id: A system assigned id for the schedule. :paramtype id: str - :keyword provisioning_status: Possible values include: "Completed", "Provisioning", "Failed". + :keyword provisioning_status: The current deployment state of schedule. Possible values + include: "Completed", "Provisioning", "Failed". :paramtype provisioning_status: str or ~azure.mgmt.machinelearningservices.models.ScheduleProvisioningState - :keyword status: Possible values include: "Enabled", "Disabled". + :keyword status: Is the schedule enabled or disabled?. Possible values include: "Enabled", + "Disabled". :paramtype status: str or ~azure.mgmt.machinelearningservices.models.ScheduleStatus """ super(ScheduleBase, self).__init__(**kwargs) @@ -20369,7 +20623,7 @@ def __init__( class ScriptReference(msrest.serialization.Model): """Script reference. - :ivar script_source: The storage source of the script: inline, workspace. + :ivar script_source: The storage source of the script: workspace. :vartype script_source: str :ivar script_data: The location of scripts in the mounted volume. :vartype script_data: str @@ -20396,7 +20650,7 @@ def __init__( **kwargs ): """ - :keyword script_source: The storage source of the script: inline, workspace. + :keyword script_source: The storage source of the script: workspace. :paramtype script_source: str :keyword script_data: The location of scripts in the mounted volume. :paramtype script_data: str @@ -20469,6 +20723,70 @@ def __init__( self.cosmos_db = cosmos_db +class ServicePrincipalAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionPropertiesV2): + """ServicePrincipalAuthTypeWorkspaceConnectionProperties. + + All required parameters must be populated in order to send to Azure. + + :ivar auth_type: Required. Authentication type of the connection target.Constant filled by + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". + :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType + :ivar category: Category of the connection. + :vartype category: str + :ivar target: + :vartype target: str + :ivar value: Value details of the workspace connection. + :vartype value: str + :ivar value_format: format for the workspace connection value. Possible values include: "JSON". + :vartype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :ivar credentials: + :vartype credentials: + ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionServicePrincipal + """ + + _validation = { + 'auth_type': {'required': True}, + } + + _attribute_map = { + 'auth_type': {'key': 'authType', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'target': {'key': 'target', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'value_format': {'key': 'valueFormat', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'WorkspaceConnectionServicePrincipal'}, + } + + def __init__( + self, + *, + category: Optional[str] = None, + target: Optional[str] = None, + value: Optional[str] = None, + value_format: Optional[Union[str, "ValueFormat"]] = None, + credentials: Optional["WorkspaceConnectionServicePrincipal"] = None, + **kwargs + ): + """ + :keyword category: Category of the connection. + :paramtype category: str + :keyword target: + :paramtype target: str + :keyword value: Value details of the workspace connection. + :paramtype value: str + :keyword value_format: format for the workspace connection value. Possible values include: + "JSON". + :paramtype value_format: str or ~azure.mgmt.machinelearningservices.models.ValueFormat + :keyword credentials: + :paramtype credentials: + ~azure.mgmt.machinelearningservices.models.WorkspaceConnectionServicePrincipal + """ + super(ServicePrincipalAuthTypeWorkspaceConnectionProperties, self).__init__(category=category, target=target, value=value, value_format=value_format, **kwargs) + self.auth_type = 'ServicePrincipal' # type: str + self.credentials = credentials + + class ServicePrincipalDatastoreCredentials(DatastoreCredentials): """Service Principal datastore credentials configuration. @@ -21698,6 +22016,7 @@ class SynapseSpark(Compute): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -21719,7 +22038,6 @@ def __init__( *, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, properties: Optional["SynapseSparkProperties"] = None, **kwargs ): @@ -21728,13 +22046,10 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool :keyword properties: :paramtype properties: ~azure.mgmt.machinelearningservices.models.SynapseSparkProperties """ - super(SynapseSpark, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, **kwargs) + super(SynapseSpark, self).__init__(description=description, resource_id=resource_id, **kwargs) self.compute_type = 'SynapseSpark' # type: str self.properties = properties @@ -23951,11 +24266,11 @@ class UsernamePasswordAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionP All required parameters must be populated in order to send to Azure. :ivar auth_type: Required. Authentication type of the connection target.Constant filled by - server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS". + server. Possible values include: "PAT", "ManagedIdentity", "UsernamePassword", "None", "SAS", + "ServicePrincipal", "AccessKey". :vartype auth_type: str or ~azure.mgmt.machinelearningservices.models.ConnectionAuthType - :ivar category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :vartype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :ivar category: Category of the connection. + :vartype category: str :ivar target: :vartype target: str :ivar value: Value details of the workspace connection. @@ -23983,7 +24298,7 @@ class UsernamePasswordAuthTypeWorkspaceConnectionProperties(WorkspaceConnectionP def __init__( self, *, - category: Optional[Union[str, "ConnectionCategory"]] = None, + category: Optional[str] = None, target: Optional[str] = None, value: Optional[str] = None, value_format: Optional[Union[str, "ValueFormat"]] = None, @@ -23991,9 +24306,8 @@ def __init__( **kwargs ): """ - :keyword category: Category of the connection. Possible values include: "PythonFeed", - "ContainerRegistry", "Git". - :paramtype category: str or ~azure.mgmt.machinelearningservices.models.ConnectionCategory + :keyword category: Category of the connection. + :paramtype category: str :keyword target: :paramtype target: str :keyword value: Value details of the workspace connection. @@ -24082,6 +24396,7 @@ class VirtualMachine(Compute, VirtualMachineSchema): 'modified_on': {'readonly': True}, 'provisioning_errors': {'readonly': True}, 'is_attached_compute': {'readonly': True}, + 'disable_local_auth': {'readonly': True}, } _attribute_map = { @@ -24104,7 +24419,6 @@ def __init__( properties: Optional["VirtualMachineSchemaProperties"] = None, description: Optional[str] = None, resource_id: Optional[str] = None, - disable_local_auth: Optional[bool] = None, **kwargs ): """ @@ -24115,11 +24429,8 @@ def __init__( :paramtype description: str :keyword resource_id: ARM resource id of the underlying compute. :paramtype resource_id: str - :keyword disable_local_auth: Opt-out of local authentication and ensure customers can use only - MSI and AAD exclusively for authentication. - :paramtype disable_local_auth: bool """ - super(VirtualMachine, self).__init__(description=description, resource_id=resource_id, disable_local_auth=disable_local_auth, properties=properties, **kwargs) + super(VirtualMachine, self).__init__(description=description, resource_id=resource_id, properties=properties, **kwargs) self.properties = properties self.compute_type = 'VirtualMachine' # type: str self.compute_location = None @@ -24130,7 +24441,7 @@ def __init__( self.resource_id = resource_id self.provisioning_errors = None self.is_attached_compute = None - self.disable_local_auth = disable_local_auth + self.disable_local_auth = None class VirtualMachineImage(msrest.serialization.Model): @@ -24823,6 +25134,38 @@ def __init__( self.scheduled_purge_date = None +class WorkspaceConnectionAccessKey(msrest.serialization.Model): + """WorkspaceConnectionAccessKey. + + :ivar access_key_id: + :vartype access_key_id: str + :ivar secret_access_key: + :vartype secret_access_key: str + """ + + _attribute_map = { + 'access_key_id': {'key': 'accessKeyId', 'type': 'str'}, + 'secret_access_key': {'key': 'secretAccessKey', 'type': 'str'}, + } + + def __init__( + self, + *, + access_key_id: Optional[str] = None, + secret_access_key: Optional[str] = None, + **kwargs + ): + """ + :keyword access_key_id: + :paramtype access_key_id: str + :keyword secret_access_key: + :paramtype secret_access_key: str + """ + super(WorkspaceConnectionAccessKey, self).__init__(**kwargs) + self.access_key_id = access_key_id + self.secret_access_key = secret_access_key + + class WorkspaceConnectionManagedIdentity(msrest.serialization.Model): """WorkspaceConnectionManagedIdentity. @@ -24970,6 +25313,45 @@ def __init__( self.next_link = None +class WorkspaceConnectionServicePrincipal(msrest.serialization.Model): + """WorkspaceConnectionServicePrincipal. + + :ivar client_id: + :vartype client_id: str + :ivar client_secret: + :vartype client_secret: str + :ivar tenant_id: + :vartype tenant_id: str + """ + + _attribute_map = { + 'client_id': {'key': 'clientId', 'type': 'str'}, + 'client_secret': {'key': 'clientSecret', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + } + + def __init__( + self, + *, + client_id: Optional[str] = None, + client_secret: Optional[str] = None, + tenant_id: Optional[str] = None, + **kwargs + ): + """ + :keyword client_id: + :paramtype client_id: str + :keyword client_secret: + :paramtype client_secret: str + :keyword tenant_id: + :paramtype tenant_id: str + """ + super(WorkspaceConnectionServicePrincipal, self).__init__(**kwargs) + self.client_id = client_id + self.client_secret = client_secret + self.tenant_id = tenant_id + + class WorkspaceConnectionSharedAccessSignature(msrest.serialization.Model): """WorkspaceConnectionSharedAccessSignature. diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_containers_operations.py index 2366781ec437..9bb4fac625ba 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_containers_operations.py @@ -77,7 +77,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -85,12 +85,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -116,7 +116,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -124,12 +124,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -155,7 +155,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -164,12 +164,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), } _url = _format_url_section(_url, **path_format_arguments) @@ -311,7 +311,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> None @@ -328,7 +328,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -356,7 +356,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore @distributed_trace @@ -364,7 +364,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -376,8 +376,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -402,7 +402,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -414,7 +414,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -426,14 +426,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> "_models.CodeContainer" @@ -445,8 +445,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: CodeContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.CodeContainer @@ -465,7 +465,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -491,14 +491,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str body, # type: "_models.CodeContainer" **kwargs # type: Any ): @@ -518,7 +518,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, content_type=content_type, json=_json, @@ -553,7 +553,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore @distributed_trace @@ -561,7 +561,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str body, # type: "_models.CodeContainer" **kwargs # type: Any ): @@ -574,8 +574,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.CodeContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -604,7 +604,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, body=body, api_version=api_version, content_type=content_type, @@ -621,7 +621,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -633,4 +633,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_versions_operations.py index df8e42fdc76b..b06b751098d6 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_code_versions_operations.py @@ -37,7 +37,7 @@ def build_list_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -48,12 +48,12 @@ def build_list_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -85,7 +85,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str **kwargs # type: Any ): @@ -94,12 +94,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -126,7 +126,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str **kwargs # type: Any ): @@ -135,12 +135,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -167,7 +167,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str **kwargs # type: Any ): @@ -177,12 +177,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "codeName": _SERIALIZER.url("code_name", code_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -234,7 +234,7 @@ def list( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str order_by=None, # type: Optional[str] top=None, # type: Optional[int] skip=None, # type: Optional[str] @@ -249,8 +249,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param order_by: Ordering of list. :type order_by: str :param top: Maximum number of records to return. @@ -278,7 +278,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, order_by=order_by, top=top, @@ -294,7 +294,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, api_version=api_version, order_by=order_by, top=top, @@ -334,13 +334,13 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str **kwargs # type: Any ): @@ -358,7 +358,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -387,7 +387,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore @distributed_trace @@ -395,7 +395,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str **kwargs # type: Any ): @@ -408,8 +408,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -436,7 +436,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -449,7 +449,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -461,14 +461,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str **kwargs # type: Any ): @@ -481,8 +481,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -503,7 +503,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -530,14 +530,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str body, # type: "_models.CodeVersion" **kwargs # type: Any @@ -558,7 +558,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, api_version=api_version, content_type=content_type, @@ -594,7 +594,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore @distributed_trace @@ -602,7 +602,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + code_name, # type: str version, # type: str body, # type: "_models.CodeVersion" **kwargs # type: Any @@ -616,8 +616,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param code_name: Container name. + :type code_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -648,7 +648,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + code_name=code_name, version=version, body=body, api_version=api_version, @@ -666,7 +666,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -678,4 +678,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_containers_operations.py index 4b9297e159f1..8b5332d2f1d7 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_containers_operations.py @@ -77,7 +77,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -85,12 +85,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -116,7 +116,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -124,12 +124,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -155,7 +155,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -164,12 +164,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), } _url = _format_url_section(_url, **path_format_arguments) @@ -311,7 +311,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> None @@ -328,7 +328,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -356,7 +356,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore @distributed_trace @@ -364,7 +364,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -376,8 +376,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -402,7 +402,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -414,7 +414,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -426,14 +426,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> "_models.ComponentContainer" @@ -445,8 +445,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ComponentContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.ComponentContainer @@ -465,7 +465,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -491,14 +491,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str body, # type: "_models.ComponentContainer" **kwargs # type: Any ): @@ -518,7 +518,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, content_type=content_type, json=_json, @@ -553,7 +553,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore @distributed_trace @@ -561,7 +561,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str body, # type: "_models.ComponentContainer" **kwargs # type: Any ): @@ -574,8 +574,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.ComponentContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -605,7 +605,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, body=body, api_version=api_version, content_type=content_type, @@ -622,7 +622,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -634,4 +634,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_versions_operations.py index 826aacb218e8..5cdbb59cd928 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_component_versions_operations.py @@ -37,7 +37,7 @@ def build_list_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -48,12 +48,12 @@ def build_list_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -85,7 +85,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str **kwargs # type: Any ): @@ -94,12 +94,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -126,7 +126,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str **kwargs # type: Any ): @@ -135,12 +135,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -167,7 +167,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str **kwargs # type: Any ): @@ -177,12 +177,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "componentName": _SERIALIZER.url("component_name", component_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -234,7 +234,7 @@ def list( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str order_by=None, # type: Optional[str] top=None, # type: Optional[int] skip=None, # type: Optional[str] @@ -249,8 +249,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param order_by: Ordering of list. :type order_by: str :param top: Maximum number of records to return. @@ -278,7 +278,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, order_by=order_by, top=top, @@ -294,7 +294,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, api_version=api_version, order_by=order_by, top=top, @@ -334,13 +334,13 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str **kwargs # type: Any ): @@ -358,7 +358,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -387,7 +387,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore @distributed_trace @@ -395,7 +395,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str **kwargs # type: Any ): @@ -408,8 +408,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -436,7 +436,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -449,7 +449,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -461,14 +461,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str **kwargs # type: Any ): @@ -481,8 +481,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -503,7 +503,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -530,14 +530,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str body, # type: "_models.ComponentVersion" **kwargs # type: Any @@ -558,7 +558,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, api_version=api_version, content_type=content_type, @@ -594,7 +594,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore @distributed_trace @@ -602,7 +602,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + component_name, # type: str version, # type: str body, # type: "_models.ComponentVersion" **kwargs # type: Any @@ -616,8 +616,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param component_name: Container name. + :type component_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -649,7 +649,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + component_name=component_name, version=version, body=body, api_version=api_version, @@ -667,7 +667,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -679,4 +679,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_containers_operations.py index 253b3b103a5b..6f2dcc994ef2 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_containers_operations.py @@ -80,7 +80,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -88,12 +88,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -119,7 +119,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -127,12 +127,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -158,7 +158,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -167,12 +167,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), } _url = _format_url_section(_url, **path_format_arguments) @@ -319,7 +319,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> None @@ -336,7 +336,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -364,7 +364,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore @distributed_trace @@ -372,7 +372,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -384,8 +384,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -410,7 +410,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -422,7 +422,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -434,14 +434,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> "_models.EnvironmentContainer" @@ -453,8 +453,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param environment_name: Container name. This is case-sensitive. + :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: EnvironmentContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.EnvironmentContainer @@ -473,7 +473,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -499,14 +499,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str body, # type: "_models.EnvironmentContainer" **kwargs # type: Any ): @@ -526,7 +526,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, content_type=content_type, json=_json, @@ -561,7 +561,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore @distributed_trace @@ -569,7 +569,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str body, # type: "_models.EnvironmentContainer" **kwargs # type: Any ): @@ -582,8 +582,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.EnvironmentContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -613,7 +613,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, body=body, api_version=api_version, content_type=content_type, @@ -630,7 +630,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -642,4 +642,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_versions_operations.py index baf37424abd9..b54f03c1f10d 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_environment_versions_operations.py @@ -37,7 +37,7 @@ def build_list_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -49,12 +49,12 @@ def build_list_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -88,7 +88,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str **kwargs # type: Any ): @@ -97,12 +97,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -129,7 +129,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str **kwargs # type: Any ): @@ -138,12 +138,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -170,7 +170,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str **kwargs # type: Any ): @@ -180,12 +180,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -237,7 +237,7 @@ def list( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str order_by=None, # type: Optional[str] top=None, # type: Optional[int] skip=None, # type: Optional[str] @@ -253,8 +253,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param environment_name: Container name. This is case-sensitive. + :type environment_name: str :param order_by: Ordering of list. :type order_by: str :param top: Maximum number of records to return. @@ -284,7 +284,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, order_by=order_by, top=top, @@ -301,7 +301,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, api_version=api_version, order_by=order_by, top=top, @@ -342,13 +342,13 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str **kwargs # type: Any ): @@ -366,7 +366,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -395,7 +395,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore @distributed_trace @@ -403,7 +403,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str **kwargs # type: Any ): @@ -416,8 +416,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -444,7 +444,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -457,7 +457,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -469,14 +469,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str **kwargs # type: Any ): @@ -489,8 +489,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param environment_name: Container name. This is case-sensitive. + :type environment_name: str :param version: Version identifier. This is case-sensitive. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -511,7 +511,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -538,14 +538,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str body, # type: "_models.EnvironmentVersion" **kwargs # type: Any @@ -566,7 +566,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, api_version=api_version, content_type=content_type, @@ -602,7 +602,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore @distributed_trace @@ -610,7 +610,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + environment_name, # type: str version, # type: str body, # type: "_models.EnvironmentVersion" **kwargs # type: Any @@ -624,8 +624,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param environment_name: Container name. + :type environment_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -657,7 +657,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + environment_name=environment_name, version=version, body=body, api_version=api_version, @@ -675,7 +675,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -687,4 +687,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_containers_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_containers_operations.py index edf60684ffbb..a321d4711e16 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_containers_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_containers_operations.py @@ -80,7 +80,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -88,12 +88,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -119,7 +119,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -127,12 +127,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -158,7 +158,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -167,12 +167,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), } _url = _format_url_section(_url, **path_format_arguments) @@ -319,7 +319,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> None @@ -336,7 +336,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, template_url=self._delete_initial.metadata['url'], ) @@ -364,7 +364,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore @distributed_trace @@ -372,7 +372,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -384,8 +384,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -410,7 +410,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, cls=lambda x,y,z: x, **kwargs @@ -422,7 +422,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -434,14 +434,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> "_models.ModelContainer" @@ -453,8 +453,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param model_name: Container name. This is case-sensitive. + :type model_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ModelContainer, or the result of cls(response) :rtype: ~azure.mgmt.machinelearningservices.models.ModelContainer @@ -473,7 +473,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, template_url=self.get.metadata['url'], ) @@ -499,14 +499,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str body, # type: "_models.ModelContainer" **kwargs # type: Any ): @@ -526,7 +526,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, content_type=content_type, json=_json, @@ -561,7 +561,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore @distributed_trace @@ -569,7 +569,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str body, # type: "_models.ModelContainer" **kwargs # type: Any ): @@ -582,8 +582,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :param body: Container entity to create or update. :type body: ~azure.mgmt.machinelearningservices.models.ModelContainer :keyword callable cls: A custom type or function that will be passed the direct response @@ -613,7 +613,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, body=body, api_version=api_version, content_type=content_type, @@ -630,7 +630,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -642,4 +642,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_versions_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_versions_operations.py index ed7ca8357ae7..f26bef0104a4 100644 --- a/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_versions_operations.py +++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2022_10_01_preview/operations/_registry_model_versions_operations.py @@ -37,7 +37,7 @@ def build_list_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str **kwargs # type: Any ): # type: (...) -> HttpRequest @@ -53,12 +53,12 @@ def build_list_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str'), } _url = _format_url_section(_url, **path_format_arguments) @@ -100,7 +100,7 @@ def build_delete_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str **kwargs # type: Any ): @@ -109,12 +109,12 @@ def build_delete_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -141,7 +141,7 @@ def build_get_request( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str **kwargs # type: Any ): @@ -150,12 +150,12 @@ def build_get_request( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -182,7 +182,7 @@ def build_create_or_update_request_initial( subscription_id, # type: str resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str **kwargs # type: Any ): @@ -192,12 +192,12 @@ def build_create_or_update_request_initial( accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}") # pylint: disable=line-too-long + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "registryName": _SERIALIZER.url("registry_name", registry_name, 'str'), - "name": _SERIALIZER.url("name", name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), + "modelName": _SERIALIZER.url("model_name", model_name, 'str', pattern=r'^[a-zA-Z0-9][a-zA-Z0-9\-_]{0,254}$'), "version": _SERIALIZER.url("version", version, 'str'), } @@ -249,7 +249,7 @@ def list( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str skip=None, # type: Optional[str] order_by=None, # type: Optional[str] top=None, # type: Optional[int] @@ -269,8 +269,8 @@ def list( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param model_name: Container name. This is case-sensitive. + :type model_name: str :param skip: Continuation token for pagination. :type skip: str :param order_by: Ordering of list. @@ -310,7 +310,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, skip=skip, order_by=order_by, @@ -331,7 +331,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, api_version=api_version, skip=skip, order_by=order_by, @@ -376,13 +376,13 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions"} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str **kwargs # type: Any ): @@ -400,7 +400,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, template_url=self._delete_initial.metadata['url'], @@ -429,7 +429,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, response_headers) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore @distributed_trace @@ -437,7 +437,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str **kwargs # type: Any ): @@ -450,8 +450,8 @@ def begin_delete( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :param version: Version identifier. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -478,7 +478,7 @@ def begin_delete( # pylint: disable=inconsistent-return-statements raw_result = self._delete_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, cls=lambda x,y,z: x, @@ -491,7 +491,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -503,14 +503,14 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore @distributed_trace def get( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str **kwargs # type: Any ): @@ -523,8 +523,8 @@ def get( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. This is case-sensitive. - :type name: str + :param model_name: Container name. This is case-sensitive. + :type model_name: str :param version: Version identifier. This is case-sensitive. :type version: str :keyword callable cls: A custom type or function that will be passed the direct response @@ -545,7 +545,7 @@ def get( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, template_url=self.get.metadata['url'], @@ -572,14 +572,14 @@ def get( return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore def _create_or_update_initial( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str body, # type: "_models.ModelVersion" **kwargs # type: Any @@ -600,7 +600,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, api_version=api_version, content_type=content_type, @@ -636,7 +636,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore @distributed_trace @@ -644,7 +644,7 @@ def begin_create_or_update( self, resource_group_name, # type: str registry_name, # type: str - name, # type: str + model_name, # type: str version, # type: str body, # type: "_models.ModelVersion" **kwargs # type: Any @@ -658,8 +658,8 @@ def begin_create_or_update( :type resource_group_name: str :param registry_name: Name of Azure Machine Learning registry. :type registry_name: str - :param name: Container name. - :type name: str + :param model_name: Container name. + :type model_name: str :param version: Version identifier. :type version: str :param body: Version entity to create or update. @@ -690,7 +690,7 @@ def begin_create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, registry_name=registry_name, - name=name, + model_name=model_name, version=version, body=body, api_version=api_version, @@ -708,7 +708,7 @@ def get_long_running_output(pipeline_response): return deserialized - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'original-uri'}, **kwargs) elif polling is False: polling_method = NoPolling() else: polling_method = polling if cont_token: @@ -720,4 +720,4 @@ def get_long_running_output(pipeline_response): ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}"} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}"} # type: ignore diff --git a/sdk/ml/azure-ai-ml/swagger/regenerate_restclient.py b/sdk/ml/azure-ai-ml/scripts/regenerate_restclient.py similarity index 96% rename from sdk/ml/azure-ai-ml/swagger/regenerate_restclient.py rename to sdk/ml/azure-ai-ml/scripts/regenerate_restclient.py index df160a57ca04..e42d5d4195ba 100644 --- a/sdk/ml/azure-ai-ml/swagger/regenerate_restclient.py +++ b/sdk/ml/azure-ai-ml/scripts/regenerate_restclient.py @@ -141,7 +141,7 @@ def regenerate_restclient(api_tag, verbose): "--api-tag", required=False, help="""Specifies which API to generate using autorest. If not supplied, all APIs are targeted. - Must match the name of a tag in the autorest/machinelearningservices/resource-manager/readme.md file.""", + Must match the name of a tag in the sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/readme.md file.""", ) parser.add_argument("-v", "--verbose", action="store_true", required=False, help="turn on verbose output") diff --git a/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json b/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json index 94234006e4d8..86f0afe434f1 100644 --- a/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json +++ b/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json @@ -822,6 +822,9 @@ "Create an ComputeInstance Compute": { "$ref": "./examples/Compute/createOrUpdate/ComputeInstance.json" }, + "Create an ComputeInstance Compute with Schedules": { + "$ref": "./examples/Compute/createOrUpdate/ComputeInstanceWithSchedules.json" + }, "Create an AKS Compute": { "$ref": "./examples/Compute/createOrUpdate/BasicAKSCompute.json" }, @@ -3339,7 +3342,8 @@ }, "disableLocalAuth": { "type": "boolean", - "description": "Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for authentication." + "description": "Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for authentication.", + "readOnly": true } }, "required": [ @@ -3703,6 +3707,11 @@ "modelAsString": true } }, + "autologgerSettings": { + "description": "Specifies settings for autologger.", + "$ref": "#/definitions/ComputeInstanceAutologgerSettings", + "x-nullable": true + }, "sshSettings": { "description": "Specifies policy and settings for SSH access.", "$ref": "#/definitions/ComputeInstanceSshSettings", @@ -3719,6 +3728,11 @@ "name" ] }, + "osImageMetadata": { + "readOnly": true, + "description": "Returns metadata about the operating system image for this compute instance.", + "$ref": "#/definitions/ImageMetadata" + }, "connectivityEndpoints": { "readOnly": true, "description": "Describes all connectivity endpoints available for this ComputeInstance.", @@ -4851,6 +4865,24 @@ ], "type": "object" }, + "ImageMetadata": { + "type": "object", + "description": "Returns metadata about the operating system image for this compute instance.", + "properties": { + "currentImageVersion": { + "type": "string", + "description": "Specifies the current operating system image version this compute instance is running on." + }, + "latestImageVersion": { + "type": "string", + "description": "Specifies the latest available operating system image version." + }, + "isLatestOsImageVersion": { + "type": "boolean", + "description": "Specifies whether this compute instance is running on the latest operating system image." + } + } + }, "CustomService": { "type": "object", "description": "Specifies the custom service configuration", @@ -5091,6 +5123,24 @@ } } }, + "ComputeInstanceAutologgerSettings": { + "type": "object", + "description": "Specifies settings for autologger.", + "properties": { + "mlflowAutologger": { + "type": "string", + "description": "Indicates whether mlflow autologger is enabled for notebooks.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "mlflowAutologger", + "modelAsString": true + } + } + } + }, "ComputeInstanceSshSettings": { "type": "object", "description": "Specifies policy and settings for SSH access.", @@ -5238,11 +5288,13 @@ "description": "Compute start stop schedule properties", "properties": { "id": { - "description": "Schedule id.", - "readOnly": true, - "type": "string" + "description": "A system assigned id for the schedule.", + "type": "string", + "x-nullable": true, + "readOnly": true }, "provisioningStatus": { + "description": "The current deployment state of schedule.", "type": "string", "enum": [ "Completed", @@ -5251,15 +5303,38 @@ ], "x-ms-enum": { "name": "provisioningStatus", - "modelAsString": true + "modelAsString": true, + "values": [ + { + "value": "Completed" + }, + { + "value": "Provisioning" + }, + { + "value": "Failed" + } + ] }, - "readOnly": true, - "description": "The current deployment state of schedule." + "readOnly": true + }, + "status": { + "$ref": "#/definitions/ScheduleStatus" }, "action": { "$ref": "#/definitions/ComputePowerAction" }, + "triggerType": { + "$ref": "./mfe.json#/definitions/TriggerType" + }, + "recurrence": { + "$ref": "#/definitions/Recurrence" + }, + "cron": { + "$ref": "#/definitions/Cron" + }, "schedule": { + "description": "[Deprecated] Not used any more.", "$ref": "#/definitions/ScheduleBase" } } @@ -5268,6 +5343,7 @@ "type": "object", "properties": { "id": { + "description": "A system assigned id for the schedule.", "type": "string", "x-nullable": true }, @@ -5286,6 +5362,7 @@ "Provisioning", "Failed" ], + "description": "The current deployment state of schedule.", "type": "string", "x-ms-enum": { "name": "ScheduleProvisioningState", @@ -5309,6 +5386,7 @@ "Enabled", "Disabled" ], + "description": "Is the schedule enabled or disabled?", "type": "string", "x-ms-enum": { "name": "ScheduleStatus", @@ -5326,7 +5404,7 @@ }, "ComputePowerAction": { "type": "string", - "description": "The compute power action.", + "description": "[Required] The compute power action.", "enum": [ "Start", "Stop" @@ -5336,6 +5414,55 @@ "modelAsString": true } }, + "Recurrence": { + "type": "object", + "description": "The workflow trigger recurrence for ComputeStartStop schedule type.", + "properties": { + "frequency": { + "description": "[Required] The frequency to trigger schedule.", + "$ref": "./mfe.json#/definitions/RecurrenceFrequency" + }, + "interval": { + "description": "[Required] Specifies schedule interval in conjunction with frequency", + "type": "integer", + "format": "int32" + }, + "startTime": { + "description": "The start time in yyyy-MM-ddTHH:mm:ss format.", + "type": "string", + "x-nullable": true + }, + "timeZone": { + "description": "Specifies time zone in which the schedule runs.\r\nTimeZone should follow Windows time zone format. Refer: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11", + "default": "UTC", + "type": "string" + }, + "schedule": { + "description": "[Required] The recurrence schedule.", + "$ref": "./mfe.json#/definitions/RecurrenceSchedule" + } + } + }, + "Cron": { + "type": "object", + "description": "The workflow trigger cron for ComputeStartStop schedule type.", + "properties": { + "startTime": { + "description": "The start time in yyyy-MM-ddTHH:mm:ss format.", + "type": "string", + "x-nullable": true + }, + "timeZone": { + "description": "Specifies time zone in which the schedule runs.\r\nTimeZone should follow Windows time zone format. Refer: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11", + "type": "string", + "default": "UTC" + }, + "expression": { + "description": "[Required] Specifies cron expression of schedule.\r\nThe expression should follow NCronTab format.", + "type": "string" + } + } + }, "ComputeInstanceDataMount": { "type": "object", "description": "Defines an Aml Instance DataMount.", @@ -5684,7 +5811,9 @@ "ManagedIdentity", "UsernamePassword", "None", - "SAS" + "SAS", + "ServicePrincipal", + "AccessKey" ], "type": "string", "description": "Authentication type of the connection target", @@ -5694,17 +5823,8 @@ } }, "ConnectionCategory": { - "enum": [ - "PythonFeed", - "ContainerRegistry", - "Git" - ], "type": "string", - "description": "Category of the connection", - "x-ms-enum": { - "name": "ConnectionCategory", - "modelAsString": true - } + "description": "Category of the connection" }, "WorkspaceConnectionUsernamePassword": { "type": "object", @@ -5781,6 +5901,65 @@ "additionalProperties": false, "x-ms-discriminator-value": "UsernamePassword" }, + "WorkspaceConnectionAccessKey": { + "type": "object", + "properties": { + "accessKeyId": { + "type": "string" + }, + "secretAccessKey": { + "type": "string", + "x-ms-secret": true + } + }, + "additionalProperties": false + }, + "AccessKeyAuthTypeWorkspaceConnectionProperties": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/WorkspaceConnectionPropertiesV2" + } + ], + "properties": { + "credentials": { + "$ref": "#/definitions/WorkspaceConnectionAccessKey" + } + }, + "additionalProperties": false, + "x-ms-discriminator-value": "AccessKey" + }, + "WorkspaceConnectionServicePrincipal": { + "type": "object", + "properties": { + "clientId": { + "type": "string" + }, + "clientSecret": { + "type": "string", + "x-ms-secret": true + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ServicePrincipalAuthTypeWorkspaceConnectionProperties": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/WorkspaceConnectionPropertiesV2" + } + ], + "properties": { + "credentials": { + "$ref": "#/definitions/WorkspaceConnectionServicePrincipal" + } + }, + "additionalProperties": false, + "x-ms-discriminator-value": "ServicePrincipal" + }, "WorkspaceConnectionPropertiesV2": { "required": [ "authType" @@ -5914,7 +6093,7 @@ "description": "Script reference", "properties": { "scriptSource": { - "description": "The storage source of the script: inline, workspace.", + "description": "The storage source of the script: workspace.", "type": "string" }, "scriptData": { diff --git a/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/mfe.json b/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/mfe.json index 13815bc7e6b6..e6bd556dfcac 100644 --- a/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/mfe.json +++ b/sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/mfe.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "title": "Azure Machine Learning Workspaces", + "title": "Azure Machine Learning Services", "version": "2022-10-01-preview" }, "host": "management.azure.com", @@ -64,7 +64,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}": { "delete": { "tags": [ "CodeContainer" @@ -90,7 +90,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string" @@ -139,7 +139,10 @@ "$ref": "./examples/Registry/CodeContainer/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -166,7 +169,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string" @@ -223,7 +226,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string", @@ -278,10 +281,13 @@ "$ref": "./examples/Registry/CodeContainer/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions": { "get": { "tags": [ "CodeVersion" @@ -307,7 +313,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string" @@ -356,7 +362,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{name}/versions/{version}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes/{codeName}/versions/{version}": { "delete": { "tags": [ "CodeVersion" @@ -382,7 +388,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string" @@ -438,7 +444,10 @@ "$ref": "./examples/Registry/CodeVersion/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -465,7 +474,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string" @@ -529,7 +538,7 @@ }, { "in": "path", - "name": "name", + "name": "codeName", "description": "Container name.", "required": true, "type": "string", @@ -591,7 +600,10 @@ "$ref": "./examples/Registry/CodeVersion/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components": { @@ -649,7 +661,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}": { "delete": { "tags": [ "ComponentContainer" @@ -675,7 +687,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string" @@ -724,7 +736,10 @@ "$ref": "./examples/Registry/ComponentContainer/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -751,7 +766,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string" @@ -808,7 +823,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string", @@ -863,10 +878,13 @@ "$ref": "./examples/Registry/ComponentContainer/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions": { "get": { "tags": [ "ComponentVersion" @@ -892,7 +910,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string" @@ -941,7 +959,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{name}/versions/{version}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/components/{componentName}/versions/{version}": { "delete": { "tags": [ "ComponentVersion" @@ -967,7 +985,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string" @@ -1023,7 +1041,10 @@ "$ref": "./examples/Registry/ComponentVersion/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -1050,7 +1071,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string" @@ -1114,7 +1135,7 @@ }, { "in": "path", - "name": "name", + "name": "componentName", "description": "Container name.", "required": true, "type": "string", @@ -1176,7 +1197,10 @@ "$ref": "./examples/Registry/ComponentVersion/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments": { @@ -1261,7 +1285,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}": { "delete": { "tags": [ "EnvironmentContainer" @@ -1287,7 +1311,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name.", "required": true, "type": "string" @@ -1336,7 +1360,10 @@ "$ref": "./examples/Registry/EnvironmentContainer/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -1363,7 +1390,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name. This is case-sensitive.", "required": true, "type": "string" @@ -1420,7 +1447,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name.", "required": true, "type": "string", @@ -1475,10 +1502,13 @@ "$ref": "./examples/Registry/EnvironmentContainer/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions": { "get": { "tags": [ "EnvironmentVersion" @@ -1504,7 +1534,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name. This is case-sensitive.", "required": true, "type": "string" @@ -1580,7 +1610,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{name}/versions/{version}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/environments/{environmentName}/versions/{version}": { "delete": { "tags": [ "EnvironmentVersion" @@ -1606,7 +1636,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name.", "required": true, "type": "string" @@ -1662,7 +1692,10 @@ "$ref": "./examples/Registry/EnvironmentVersion/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -1689,7 +1722,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name. This is case-sensitive.", "required": true, "type": "string" @@ -1753,7 +1786,7 @@ }, { "in": "path", - "name": "name", + "name": "environmentName", "description": "Container name.", "required": true, "type": "string", @@ -1815,7 +1848,10 @@ "$ref": "./examples/Registry/EnvironmentVersion/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models": { @@ -1900,7 +1936,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}": { "delete": { "tags": [ "ModelContainer" @@ -1926,7 +1962,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name.", "required": true, "type": "string" @@ -1975,7 +2011,10 @@ "$ref": "./examples/Registry/ModelContainer/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -2002,7 +2041,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name. This is case-sensitive.", "required": true, "type": "string" @@ -2059,7 +2098,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name.", "required": true, "type": "string", @@ -2114,10 +2153,13 @@ "$ref": "./examples/Registry/ModelContainer/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions": { "get": { "tags": [ "ModelVersion" @@ -2143,7 +2185,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name. This is case-sensitive.", "required": true, "type": "string" @@ -2243,7 +2285,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{name}/versions/{version}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/models/{modelName}/versions/{version}": { "delete": { "tags": [ "ModelVersion" @@ -2269,7 +2311,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name.", "required": true, "type": "string" @@ -2325,7 +2367,10 @@ "$ref": "./examples/Registry/ModelVersion/delete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -2352,7 +2397,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name. This is case-sensitive.", "required": true, "type": "string" @@ -2416,7 +2461,7 @@ }, { "in": "path", - "name": "name", + "name": "modelName", "description": "Container name.", "required": true, "type": "string", @@ -2478,7 +2523,10 @@ "$ref": "./examples/Registry/ModelVersion/createOrUpdate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "original-uri" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints": { @@ -8800,11 +8848,11 @@ "AutologgerSettings": { "description": "Settings for Autologger.", "required": [ - "mlFlowAutologger" + "mlflowAutologger" ], "type": "object", "properties": { - "mlFlowAutologger": { + "mlflowAutologger": { "description": "[Required] Indicates whether mlflow autologger is enabled.", "$ref": "#/definitions/MLFlowAutologgerState", "x-ms-mutability": [