chore(api-core): revert requests.py and test_requests.py to origin/main

Author: hebaalazzeh

packages/google-api-core/google/api_core/gapic_v1/requests.py

@@ -65,13 +65,6 @@ def setup_request_id(
                 setattr(request, field_name, str(uuid.uuid4()))
         except (AttributeError, ValueError):
             # Proto-plus messages or other objects
-            if hasattr(request, "_pb"):
-                try:
-                    if not request._pb.HasField(field_name):
-                        setattr(request, field_name, str(uuid.uuid4()))
-                    return
-                except (AttributeError, ValueError):
-                    pass
             if getattr(request, field_name, None) is None:
                 setattr(request, field_name, str(uuid.uuid4()))
     else:

packages/google-api-core/tests/unit/gapic/test_requests.py

@@ -14,7 +14,6 @@
 # limitations under the License.
 
 import re
-from unittest import mock
 
 import pytest
 
@@ -43,33 +42,6 @@ def HasField(self, key):
         raise ValueError("Mismatched field")
 
 
-class MockProtoPlusRequest:
-    def __init__(self, pb_has_field=False, pb_raises=False, request_id=None):
-        if request_id is not None:
-            self.request_id = request_id
-
-        if pb_raises:
-
-            class FailingPb:
-                def HasField(self, key):
-                    raise AttributeError("No HasField on _pb")
-
-            self._pb = FailingPb()
-        else:
-
-            class MockPb:
-                def __init__(self, has_field):
-                    self._has_field = has_field
-
-                def HasField(self, key):
-                    return self._has_field
-
-            self._pb = MockPb(pb_has_field)
-
-    def HasField(self, key):
-        raise AttributeError("Proto-plus object HasField fails")
-
-
 # --- Parameterized Test ---
 
 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}"
@@ -89,14 +61,6 @@ def HasField(self, key):
         (MockProtoRequest(request_id="already_set"), True, "already_set"),
         # ValueError case
         (MockValueErrorRequest(), True, "uuid"),
-        # ProtoPlus _pb cases
-        (MockProtoPlusRequest(pb_has_field=False), True, "uuid"),
-        (
-            MockProtoPlusRequest(pb_has_field=True, request_id="already_set"),
-            True,
-            "already_set",
-        ),
-        (MockProtoPlusRequest(pb_raises=True), True, "uuid"),
         # Dict cases
         ({}, True, "uuid"),
         ({"request_id": None}, True, "uuid"),
@@ -117,9 +81,6 @@ def HasField(self, key):
         "proto3_optional_not_in_request_proto",
         "proto3_optional_already_in_request_proto",
         "value_error_fallback",
-        "proto_plus_pb_not_set",
-        "proto_plus_pb_already_set",
-        "proto_plus_pb_raises",
         "dict_proto3_optional_not_in_request",
         "dict_proto3_optional_value_none",
         "dict_proto3_optional_already_in_request",
@@ -152,17 +113,15 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
         assert value == expected
 
 
-def test_setup_request_id_assertion_strictness():
+def test_setup_request_id_assertion_strictness(mocker):
     # Mock uuid.uuid4 to return a UUID with trailing characters
-    with mock.patch("uuid.uuid4") as mock_uuid:
-        mock_uuid.return_value.__str__.return_value = (
-            "12345678-1234-4123-8123-123456789012-extra"
-        )
-
-        # We expect test_setup_request_id to fail (raise AssertionError) because the UUID is invalid.
-        # If test_setup_request_id uses re.fullmatch, it will fail (raise AssertionError), so pytest.raises passes.
-        # If test_setup_request_id uses re.match, it will NOT fail, so pytest.raises fails!
-        with pytest.raises(AssertionError):
-            test_setup_request_id(
-                MockRequest(), is_proto3_optional=True, expected="uuid"
-            )
+    mock_uuid = mocker.patch("uuid.uuid4")
+    mock_uuid.return_value.__str__.return_value = (
+        "12345678-1234-4123-8123-123456789012-extra"
+    )
+
+    # We expect test_setup_request_id to fail (raise AssertionError) because the UUID is invalid.
+    # If test_setup_request_id uses re.fullmatch, it will fail (raise AssertionError), so pytest.raises passes.
+    # If test_setup_request_id uses re.match, it will NOT fail, so pytest.raises fails!
+    with pytest.raises(AssertionError):
+        test_setup_request_id(MockRequest(), is_proto3_optional=True, expected="uuid")