Skip to content

[SYNPY-1787] Changed conditionals so that the watched property is required #1334

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewelamb merged 1 commit into from
Mar 5, 2026
Merged

[SYNPY-1787] Changed conditionals so that the watched property is required #1334

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
10 changes: 8 additions & 2 deletions synapseclient/extensions/curator/schema_generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5198,7 +5198,10 @@ def _convert_conditional_properties_to_all_of(
"Cancer"
]
}
}
},
"required":[
"Diagnosis"
]
},
"then":{
"properties":{
Expand All @@ -5217,7 +5220,10 @@ def _convert_conditional_properties_to_all_of(
enum_value,
), dependent_properties in conditional_dependencies.items():
conditional_dep = {
"if": {"properties": {watched_property: {"enum": [enum_value]}}},
"if": {
"properties": {watched_property: {"enum": [enum_value]}},
"required": [watched_property],
},
"then": {
"properties": {
prop: {"not": {"type": "null"}} for prop in dependent_properties
Expand Down
15 changes: 12 additions & 3 deletions ...ons/schema_files/expected_jsonschemas/expected.BulkRNA-seqAssay.display_names_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"BAM"
]
}
}
},
"required":[
"File Format"
]
},
"then": {
"properties": {
Expand All @@ -33,7 +36,10 @@
"CRAM"
]
}
}
},
"required":[
"File Format"
]
},
"then": {
"properties": {
Expand Down Expand Up @@ -62,7 +68,10 @@
"CSV/TSV"
]
}
}
},
"required":[
"File Format"
]
},
"then": {
"properties": {
Expand Down
15 changes: 12 additions & 3 deletions ...client/extensions/schema_files/expected_jsonschemas/expected.BulkRNA-seqAssay.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"BAM"
]
}
}
},
"required":[
"FileFormat"
]
},
"then": {
"properties": {
Expand All @@ -33,7 +36,10 @@
"CRAM"
]
}
}
},
"required":[
"FileFormat"
]
},
"then": {
"properties": {
Expand Down Expand Up @@ -62,7 +68,10 @@
"CSV/TSV"
]
}
}
},
"required":[
"FileFormat"
]
},
"then": {
"properties": {
Expand Down
5 changes: 4 additions & 1 deletion ...t/extensions/schema_files/expected_jsonschemas/expected.Patient.display_names_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"Cancer"
]
}
}
},
"required":[
"Diagnosis"
]
},
"then": {
"properties": {
Expand Down
5 changes: 4 additions & 1 deletion ...t/synapseclient/extensions/schema_files/expected_jsonschemas/expected.Patient.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"Cancer"
]
}
}
},
"required":[
"Diagnosis"
]
},
"then": {
"properties": {
Expand Down
10 changes: 8 additions & 2 deletions tests/unit/synapseclient/extensions/unit_test_create_json_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,10 @@ def test_convert_conditional_properties_to_all_of(self) -> None:

# THEN the result should match the expected structure
expected_cancer = {
"if": {"properties": {"Diagnosis": {"enum": ["Cancer"]}}},
"if": {
"properties": {"Diagnosis": {"enum": ["Cancer"]}},
"required": ["Diagnosis"],
},
"then": {
"properties": {
"CancerType": {"not": {"type": "null"}},
Expand All @@ -338,7 +341,10 @@ def test_convert_conditional_properties_to_all_of(self) -> None:
}

expected_healthy = {
"if": {"properties": {"Diagnosis": {"enum": ["Healthy"]}}},
"if": {
"properties": {"Diagnosis": {"enum": ["Healthy"]}},
"required": ["Diagnosis"],
},
"then": {
"properties": {"CheckupDate": {"not": {"type": "null"}}},
"required": ["CheckupDate"],
Expand Down
Loading