wip

Author: parthea

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

@@ -424,6 +424,13 @@ def test__setup_request_id():
         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)
+
     # Test with proto3 optional field not in request
     request = MockRequest()
     {{ service.client_name }}._setup_request_id(request, "request_id", True)
@@ -444,6 +451,27 @@ def test__setup_request_id():
     {{ service.client_name }}._setup_request_id(request, "request_id", False)
     assert request.request_id == "already_set"
 
+    # Test with proto3 optional field not in request (MockProtoRequest)
+    request = MockProtoRequest()
+    {{ service.client_name }}._setup_request_id(request, "request_id", True)
+    assert re.match(r"{{ test_macros.get_uuid4_re() }}", request.request_id)
+
+    # Test with proto3 optional field already in request (MockProtoRequest)
+    request = MockProtoRequest(request_id="already_set")
+    {{ service.client_name }}._setup_request_id(request, "request_id", True)
+    assert request.request_id == "already_set"
+
+    # Test with ValueError
+    class MockValueErrorRequest:
+        def HasField(self, key):
+            raise ValueError("Mismatched field")
+        def __contains__(self, key):
+            return hasattr(self, key)
+
+    request = MockValueErrorRequest()
+    {{ service.client_name }}._setup_request_id(request, "request_id", True)
+    assert re.match(r"{{ test_macros.get_uuid4_re() }}", request.request_id)
+
     # Test with dict and proto3 optional field not in request
     request = {}
     {{ service.client_name }}._setup_request_id(request, "request_id", True)
@@ -463,8 +491,8 @@ def test__setup_request_id():
     request = {"request_id": "already_set"}
     {{ service.client_name }}._setup_request_id(request, "request_id", False)
     assert request["request_id"] == "already_set"
-{% endif %}
 
+{% endif %}
 @pytest.mark.parametrize("client_class,transport_name", [
     {% if 'grpc' in opts.transport %}
     ({{ service.client_name }}, "grpc"),

packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/services/storage_batch_operations/client.py

@@ -480,9 +480,23 @@ def _setup_request_id(request, field_name: str, is_proto3_optional: bool):
             field_name (str): The name of the field to populate.
             is_proto3_optional (bool): Whether the field is proto3 optional.
         """
+        if isinstance(request, dict):
+            if is_proto3_optional:
+                if field_name not in request:
+                    request[field_name] = str(uuid.uuid4())
+            elif not request.get(field_name):
+                request[field_name] = str(uuid.uuid4())
+            return
+
         if is_proto3_optional:
-            if field_name not in request:
-                setattr(request, field_name, str(uuid.uuid4()))
+            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 field_name not in request:
+                    setattr(request, field_name, str(uuid.uuid4()))
         else:
             if not getattr(request, field_name):
                 setattr(request, field_name, str(uuid.uuid4()))

packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py

@@ -334,6 +334,82 @@ def test__add_cred_info_for_auth_errors_no_get_cred_info(error_code):
     client._add_cred_info_for_auth_errors(error)
     assert error.details == []
 
+def test__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)
+
+    # Test with proto3 optional field not in request
+    request = MockRequest()
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", request.request_id)
+
+    # Test with proto3 optional field already in request
+    request = MockRequest(request_id="already_set")
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert request.request_id == "already_set"
+
+    # Test with non-proto3 optional field empty
+    request = MockRequest(request_id="")
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", False)
+    assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", request.request_id)
+
+    # Test with non-proto3 optional field already set
+    request = MockRequest(request_id="already_set")
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", False)
+    assert request.request_id == "already_set"
+
+    # Test with proto3 optional field not in request (MockProtoRequest)
+    request = MockProtoRequest()
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", request.request_id)
+
+    # Test with proto3 optional field already in request (MockProtoRequest)
+    request = MockProtoRequest(request_id="already_set")
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert request.request_id == "already_set"
+
+    # Test with ValueError
+    class MockValueErrorRequest:
+        def HasField(self, key):
+            raise ValueError("Mismatched field")
+        def __contains__(self, key):
+            return hasattr(self, key)
+
+    request = MockValueErrorRequest()
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", request.request_id)
+
+    # Test with dict and proto3 optional field not in request
+    request = {}
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", request["request_id"])
+
+    # Test with dict and proto3 optional field already in request
+    request = {"request_id": "already_set"}
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", True)
+    assert request["request_id"] == "already_set"
+
+    # Test with dict and non-proto3 optional field empty
+    request = {"request_id": ""}
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", False)
+    assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", request["request_id"])
+
+    # Test with dict and non-proto3 optional field already set
+    request = {"request_id": "already_set"}
+    StorageBatchOperationsClient._setup_request_id(request, "request_id", False)
+    assert request["request_id"] == "already_set"
+
 @pytest.mark.parametrize("client_class,transport_name", [
     (StorageBatchOperationsClient, "grpc"),
     (StorageBatchOperationsAsyncClient, "grpc_asyncio"),