extra test cases and change types

Author: brianjlai

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

@@ -405,7 +405,7 @@ def _read_pages(
                             )
                         )
                         if merge_key:
-                            deep_merge(merged_records[merge_key], current_record)
+                            _deep_merge(merged_records[merge_key], current_record)
                         else:
                             # We should still emit records even if the record did not have a merge key
                             last_page_size += 1
@@ -624,16 +624,22 @@ def _to_partition_key(to_serialize: Any) -> str:
         return json.dumps(to_serialize, indent=None, separators=(",", ":"), sort_keys=True)
 
 
-def deep_merge(target: Dict[str, Any], source: Union[Record, Dict[str, Any]]) -> None:
+def _deep_merge(
+    target: MutableMapping[str, Any], source: Union[Record, MutableMapping[str, Any]]
+) -> None:
     """
     Recursively merge two dictionaries, combining nested dictionaries instead of overwriting them.
 
     :param target: The dictionary to merge into (modified in place)
     :param source: The dictionary to merge from
     """
     for key, value in source.items():
-        if key in target and isinstance(target[key], dict) and isinstance(value, dict):
-            deep_merge(target[key], value)
+        if (
+            key in target
+            and isinstance(target[key], MutableMapping)
+            and isinstance(value, MutableMapping)
+        ):
+            _deep_merge(target[key], value)
         else:
             target[key] = value
 

unit_tests/sources/declarative/retrievers/test_simple_retriever.py

@@ -1151,6 +1151,10 @@ def test_simple_retriever_with_additional_query_properties():
                 "dict_field": {
                     "key1": "value1",
                     "key2": "value2",
+                    "affiliation": {
+                        "company": "cradle",
+                        "industry": "pharmaceutical",
+                    },
                 },
             },
             associated_slice=None,
@@ -1174,6 +1178,7 @@ def test_simple_retriever_with_additional_query_properties():
                 "last_name": "kurashiki",
                 "nonary": "second",
                 "bracelet": "6",
+                "allies": ["aoi_kurashiki"],
             },
             associated_slice=None,
             stream_name=stream_name,
@@ -1224,7 +1229,7 @@ def test_simple_retriever_with_additional_query_properties():
                     "id": "a",
                     "first_name": "gentarou",
                     "last_name": "hongou",
-                    "dict_field": {"key1": "value1"},
+                    "dict_field": {"key1": "value1", "affiliation": {"company": "cradle"}},
                 },
                 associated_slice=None,
                 stream_name=stream_name,
@@ -1235,7 +1240,12 @@ def test_simple_retriever_with_additional_query_properties():
                 stream_name=stream_name,
             ),
             Record(
-                data={"id": "c", "first_name": "akane", "last_name": "kurashiki"},
+                data={
+                    "id": "c",
+                    "first_name": "akane",
+                    "last_name": "kurashiki",
+                    "allies": ["aoi_kurashiki"],
+                },
                 associated_slice=None,
                 stream_name=stream_name,
             ),
@@ -1276,7 +1286,7 @@ def test_simple_retriever_with_additional_query_properties():
                     "id": "a",
                     "nonary": "second",
                     "bracelet": "1",
-                    "dict_field": {"key2": "value2"},
+                    "dict_field": {"key2": "value2", "affiliation": {"industry": "pharmaceutical"}},
                 },
                 associated_slice=None,
                 stream_name=stream_name,