revert: remove unrelated changes to requests.py and test_requests.py

Author: hebaalazzeh

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

@@ -21,8 +21,8 @@
 if they are not already set.
 """
 
-import uuid
 from typing import Union
+import uuid
 
 import google.protobuf.message
 
@@ -65,7 +65,7 @@ def setup_request_id(
                 setattr(request, field_name, str(uuid.uuid4()))
         except (AttributeError, ValueError):
             # Proto-plus messages or other objects
-            if getattr(request, field_name, None) is None:
+            if not getattr(request, field_name, None):
                 setattr(request, field_name, str(uuid.uuid4()))
     else:
         if not getattr(request, field_name, None):

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

@@ -19,6 +19,7 @@
 
 from google.api_core.gapic_v1.requests import setup_request_id
 
+
 # --- Mock Request Helper Classes ---
 
 
@@ -27,6 +28,9 @@ 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):
@@ -41,6 +45,9 @@ class MockValueErrorRequest:
     def HasField(self, key):
         raise ValueError("Mismatched field")
 
+    def __contains__(self, key):
+        return hasattr(self, key)
+
 
 # --- Parameterized Test ---
 
@@ -53,7 +60,6 @@ def HasField(self, key):
         # MockRequest cases
         (MockRequest(), True, "uuid"),
         (MockRequest(request_id="already_set"), True, "already_set"),
-        (MockRequest(request_id=""), True, ""),
         (MockRequest(request_id=""), False, "uuid"),
         (MockRequest(request_id="already_set"), False, "already_set"),
         # MockProtoRequest cases
@@ -65,7 +71,6 @@ def HasField(self, key):
         ({}, True, "uuid"),
         ({"request_id": None}, True, "uuid"),
         ({"request_id": "already_set"}, True, "already_set"),
-        ({"request_id": ""}, True, ""),
         ({"request_id": ""}, False, "uuid"),
         ({"request_id": None}, False, "uuid"),
         ({"request_id": "already_set"}, False, "already_set"),
@@ -75,7 +80,6 @@ def HasField(self, key):
     ids=[
         "proto3_optional_not_in_request",
         "proto3_optional_already_in_request",
-        "proto3_optional_explicit_empty",
         "non_proto3_optional_empty",
         "non_proto3_optional_already_set",
         "proto3_optional_not_in_request_proto",
@@ -84,7 +88,6 @@ def HasField(self, key):
         "dict_proto3_optional_not_in_request",
         "dict_proto3_optional_value_none",
         "dict_proto3_optional_already_in_request",
-        "dict_proto3_optional_explicit_empty",
         "dict_non_proto3_optional_empty",
         "dict_non_proto3_optional_value_none",
         "dict_non_proto3_optional_already_set",
@@ -108,6 +111,6 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
     )
 
     if expected == "uuid":
-        assert re.fullmatch(UUID_REGEX, value)
+        assert re.match(UUID_REGEX, value)
     else:
         assert value == expected