[Tables] Fix pylint errors (#33686)

* Fix pylint errors

* Fix the same pylint error in other client ops

* Address same errors in base_client.py

* Remove two unnecessary pylint ignores

* Fix errors in Analyze

Author: Yalin Li

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

@@ -7,7 +7,7 @@
 import os
 from uuid import uuid4
 from urllib.parse import parse_qs, quote, urlparse
-from typing import Any, Dict, List, Optional, Mapping, Union
+from typing import Any, List, Optional, Mapping, Union
 from typing_extensions import Self
 
 from azure.core.credentials import AzureSasCredential, AzureNamedKeyCredential, TokenCredential
@@ -49,8 +49,7 @@
 _DEV_CONN_STRING = "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1"  # pylint: disable=line-too-long
 
 
-def get_api_version(kwargs: Dict[str, Any], default: str) -> str:
-    api_version = kwargs.pop("api_version", None)
+def get_api_version(api_version: Optional[str], default: str) -> str:
     if api_version and api_version not in _SUPPORTED_API_VERSIONS:
         versions = "\n".join(_SUPPORTED_API_VERSIONS)
         raise ValueError(f"Unsupported API version '{api_version}'. Please select from:\n{versions}")
@@ -71,6 +70,7 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         endpoint: str,
         *,
         credential: Optional[Union[AzureSasCredential, AzureNamedKeyCredential, TokenCredential]] = None,
+        api_version: Optional[str] = None,
         **kwargs: Any,
     ) -> None:
         """
@@ -135,7 +135,9 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
 
         self._client = AzureTable(self.url, 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(kwargs, self._client._config.version)  # type: ignore[assignment]
+        self._client._config.version = get_api_version(
+            api_version, self._client._config.version
+        )  # type: ignore[assignment]
 
     @property
     def url(self) -> str:

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

@@ -43,7 +43,7 @@ def _prepare_key(keyvalue: str) -> str:
         raise TypeError("PartitionKey or RowKey must be of type string.") from exc
 
 
-def _parameter_filter_substitution(parameters: Dict[str, str], query_filter: str) -> str:
+def _parameter_filter_substitution(parameters: Optional[Dict[str, str]], query_filter: str) -> str:
     """Replace user defined parameters in filter.
 
     :param parameters: User defined parameters

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

@@ -60,6 +60,7 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         table_name: str,
         *,
         credential: Optional[Union[AzureSasCredential, AzureNamedKeyCredential, TokenCredential]] = None,
+        api_version: Optional[str] = None,
         **kwargs: Any,
     ) -> None:
         """Create TableClient from a Credential.
@@ -82,7 +83,7 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         if not table_name:
             raise ValueError("Please specify a table name.")
         self.table_name: str = table_name
-        super(TableClient, self).__init__(endpoint, credential=credential, **kwargs)
+        super(TableClient, self).__init__(endpoint, credential=credential, api_version=api_version, **kwargs)
 
     @classmethod
     def from_connection_string(cls, conn_str: str, table_name: str, **kwargs: Any) -> "TableClient":
@@ -263,7 +264,15 @@ def delete_table(self, **kwargs) -> None:
                 raise
 
     @overload
-    def delete_entity(self, partition_key: str, row_key: str, **kwargs: Any) -> None:
+    def delete_entity(
+        self,
+        partition_key: str,
+        row_key: str,
+        *,
+        etag: Optional[str] = None,
+        match_condition: Optional[MatchConditions] = None,
+        **kwargs: Any,
+    ) -> None:
         """Deletes the specified entity in a table. No error will be raised if
         the entity or PartitionKey-RowKey pairing is not found.
 
@@ -288,7 +297,14 @@ def delete_entity(self, partition_key: str, row_key: str, **kwargs: Any) -> None
         """
 
     @overload
-    def delete_entity(self, entity: EntityType, **kwargs: Any) -> None:
+    def delete_entity(
+        self,
+        entity: EntityType,
+        *,
+        etag: Optional[str] = None,
+        match_condition: Optional[MatchConditions] = None,
+        **kwargs: Any,
+    ) -> None:
         """Deletes the specified entity in a table. No error will be raised if
         the entity or PartitionKey-RowKey pairing is not found.
 
