chore: update type hints to standard collections

This change is analogous to CloudSQL's change:
GoogleCloudPlatform/cloud-sql-python-connector#1183

Author: rhatgadkar-goog

google/cloud/alloydb/connector/async_connector.py

@@ -17,7 +17,7 @@
 import asyncio
 import logging
 from types import TracebackType
-from typing import Any, Dict, Optional, Type, TYPE_CHECKING, Union
+from typing import Any, Optional, Type, TYPE_CHECKING, Union
 
 import google.auth
 from google.auth.credentials import with_scopes_if_required
@@ -71,7 +71,7 @@ def __init__(
         user_agent: Optional[str] = None,
         refresh_strategy: str | RefreshStrategy = RefreshStrategy.BACKGROUND,
     ) -> None:
-        self._cache: Dict[str, Union[RefreshAheadCache, LazyRefreshCache]] = {}
+        self._cache: dict[str, Union[RefreshAheadCache, LazyRefreshCache]] = {}
         # initialize default params
         self._quota_project = quota_project
         self._alloydb_api_endpoint = alloydb_api_endpoint

google/cloud/alloydb/connector/client.py

@@ -16,7 +16,7 @@
 
 import asyncio
 import logging
-from typing import Dict, List, Optional, Tuple, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING
 
 import aiohttp
 from cryptography import x509
@@ -100,7 +100,7 @@ async def _get_metadata(
         region: str,
         cluster: str,
         name: str,
-    ) -> Dict[str, Optional[str]]:
+    ) -> dict[str, Optional[str]]:
         """
         Fetch the metadata for a given AlloyDB instance.
 
@@ -156,7 +156,7 @@ async def _get_client_certificate(
         region: str,
         cluster: str,
         pub_key: str,
-    ) -> Tuple[str, List[str]]:
+    ) -> tuple[str, list[str]]:
         """
         Fetch a client certificate for the given AlloyDB cluster.
 
