[Tables] Testing tsp migration

sdk/tables/azure-data-tables/MANIFEST.in

@@ -1,8 +1,7 @@
-recursive-include tests *.py *.yaml
 include *.md
-include azure/__init__.py
-include azure/data/__init__.py
 include LICENSE
+include azure/data/tables/_generated/py.typed
 recursive-include tests *.py
 recursive-include samples *.py *.md
-include azure/data/tables/py.typed
+include azure/__init__.py
+include azure/data/__init__.py

sdk/tables/azure-data-tables/_metadata.json

@@ -0,0 +1,3 @@
+{
+  "apiVersion": "2019-02-02"
+}

sdk/tables/azure-data-tables/apiview-properties.json

@@ -0,0 +1,50 @@
+{
+    "CrossLanguagePackageId": "Data.Tables",
+    "CrossLanguageDefinitionId": {
+        "azure.data.tables._generated.models.AccessPolicy": "Data.Tables.AccessPolicy",
+        "azure.data.tables._generated.models.CorsRule": "Data.Tables.CorsRule",
+        "azure.data.tables._generated.models.GeoReplication": "Data.Tables.GeoReplication",
+        "azure.data.tables._generated.models.Logging": "Data.Tables.Logging",
+        "azure.data.tables._generated.models.Metrics": "Data.Tables.Metrics",
+        "azure.data.tables._generated.models.RetentionPolicy": "Data.Tables.RetentionPolicy",
+        "azure.data.tables._generated.models.SignedIdentifier": "Data.Tables.SignedIdentifier",
+        "azure.data.tables._generated.models.TableEntityQueryResponse": "Data.Tables.TableEntityQueryResponse",
+        "azure.data.tables._generated.models.TableProperties": "Data.Tables.TableProperties",
+        "azure.data.tables._generated.models.TableResponse": "Data.Tables.TableResponse",
+        "azure.data.tables._generated.models.TablesError": "Data.Tables.TablesError",
+        "azure.data.tables._generated.models.TableServiceProperties": "Data.Tables.TableServiceProperties",
+        "azure.data.tables._generated.models.TableServiceStats": "Data.Tables.TableServiceStats",
+        "azure.data.tables._generated.models.TablesServiceError": "Data.Tables.TablesServiceError",
+        "azure.data.tables._generated.models.OdataMetadataFormat": "Data.Tables.OdataMetadataFormat",
+        "azure.data.tables._generated.models.ResponseFormat": "Data.Tables.ResponseFormat",
+        "azure.data.tables._generated.models.GeoReplicationStatusType": "Data.Tables.GeoReplicationStatusType",
+        "azure.data.tables._generated.operations.TableOperations.query": "Data.Tables.Table.query",
+        "azure.data.tables._generated.aio.operations.TableOperations.query": "Data.Tables.Table.query",
+        "azure.data.tables._generated.operations.TableOperations.create": "Data.Tables.Table.create",
+        "azure.data.tables._generated.aio.operations.TableOperations.create": "Data.Tables.Table.create",
+        "azure.data.tables._generated.operations.TableOperations.delete": "Data.Tables.Table.delete",
+        "azure.data.tables._generated.aio.operations.TableOperations.delete": "Data.Tables.Table.delete",
+        "azure.data.tables._generated.operations.TableOperations.query_entities": "Data.Tables.Table.queryEntities",
+        "azure.data.tables._generated.aio.operations.TableOperations.query_entities": "Data.Tables.Table.queryEntities",
+        "azure.data.tables._generated.operations.TableOperations.query_entity_with_partition_and_row_key": "Data.Tables.Table.queryEntityWithPartitionAndRowKey",
+        "azure.data.tables._generated.aio.operations.TableOperations.query_entity_with_partition_and_row_key": "Data.Tables.Table.queryEntityWithPartitionAndRowKey",
+        "azure.data.tables._generated.operations.TableOperations.update_entity": "Data.Tables.Table.updateEntity",
+        "azure.data.tables._generated.aio.operations.TableOperations.update_entity": "Data.Tables.Table.updateEntity",
+        "azure.data.tables._generated.operations.TableOperations.merge_entity": "Data.Tables.Table.mergeEntity",
+        "azure.data.tables._generated.aio.operations.TableOperations.merge_entity": "Data.Tables.Table.mergeEntity",
+        "azure.data.tables._generated.operations.TableOperations.delete_entity": "Data.Tables.Table.deleteEntity",
+        "azure.data.tables._generated.aio.operations.TableOperations.delete_entity": "Data.Tables.Table.deleteEntity",
+        "azure.data.tables._generated.operations.TableOperations.insert_entity": "Data.Tables.Table.insertEntity",
+        "azure.data.tables._generated.aio.operations.TableOperations.insert_entity": "Data.Tables.Table.insertEntity",
+        "azure.data.tables._generated.operations.TableOperations.get_access_policy": "Data.Tables.Table.getAccessPolicy",
+        "azure.data.tables._generated.aio.operations.TableOperations.get_access_policy": "Data.Tables.Table.getAccessPolicy",
+        "azure.data.tables._generated.operations.TableOperations.set_access_policy": "Data.Tables.Table.setAccessPolicy",
+        "azure.data.tables._generated.aio.operations.TableOperations.set_access_policy": "Data.Tables.Table.setAccessPolicy",
+        "azure.data.tables._generated.operations.ServiceOperations.set_properties": "Data.Tables.Service.setProperties",
+        "azure.data.tables._generated.aio.operations.ServiceOperations.set_properties": "Data.Tables.Service.setProperties",
+        "azure.data.tables._generated.operations.ServiceOperations.get_properties": "Data.Tables.Service.getProperties",
+        "azure.data.tables._generated.aio.operations.ServiceOperations.get_properties": "Data.Tables.Service.getProperties",
+        "azure.data.tables._generated.operations.ServiceOperations.get_statistics": "Data.Tables.Service.getStatistics",
+        "azure.data.tables._generated.aio.operations.ServiceOperations.get_statistics": "Data.Tables.Service.getStatistics"
+    }
+}

