Use Latest autorest + DT (#41998)

* Use Latest autorest + DT

* Use Latest autorest + DT

* update version

* update assets.json

* update core version

* fix test error

* fix py error

* fix py error

* fix py error

* fix pylint error

* fix pylint error

* fix pylint error

* fix pylint error

* fix pylint error

* fix pylint error

* fix pylint error

* fix pylint error

* fix mypy error

* fix mypy error

* fix mypy error

Author: Vidyashreebn

sdk/digitaltwins/azure-digitaltwins-core/CHANGELOG.md

@@ -1,14 +1,17 @@
 # Release History
 
-## 1.2.1 (Unreleased)
+## 1.3.0 (Unreleased)
 
 ### Features Added
 
-### Breaking Changes
-
+	@@ -9,6 +9,9 @@
 ### Bugs Fixed
 
 ### Other Changes
+- Migrated from AutoRest v2 to AutoRest v3 for code generation, improving code quality and maintainability.
+- Updated service API version to use API version 2023-10-31 by default.
+- Updated internal implementation while maintaining API compatibility.
+- Improved type annotations throughout the library.
 
 ## 1.2.0 (2022-05-31)
  - GA release

sdk/digitaltwins/azure-digitaltwins-core/README.md

@@ -52,7 +52,8 @@ from azure.digitaltwins.core import DigitalTwinsClient
 
 # - AZURE_URL: The URL to the ADT in Azure
 url = os.getenv("AZURE_URL")
-
+if url is None:
+    raise ValueError("AZURE_URL environment variable is not set")
 # DefaultAzureCredential expects the following three environment variables:
 # - AZURE_TENANT_ID: The tenant ID in Azure Active Directory
 # - AZURE_CLIENT_ID: The application (client) ID registered in the AAD tenant

sdk/digitaltwins/azure-digitaltwins-core/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/digitaltwins/azure-digitaltwins-core",
-  "Tag": "python/digitaltwins/azure-digitaltwins-core_c57b95066b"
+  "Tag": "python/digitaltwins/azure-digitaltwins-core_4136cfa681"
 }

sdk/digitaltwins/azure-digitaltwins-core/azure/digitaltwins/core/_digitaltwins_client.py

@@ -5,14 +5,25 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._azure_digital_twins_api import AzureDigitalTwinsAPI
-from ._version import VERSION
+from typing import TYPE_CHECKING
 
-__version__ = VERSION
-__all__ = ['AzureDigitalTwinsAPI']
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
 
-# `._patch.py` is used for handwritten extensions to the generated code
-# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
-from ._patch import patch_sdk
-patch_sdk()
+from ._azure_digital_twins_api import AzureDigitalTwinsAPI  # type: ignore
+
+try:
+    from ._patch import __all__ as _patch_all
+    from ._patch import *
+except ImportError:
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = [
+    "AzureDigitalTwinsAPI",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
+
+_patch_sdk()

sdk/digitaltwins/azure-digitaltwins-core/azure/digitaltwins/core/_generated/__init__.py

@@ -7,24 +7,30 @@
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import TYPE_CHECKING
-
-from msrest import Deserializer, Serializer
+from typing import Any, Optional, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core import PipelineClient
+from azure.core.pipeline import policies
+from azure.core.rest import HttpRequest, HttpResponse
 
-from . import models
+from . import models as _models
 from ._configuration import AzureDigitalTwinsAPIConfiguration
-from .operations import DigitalTwinModelsOperations, DigitalTwinsOperations, EventRoutesOperations, QueryOperations
+from ._utils.serialization import Deserializer, Serializer
+from .operations import (
+    DeleteJobsOperations,
+    DigitalTwinModelsOperations,
+    DigitalTwinsOperations,
+    EventRoutesOperations,
+    ImportJobsOperations,
+    QueryOperations,
+)
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
-    from azure.core.rest import HttpRequest, HttpResponse
 
-class AzureDigitalTwinsAPI(object):
+
+class AzureDigitalTwinsAPI:
     """A service for managing and querying digital twins and digital twin models.
 
     :ivar digital_twin_models: DigitalTwinModelsOperations operations
@@ -35,41 +41,74 @@ class AzureDigitalTwinsAPI(object):
     :vartype digital_twins: azure.digitaltwins.core.operations.DigitalTwinsOperations
     :ivar event_routes: EventRoutesOperations operations
     :vartype event_routes: azure.digitaltwins.core.operations.EventRoutesOperations
-    :param credential: Credential needed for the client to connect to Azure.
+    :ivar import_jobs: ImportJobsOperations operations
+    :vartype import_jobs: azure.digitaltwins.core.operations.ImportJobsOperations
+    :ivar delete_jobs: DeleteJobsOperations operations
+    :vartype delete_jobs: azure.digitaltwins.core.operations.DeleteJobsOperations
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
+    :param operation_id: ID for the operation's status monitor. The ID is generated if header was
+     not passed by the client. Default value is None.
+    :type operation_id: str
+    :param timeout_in_minutes: Desired timeout for the delete job. Once the specified timeout is
+     reached, service will stop any delete operations triggered by the current delete job that are
+     in progress, and go to a failed state. Please note that this will leave your instance in an
+     unknown state as there won't be any rollback operation. Default value is None.
+    :type timeout_in_minutes: int
     :param base_url: Service URL. Default value is "https://digitaltwins-hostname".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2022-05-31". Note that overriding
-     this default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-10-31". Note that overriding this
+     default value may result in unsupported behavior.
     :paramtype api_version: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
     """
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        base_url="https://digitaltwins-hostname",  # type: str
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        self._config = AzureDigitalTwinsAPIConfiguration(credential=credential, **kwargs)
-        self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs)
-
-        client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
+        credential: "TokenCredential",
+        operation_id: Optional[str] = None,
+        timeout_in_minutes: Optional[int] = None,
+        base_url: str = "https://digitaltwins-hostname",
+        **kwargs: Any
+    ) -> None:
+        self._config = AzureDigitalTwinsAPIConfiguration(
+            credential=credential, operation_id=operation_id, timeout_in_minutes=timeout_in_minutes, **kwargs
+        )
+
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs)
+
+        client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
         self._serialize.client_side_validation = False