@@ -172,7 +172,7 @@ async def _get_client_certificate(
             pub_key (str): PEM-encoded client public key.
 
         Returns:
-            Tuple[str, list[str]]: Tuple containing the CA certificate
+            tuple[str, list[str]]: tuple containing the CA certificate
                 and certificate chain for the AlloyDB instance.
         """
         headers = {

google/cloud/alloydb/connector/connection_info.py

@@ -17,7 +17,7 @@
 from dataclasses import dataclass
 import logging
 import ssl
-from typing import Dict, List, Optional, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING
 
 from aiofiles.tempfile import TemporaryDirectory
 
@@ -39,10 +39,10 @@ class ConnectionInfo:
     """Contains all necessary information to connect securely to the
     server-side Proxy running on an AlloyDB instance."""
 
-    cert_chain: List[str]
+    cert_chain: list[str]
     ca_cert: str
     key: rsa.RSAPrivateKey
-    ip_addrs: Dict[str, Optional[str]]
+    ip_addrs: dict[str, Optional[str]]
     expiration: datetime.datetime
     context: Optional[ssl.SSLContext] = None
 

google/cloud/alloydb/connector/connector.py

@@ -21,7 +21,7 @@
 import struct
 from threading import Thread
 from types import TracebackType
-from typing import Any, Dict, Optional, Type, TYPE_CHECKING, Union
+from typing import Any, Optional, Type, TYPE_CHECKING, Union
 
 from google.auth import default
 from google.auth.credentials import TokenState
@@ -87,7 +87,7 @@ def __init__(
         self._loop: asyncio.AbstractEventLoop = asyncio.new_event_loop()
         self._thread = Thread(target=self._loop.run_forever, daemon=True)
         self._thread.start()
-        self._cache: Dict[str, Union[RefreshAheadCache, LazyRefreshCache]] = {}
+        self._cache: dict[str, Union[RefreshAheadCache, LazyRefreshCache]] = {}
         # initialize default params
         self._quota_project = quota_project
         self._alloydb_api_endpoint = alloydb_api_endpoint

google/cloud/alloydb/connector/instance.py

@@ -20,7 +20,7 @@
 from datetime import timezone
 import logging
 import re
-from typing import Tuple, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from google.cloud.alloydb.connector.connection_info import ConnectionInfo
 from google.cloud.alloydb.connector.exceptions import RefreshError
@@ -40,7 +40,7 @@
 )
 
 
-def _parse_instance_uri(instance_uri: str) -> Tuple[str, str, str, str]:
+def _parse_instance_uri(instance_uri: str) -> tuple[str, str, str, str]:
     # should take form "projects/<PROJECT>/locations/<REGION>/clusters/<CLUSTER>/instances/<INSTANCE>"
     if INSTANCE_URI_REGEX.fullmatch(instance_uri) is None:
         raise ValueError(
@@ -69,14 +69,14 @@ class RefreshAheadCache:
         instance_uri (str): The instance URI of the AlloyDB instance.
             ex. projects/<PROJECT>/locations/<REGION>/clusters/<CLUSTER>/instances/<INSTANCE>
         client (AlloyDBClient): Client used to make requests to AlloyDB APIs.
-        keys (Tuple[rsa.RSAPrivateKey, str]): Private and Public key pair.
+        keys (tuple[rsa.RSAPrivateKey, str]): Private and Public key pair.
     """
 
     def __init__(
         self,
         instance_uri: str,
         client: AlloyDBClient,
-        keys: asyncio.Future[Tuple[rsa.RSAPrivateKey, str]],
+        keys: asyncio.Future[tuple[rsa.RSAPrivateKey, str]],
     ) -> None:
         # validate and parse instance_uri
         self._project, self._region, self._cluster, self._name = _parse_instance_uri(

google/cloud/alloydb/connector/utils.py

@@ -14,16 +14,14 @@
 
 from __future__ import annotations
 
-from typing import List, Tuple
-
 import aiofiles
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 
 
 async def _write_to_file(
-    dir_path: str, ca_cert: str, cert_chain: List[str], key: rsa.RSAPrivateKey
-) -> Tuple[str, str, str]:
+    dir_path: str, ca_cert: str, cert_chain: list[str], key: rsa.RSAPrivateKey
+) -> tuple[str, str, str]:
     """
     Helper function to write the server_ca, client certificate and
     private key to .pem files in a given directory.
@@ -48,7 +46,7 @@ async def _write_to_file(
     return (ca_filename, cert_chain_filename, key_filename)
 
 
-async def generate_keys() -> Tuple[rsa.RSAPrivateKey, str]:
+async def generate_keys() -> tuple[rsa.RSAPrivateKey, str]:
     priv_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
     pub_key = (
         priv_key.public_key()

tests/system/test_asyncpg_connection.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-from typing import Tuple
 
 # [START alloydb_sqlalchemy_connect_async_connector]
 import asyncpg
@@ -29,7 +28,7 @@ async def create_sqlalchemy_engine(
     password: str,
     db: str,
     refresh_strategy: str = "background",
-) -> Tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
+) -> tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
     """Creates a connection pool for an AlloyDB instance and returns the pool
     and the connector. Callers are responsible for closing the pool and the
     connector.

tests/system/test_asyncpg_iam_authn.py

@@ -14,7 +14,6 @@
 
 from datetime import datetime
 import os
-from typing import Tuple
 
 # [START alloydb_sqlalchemy_connect_async_connector_iam_authn]
 import asyncpg
@@ -26,7 +25,7 @@
 
 async def create_sqlalchemy_engine(
     inst_uri: str, user: str, db: str, refresh_strategy: str = "background"
-) -> Tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
+) -> tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
     """Creates a connection pool for an AlloyDB instance and returns the pool
     and the connector. Callers are responsible for closing the pool and the
     connector.

tests/system/test_asyncpg_psc.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-from typing import Tuple
 
 import asyncpg
 import pytest
@@ -28,7 +27,7 @@ async def create_sqlalchemy_engine(
     user: str,
     password: str,
     db: str,
-) -> Tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
+) -> tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
     """Creates a connection pool for an AlloyDB instance and returns the pool
     and the connector. Callers are responsible for closing the pool and the
     connector.

tests/system/test_asyncpg_public_ip.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-from typing import Tuple
 
 # [START alloydb_sqlalchemy_connect_async_connector_public_ip]
 import asyncpg
@@ -29,7 +28,7 @@ async def create_sqlalchemy_engine(
     user: str,
     password: str,
     db: str,
-) -> Tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
+) -> tuple[sqlalchemy.ext.asyncio.engine.AsyncEngine, AsyncConnector]:
     """Creates a connection pool for an AlloyDB instance and returns the pool
     and the connector. Callers are responsible for closing the pool and the
     connector.