sdk/tables/azure-data-tables/azure/__init__.py

@@ -1 +1 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore

sdk/tables/azure-data-tables/azure/data/__init__.py

@@ -1 +1 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore

sdk/tables/azure-data-tables/azure/data/tables/__init__.py

@@ -50,4 +50,4 @@
     "TransactionOperation",
     "RequestTooLargeError",
     "EntityMetadata",
-]
+]

sdk/tables/azure-data-tables/azure/data/tables/_base_client.py

@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
@@ -26,7 +27,7 @@
     RequestIdPolicy,
 )
 
-from ._generated import AzureTable
+from ._generated import TablesClient as AzureTable
 from ._common_conversion import _is_cosmos_endpoint, _get_account
 from ._shared_access_signature import QueryStringConstants
 from ._constants import (
@@ -145,14 +146,20 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
             }
         self._hosts = _hosts
 
-        self._policies = self._configure_policies(audience=audience, hosts=self._hosts, **kwargs)
+        auth_policy, self._policies = self._configure_policies(audience=audience, hosts=self._hosts, **kwargs)
         if self._cosmos_endpoint:
             self._policies.insert(0, CosmosPatchTransformPolicy())
 
-        self._client = AzureTable(self.url, policies=kwargs.pop("policies", self._policies), **kwargs)
+        self._client = AzureTable(
+            self.url,
+            credential=credential,
+            authentication_policy=auth_policy,
+            policies=kwargs.pop("policies", self._policies),
+            **kwargs,
+        )
         # Incompatible assignment when assigning a str value to a Literal type variable
