Skip to content
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

Filtering terms in model fix #161

Closed
wants to merge 2 commits into from
Closed

Filtering terms in model fix #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37b3df
proper filteringTerms definition for models
mbaudis Aug 21, 2024
bf3e848
Merge branch 'schema-urgent-fixes' into filtering-terms-in-model-fix
costero-e Sep 12, 2024
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
2 changes: 1 addition & 1 deletion framework/src/responses/sections/beaconFilteringTermsResults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $defs:
- 'B Lymphoblastic Leukemia/Lymphoma'
- 'Aplasia/Hypoplasia of the middle ear'
scopes:
description: >-
description: >-
Entry types affected by this filter.
examples:
-
Expand Down
5 changes: 4 additions & 1 deletion models/json/beacon-v2-default-model/analyses/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": []
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
5 changes: 4 additions & 1 deletion models/json/beacon-v2-default-model/biosamples/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": []
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
12 changes: 4 additions & 8 deletions models/json/beacon-v2-default-model/cohorts/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": [
{
"ftType": "ontologyTerm",
"id": "DUO:0000006",
"label": "health or medical or biomedical research",
"version": "2021-02-23"
}
]
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
12 changes: 4 additions & 8 deletions models/json/beacon-v2-default-model/datasets/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": [
{
"ftType": "ontologyTerm",
"id": "DUO:0000006",
"label": "health or medical or biomedical research",
"version": "2021-02-23"
}
]
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
14 changes: 4 additions & 10 deletions models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": [
{
"ftType": "alphanumeric",
"id": "gene"
},
{
"ftType": "alphanumeric",
"id": "aminoacidChanges"
}
]
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
5 changes: 4 additions & 1 deletion models/json/beacon-v2-default-model/individuals/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": []
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
5 changes: 4 additions & 1 deletion models/json/beacon-v2-default-model/runs/filteringTerms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"filteringTerms": []
"items": {
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm"
},
"type": "array"
}
4 changes: 3 additions & 1 deletion models/src/beacon-v2-default-model/analyses/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms: []
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
4 changes: 3 additions & 1 deletion models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms: []
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
8 changes: 3 additions & 5 deletions models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms:
- ftType: ontologyTerm
id: DUO:0000006
label: health or medical or biomedical research
version: '2021-02-23'
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
8 changes: 3 additions & 5 deletions models/src/beacon-v2-default-model/datasets/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms:
- ftType: ontologyTerm
id: DUO:0000006
label: health or medical or biomedical research
version: '2021-02-23'
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
8 changes: 3 additions & 5 deletions models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms:
- ftType: alphanumeric
id: gene
- ftType: alphanumeric
id: aminoacidChanges
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
4 changes: 3 additions & 1 deletion models/src/beacon-v2-default-model/individuals/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms: []
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
4 changes: 3 additions & 1 deletion models/src/beacon-v2-default-model/runs/filteringTerms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$schema: https://json-schema.org/draft/2020-12/schema
filteringTerms: []
type: array
items:
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm
Loading