revert whitespace

Author: hebaalazzeh

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/_compat.py.j2

@@ -3,6 +3,7 @@
 {% block content %}
 
 """A compatibility module for older versions of google-api-core."""
+{% set has_auto_populated_fields = api.all_method_settings.values()|map(attribute="auto_populated_fields", default=[])|select|list %}
 {# TODO(https://github.com/googleapis/google-cloud-python/issues/17813):
 Clean up this file/functions when the minimum supported version of 
 google-api-core has the functions in `_compat.py.j2`. #}
@@ -12,6 +13,7 @@ falling back to the local implementation if not present. #}
 {# TODO(https://github.com/googleapis/google-cloud-python/issues/17883): 
 Backfill compatibility functions being removed from the client layer. #}
 
+{% if has_auto_populated_fields %}
 from typing import Union
 import uuid
 
@@ -61,4 +63,5 @@ def setup_request_id(
     else:
         if not getattr(request, field_name, None):
             setattr(request, field_name, str(uuid.uuid4()))
+{% endif %}
 {% endblock %}

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

@@ -111,6 +111,7 @@ CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 _UUID4_RE = re.compile(r"{{ uuid4_re }}")
 {% endif %}
 
+
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]

packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_compat.py.j2

@@ -2,6 +2,7 @@
 
 {% block content %}
 
+{% set has_auto_populated_fields = api.all_method_settings.values()|map(attribute="auto_populated_fields", default=[])|select|list %}
 """Tests for the compatibility module for older versions of google-api-core."""
 {# TODO(https://github.com/googleapis/google-cloud-python/issues/17813):
 Clean up this file/tests when the minimum supported version of 
@@ -10,6 +11,7 @@ google-api-core has the functions in `_compat.py.j2`. #}
 Backfill compatibility functions tests being removed from the client layer. #}
 
 
+{% if has_auto_populated_fields %}
 import re
 import pytest
 
@@ -96,4 +98,5 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
     else:
         assert value == expected
 
+{% endif %}
 {% endblock %}

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/_compat.py

@@ -14,53 +14,3 @@
 # limitations under the License.
 #
 """A compatibility module for older versions of google-api-core."""
-
-from typing import Union
-import uuid
-
-import google.protobuf.message
-
-
-def setup_request_id(
-    request: Union[google.protobuf.message.Message, dict, None],
-    field_name: str,
-    is_proto3_optional: bool,
-) -> None:
-    """Populate a UUID4 field in the request if it is not already set.
-
-    This helper is used to ensure request idempotency by automatically
-    generating a unique identifier (such as `request_id`) for requests
-    that support it. If a request is retried, the same identifier can be
-    sent on subsequent retries, allowing the server to recognize the retried
-    request and prevent duplicate processing (e.g., creating duplicate
-    resources).
-
-    Args:
-        request (Union[google.protobuf.message.Message, dict]): The
-            request object.
-        field_name (str): The name of the field to populate.
-        is_proto3_optional (bool): Whether the field is proto3 optional.
-    """
-    if request is None:
-        return
-
-    if isinstance(request, dict):
-        if is_proto3_optional:
-            if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())
-        elif not request.get(field_name):
-            request[field_name] = str(uuid.uuid4())
-        return
-
-    if is_proto3_optional:
-        try:
-            # Pure protobuf messages
-            if not request.HasField(field_name):
-                setattr(request, field_name, str(uuid.uuid4()))
-        except (AttributeError, ValueError):
-            # Proto-plus messages or other objects
-            if not getattr(request, field_name, None):
-                setattr(request, field_name, str(uuid.uuid4()))
-    else:
-        if not getattr(request, field_name, None):
-            setattr(request, field_name, str(uuid.uuid4()))

packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py

@@ -77,6 +77,7 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
+
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]

packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_compat.py

@@ -14,89 +14,3 @@
 # limitations under the License.
 #
 """Tests for the compatibility module for older versions of google-api-core."""
-
-
-import re
-import pytest
-
-from google.cloud.asset_v1._compat import setup_request_id
-
-class MockRequest:
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-    def __contains__(self, key):
-        return hasattr(self, key)
-
-
-class MockProtoRequest:
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-    def HasField(self, key):
-        return hasattr(self, key)
-
-
-class MockValueErrorRequest:
-    def HasField(self, key):
-        raise ValueError("Mismatched field")
-
-    def __contains__(self, key):
-        return hasattr(self, key)
-
-UUID_REGEX = r"[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
-
-@pytest.mark.parametrize(
-    "request_obj, is_proto3_optional, expected",
-    [
-        (MockRequest(), True, "uuid"),
-        (MockRequest(request_id="already_set"), True, "already_set"),
-        (MockRequest(request_id=""), False, "uuid"),
-        (MockRequest(request_id="already_set"), False, "already_set"),
-        (MockProtoRequest(), True, "uuid"),
-        (MockProtoRequest(request_id="already_set"), True, "already_set"),
-        (MockValueErrorRequest(), True, "uuid"),
-        ({}, True, "uuid"),
-        ({"request_id": None}, True, "uuid"),
-        ({"request_id": "already_set"}, True, "already_set"),
-        ({"request_id": ""}, False, "uuid"),
-        ({"request_id": None}, False, "uuid"),
-        ({"request_id": "already_set"}, False, "already_set"),
-        (None, True, "none"),
-    ],
-    ids=[
-        "proto3_optional_not_in_request",
-        "proto3_optional_already_in_request",
-        "non_proto3_optional_empty",
-        "non_proto3_optional_already_set",
-        "proto3_optional_not_in_request_proto",
-        "proto3_optional_already_in_request_proto",
-        "value_error_fallback",
-        "dict_proto3_optional_not_in_request",
-        "dict_proto3_optional_value_none",
-        "dict_proto3_optional_already_in_request",
-        "dict_non_proto3_optional_empty",
-        "dict_non_proto3_optional_value_none",
-        "dict_non_proto3_optional_already_set",
-        "none_request",
-    ],
-)
-def test_setup_request_id(request_obj, is_proto3_optional, expected):
-    setup_request_id(request_obj, "request_id", is_proto3_optional)
-
-    if expected == "none":
-        assert request_obj is None
-        return
-
-    value = (
-        request_obj["request_id"]
-        if isinstance(request_obj, dict)
-        else request_obj.request_id
-    )
-
-    if expected == "uuid":
-        assert re.match(UUID_REGEX, value)
-    else:
-        assert value == expected

packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/_compat.py

@@ -14,53 +14,3 @@
 # limitations under the License.
 #
 """A compatibility module for older versions of google-api-core."""
-
-from typing import Union
-import uuid
-
-import google.protobuf.message
-
-
-def setup_request_id(
-    request: Union[google.protobuf.message.Message, dict, None],
-    field_name: str,
-    is_proto3_optional: bool,
-) -> None:
-    """Populate a UUID4 field in the request if it is not already set.
-
-    This helper is used to ensure request idempotency by automatically
-    generating a unique identifier (such as `request_id`) for requests
-    that support it. If a request is retried, the same identifier can be
-    sent on subsequent retries, allowing the server to recognize the retried
-    request and prevent duplicate processing (e.g., creating duplicate
-    resources).
-
-    Args:
-        request (Union[google.protobuf.message.Message, dict]): The
-            request object.
-        field_name (str): The name of the field to populate.
-        is_proto3_optional (bool): Whether the field is proto3 optional.
-    """
-    if request is None:
-        return
-
-    if isinstance(request, dict):
-        if is_proto3_optional:
-            if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())
-        elif not request.get(field_name):
-            request[field_name] = str(uuid.uuid4())
-        return
-
-    if is_proto3_optional:
-        try:
-            # Pure protobuf messages
-            if not request.HasField(field_name):
-                setattr(request, field_name, str(uuid.uuid4()))
-        except (AttributeError, ValueError):
-            # Proto-plus messages or other objects
-            if not getattr(request, field_name, None):
-                setattr(request, field_name, str(uuid.uuid4()))
-    else:
-        if not getattr(request, field_name, None):
-            setattr(request, field_name, str(uuid.uuid4()))

packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_compat.py

@@ -14,89 +14,3 @@
 # limitations under the License.
 #
 """Tests for the compatibility module for older versions of google-api-core."""
-
-
-import re
-import pytest
-
-from google.iam.credentials_v1._compat import setup_request_id
-
-class MockRequest:
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-    def __contains__(self, key):
-        return hasattr(self, key)
-
-
-class MockProtoRequest:
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-    def HasField(self, key):
-        return hasattr(self, key)
-
-
-class MockValueErrorRequest:
-    def HasField(self, key):
-        raise ValueError("Mismatched field")
-
-    def __contains__(self, key):
-        return hasattr(self, key)
-
-UUID_REGEX = r"[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
-
-@pytest.mark.parametrize(
-    "request_obj, is_proto3_optional, expected",
-    [
-        (MockRequest(), True, "uuid"),
-        (MockRequest(request_id="already_set"), True, "already_set"),
-        (MockRequest(request_id=""), False, "uuid"),
-        (MockRequest(request_id="already_set"), False, "already_set"),
-        (MockProtoRequest(), True, "uuid"),
-        (MockProtoRequest(request_id="already_set"), True, "already_set"),
-        (MockValueErrorRequest(), True, "uuid"),
-        ({}, True, "uuid"),
-        ({"request_id": None}, True, "uuid"),
-        ({"request_id": "already_set"}, True, "already_set"),
-        ({"request_id": ""}, False, "uuid"),
-        ({"request_id": None}, False, "uuid"),
-        ({"request_id": "already_set"}, False, "already_set"),
-        (None, True, "none"),
-    ],
-    ids=[
-        "proto3_optional_not_in_request",
-        "proto3_optional_already_in_request",
-        "non_proto3_optional_empty",
-        "non_proto3_optional_already_set",
-        "proto3_optional_not_in_request_proto",
-        "proto3_optional_already_in_request_proto",
-        "value_error_fallback",
-        "dict_proto3_optional_not_in_request",
-        "dict_proto3_optional_value_none",
-        "dict_proto3_optional_already_in_request",
-        "dict_non_proto3_optional_empty",
-        "dict_non_proto3_optional_value_none",
-        "dict_non_proto3_optional_already_set",
-        "none_request",
-    ],
-)
-def test_setup_request_id(request_obj, is_proto3_optional, expected):
-    setup_request_id(request_obj, "request_id", is_proto3_optional)
-
-    if expected == "none":
-        assert request_obj is None
-        return
-
-    value = (
-        request_obj["request_id"]
-        if isinstance(request_obj, dict)
-        else request_obj.request_id
-    )
-
-    if expected == "uuid":
-        assert re.match(UUID_REGEX, value)
-    else:
-        assert value == expected

packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py

@@ -67,6 +67,7 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
+
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]