fix(storage): resolve circular import issues in type hints

Author: bautsi

packages/google-cloud-storage/google/cloud/storage/bucket.py

@@ -18,17 +18,16 @@
 import copy
 import datetime
 import json
-from typing import Any, Optional, Set, Tuple, Union
 import warnings
+from typing import Any, Optional, Set, Tuple, Union, TYPE_CHECKING
 from urllib.parse import urlsplit
 
 from google.api_core import datetime_helpers
 from google.api_core.iam import Policy
 from google.api_core.retry import Retry
 from google.cloud._helpers import _datetime_to_rfc3339, _rfc3339_nanos_to_datetime
 from google.cloud.exceptions import NotFound
-
-from google.cloud.storage import Client, _signing
+from google.cloud.storage import _signing
 from google.cloud.storage._helpers import (
     _NOW,
     _UTC,
@@ -70,6 +69,9 @@
     ConditionalRetryPolicy,
 )
 
+if TYPE_CHECKING:
+    from google.cloud.storage.client import Client
+
 _UBLA_BPO_ENABLED_MESSAGE = (
     "Pass only one of 'uniform_bucket_level_access_enabled' / "
     "'bucket_policy_only_enabled' to 'IAMConfiguration'."
@@ -854,7 +856,7 @@ def blob(
         encryption_key: Optional[bytes] = None,
         kms_key_name: Optional[str] = None,
         generation: Optional[int] = None,
-    ) -> Blob:
+    ) -> "Blob":
         """Factory constructor for blob object.
 
         .. note::
@@ -1295,7 +1297,7 @@ def path(self):
     def get_blob(
         self,
         blob_name: str,
-        client: Optional[Client] = None,
+        client: Optional["Client"] = None,
         encryption_key: Optional[bytes] = None,
         generation: Optional[int] = None,
         if_etag_match: Optional[Union[str, Set[str]]] = None,

packages/google-cloud-storage/google/cloud/storage/client.py

@@ -21,8 +21,8 @@
 import functools
 import json
 import os
-from typing import Optional, Sequence, Tuple, Union
 import warnings
+from typing import Optional, Sequence, Tuple, Union
 
 import google.api_core.client_options
 from google.api_core import page_iterator
@@ -32,7 +32,6 @@
 from google.cloud._helpers import _LocalStack
 from google.cloud.client import ClientWithProject
 from google.cloud.exceptions import NotFound
-
 from google.cloud.storage._helpers import (
     _DEFAULT_SCHEME,
     _DEFAULT_UNIVERSE_DOMAIN,