Skip to content

fix(low-code): keep $parameters out of JSON schemas with a list type #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Baz (bazarnov) merged 1 commit into from
Oct 6, 2026
Merged

fix(low-code): keep $parameters out of JSON schemas with a list type #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ def propagate_types_and_parameters(

@staticmethod
def _is_json_schema_object(propagated_component: Mapping[str, Any]) -> bool:
return propagated_component.get("type") == "object" or propagated_component.get("type") == [
"null",
"object",
]
# Component types are always strings: a list is a JSON schema type union and a dict is a
# `properties` map that has a property named `type`.
component_type = propagated_component.get("type")
return component_type == "object" or isinstance(component_type, (list, dict))

@staticmethod
def _has_nested_components(propagated_component: Dict[str, Any]) -> bool:
Expand Down
43 changes: 32 additions & 11 deletions unit_tests/sources/declarative/parsers/test_manifest_component_transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,19 +405,44 @@ def test_only_propagate_parameters_to_components():
assert actual_component == expected_component


def test_do_not_propagate_parameters_on_json_schema_object():
@pytest.mark.parametrize(
"schema",
[
pytest.param(
{
"type": "object",
"$schema": "http://json-schema.org/schema#",
"properties": {"id": {"type": "string"}},
},
id="object",
),
pytest.param(
{"type": ["null", "object"], "properties": {"id": {"type": ["null", "string"]}}},
id="null_object",
),
pytest.param(
{"type": ["object", "null"], "properties": {"id": {"type": ["null", "string"]}}},
id="object_null",
),
pytest.param(
{"type": ["object"], "properties": {"id": {"type": ["integer"]}}},
id="object_only",
),
pytest.param(
{"properties": {"type": {"type": "string"}, "id": {"type": "string"}}},
id="no_root_type_with_type_property",
),
],
)
def test_do_not_propagate_parameters_on_json_schema_object(schema):
component = {
"type": "DeclarativeStream",
"streams": [
{
"type": "DeclarativeStream",
"schema_loader": {
"type": "InlineSchemaLoader",
"schema": {
"type": "object",
"$schema": "http://json-schema.org/schema#",
"properties": {"id": {"type": "string"}},
},
"schema": schema,
},
"$parameters": {
"name": "roasters",
Expand All @@ -438,11 +463,7 @@ def test_do_not_propagate_parameters_on_json_schema_object():
"type": "InlineSchemaLoader",
"name": "roasters",
"primary_key": "id",
"schema": {
"type": "object",
"$schema": "http://json-schema.org/schema#",
"properties": {"id": {"type": "string"}},
},
"schema": schema,
"$parameters": {
"name": "roasters",
"primary_key": "id",
Expand Down
Loading