chore(gapic): apply blacken/ruff format to generator

Author: chalmerlowe

packages/gapic-generator/gapic/schema/api.py

@@ -36,35 +36,29 @@
     Set,
     Tuple,
 )
-import yaml
 
+import grpc  # type: ignore
+import yaml
+from gapic.schema import metadata, mixins, wrappers
+from gapic.schema import naming as api_naming
+from gapic.utils import RESERVED_NAMES, Options, cached_property, nth, to_snake_case
+from google.api import (
+    annotations_pb2,  # type: ignore
+    client_pb2,  # type: ignore
+    http_pb2,  # type: ignore
+    resource_pb2,  # type: ignore
+    service_pb2,  # type: ignore
+)
 from google.api_core import exceptions
-from google.api import client_pb2  # type: ignore
-from google.api import http_pb2  # type: ignore
-from google.api import resource_pb2  # type: ignore
-from google.api import service_pb2  # type: ignore
 from google.cloud import extended_operations_pb2 as ex_ops_pb2  # type: ignore
+from google.cloud.location import locations_pb2  # type: ignore
 from google.gapic.metadata import gapic_metadata_pb2  # type: ignore
-from google.longrunning import operations_pb2  # type: ignore
 from google.iam.v1 import iam_policy_pb2  # type: ignore
-from google.cloud.location import locations_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import descriptor_pb2  # type: ignore
-from google.protobuf.json_format import MessageToJson
-from google.protobuf.json_format import ParseDict
 from google.protobuf.descriptor import ServiceDescriptor
-import grpc  # type: ignore
 from google.protobuf.descriptor_pb2 import MethodDescriptorProto
-from google.api import annotations_pb2  # type: ignore
-from gapic.schema import metadata
-from gapic.schema import mixins
-from gapic.schema import wrappers
-from gapic.schema import naming as api_naming
-from gapic.utils import cached_property
-from gapic.utils import nth
-from gapic.utils import Options
-from gapic.utils import to_snake_case
-from gapic.utils import RESERVED_NAMES
-
+from google.protobuf.json_format import MessageToJson, ParseDict
 
 TRANSPORT_GRPC = "grpc"
 TRANSPORT_GRPC_ASYNC = "grpc-async"
@@ -160,7 +154,12 @@ def messages(self) -> Mapping[str, wrappers.MessageType]:
     def resource_messages(self) -> Mapping[str, wrappers.MessageType]:
         """Return the file level resources of the proto."""
         file_resource_messages = (
-            (res.type, wrappers.CommonResource.build(res, aliases=self.resource_name_aliases).message_type)
+            (
+                res.type,
+                wrappers.CommonResource.build(
+                    res, aliases=self.resource_name_aliases
+                ).message_type,
+            )
             for res in self.file_pb2.options.Extensions[
                 resource_pb2.resource_definition
             ]
@@ -179,7 +178,7 @@ def resource_messages(self) -> Mapping[str, wrappers.MessageType]:
                     file_resource_messages,
                     resource_messages,
                 ),
-                key=lambda item: item[0]
+                key=lambda item: item[0],
             )
         )
 
@@ -319,7 +318,8 @@ def with_selective_generation(
             new_v = v.with_selective_generation(
                 generate_omitted_as_internal=generate_omitted_as_internal,
                 public_methods=public_methods,
-                excluded_addresses=excluded_addresses)
+                excluded_addresses=excluded_addresses,
+            )
             if new_v:
                 services[k] = new_v
 
