Minor change, address comments

Author: trollyxia

google/cloud/bigtable/data/_async/client.py

@@ -23,7 +23,6 @@
     Set,
     Sequence,
     TYPE_CHECKING,
-    Union,
 )
 
 import abc
@@ -660,7 +659,7 @@ async def execute_query(
             DeadlineExceeded,
             ServiceUnavailable,
         ),
-        column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+        column_info: dict[str, Message | EnumTypeWrapper] | None = None,
     ) -> "ExecuteQueryIteratorAsync":
         """
         Executes an SQL query on an instance.

google/cloud/bigtable/data/execute_query/_async/execute_query_iterator.py

@@ -21,7 +21,6 @@
     Sequence,
     Tuple,
     TYPE_CHECKING,
-    Union,
 )
 from google.api_core import retry as retries
 from google.protobuf.message import Message
@@ -90,7 +89,7 @@ def __init__(
         operation_timeout: float,
         req_metadata: Sequence[Tuple[str, str]] = (),
         retryable_excs: Sequence[type[Exception]] = (),
-        column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+        column_info: dict[str, Message | EnumTypeWrapper] | None = None,
     ) -> None:
         """
         Collects responses from ExecuteQuery requests and parses them into QueryResultRows.

google/cloud/bigtable/data/execute_query/_query_result_parsing_utils.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 from __future__ import annotations
 
-from typing import Any, Callable, Dict, Type, Union, Optional
-from typing_extensions import TypeAlias
+from typing import Any, Callable, Dict, Type, Optional, Union
 
 from google.protobuf.message import Message
 from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
@@ -44,8 +43,8 @@ def _parse_array_type(
     value: PBValue,
     metadata_type: SqlType.Array,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
-) -> Any:
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
+) -> list[Any]:
     """
     used for parsing an array represented as a protobuf to a python list.
     """
@@ -63,8 +62,8 @@ def _parse_map_type(
     value: PBValue,
     metadata_type: SqlType.Map,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
-) -> Any:
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
+) -> dict[Any, Any]:
     """
     used for parsing a map represented as a protobuf to a python dict.
 
@@ -104,7 +103,7 @@ def _parse_struct_type(
     value: PBValue,
     metadata_type: SqlType.Struct,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
 ) -> Struct:
     """
     used for parsing a struct represented as a protobuf to a
@@ -138,7 +137,7 @@ def _parse_timestamp_type(
     value: PBValue,
     metadata_type: SqlType.Timestamp,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
 ) -> DatetimeWithNanoseconds:
     """
     used for parsing a timestamp represented as a protobuf to DatetimeWithNanoseconds
@@ -150,7 +149,7 @@ def _parse_proto_type(
     value: PBValue,
     metadata_type: SqlType.Proto,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
 ) -> Message | bytes:
     """
     Parses a serialized protobuf message into a Message object using type information
@@ -188,7 +187,7 @@ def _parse_enum_type(
     value: PBValue,
     metadata_type: SqlType.Enum,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
 ) -> int | str:
     """
     Parses an integer value into a Protobuf enum name string using type information
@@ -221,7 +220,7 @@ def _parse_enum_type(
     return value.int_value
 
 
-ParserCallable: TypeAlias = Callable[
+ParserCallable = Callable[
     [PBValue, Any, Optional[str], Optional[Dict[str, Union[Message, EnumTypeWrapper]]]],
     Any,
 ]
@@ -240,7 +239,7 @@ def _parse_pb_value_to_python_value(
     value: PBValue,
     metadata_type: SqlType.Type,
     column_name: str | None,
-    column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+    column_info: dict[str, Message | EnumTypeWrapper] | None = None,
 ) -> Any:
     """
     used for converting the value represented as a protobufs to a python object.

google/cloud/bigtable/data/execute_query/_reader.py

@@ -20,7 +20,6 @@
     Iterable,
     Optional,
     Sequence,
-    Union,
 )
 from abc import ABC, abstractmethod
 from google.protobuf.message import Message
@@ -61,7 +60,7 @@ def consume(
         self,
         batches_to_consume: List[bytes],
         metadata: Metadata,
-        column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+        column_info: dict[str, Message | EnumTypeWrapper] | None = None,
     ) -> Optional[Iterable[T]]:
         """This method receives a list of batches of bytes to be parsed as ProtoRows messages.
         It then uses the metadata to group the values in the parsed messages into rows. Returns
@@ -101,7 +100,7 @@ def _construct_query_result_row(
         self,
         values: Sequence[PBValue],
         metadata: Metadata,
-        column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+        column_info: dict[str, Message | EnumTypeWrapper] | None = None,
     ) -> QueryResultRow:
         result = QueryResultRow()
         columns = metadata.columns
@@ -121,7 +120,7 @@ def consume(
         self,
         batches_to_consume: List[bytes],
         metadata: Metadata,
-        column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+        column_info: dict[str, Message | EnumTypeWrapper] | None = None,
     ) -> Optional[Iterable[QueryResultRow]]:
         num_columns = len(metadata.columns)
         rows = []

google/cloud/bigtable/data/execute_query/_sync_autogen/execute_query_iterator.py

@@ -16,10 +16,8 @@
 # This file is automatically generated by CrossSync. Do not edit manually.
 
 from __future__ import annotations
-from typing import Any, Dict, Optional, Sequence, Tuple, TYPE_CHECKING, Union
+from typing import Any, Dict, Optional, Sequence, Tuple, TYPE_CHECKING
 from google.api_core import retry as retries
-from google.protobuf.message import Message
-from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
 from google.cloud.bigtable.data.execute_query._byte_cursor import _ByteCursor
 from google.cloud.bigtable.data._helpers import (
     _attempt_timeout_generator,
@@ -65,7 +63,7 @@ def __init__(
         operation_timeout: float,
         req_metadata: Sequence[Tuple[str, str]] = (),
         retryable_excs: Sequence[type[Exception]] = (),
-        column_info: dict[str, Union[Message, EnumTypeWrapper]] | None = None,
+        column_info: Dict[str, Any] | None = None,
     ) -> None:
         """Collects responses from ExecuteQuery requests and parses them into QueryResultRows.