@@ -390,7 +406,15 @@ def create_entity(self, entity: EntityType, **kwargs) -> Dict[str, Any]:
         return _trim_service_metadata(metadata, content=content)
 
     @distributed_trace
-    def update_entity(self, entity: EntityType, mode: UpdateMode = UpdateMode.MERGE, **kwargs) -> Dict[str, Any]:
+    def update_entity(
+        self,
+        entity: EntityType,
+        mode: UpdateMode = UpdateMode.MERGE,
+        *,
+        etag: Optional[str] = None,
+        match_condition: Optional[MatchConditions] = None,
+        **kwargs,
+    ) -> Dict[str, Any]:
         """Update entity in a table.
 
         :param entity: The properties for the table entity.
@@ -415,8 +439,6 @@ def update_entity(self, entity: EntityType, mode: UpdateMode = UpdateMode.MERGE,
                 :dedent: 16
                 :caption: Updating an already exiting entity in a Table
         """
-        match_condition = kwargs.pop("match_condition", None)
-        etag = kwargs.pop("etag", None)
         if match_condition and not etag and isinstance(entity, TableEntity):
             etag = entity.metadata.get("etag")
         match_condition = _get_match_condition(
@@ -462,7 +484,13 @@ def update_entity(self, entity: EntityType, mode: UpdateMode = UpdateMode.MERGE,
         return _trim_service_metadata(metadata, content=content)
 
     @distributed_trace
-    def list_entities(self, **kwargs) -> ItemPaged[TableEntity]:
+    def list_entities(
+        self,
+        *,
+        results_per_page: Optional[int] = None,
+        select: Optional[Union[str, List[str]]] = None,
+        **kwargs,
+    ) -> ItemPaged[TableEntity]:
         """Lists entities in a table.
 
         :keyword int results_per_page: Number of entities returned per service request.
@@ -481,22 +509,28 @@ def list_entities(self, **kwargs) -> ItemPaged[TableEntity]:
                 :dedent: 16
                 :caption: List all entities held within a table
         """
-        user_select = kwargs.pop("select", None)
-        if user_select and not isinstance(user_select, str):
-            user_select = ",".join(user_select)
-        top = kwargs.pop("results_per_page", None)
+        if select and not isinstance(select, str):
+            select = ",".join(select)
 
         command = functools.partial(self._client.table.query_entities, **kwargs)
         return ItemPaged(
             command,
             table=self.table_name,
-            results_per_page=top,
-            select=user_select,
+            results_per_page=results_per_page,
+            select=select,
             page_iterator_class=TableEntityPropertiesPaged,
         )
 
     @distributed_trace
-    def query_entities(self, query_filter: str, **kwargs) -> ItemPaged[TableEntity]:
+    def query_entities(
+        self,
+        query_filter: str,
+        *,
+        results_per_page: Optional[int] = None,
+        select: Optional[Union[str, List[str]]] = None,
+        parameters: Optional[Dict[str, Any]] = None,
+        **kwargs,
+    ) -> ItemPaged[TableEntity]:
         # pylint: disable=line-too-long
         """Lists entities in a table.
 
@@ -520,25 +554,29 @@ def query_entities(self, query_filter: str, **kwargs) -> ItemPaged[TableEntity]:
                 :dedent: 8
                 :caption: Query entities held within a table
         """
-        parameters = kwargs.pop("parameters", None)
         query_filter = _parameter_filter_substitution(parameters, query_filter)
-        top = kwargs.pop("results_per_page", None)
-        user_select = kwargs.pop("select", None)
-        if user_select and not isinstance(user_select, str):
-            user_select = ",".join(user_select)
+        if select and not isinstance(select, str):
+            select = ",".join(select)
 
         command = functools.partial(self._client.table.query_entities, **kwargs)
         return ItemPaged(
             command,
             table=self.table_name,
-            results_per_page=top,
+            results_per_page=results_per_page,
             filter=query_filter,
-            select=user_select,
+            select=select,
             page_iterator_class=TableEntityPropertiesPaged,
         )
 
     @distributed_trace
-    def get_entity(self, partition_key: str, row_key: str, **kwargs) -> TableEntity:
+    def get_entity(
+        self,
+        partition_key: str,
+        row_key: str,
+        *,
+        select: Optional[Union[str, List[str]]] = None,
+        **kwargs,
+    ) -> TableEntity:
         """Get a single entity in a table.
 
         :param partition_key: The partition key of the entity.
@@ -560,9 +598,11 @@ def get_entity(self, partition_key: str, row_key: str, **kwargs) -> TableEntity:
                 :dedent: 16
                 :caption: Get a single entity from a table
         """
-        user_select = kwargs.pop("select", None)
-        if user_select and not isinstance(user_select, str):
-            user_select = ",".join(user_select)
+        user_select = None
+        if select and not isinstance(select, str):
+            user_select = ",".join(select)
+        elif isinstance(select, str):
+            user_select = select
         try:
             entity = self._client.table.query_entity_with_partition_and_row_key(
                 table=self.table_name,

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

@@ -240,7 +240,14 @@ def delete_table(self, table_name: str, **kwargs) -> None:
         table.delete_table(**kwargs)
 
     @distributed_trace
-    def query_tables(self, query_filter: str, **kwargs) -> ItemPaged[TableItem]:
+    def query_tables(
+        self,
+        query_filter: str,
+        *,
+        results_per_page: Optional[int] = None,
+        parameters: Optional[Dict[str, Any]] = None,
+        **kwargs,
+    ) -> ItemPaged[TableItem]:
         """Queries tables under the given account.
 
         :param str query_filter: Specify a filter to return certain tables.
@@ -260,20 +267,18 @@ def query_tables(self, query_filter: str, **kwargs) -> ItemPaged[TableItem]:
                 :dedent: 16
                 :caption: Querying tables in a storage account
         """
-        parameters = kwargs.pop("parameters", None)
         query_filter = _parameter_filter_substitution(parameters, query_filter)
-        top = kwargs.pop("results_per_page", None)
 
         command = functools.partial(self._client.table.query, **kwargs)
         return ItemPaged(
             command,
-            results_per_page=top,
+            results_per_page=results_per_page,
             filter=query_filter,
             page_iterator_class=TablePropertiesPaged,
         )
 
     @distributed_trace
-    def list_tables(self, **kwargs) -> ItemPaged[TableItem]:
+    def list_tables(self, *, results_per_page: Optional[int] = None, **kwargs) -> ItemPaged[TableItem]:
         """Queries tables under the given account.
 
         :keyword int results_per_page: Number of tables per page in returned ItemPaged
@@ -290,12 +295,10 @@ def list_tables(self, **kwargs) -> ItemPaged[TableItem]:
                 :dedent: 16
                 :caption: Listing all tables in a storage account
         """
-        top = kwargs.pop("results_per_page", None)
-
         command = functools.partial(self._client.table.query, **kwargs)
         return ItemPaged(
             command,
-            results_per_page=top,
+            results_per_page=results_per_page,
             page_iterator_class=TablePropertiesPaged,
         )
 

sdk/tables/azure-data-tables/azure/data/tables/aio/_base_client_async.py

@@ -57,6 +57,7 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         endpoint: str,
         *,
         credential: Optional[Union[AzureSasCredential, AzureNamedKeyCredential, AsyncTokenCredential]] = None,
+        api_version: Optional[str] = None,
         **kwargs: Any,
     ) -> None:
         """
@@ -121,7 +122,9 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
 
         self._client = AzureTable(self.url, 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(kwargs, self._client._config.version)  # type: ignore[assignment]
+        self._client._config.version = get_api_version(
+            api_version, self._client._config.version
+        )  # type: ignore[assignment]
 
     @property
     def url(self) -> str: