Skip to content

Commit dd3b552

Browse files
hebaalazzehhebaalazzeh
committed
fix(generator): type annotate self._client_options in client.py.j2 to resolve mypy union-attr errors
1 parent 79005a0 commit dd3b552

13 files changed

Lines changed: 79 additions & 90 deletions

File tree

  • packages/gapic-generator
    • gapic/templates/%namespace/%name_%version/%sub/services/%service
    • tests/integration/goldens
      • asset/google/cloud/asset_v1/services/asset_service
      • credentials/google/iam/credentials_v1/services/iam_credentials
      • eventarc/google/cloud/eventarc_v1/services/eventarc
      • logging_internal/google/cloud/logging_v2/services
      • logging/google/cloud/logging_v2/services
      • redis_selective/google/cloud/redis_v1/services/cloud_redis
      • redis/google/cloud/redis_v1/services/cloud_redis
      • storagebatchoperations/google/cloud/storagebatchoperations_v1/services/storage_batch_operations

‎packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,13 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
565565
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
566566
creation failed for any reason.
567567
"""
568-
self._client_options = client_options
569-
if isinstance(self._client_options, dict):
570-
self._client_options = client_options_lib.from_dict(self._client_options)
571-
if self._client_options is None:
572-
self._client_options = client_options_lib.ClientOptions()
573-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
568+
if isinstance(client_options, dict):
569+
client_options = client_options_lib.from_dict(client_options)
570+
if client_options is None:
571+
client_options = client_options_lib.ClientOptions()
572+
self._client_options: client_options_lib.ClientOptions = cast(
573+
client_options_lib.ClientOptions, client_options
574+
)
574575

575576
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
576577

‎packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -723,13 +723,12 @@ def __init__(
723723
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
724724
creation failed for any reason.
725725
"""
726-
self._client_options = client_options
727-
if isinstance(self._client_options, dict):
728-
self._client_options = client_options_lib.from_dict(self._client_options)
729-
if self._client_options is None:
730-
self._client_options = client_options_lib.ClientOptions()
731-
self._client_options = cast(
732-
client_options_lib.ClientOptions, self._client_options
726+
if isinstance(client_options, dict):
727+
client_options = client_options_lib.from_dict(client_options)
728+
if client_options is None:
729+
client_options = client_options_lib.ClientOptions()
730+
self._client_options: client_options_lib.ClientOptions = cast(
731+
client_options_lib.ClientOptions, client_options
733732
)
734733

735734
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -622,13 +622,12 @@ def __init__(
622622
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
623623
creation failed for any reason.
624624
"""
625-
self._client_options = client_options
626-
if isinstance(self._client_options, dict):
627-
self._client_options = client_options_lib.from_dict(self._client_options)
628-
if self._client_options is None:
629-
self._client_options = client_options_lib.ClientOptions()
630-
self._client_options = cast(
631-
client_options_lib.ClientOptions, self._client_options
625+
if isinstance(client_options, dict):
626+
client_options = client_options_lib.from_dict(client_options)
627+
if client_options is None:
628+
client_options = client_options_lib.ClientOptions()
629+
self._client_options: client_options_lib.ClientOptions = cast(
630+
client_options_lib.ClientOptions, client_options
632631
)
633632

634633
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -960,13 +960,12 @@ def __init__(
960960
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
961961
creation failed for any reason.
962962
"""
963-
self._client_options = client_options
964-
if isinstance(self._client_options, dict):
965-
self._client_options = client_options_lib.from_dict(self._client_options)
966-
if self._client_options is None:
967-
self._client_options = client_options_lib.ClientOptions()
968-
self._client_options = cast(
969-
client_options_lib.ClientOptions, self._client_options
963+
if isinstance(client_options, dict):
964+
client_options = client_options_lib.from_dict(client_options)
965+
if client_options is None:
966+
client_options = client_options_lib.ClientOptions()
967+
self._client_options: client_options_lib.ClientOptions = cast(
968+
client_options_lib.ClientOptions, client_options
970969
)
971970

972971
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,12 @@ def __init__(
728728
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
729729
creation failed for any reason.
730730
"""
731-
self._client_options = client_options
732-
if isinstance(self._client_options, dict):
733-
self._client_options = client_options_lib.from_dict(self._client_options)
734-
if self._client_options is None:
735-
self._client_options = client_options_lib.ClientOptions()
736-
self._client_options = cast(
737-
client_options_lib.ClientOptions, self._client_options
731+
if isinstance(client_options, dict):
732+
client_options = client_options_lib.from_dict(client_options)
733+
if client_options is None:
734+
client_options = client_options_lib.ClientOptions()
735+
self._client_options: client_options_lib.ClientOptions = cast(
736+
client_options_lib.ClientOptions, client_options
738737
)
739738

740739
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,13 +610,12 @@ def __init__(
610610
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
611611
creation failed for any reason.
612612
"""
613-
self._client_options = client_options
614-
if isinstance(self._client_options, dict):
615-
self._client_options = client_options_lib.from_dict(self._client_options)
616-
if self._client_options is None:
617-
self._client_options = client_options_lib.ClientOptions()
618-
self._client_options = cast(
619-
client_options_lib.ClientOptions, self._client_options
613+
if isinstance(client_options, dict):
614+
client_options = client_options_lib.from_dict(client_options)
615+
if client_options is None:
616+
client_options = client_options_lib.ClientOptions()
617+
self._client_options: client_options_lib.ClientOptions = cast(
618+
client_options_lib.ClientOptions, client_options
620619
)
621620

622621
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -609,13 +609,12 @@ def __init__(
609609
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
610610
creation failed for any reason.
611611
"""
612-
self._client_options = client_options
613-
if isinstance(self._client_options, dict):
614-
self._client_options = client_options_lib.from_dict(self._client_options)
615-
if self._client_options is None:
616-
self._client_options = client_options_lib.ClientOptions()
617-
self._client_options = cast(
618-
client_options_lib.ClientOptions, self._client_options
612+
if isinstance(client_options, dict):
613+
client_options = client_options_lib.from_dict(client_options)
614+
if client_options is None:
615+
client_options = client_options_lib.ClientOptions()
616+
self._client_options: client_options_lib.ClientOptions = cast(
617+
client_options_lib.ClientOptions, client_options
619618
)
620619

621620
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/config_service_v2/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,12 @@ def __init__(
728728
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
729729
creation failed for any reason.
730730
"""
731-
self._client_options = client_options
732-
if isinstance(self._client_options, dict):
733-
self._client_options = client_options_lib.from_dict(self._client_options)
734-
if self._client_options is None:
735-
self._client_options = client_options_lib.ClientOptions()
736-
self._client_options = cast(
737-
client_options_lib.ClientOptions, self._client_options
731+
if isinstance(client_options, dict):
732+
client_options = client_options_lib.from_dict(client_options)
733+
if client_options is None:
734+
client_options = client_options_lib.ClientOptions()
735+
self._client_options: client_options_lib.ClientOptions = cast(
736+
client_options_lib.ClientOptions, client_options
738737
)
739738

740739
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/logging_service_v2/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,13 +610,12 @@ def __init__(
610610
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
611611
creation failed for any reason.
612612
"""
613-
self._client_options = client_options
614-
if isinstance(self._client_options, dict):
615-
self._client_options = client_options_lib.from_dict(self._client_options)
616-
if self._client_options is None:
617-
self._client_options = client_options_lib.ClientOptions()
618-
self._client_options = cast(
619-
client_options_lib.ClientOptions, self._client_options
613+
if isinstance(client_options, dict):
614+
client_options = client_options_lib.from_dict(client_options)
615+
if client_options is None:
616+
client_options = client_options_lib.ClientOptions()
617+
self._client_options: client_options_lib.ClientOptions = cast(
618+
client_options_lib.ClientOptions, client_options
620619
)
621620

622621
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

‎packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/metrics_service_v2/client.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -609,13 +609,12 @@ def __init__(
609609
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
610610
creation failed for any reason.
611611
"""
612-
self._client_options = client_options
613-
if isinstance(self._client_options, dict):
614-
self._client_options = client_options_lib.from_dict(self._client_options)
615-
if self._client_options is None:
616-
self._client_options = client_options_lib.ClientOptions()
617-
self._client_options = cast(
618-
client_options_lib.ClientOptions, self._client_options
612+
if isinstance(client_options, dict):
613+
client_options = client_options_lib.from_dict(client_options)
614+
if client_options is None:
615+
client_options = client_options_lib.ClientOptions()
616+
self._client_options: client_options_lib.ClientOptions = cast(
617+
client_options_lib.ClientOptions, client_options
619618
)
620619

621620
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

0 commit comments

Comments
 (0)