Fix complex type resolving

Author: lazebnyi

airbyte_cdk/sources/declarative/schema/dynamic_schema_loader.py

@@ -154,8 +154,9 @@ def get_json_schema(self) -> Mapping[str, Any]:
         transformed_properties = self._transform(properties, {})
 
         return {
-            "$schema": "http://json-schema.org/draft-07/schema#",
+            "$schema": "https://json-schema.org/draft-07/schema#",
             "type": "object",
+            "additionalProperties": True,
             "properties": transformed_properties,
         }
 
@@ -220,25 +221,14 @@ def _get_type(
             )
 
     def _resolve_complex_type(self, complex_type: ComplexFieldType) -> Mapping[str, Any]:
-        types = [complex_type]
-        resolved_type: MutableMapping[str, Any] = {}
-
-        while types:
-            current_type = types.pop()
-            if not current_type.items:
-                resolved_type = self._get_airbyte_type(current_type.field_type)
-            else:
-                field_type = self._get_airbyte_type(current_type.field_type)
-
-                if isinstance(current_type.items, str):
-                    items_type = current_type.items
-                else:
-                    types.append(current_type.items)
-                    continue  # Skip the following lines until the stack is resolved
-                field_type["items"] = self._get_airbyte_type(items_type)
-                resolved_type = field_type
-
-        return resolved_type
+        if not complex_type.items:
+            return self._get_airbyte_type(complex_type.field_type)
+
+        field_type = self._get_airbyte_type(complex_type.field_type)
+        field_type["items"] = self._get_airbyte_type(complex_type.items) if isinstance(complex_type.items, str) else self._resolve_complex_type(
+            complex_type.items)
+
+        return field_type
 
     def _replace_type_if_not_valid(
         self,

unit_tests/sources/declarative/schema/test_dynamic_schema_loader.py

@@ -87,7 +87,7 @@
                     "types_mapping": [
                         {"target_type": "string", "current_type": "singleLineText"},
                         {
-                            "target_type": {"field_type": "array", "items": "integer"},
+                            "target_type": {"field_type": "array", "items": {"field_type": "array", "items": "integer"}},
                             "current_type": "formula",
                             "condition": "{{ raw_schema['result']['type'] == 'customInteger' }}",
                         },
@@ -321,7 +321,8 @@ def test_dynamic_schema_loader_with_type_conditions():
     ]["types_mapping"].append({"target_type": "array", "current_type": "formula"})
 
     expected_schema = {
-        "$schema": "http://json-schema.org/draft-07/schema#",
+        "$schema": "https://json-schema.org/draft-07/schema#",
+        "additionalProperties": True,
         "type": "object",
         "properties": {
             "id": {"type": ["null", "integer"]},
@@ -331,7 +332,7 @@ def test_dynamic_schema_loader_with_type_conditions():
             "currency": {"type": ["null", "number"]},
             "salary": {"type": ["null", "number"]},
             "working_days": {"type": ["null", "array"]},
-            "avg_salary": {"type": ["null", "array"], "items": {"type": ["null", "integer"]}},
+            "avg_salary": {"type": ["null", "array"], "items": {"type": ["null", "array"], "items": {"type": ["null", "integer"]}}},
         },
     }
     source = ConcurrentDeclarativeSource(