refactor(api-core): simplify required fields default value merging to keep consistent with original transports

Author: hebaalazzeh

packages/google-api-core/google/api_core/rest_helpers.py

@@ -159,49 +159,11 @@ def transcode_request(
         )
 
     # If required_fields_default_values is provided, we merge default values for missing
-    # required fields into the query parameters. However, we must exclude any fields
-    # that are already bound to the URI path or the request body for the matched HTTP option.
+    # required fields into the query parameters.
     if required_fields_default_values:
-        # 1. Identify which HTTP option matched the transcoded request by comparing method and URI.
-        matched_option = None
-        for option in http_options:
-            if (
-                option.get("method", "").lower()
-                == transcoded_request.get("method", "").lower()
-            ):
-                if path_template.validate(
-                    option.get("uri", ""), transcoded_request.get("uri", "")
-                ):
-                    matched_option = option
-                    break
-
-        # 2. Determine which fields are bound to the path or body.
-        # If the body is '*', all fields are bound to the body, so bound_fields is None.
-        bound_fields: Optional[Set[str]] = set()
-        if matched_option:
-            body_param = matched_option.get("body")
-            if body_param == "*":
-                bound_fields = None
-            else:
-                assert bound_fields is not None
-                uri_template = matched_option.get("uri", "")
-                # Extract the top-level field names for variables in the URI path.
-                # E.g., for URI "/v1/{name}" we extract "name".
-                # For nested path variables like "{options.deprecated}", we split on "."
-                # and extract the top-level field "options", because required_fields_default_values
-                # only maps top-level request field names to their default values.
-                for m in path_template._VARIABLE_RE.finditer(uri_template):
-                    bound_fields.add(m.group("name").split(".")[0])
-                if body_param:
-                    bound_fields.add(body_param.split(".")[0])
-
-        # 3. Only merge default values for fields that are not bound to the path or body.
-        if bound_fields is not None:
-            for k, v in required_fields_default_values.items():
-                if k in bound_fields:
-                    continue
-                if k not in query_params_json:
-                    query_params_json[k] = v
+        for k, v in required_fields_default_values.items():
+            if k not in query_params_json:
+                query_params_json[k] = v
 
     if rest_numeric_enums:
         query_params_json["$alt"] = "json;enum-encoding=int"

packages/google-api-core/tests/unit/test_rest_helpers.py

@@ -278,84 +278,3 @@ def test_transcode_request_proto_plus_wrapper():
     assert transcoded["uri"] == "/v1/test/proto-plus-field"
 
 
-def test_transcode_with_required_fields_in_path():
-    http_options = [{"method": "get", "uri": "/v1/test/{name}"}]
-    request = descriptor_pb2.FieldDescriptorProto()
-    request.name = "my-name"
-
-    required_defaults = {"name": "default-name", "filter": "default-filter"}
-    transcoded, _, query_params = transcode_request(
-        http_options, request, required_fields_default_values=required_defaults
-    )
-
-    assert transcoded["uri"] == "/v1/test/my-name"
-    assert "name" not in query_params
-    assert query_params["filter"] == "default-filter"
-
-
-def test_transcode_with_required_fields_in_body():
-    http_options = [{"method": "post", "uri": "/v1/test", "body": "*"}]
-    request = descriptor_pb2.FieldDescriptorProto()
-    request.name = "my-name"
-
-    required_defaults = {"name": "default-name"}
-    _, body, query_params = transcode_request(
-        http_options, request, required_fields_default_values=required_defaults
-    )
-
-    assert body is not None
-    assert "name" not in query_params
-    assert query_params == {}
-
-
-def test_transcode_with_required_fields_in_body_param():
-    http_options = [{"method": "post", "uri": "/v1/test/{name}", "body": "options"}]
-    request = descriptor_pb2.FieldDescriptorProto()
-    request.name = "my-name"
-
-    required_defaults = {
-        "options": "default-options",
-        "filter": "default-filter",
-    }
-    transcoded, body, query_params = transcode_request(
-        http_options, request, required_fields_default_values=required_defaults
-    )
-
-    assert transcoded["uri"] == "/v1/test/my-name"
-    assert "options" not in query_params
-    assert query_params["filter"] == "default-filter"
-
-
-def test_transcode_required_fields_no_matching_option():
-    http_options = [{"method": "get", "uri": "/v1/test"}]
-    request = descriptor_pb2.FieldDescriptorProto()
-    required_defaults = {"name": "default-name"}
-
-    with mock.patch(
-        "google.api_core.path_template.transcode",
-        return_value={"method": "delete", "uri": "/v1/test"},
-    ):
-        _, _, query_params = transcode_request(
-            http_options, request, required_fields_default_values=required_defaults
-        )
-        assert query_params["name"] == "default-name"
-
-
-def test_transcode_required_fields_uri_mismatch():
-    http_options = [
-        {"method": "get", "uri": "/v1/wrong_path/{name}"},
-        {"method": "get", "uri": "/v1/test/{name}"},
-    ]
-    request = descriptor_pb2.FieldDescriptorProto()
-    request.name = "my-name"
-    required_defaults = {"name": "default-name", "filter": "default-filter"}
-
-    with mock.patch(
-        "google.api_core.path_template.transcode",
-        return_value={"method": "get", "uri": "/v1/test/my-name"},
-    ):
-        transcoded, _, query_params = transcode_request(
-            http_options, request, required_fields_default_values=required_defaults
-        )
-        assert "name" not in query_params
-        assert query_params["filter"] == "default-filter"