@@ -331,7 +331,9 @@ def with_selective_generation(
         # This ensures that shared messages, messages not attached to any RPC,
         # and messages reachable via other paths (like LRO response types) are KEPT.
         all_messages = {
-            k: v for k, v in self.all_messages.items() if v.ident not in excluded_addresses
+            k: v
+            for k, v in self.all_messages.items()
+            if v.ident not in excluded_addresses
         }
 
         all_enums = {
@@ -340,7 +342,12 @@ def with_selective_generation(
 
         # If the proto becomes empty after pruning, we return None to signal
         # that it should be excluded from generation.
-        if not generate_omitted_as_internal and not services and not all_messages and not all_enums:
+        if (
+            not generate_omitted_as_internal
+            and not services
+            and not all_messages
+            and not all_enums
+        ):
             return None
 
         return dataclasses.replace(
@@ -521,9 +528,14 @@ def disambiguate_keyword_sanitize_fname(
                             excluded_addresses=set([]),
                         )
                 else:
-                    all_resource_messages = dict(collections.ChainMap(
-                        *(proto.resource_messages for proto in api.all_protos.values())
-                    ))
+                    all_resource_messages = dict(
+                        collections.ChainMap(
+                            *(
+                                proto.resource_messages
+                                for proto in api.all_protos.values()
+                            )
+                        )
+                    )
 
                     # Create a global map of services to support cross-proto lookup
                     # for extended LROs.
@@ -550,19 +562,31 @@ def disambiguate_keyword_sanitize_fname(
                             for method in service.methods.values():
                                 if method.ident.proto not in selective_gapic_methods:
                                     # Candidate for exclusion: the method itself and its direct request/response types.
-                                    candidate_excluded_addresses.add(method.meta.address)
+                                    candidate_excluded_addresses.add(
+                                        method.meta.address
+                                    )
                                     candidate_excluded_addresses.add(method.input.ident)
-                                    candidate_excluded_addresses.add(method.output.ident)
+                                    candidate_excluded_addresses.add(
+                                        method.output.ident
+                                    )
 
                                     # If this is an LRO, add its response and metadata types to candidates.
                                     if method.lro:
-                                        candidate_excluded_addresses.add(method.lro.response_type.ident)
-                                        candidate_excluded_addresses.add(method.lro.metadata_type.ident)
+                                        candidate_excluded_addresses.add(
+                                            method.lro.response_type.ident
+                                        )
+                                        candidate_excluded_addresses.add(
+                                            method.lro.metadata_type.ident
+                                        )
 
                                     # If this is an extended LRO, add its request and operation types to candidates.
                                     if method.extended_lro:
-                                        candidate_excluded_addresses.add(method.extended_lro.request_type.ident)
-                                        candidate_excluded_addresses.add(method.extended_lro.operation_type.ident)
+                                        candidate_excluded_addresses.add(
+                                            method.extended_lro.request_type.ident
+                                        )
+                                        candidate_excluded_addresses.add(
+                                            method.extended_lro.operation_type.ident
+                                        )
 
                     # Calculate publicly reachable addresses (API-wide).
                     # This includes all types reachable from the allowlisted (public) methods.
@@ -581,7 +605,9 @@ def disambiguate_keyword_sanitize_fname(
                     # This set difference effectively "vets" the candidates. If a candidate
                     # message is actually reachable from a public RPC, it's removed from
                     # the exclusion list.
-                    excluded_addresses = candidate_excluded_addresses - public_rpc_addresses
+                    excluded_addresses = (
+                        candidate_excluded_addresses - public_rpc_addresses
+                    )
 
                     for name, proto in api.protos.items():
                         proto_to_generate = proto.with_selective_generation(

packages/gapic-generator/gapic/schema/wrappers.py

@@ -37,39 +37,38 @@
 from itertools import chain
 from typing import (
     Any,
-    cast,
+    ClassVar,
     Dict,
     FrozenSet,
-    Iterator,
     Iterable,
+    Iterator,
     List,
     Mapping,
-    ClassVar,
     Optional,
+    Pattern,
     Sequence,
     Set,
     Tuple,
     Union,
-    Pattern,
+    cast,
 )
-from google.api import annotations_pb2  # type: ignore
-from google.api import client_pb2
-from google.api import field_behavior_pb2
-from google.api import field_info_pb2
-from google.api import http_pb2
-from google.api import resource_pb2
-from google.api import routing_pb2
-from google.api_core import exceptions
-from google.api_core import path_template
-from google.cloud import extended_operations_pb2 as ex_ops_pb2  # type: ignore
-from google.protobuf import descriptor_pb2  # type: ignore
-from google.protobuf.json_format import MessageToDict  # type: ignore
 
 from gapic import utils
 from gapic.schema import metadata
-from gapic.utils import cached_proto_context
-from gapic.utils import uri_sample
-from gapic.utils import make_private
+from gapic.utils import cached_proto_context, make_private, uri_sample
+from google.api import (
+    annotations_pb2,  # type: ignore
+    client_pb2,
+    field_behavior_pb2,
+    field_info_pb2,
+    http_pb2,
+    resource_pb2,
+    routing_pb2,
+)
+from google.api_core import exceptions, path_template
+from google.cloud import extended_operations_pb2 as ex_ops_pb2  # type: ignore
+from google.protobuf import descriptor_pb2  # type: ignore
+from google.protobuf.json_format import MessageToDict  # type: ignore
 
 
 @dataclasses.dataclass(frozen=True)
@@ -691,7 +690,7 @@ def resource_type(self) -> Optional[str]:
         resource = self.options.Extensions[resource_pb2.resource]
         if not resource.type:
             return None
-            
+
         default_type = resource.type[resource.type.find("/") + 1 :]
 
         return self.resource_name_aliases.get(resource.type, default_type)
@@ -2091,16 +2090,23 @@ def with_selective_generation(
             return None
 
 
-
 @dataclasses.dataclass(frozen=True)
 class CommonResource:
     type_name: str
     pattern: str
     resource_name_aliases: Mapping[str, str] = dataclasses.field(default_factory=dict)
 
     @classmethod
-    def build(cls, resource: resource_pb2.ResourceDescriptor, aliases: Optional[Mapping[str, str]] = None):
-        return cls(type_name=resource.type, pattern=next(iter(resource.pattern)), resource_name_aliases=aliases or {})
+    def build(
+        cls,
+        resource: resource_pb2.ResourceDescriptor,
+        aliases: Optional[Mapping[str, str]] = None,
+    ):
+        return cls(
+            type_name=resource.type,
+            pattern=next(iter(resource.pattern)),
+            resource_name_aliases=aliases or {},
+        )
 
     @utils.cached_property
     def message_type(self):
@@ -2295,7 +2301,7 @@ def names(self) -> FrozenSet[str]:
         return frozenset(answer)
 
     @utils.cached_property
-    def resource_messages(self) -> Sequence['MessageType']:
+    def resource_messages(self) -> Sequence["MessageType"]:
         """Returns all the resource message types used in all
         request and response fields in the service."""
 
@@ -2336,8 +2342,7 @@ def gen_indirect_resources_used(message):
         # Convert the set to a sorted tuple using the resource path or message name.
         # This is needed to prevent non-deterministic code generation.
         sorted_messages = sorted(
-            unique_messages,
-            key=lambda m: m.resource_type_full_path or m.name
+            unique_messages, key=lambda m: m.resource_type_full_path or m.name
         )
 
         # Fail-fast collision detection
@@ -2350,7 +2355,7 @@ def gen_indirect_resources_used(message):
                     f"\n\nFatal: Message '{msg.name}' defines a resource pattern but is missing a resource type. "
                     f"This violates AIP-123 (https://google.aip.dev/123). Please define a 'type' in the google.api.resource option."
                 )
-                
+
             if res_type in seen_types:
                 incumbent = seen_types[res_type]
                 raise ValueError(
@@ -2500,7 +2505,8 @@ def with_selective_generation(
             new_v = v.with_selective_generation(
                 generate_omitted_as_internal=generate_omitted_as_internal,
                 public_methods=public_methods,
-                excluded_addresses=excluded_addresses)
+                excluded_addresses=excluded_addresses,
+            )
             if new_v:
                 methods[k] = new_v
 

packages/gapic-generator/gapic/utils/options.py

@@ -12,16 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from collections import defaultdict
-from os import path
-from typing import Any, DefaultDict, Dict, FrozenSet, List, Optional, Tuple
-
 import dataclasses
 import json
 import os
 import warnings
-import yaml
+from collections import defaultdict
+from os import path
+from typing import Any, DefaultDict, Dict, FrozenSet, List, Optional, Tuple
 
+import yaml
 from gapic.samplegen_utils import utils as samplegen_utils
 
 
@@ -74,7 +73,7 @@ class Options:
             # For example, 'google.cloud.api.v1+google.cloud.anotherapi.v2'
             "proto-plus-deps",
             "gapic-version",  # A version string following https://peps.python.org/pep-0440,
-            # Resolves method name collisions by mapping a fully qualified 
+            # Resolves method name collisions by mapping a fully qualified
             # resource path to a custom TitleCase alias.
             # Format: resource.path/Name:AliasName
             "resource-name-alias",
@@ -196,26 +195,26 @@ def tweak_path(p):
         # Parse the resource name aliases dictionary (Format: "path/to/Resource:AliasName")
         resource_name_aliases = {}
         raw_aliases = opts.pop("resource-name-alias", [])
-            
+
         # Parse explicitly and safely
         for mapping in raw_aliases:
             if not mapping:
-                # We only need to check `not mapping` because the top-level 
+                # We only need to check `not mapping` because the top-level
                 # opt_string parser already stripped trailing whitespaces
                 continue
-                
+
             try:
-                # split(":", 1) ensures we only split on the FIRST colon 
+                # split(":", 1) ensures we only split on the FIRST colon
                 res_path, alias_name = mapping.split(":", 1)
-                
+
                 clean_path = res_path.strip()
                 clean_alias = alias_name.strip()
-                
+
                 if not clean_path or not clean_alias:
                     raise ValueError()
-                    
+
                 resource_name_aliases[clean_path] = clean_alias
-                
+
             except ValueError:
                 warnings.warn(
                     f"Ignored malformed resource-name-alias: '{mapping}'. "