gapic-generator 1.30.6__py3-none-any.whl → 1.30.7__py3-none-any.whl

gapic/cli/generate.py

@@ -39,7 +39,7 @@ from gapic.utils.cache import generation_cache_context
     "--output",
     type=click.File("wb"),
     default=sys.stdout.buffer,
-    help="Where to output the `CodeGeneratorResponse`. " "Defaults to stdout.",
+    help="Where to output the `CodeGeneratorResponse`. Defaults to stdout.",
 )
 def generate(request: typing.BinaryIO, output: typing.BinaryIO) -> None:
     """Generate a full API client description."""

gapic/generator/generator.py

@@ -131,9 +131,7 @@ class Generator:
             )
 
         # Return the CodeGeneratorResponse output.
-        res = CodeGeneratorResponse(
-            file=[i for i in output_files.values()]
-        )  # type: ignore
+        res = CodeGeneratorResponse(file=[i for i in output_files.values()])  # type: ignore
         res.supported_features |= CodeGeneratorResponse.Feature.FEATURE_PROTO3_OPTIONAL  # type: ignore
         return res
 

gapic/samplegen_utils/snippet_index.py

@@ -117,7 +117,9 @@ class SnippetIndex:
         self.metadata_index.client_library.name = (
             api_schema.naming.warehouse_package_name
         )
-        self.metadata_index.client_library.language = snippet_metadata_pb2.Language.PYTHON  # type: ignore
+        self.metadata_index.client_library.language = (
+            snippet_metadata_pb2.Language.PYTHON  # type: ignore
+        )
 
         self.metadata_index.client_library.version = api_schema.gapic_version
 

gapic/samplegen_utils/yaml.py