-        self._client._config.version = get_api_version(
-            api_version, self._client._config.version
+        self._client._config.api_version = get_api_version(
+            api_version, self._client._config.api_version
         )  # type: ignore[assignment]
 
     @property
@@ -219,7 +226,7 @@ def api_version(self) -> str:
         :return: The Storage API version.
         :type: str
         """
-        return self._client._config.version  # pylint: disable=protected-access
+        return self._client._config.api_version  # pylint: disable=protected-access
 
     def __enter__(self) -> Self:
         self._client.__enter__()
@@ -238,11 +245,11 @@ def _format_url(self, hostname):
         """
         return f"{self.scheme}://{hostname}{self._query_str}"
 
-    def _configure_policies(self, *, audience: Optional[str] = None, **kwargs: Any) -> List[Any]:
+    def _configure_policies(self, *, audience: Optional[str] = None, **kwargs: Any) -> tuple[Any, List[Any]]:
         credential_policy = _configure_credential(
             self.credential, cosmos_endpoint=self._cosmos_endpoint, audience=audience
         )
-        return [
+        return credential_policy, [
             RequestIdPolicy(**kwargs),
             StorageHeadersPolicy(**kwargs),
             UserAgentPolicy(sdk_moniker=SDK_MONIKER, **kwargs),

sdk/tables/azure-data-tables/azure/data/tables/_generated/__init__.py

@@ -2,25 +2,31 @@
 # --------------------------------------------------------------------------
 # 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.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._client import AzureTable
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._client import TablesClient  # type: ignore
 from ._version import VERSION
 
 __version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
-    "AzureTable",
+    "TablesClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()

sdk/tables/azure-data-tables/azure/data/tables/_generated/_client.py

@@ -2,52 +2,73 @@
 # --------------------------------------------------------------------------
 # 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.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any
+from typing import Any, 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 as _models
-from ._configuration import AzureTableConfiguration
-from ._serialization import Deserializer, Serializer
+from ._configuration import TablesClientConfiguration
+from ._utils.serialization import Deserializer, Serializer
 from .operations import ServiceOperations, TableOperations
 
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
 
-class AzureTable:  # pylint: disable=client-accepts-api-version-keyword
-    """AzureTable.
+
+class TablesClient:
+    """TablesClient.
 
     :ivar table: TableOperations operations
-    :vartype table: azure.table.operations.TableOperations
+    :vartype table: azure.data.tables._generated.operations.TableOperations
     :ivar service: ServiceOperations operations
-    :vartype service: azure.table.operations.ServiceOperations
-    :param url: The URL of the service account or table that is the target of the desired
-     operation. Required.
+    :vartype service: azure.data.tables._generated.operations.ServiceOperations
+    :param url: The host name of the tables account, e.g. accountName.table.core.windows.net.
+     Required.
     :type url: str
-    :keyword version: Specifies the version of the operation to use for this request. Default value
-     is "2019-02-02". Note that overriding this default value may result in unsupported behavior.
-    :paramtype version: str
+    :param credential: Credential used to authenticate requests to the service. Required.
+    :type credential: ~azure.core.credentials.TokenCredential
+    :keyword api_version: The API version. Default value is "2019-02-02". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     """
 
-    def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
-        self, url: str, **kwargs: Any
-    ) -> None:
+    def __init__(self, url: str, credential: "TokenCredential", **kwargs: Any) -> None:
         _endpoint = "{url}"
-        self._config = AzureTableConfiguration(url=url, **kwargs)
-        self._client: PipelineClient = PipelineClient(base_url=_endpoint, config=self._config, **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._config = TablesClientConfiguration(url=url, credential=credential, **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=_endpoint, policies=_policies, **kwargs)
+
+        self._serialize = Serializer()
+        self._deserialize = Deserializer()
         self._serialize.client_side_validation = False
         self.table = TableOperations(self._client, self._config, self._serialize, self._deserialize)
         self.service = ServiceOperations(self._client, self._config, self._serialize, self._deserialize)
 
-    def send_request(self, request: HttpRequest, **kwargs: Any) -> 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
@@ -71,12 +92,12 @@ def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         }
 
         request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "AzureTable":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 

sdk/tables/azure-data-tables/azure/data/tables/_generated/_configuration.py

@@ -2,48 +2,50 @@
 # --------------------------------------------------------------------------
 # 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.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
-from typing import Any
+from typing import Any, TYPE_CHECKING
 
-from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 
 from ._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
 
 
-class AzureTableConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
-    """Configuration for AzureTable.
+class TablesClientConfiguration:  # pylint: disable=too-many-instance-attributes
+    """Configuration for TablesClient.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param url: The URL of the service account or table that is the target of the desired
-     operation. Required.
+    :param url: The host name of the tables account, e.g. accountName.table.core.windows.net.
+     Required.
     :type url: str
-    :keyword version: Specifies the version of the operation to use for this request. Default value
-     is "2019-02-02". Note that overriding this default value may result in unsupported behavior.
-    :paramtype version: str
+    :param credential: Credential used to authenticate requests to the service. Required.
+    :type credential: ~azure.core.credentials.TokenCredential
+    :keyword api_version: The API version. Default value is "2019-02-02". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     """
 
-    def __init__(self, url: str, **kwargs: Any) -> None:
-        super(AzureTableConfiguration, self).__init__(**kwargs)
-        version: Literal["2019-02-02"] = kwargs.pop("version", "2019-02-02")
+    def __init__(self, url: str, credential: "TokenCredential", **kwargs: Any) -> None:
+        api_version: str = kwargs.pop("api_version", "2019-02-02")
 
         if url is None:
             raise ValueError("Parameter 'url' must not be None.")
+        if credential is None:
+            raise ValueError("Parameter 'credential' must not be None.")
 
         self.url = url
-        self.version = version
-        kwargs.setdefault("sdk_moniker", "table/{}".format(VERSION))
+        self.credential = credential
+        self.api_version = api_version
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://storage.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "data-tables/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
@@ -52,7 +54,11 @@ def _configure(self, **kwargs: Any) -> None:
         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.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
+            )

sdk/tables/azure-data-tables/azure/data/tables/_generated/_serialization.py

@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
 # --------------------------------------------------------------------------
 #
 # Copyright (c) Microsoft Corporation. All rights reserved.