-        self.digital_twin_models = DigitalTwinModelsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.digital_twin_models = DigitalTwinModelsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.query = QueryOperations(self._client, self._config, self._serialize, self._deserialize)
         self.digital_twins = DigitalTwinsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.event_routes = EventRoutesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.import_jobs = ImportJobsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.delete_jobs = DeleteJobsOperations(self._client, self._config, self._serialize, self._deserialize)
 
-
-    def _send_request(
-        self,
-        request,  # type: HttpRequest
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> HttpResponse
+    def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
@@ -78,7 +117,7 @@ def _send_request(
         >>> response = client._send_request(request)
         <HttpResponse: 200 OK>
 
-        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+        For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
 
         :param request: The network request you want to make. Required.
         :type request: ~azure.core.rest.HttpRequest
@@ -89,17 +128,14 @@ def _send_request(
 
         request_copy = deepcopy(request)
         request_copy.url = self._client.format_url(request_copy.url)
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
-    def close(self):
-        # type: () -> None
+    def close(self) -> None:
         self._client.close()
 
-    def __enter__(self):
-        # type: () -> AzureDigitalTwinsAPI
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
-    def __exit__(self, *exc_details):
-        # type: (Any) -> None
+    def __exit__(self, *exc_details: Any) -> None:
         self._client.__exit__(*exc_details)

sdk/digitaltwins/azure-digitaltwins-core/azure/digitaltwins/core/_generated/_azure_digital_twins_api.py

@@ -6,64 +6,69 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from typing import Any, Optional, TYPE_CHECKING
 
-from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 
-from ._version import VERSION
-
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
+VERSION = "unknown"
 
-class AzureDigitalTwinsAPIConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
+
+class AzureDigitalTwinsAPIConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for AzureDigitalTwinsAPI.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :keyword api_version: Api Version. Default value is "2022-05-31". Note that overriding
-     this default value may result in unsupported behavior.
+    :param operation_id: ID for the operation's status monitor. The ID is generated if header was
+     not passed by the client. Default value is None.
+    :type operation_id: str
+    :param timeout_in_minutes: Desired timeout for the delete job. Once the specified timeout is
+     reached, service will stop any delete operations triggered by the current delete job that are
+     in progress, and go to a failed state. Please note that this will leave your instance in an
+     unknown state as there won't be any rollback operation. Default value is None.
+    :type timeout_in_minutes: int
+    :keyword api_version: Api Version. Default value is "2023-10-31". Note that overriding this
+     default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        super(AzureDigitalTwinsAPIConfiguration, self).__init__(**kwargs)
-        api_version = kwargs.pop('api_version', "2022-05-31")  # type: str
+        credential: "TokenCredential",
+        operation_id: Optional[str] = None,
+        timeout_in_minutes: Optional[int] = None,
+        **kwargs: Any
+    ) -> None:
+        api_version: str = kwargs.pop("api_version", "2023-10-31")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
 
         self.credential = credential
+        self.operation_id = operation_id
+        self.timeout_in_minutes = timeout_in_minutes
         self.api_version = api_version
-        self.credential_scopes = kwargs.pop('credential_scopes', ['https://digitaltwins.azure.net/.default'])
-        kwargs.setdefault('sdk_moniker', 'azuredigitaltwinsapi/{}'.format(VERSION))
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://digitaltwins.azure.net/.default"])
+        kwargs.setdefault("sdk_moniker", "azuredigitaltwinsapi/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 
-    def _configure(
-        self,
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
-        self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
-        self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
-        self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
-        self.http_logging_policy = kwargs.get('http_logging_policy') or policies.HttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs)
-        self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
-        self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
-        self.authentication_policy = kwargs.get('authentication_policy')
+    def _configure(self, **kwargs: Any) -> None:
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
+        self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
+        self.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
-            self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
+            self.authentication_policy = policies.BearerTokenCredentialPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )

sdk/digitaltwins/azure-digitaltwins-core/azure/digitaltwins/core/_generated/_configuration.py

@@ -27,5 +27,8 @@
 
 # This file is used for handwritten extensions to the generated code. Example:
 # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
+
+__all__ = ["patch_sdk"]
+
 def patch_sdk():
-    pass
+    pass

sdk/digitaltwins/azure-digitaltwins-core/azure/digitaltwins/core/_generated/_patch.py

@@ -0,0 +1,6 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------