refactor(schema): encapsulate has_auto_populated_fields on Service wrapper and remove Jinja namespace loops

Author: hebaalazzeh

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

@@ -2413,6 +2413,17 @@ def operation_polling_method(self) -> Optional[Method]:
     def is_internal(self) -> bool:
         return any(m.is_internal for m in self.methods.values())
 
+    @utils.cached_property
+    def has_auto_populated_fields(self) -> bool:
+        """Returns True if any method in this service has auto-populated fields (e.g. AIP-4235 request_id)."""
+        return any(
+            bool(
+                self.api.all_method_settings.get(m.meta.address.proto)
+                and self.api.all_method_settings[m.meta.address.proto].auto_populated_fields
+            )
+            for m in self.methods.values()
+        )
+
     @cached_proto_context
     def with_context(
         self,

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

@@ -4,16 +4,6 @@
 {% import "%namespace/%name_%version/%sub/services/%service/_client_macros.j2" as macros %}
 {% import "%namespace/%name_%version/%sub/services/%service/_shared_macros.j2" as shared_macros %}
 
-{# Check if any method in this service has auto-populated fields (e.g. AIP-4235 request_id)
-   so setup_request_id is conditionally imported from _compat only when needed. #}
-{% set has_auto_populated_fields = namespace(value=false) %}
-{% for method in service.methods.values() %}
-  {% set method_settings = api.all_method_settings.get(method.meta.address.proto) %}
-  {% if method_settings and method_settings.auto_populated_fields %}
-    {% set has_auto_populated_fields.value = true %}
-  {% endif %}
-{% endfor %}
-
 import logging as std_logging
 from collections import OrderedDict
 import re
@@ -28,7 +18,7 @@ from {{package_path}} import gapic_version as package_version
 from google.api_core.client_options import ClientOptions
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
-{% if has_auto_populated_fields.value %}
+{% if service.has_auto_populated_fields %}
 from {{package_path}}._compat import setup_request_id
 {% endif %}
 from google.api_core import retry_async as retries

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

@@ -6,16 +6,6 @@
 {% import "%namespace/%name_%version/%sub/services/%service/_client_macros.j2" as macros %}
 {% import "%namespace/%name_%version/%sub/services/%service/_shared_macros.j2" as shared_macros %}
 
-{# Check if any method in this service has auto-populated fields (e.g. AIP-4235 request_id)
-   so setup_request_id is conditionally imported from _compat only when needed. #}
-{% set has_auto_populated_fields = namespace(value=false) %}
-{% for method in service.methods.values() %}
-  {% set method_settings = api.all_method_settings.get(method.meta.address.proto) %}
-  {% if method_settings and method_settings.auto_populated_fields %}
-    {% set has_auto_populated_fields.value = true %}
-  {% endif %}
-{% endfor %}
-
 from collections import OrderedDict
 {% if service.any_extended_operations_methods %}
 import functools
@@ -37,7 +27,7 @@ from google.api_core import exceptions as core_exceptions
 from google.api_core import extended_operation
 {% endif %}
 from google.api_core import gapic_v1
-{% if has_auto_populated_fields.value %}
+{% if service.has_auto_populated_fields %}
 from {{package_path}}._compat import setup_request_id
 {% endif %}
 from google.api_core import retry as retries