@@ -116,7 +116,9 @@ class Map(Element):
         return next(
             iter(
                 [
-                    e.val for e in self.elements if e.key == key  # type: ignore
+                    e.val
+                    for e in self.elements
+                    if e.key == key  # type: ignore
                 ]  # type: ignore
             ),
             default,

gapic/schema/api.py

@@ -941,11 +941,7 @@ class API:
             selective_gapic_errors = {}
             # TODO(https://github.com/googleapis/gapic-generator-python/issues/2446):
             # Workaround issue in Python 3.14 related to code coverage by adding `# pragma: no branch`
-            for (
-                method_name
-            ) in (
-                library_settings.python_settings.common.selective_gapic_generation.methods
-            ):  # pragma: no branch
+            for method_name in library_settings.python_settings.common.selective_gapic_generation.methods:  # pragma: no branch
                 if method_name not in self.all_methods:
                     selective_gapic_errors[method_name] = "Method does not exist."
                 elif not method_name.startswith(library_settings.version):
@@ -1180,8 +1176,7 @@ class _ProtoBuilder:
                 object.__setattr__(field, "enum", maybe_enum_type)
             else:
                 raise TypeError(
-                    f"Unknown type referenced in "
-                    f"{self.file_descriptor.name}: '{key}'"
+                    f"Unknown type referenced in {self.file_descriptor.name}: '{key}'"
                 )
 
         # Only generate the service if this is a target file to be generated.

gapic/schema/metadata.py

@@ -357,7 +357,7 @@ class Address(BaseAddress):
             str: An absolute selector.
         """
         if "." not in selector:
-            return f'{".".join(self.package)}.{selector}'
+            return f"{'.'.join(self.package)}.{selector}"
         return selector
 
     @cached_proto_context

gapic/schema/naming.py

@@ -86,7 +86,7 @@ class Naming(abc.ABC):
                 "The protos provided do not share a common root package. "
                 "Ensure that all explicitly-specified protos are for a "
                 "single API. "
-                f'The packages we got are: {", ".join(proto_packages)}'
+                f"The packages we got are: {', '.join(proto_packages)}"
             )
 
         # Define the valid regex to split the package.

gapic/schema/wrappers.py

@@ -799,7 +799,7 @@ class MessageType:
         # Quick check: If this cursor has no message, there is a problem.
         if not cursor.message:
             raise KeyError(
-                f'Field {".".join(field_path)} could not be resolved from '
+                f"Field {'.'.join(field_path)} could not be resolved from "
                 f"{cursor.name}.",
             )
 

gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2

@@ -98,7 +98,8 @@ class {{ service.async_client_name }}:
         Returns:
             {{ service.async_client_name }}: The constructed client.
         """
-        return {{ service.client_name }}.from_service_account_info.__func__({{ service.async_client_name }}, info, *args, **kwargs)  # type: ignore
+        sa_info_func = {{ service.client_name }}.from_service_account_info.__func__  # type: ignore
+        return sa_info_func({{ service.async_client_name }}, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -114,7 +115,8 @@ class {{ service.async_client_name }}:
         Returns:
             {{ service.async_client_name }}: The constructed client.
         """
-        return {{ service.client_name }}.from_service_account_file.__func__({{ service.async_client_name }}, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = {{ service.client_name }}.from_service_account_file.__func__  # type: ignore
+        return sa_file_func({{ service.async_client_name }}, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 

gapic/templates/noxfile.py.j2

@@ -12,8 +12,7 @@ import warnings
 
 import nox
 
-BLACK_VERSION = "black[jupyter]==23.7.0"
-ISORT_VERSION = "isort==5.11.0"
+RUFF_VERSION = "ruff==0.14.14"
 
 {% if api.naming.module_namespace %}
 LINT_PATHS = ["docs", "{{ api.naming.module_namespace[0] }}", "tests", "noxfile.py", "setup.py"]
@@ -147,13 +146,18 @@ def lint(session):
     Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
-    session.install("flake8", BLACK_VERSION)
+    session.install("flake8", RUFF_VERSION)
+
+    # 2. Check formatting
     session.run(
-        "black",
+        "ruff", "format",
         "--check",
+        f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
+        "--line-length=88", 
         *LINT_PATHS,
     )
 
+
 {% if api.naming.module_namespace %}
     session.run("flake8", "{{ api.naming.module_namespace[0] }}", "tests")
 {% else %}
@@ -163,10 +167,15 @@ def lint(session):
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def blacken(session):
-    """Run black. Format code to uniform standard."""
-    session.install(BLACK_VERSION)
+    """(Deprecated) Legacy session. Please use 'nox -s format'."""
+    session.log("WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future.")
+    
+    # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports)
+    session.install(RUFF_VERSION)
     session.run(
-        "black",
+        "ruff", "format",
+        f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
+        "--line-length=88",
         *LINT_PATHS,
     )
 
@@ -174,19 +183,28 @@ def blacken(session):
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def format(session):
     """
-    Run isort to sort imports. Then run black
-    to format code to uniform standard.
+    Run ruff to sort imports and format code.
     """
-    session.install(BLACK_VERSION, ISORT_VERSION)
-    # Use the --fss option to sort imports using strict alphabetical order.
-    # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
+    # 1. Install ruff (skipped automatically if you run with --no-venv)
+    session.install(RUFF_VERSION)
+
+    # 2. Run Ruff to fix imports
+    # check --select I: Enables strict import sorting
+    # --fix: Applies the changes automatically
     session.run(
-        "isort",
-        "--fss",
+        "ruff", "check",
+        "--select", "I",
+        "--fix",
+        f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
+        "--line-length=88",  # Standard Black line length
         *LINT_PATHS,
     )
+
+    # 3. Run Ruff to format code
     session.run(
-        "black",
+        "ruff", "format",
+        f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
+        "--line-length=88",  # Standard Black line length
         *LINT_PATHS,
     )
 

gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2

@@ -26,6 +26,7 @@ from google.protobuf import json_format
 import json
 import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
 from proto.marshal.rules.dates import DurationRule, TimestampRule
 from proto.marshal.rules import wrappers

gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2

@@ -752,8 +752,18 @@ def test_{{ method_name }}_pager(transport_name: str = "grpc"):
 
         results = list(pager)
         assert len(results) == 6
+        {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %}
+        assert all(isinstance(i, Sequence)
+                   for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Struct' %}
+        assert all(isinstance(i, Mapping)
+                   for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Value' %}
+        assert all(True for i in results)
+        {% else %}
         assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
                    for i in results)
+        {% endif %}
 {% endif %}
 def test_{{ method_name }}_pages(transport_name: str = "grpc"):
     client = {{ service.client_name }}(
@@ -913,9 +923,19 @@ async def test_{{ method_name }}_async_pager():
         assert async_pager.get('a') is None
         assert isinstance(async_pager.get('h'), {{ method.paged_result_field.type.fields.get('value').ident }})
         {% else %}
+        {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %}
+        assert all(isinstance(i, Sequence)
+                for i in responses)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Struct' %}
+        assert all(isinstance(i, Mapping)
+                for i in responses)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Value' %}
+        assert all(True for i in responses)
+        {% else %}
         assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
                 for i in responses)
         {% endif %}
+        {% endif %}
 
 
 @pytest.mark.asyncio
@@ -1412,9 +1432,19 @@ def test_{{ method_name }}_rest_pager(transport: str = 'rest'):
         assert pager.get('a') is None
         assert isinstance(pager.get('h'), {{ method.paged_result_field.type.fields.get('value').ident }})
         {% else %}
+        {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %}
+        assert all(isinstance(i, Sequence)
+                for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Struct' %}
+        assert all(isinstance(i, Mapping)
+                for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Value' %}
+        assert all(True for i in results)
+        {% else %}
         assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
                 for i in results)
         {% endif %}
+        {% endif %}
 
         pages = list(client.{{ method_name }}(request=sample_request).pages)
         for page_, token in zip(pages, ['abc','def','ghi', '']):

gapic/utils/cache.py

@@ -101,7 +101,6 @@ def cached_proto_context(func):
 
     @functools.wraps(func)
     def wrapper(self, *, collisions, **kwargs):
-
         # 1. Check for active cache (returns None if context is not active)
         context_cache = getattr(
             _proto_collisions_cache_state, "resolved_collisions", None

{gapic_generator-1.30.6.dist-info → gapic_generator-1.30.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gapic-generator
-Version: 1.30.6
+Version: 1.30.7
 Summary: Google API Client Generator for Python
 Home-page: https://github.com/googleapis/gapic-generator-python
 Author: Google LLC