Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
09366aa
General maintenance updates - part 1
PhilipMusk Nov 1, 2023
6f1c73f
Fix #144 Update model per OSA02 and OSA04 requirements
PhilipMusk Apr 11, 2024
4343c71
Fix #145 General model maintenance and house-keeping
PhilipMusk Apr 16, 2024
b20b901
Fix #145 General model maintenance and house-keeping
PhilipMusk Apr 16, 2024
38913b3
Add new file to support content and content order for download and ex…
May 1, 2024
d6873c4
Fix #144 Update model per OSA02 and OSA04 requirements
PhilipMusk May 8, 2024
817c3a3
Mitigate duplicate keys in the same object
May 14, 2024
dfb04b7
Revise syntax for static props
May 14, 2024
bae0548
Update syntax for props to be exported in the file manifest
May 14, 2024
49ba764
Merge pull request #148 from CBIIT/add-file-for-manifest
kuffelgr May 14, 2024
c332dc1
update comments
kuffelgr May 14, 2024
c71a5c4
Merge pull request #146 from CBIIT/General_maintenance_updates
PhilipMusk Jun 11, 2024
bff91ea
CRDCDH-1308
Jul 3, 2024
0dfbc2c
Add file_id
Jul 3, 2024
d33eee6
Remove quotes causing validation error.
kuffelgr Jul 3, 2024
1211087
Update icdc-model-props.yml
kuffelgr Jul 3, 2024
4cc57a7
Merge pull request #149 from CBIIT/CRDCDH-1308
kuffelgr Jul 9, 2024
da78c2e
Changes requested by Data Hub
Jul 9, 2024
b378bd3
Update icdc-model-props.yml
kuffelgr Jul 9, 2024
c11b220
Merge pull request #150 from CBIIT/CRDCDH-1308
kuffelgr Jul 11, 2024
b0bd63b
additional updates requested
Jul 11, 2024
18e8d57
Revert "additional updates requested"
Jul 11, 2024
1e91a18
additional changes requested
Jul 11, 2024
c22d219
Merge pull request #151 from CBIIT/CRDCDH-1308
kuffelgr Jul 15, 2024
7123719
Data model updates requested by the CRDC Data Hub
Jul 22, 2024
d7b38c7
Update icdc-model-props.yml
kuffelgr Jul 22, 2024
c09ff4e
Remove duplicate props
Jul 24, 2024
11c2414
add prop display values to manifest YAML
erm156 Jul 25, 2024
880a8de
Merge pull request #155 from CBIIT/add-display-vals
erm156 Jul 26, 2024
69dd9b0
Merge pull request #154 from CBIIT/remove-dup-props
erm156 Jul 26, 2024
e2ae0bf
Comment out agent_administration
kuffelgr Jul 30, 2024
863140c
Update key prop names
Aug 13, 2024
0393ffe
resolve conflict
Aug 13, 2024
1839604
resolve merge conflict
kuffelgr Aug 13, 2024
43dd4a3
remove relationships involving agent node
kuffelgr Aug 14, 2024
5283ba6
Update icdc-model.yml
kuffelgr Aug 14, 2024
3eb03b4
Add urethra as permissible value
kuffelgr Aug 16, 2024
76b42b0
remove multiple key from extent of disease node
kuffelgr Aug 19, 2024
bdd66b2
add type string to respiration_pattern prop
kuffelgr Aug 20, 2024
5723bcd
update anatomical_site_of_surgery to type string
kuffelgr Aug 20, 2024
7a6c373
update procedure prop to type string
kuffelgr Aug 20, 2024
38202db
update modified_ecog prop to type string
kuffelgr Aug 20, 2024
ea7ba4f
remove manifest props to demo dynamic update (TO BE REVERTED)
erm156 Aug 21, 2024
d5d3043
Merge pull request #156 from CBIIT/retro-demo-update
erm156 Aug 21, 2024
b70acdc
Revert "remove manifest props to demo dynamic update (TO BE REVERTED)"
erm156 Aug 21, 2024
27fdf12
Merge pull request #157 from CBIIT/revert-156-retro-demo-update
erm156 Aug 21, 2024
f1bba3b
remove properties from manifest YAML to demo dynamic update (TO BE RE…
erm156 Aug 21, 2024
0d48281
Merge pull request #158 from CBIIT/retro-demo-manifest-update
erm156 Aug 21, 2024
5766372
Revert "remove properties from manifest YAML to demo dynamic update (…
erm156 Aug 21, 2024
9bd317e
Merge pull request #159 from CBIIT/revert-158-retro-demo-manifest-update
erm156 Aug 21, 2024
715653c
remove all non-static props for QA test (to be reverted)
erm156 Aug 26, 2024
3811ef9
Merge pull request #160 from CBIIT/icdc-3491-qa-test
erm156 Aug 26, 2024
73562f1
Revert "remove all non-static props for QA test (to be reverted)"
erm156 Aug 26, 2024
1d8466f
Merge pull request #161 from CBIIT/revert-160-icdc-3491-qa-test
erm156 Aug 26, 2024
6989839
remove all non-static file props
erm156 Aug 26, 2024
6f46c1e
Merge pull request #162 from CBIIT/icdc-3491-qa-test-v2
erm156 Aug 26, 2024
aa296c5
Revert "remove all non-static file props (to be reverted)"
erm156 Aug 26, 2024
f1f249c
Merge pull request #163 from CBIIT/revert-162-icdc-3491-qa-test-v2
erm156 Aug 26, 2024
093ce90
add test property
erm156 Aug 26, 2024
a2f9427
Merge pull request #164 from CBIIT/icdc-3491-qa-test-v3
erm156 Aug 26, 2024
cbdf8b8
Revert "add test property (to be reverted)"
erm156 Aug 26, 2024
0c7a3c2
Merge pull request #165 from CBIIT/revert-164-icdc-3491-qa-test-v3
erm156 Aug 26, 2024
6c591fa
add cohort node and move props
erm156 Aug 27, 2024
89cb083
fix(validataion) - change 'Integer' to 'integer' in Types
majensen Nov 12, 2024
3735c3d
Merge pull request #166 from CBIIT/update-manifest-yaml
kuffelgr Nov 18, 2024
51b0009
CRDCDH-1684
Nov 19, 2024
c607cd8
Fix #168 Update model per STS01 and OSA04 requirements
PhilipMusk Feb 19, 2025
7b5adaa
Fix #168 Update Model per STS01 and OSA04 requirements - fix "Integer"
PhilipMusk Feb 19, 2025
a3cf0d0
Merge pull request #169 from CBIIT/Alignment_with_STS01_and_OSA04_stu…
PhilipMusk Feb 21, 2025
ad9b139
Fix #168 Update Model per STS01 and OSA04 requirements - polish
PhilipMusk Feb 24, 2025
20dd783
Fix #168 - additional minor updates
PhilipMusk Mar 19, 2025
18b4b4a
Update model-test-and-deploy.yml - update yml version
PhilipMusk Mar 19, 2025
33386b5
bump cicd
majensen Mar 21, 2025
5138106
Merge pull request #170 from CBIIT/Alignment_with_STS01_and_OSA04_stu…
PhilipMusk Apr 10, 2025
54b9d90
Add human relevance node and props
Apr 15, 2025
f9145de
Updates per reviewer comments
Apr 16, 2025
cb94105
Fix spelling error
Apr 17, 2025
1861757
Merge pull request #171 from CBIIT/ICDC-3883
kuffelgr Apr 17, 2025
c6a5ac0
Merge branch 'develop' into CRDCDH-1344
kuffelgr Aug 5, 2025
0c1995e
Merge pull request #167 from CBIIT/maj-val-fix
kuffelgr Aug 5, 2025
af0a02b
remove follow_up relationship
kuffelgr Aug 5, 2025
d8e4dc3
restore image_collection
kuffelgr Aug 5, 2025
f3d26ea
remove agent_administration relationship
kuffelgr Aug 5, 2025
7808001
remove image relationship
kuffelgr Aug 5, 2025
99faa06
Merge pull request #152 from CBIIT/CRDCDH-1344
kuffelgr Aug 5, 2025
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 .github/workflows/model-test-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
permissions:
packages: read
contents: write
uses: CBIIT/bento-workflows/.github/workflows/model-test-and-deploy.yml@v2.1.7
uses: CBIIT/bento-workflows/.github/workflows/model-test-and-deploy.yml@v2.3.12
with:
model_files: |
icdc-model.yml icdc-model-props.yml
Expand Down
106 changes: 106 additions & 0 deletions model-desc/icdc-manifest-props.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# ICDC nodes and props for the file manifest
# Title case names are "reserved" (meaningful to the parser)
# Lower case names are labels for the entities
# The first 4 properties to be listed in the File Manifest are designated in StaticProps. The file node properties are required by the CGC for mapping and the others are designated for context. These will not change and do not need to be read dynamically.

Nodes:
file:
StaticProps:
- property: file_name
display: "name"
- property: drs_uri
display: "drs_uri"
ExportProps:
- property: file_type
display: "File Type"
- property: file_description
display: "File Description"
- property: file_format
display: "File Format"
- property: file_size
display: "File Size"
- property: md5sum
display: "md5sum"
- property: uuid
display: "File UUID"
- property: file_location
display: "File Location"
case:
StaticProps:
- property: case_id
display: "Case ID"
study:
StaticProps:
- property: clinical_study_designation
display: "Study Code"
ExportProps:
- property: patient_id
display: "Patient ID"
- property: patient_first_name
display: "Case Name"
cohort:
ExportProps:
- property: cohort_description
display: "Cohort"
- property: cohort_dose
display: "Cohort Dose"
- property: cohort_id
display: "Cohort ID"
demographic:
ExportProps:
- demographic_record_id
- breed
- additional_breed_detail
- patient_age_at_enrollment
- date_of_birth
- sex
- weight
- neutered_indicator
- diagnosis_id
- disease_term
- stage_of_disease
- histology_cytopathology
- date_of_histology_confirmation
- histological_grade
- best_response
- pathology_report
- treatment_data
- follow_up_data
- concurrent_disease
- concurrent_disease_type
sample:
ExportProps:
- property: sample_id
display: "Sample ID"
- property: sample_site
display: "Sample Site"
- property: physical_sample_type
display: "Physical Sample Type"
- property: general_sample_pathology
display: "Sample Pathology"
- property: tumor_sample_origin
display: "Tumor Sample Origin"
- property: summarized_sample_type
display: "Sample Type"
- property: molecular_subtype
display: "Molecular Subtype"
- property: specific_sample_pathology
display: "Pathology/Morphology"
- property: date_of_sample_collection
display: "Date of Sample Collection"
- property: sample_chronology
display: "Sample Chronology"
- property: necropsy_sample
display: "Necropsy Sample"
- property: tumor_grade
display: "Tumor Grade"
- property: length_of_tumor
display: "Tumor Length"
- property: width_of_tumor
display: "Tumor Width"
- property: volume_of_tumor
display: "Tumor Volume"
- property: percentage_tumor
display: "Percentage Tumor"
- property: sample_preservation
display: "Sample Preservation"
Loading