revert: remove other api-core changes

Author: hebaalazzeh

packages/google-api-core/.coveragerc

@@ -2,8 +2,11 @@
 branch = True
 
 [report]
-fail_under = 99
+fail_under = 100
 show_missing = True
+omit =
+    tests/*
+    */tests/*
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER

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

@@ -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 not getattr(request, field_name, None):
+            if getattr(request, field_name, None) is None:
                 setattr(request, field_name, str(uuid.uuid4()))
     else:
         if not getattr(request, field_name, None):

packages/google-api-core/tests/conftest.py

@@ -27,9 +27,6 @@ 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):
@@ -44,9 +41,6 @@ class MockValueErrorRequest:
     def HasField(self, key):
         raise ValueError("Mismatched field")
 
-    def __contains__(self, key):
-        return hasattr(self, key)
-
 
 # --- Parameterized Test ---
 
@@ -59,6 +53,7 @@ def __contains__(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
@@ -70,6 +65,7 @@ def __contains__(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"),
@@ -79,6 +75,7 @@ def __contains__(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",
@@ -87,6 +84,7 @@ def __contains__(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",
@@ -110,6 +108,20 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
     )
 
     if expected == "uuid":
-        assert re.match(UUID_REGEX, value)
+        assert re.fullmatch(UUID_REGEX, value)
     else:
         assert value == expected
+
+
+def test_setup_request_id_assertion_strictness(mocker):
+    # Mock uuid.uuid4 to return a UUID with trailing characters
+    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")

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

@@ -100,3 +100,52 @@ def test_cancel_operation():
 
 def test_operations_client_config():
     assert operations_client_config.config["interfaces"]
+
+
+def test_operations_v1_transport_base_to_dict_protobuf_versions(monkeypatch):
+    from google.auth import credentials as ga_credentials
+    from google.longrunning import operations_pb2
+
+    from google.api_core.operations_v1.transports import base
+
+    message = operations_pb2.Operation(name="test_op")
+    transport = base.OperationsTransport(
+        credentials=ga_credentials.AnonymousCredentials()
+    )
+
+    calls = []
+
+    def mock_message_to_dict(*args, **kwargs):
+        calls.append(kwargs)
+        return {"name": "test_op"}
+
+    monkeypatch.setattr(base.json_format, "MessageToDict", mock_message_to_dict)
+
+    monkeypatch.setattr(base, "PROTOBUF_VERSION", "3.20.0")
+    res3 = transport._convert_protobuf_message_to_dict(message)
+    assert res3.get("name") == "test_op"
+    assert "including_default_value_fields" in calls[-1]
+
+    monkeypatch.setattr(base, "PROTOBUF_VERSION", "5.26.0")
+    res5 = transport._convert_protobuf_message_to_dict(message)
+    assert res5.get("name") == "test_op"
+    assert "always_print_fields_with_no_presence" in calls[-1]
+
+
+def test_operations_v1_init_import_error_fallback(monkeypatch):
+    import importlib
+
+    import google.api_core.operations_v1 as op_v1
+
+    orig_import = __import__
+
+    def mock_import(name, globals=None, locals=None, fromlist=(), level=0):
+        if "operations_rest_client_async" in name or (
+            fromlist and "AsyncOperationsRestClient" in fromlist
+        ):
+            raise ImportError("Simulated async rest import error")
+        return orig_import(name, globals, locals, fromlist, level)
+
+    monkeypatch.setattr("builtins.__import__", mock_import)
+    monkeypatch.setattr(op_v1, "_has_async_rest", True)
+    importlib.reload(op_v1)