Skip to content
Merged
Show file tree
Hide file tree
Changes from 208 commits
Commits
Show all changes
211 commits
Select commit Hold shift + click to select a range
7ba4ecd
Remove unused Consortium Grant schema
Bankso Jul 25, 2024
e427547
Removed unused Dataset and Dataset Grant schemas
Bankso Jul 25, 2024
dadb821
Remove unused Grant schema
Bankso Jul 25, 2024
bf09717
Remove unused Institution Grant schema
Bankso Jul 25, 2024
f6f6372
Remove unused Person Consortium schema
Bankso Jul 25, 2024
78358df
Remove unused Publication schemas
Bankso Jul 25, 2024
149ea59
Remove unused Theme Grant schema
Bankso Jul 25, 2024
46b3462
Remove unused Tool and Tool Grant schemas
Bankso Jul 25, 2024
2ad5f60
Make model
Bankso Jul 25, 2024
6fc65ff
Adjust dependsOn Component to reflect dependencies
Bankso Jul 25, 2024
707cb31
Remove PublicationView dependency on DatasetView
Bankso Jul 25, 2024
d07549d
Make model
Bankso Jul 25, 2024
e61aecd
Update key dependencies
Bankso Jul 25, 2024
e3d2446
Make model
Bankso Jul 25, 2024
e822294
Make model
Bankso Jul 25, 2024
961e952
Add File Data Use Codes
Bankso Jul 26, 2024
c04f07e
Add File Data Use Codes mapping
Bankso Jul 26, 2024
e6ff832
Make model
Bankso Jul 26, 2024
89aa95b
Create Study schema
Bankso Mar 29, 2024
9c8175f
Create Dataset Sharing Plan schema
Bankso Mar 29, 2024
ab24b4f
Update mapping.yaml
Bankso Mar 29, 2024
d1db668
Update annotationProperty.csv
Bankso Mar 29, 2024
4f29397
Update annotationProperty.csv
Bankso Mar 29, 2024
017d43b
Update annotationProperty.csv
Bankso Mar 29, 2024
1940c04
Update annotationProperty.csv
Bankso Mar 29, 2024
1ac080e
Add Project and Study Keys to biospecimen
Bankso Apr 9, 2024
1db9704
Add Project and Study Keys to ed resource
Bankso Apr 9, 2024
9a70ecc
Add Project and Study Key to GeoMx models
Bankso Apr 9, 2024
4f37128
Update annotationProperty.csv
Bankso Apr 16, 2024
c721b0c
Update annotationProperty.csv
Bankso Apr 16, 2024
7ad64fd
Add DUO controlled vocab mapping
Bankso Apr 22, 2024
4b6b1b3
Add a basic Study metadata model
Bankso Apr 22, 2024
1321b55
Remove unneeded grant key ref
Bankso Apr 22, 2024
ada5674
Add model for resource Collections
Bankso Apr 22, 2024
f6c5e31
Add skeleton of Source model
Bankso Apr 22, 2024
7ba59dc
Add sharing plan with links and DUO
Bankso Apr 22, 2024
dee14bd
Add DUO attribute to dataset and datasetview
Bankso Jun 14, 2024
6b05208
Update Biospecimen attribute list
Bankso Jun 21, 2024
33249a6
Update DatasetView attribute list
Bankso Jun 21, 2024
e57a363
Update EducationalResource attribute list
Bankso Jun 21, 2024
ec5b8cc
Rename Source to Individual
Bankso Jun 21, 2024
951ddd1
Update PersonView attribute list
Bankso Jun 21, 2024
f7daad5
Update ProjectView attribute list
Bankso Jun 21, 2024
4e2cdb3
Update PublicationView attribute list
Bankso Jun 21, 2024
d8b6241
Replace Source with Individual
Bankso Jun 21, 2024
77ff1ab
Update ToolView attribute list
Bankso Jun 21, 2024
ac7c429
Update valid values, build CSV and JSON
Bankso Jun 21, 2024
420afa2
Update release_workflow.sh
Bankso Jun 21, 2024
c29c59f
Replace old XLSX templates with CSVs
Bankso Jun 21, 2024
0cd75ff
Update release_workflow.sh
Bankso Jun 21, 2024
0eb606d
Update GeoMx schema definitions
Bankso Jun 24, 2024
9997272
Prep for rebase
Bankso Jun 27, 2024
a9825cc
Add initial Model CSV and schema def
Bankso Jun 27, 2024
7b0a035
Update Biospecimen attributes and schema definition
Bankso Jun 28, 2024
803d16a
Relocate subset of Biospecimen attributes to Individual
Bankso Jun 28, 2024
c885a89
Update mapping.yaml
Bankso Jun 28, 2024
0318b14
Add keys to DSP schema definition
Bankso Jun 28, 2024
a6066c5
Add first set of Individual model attributes
Bankso Jul 11, 2024
7b391be
Add approximate attributes for Model schema
Bankso Jul 11, 2024
26f7270
Add File attribute valid value mappings
Bankso Jul 19, 2024
be30fc6
Update annotationProperty.csv
Bankso Jul 19, 2024
be1c868
Squashed commit of the following:
Bankso Jul 19, 2024
5cb4a84
Update dependencies
Bankso Jul 26, 2024
11e72a1
Update dependencies
Bankso Jul 26, 2024
5d8b96d
Make model
Bankso Jul 26, 2024
e11965d
Refine dependencies for schema viz
Bankso Jul 26, 2024
7eaded8
Make model
Bankso Jul 26, 2024
6457240
Update dependencies
Bankso Jul 30, 2024
1a9b578
Make model
Bankso Jul 30, 2024
45c66e3
Update dependencies
Bankso Jul 30, 2024
486d8be
Make model
Bankso Jul 30, 2024
88e10e0
Update annotationProperty.csv
Bankso Jul 30, 2024
f61e910
Make model
Bankso Jul 30, 2024
c48f7c5
Add assay dependencies
Bankso Jul 30, 2024
d927626
Make model
Bankso Jul 30, 2024
cf542a9
Update ToolView.csv (#130)
aditigopalan Jul 25, 2024
a540990
Add Visium models and attributes
Bankso Aug 2, 2024
4b28130
Update mapping.yaml
Bankso Aug 2, 2024
618a67d
Ed Res - fix dependencies
Bankso Aug 2, 2024
f827ccc
File - fix dependencies, move common attributes to shared
Bankso Aug 2, 2024
d5b2d23
Add terms for Visium attributes
Bankso Aug 2, 2024
50365ad
Update seqPlatform.csv
Bankso Aug 2, 2024
429c7b7
Update mapping.yaml
Bankso Aug 2, 2024
db639f9
Update all_valid_values.csv
Bankso Aug 2, 2024
824329e
Create CSV templates
Bankso Aug 2, 2024
4a93e9d
Separate visium model into level folders
Bankso Aug 2, 2024
bf72391
Update mapping.yaml
Bankso Aug 2, 2024
77aa835
Move biospecimen terms back to biospecimen module
Bankso Aug 19, 2024
ad15a93
Move terms to relevant module subfolders
Bankso Aug 19, 2024
ec19b53
Move file terms to file module
Bankso Aug 19, 2024
b76e13a
GeoMx terms to GeoMx modules
Bankso Aug 19, 2024
e6d8e57
Move imaging terms to imaging modules
Bankso Aug 19, 2024
b4ae9f4
Move sequencing terms to sequencing modules
Bankso Aug 19, 2024
79012df
Move visium terms to visium modules
Bankso Aug 19, 2024
7630ff6
Split GeoMx attributes into level-based modules
Bankso Aug 19, 2024
810be84
Add initial set of sequencing attributes
Bankso Aug 19, 2024
4ffe301
Move shared visium attributes to visium modules
Bankso Aug 19, 2024
aa80615
Update mapping to match new valid values
Bankso Aug 19, 2024
b22e753
Make and json-ld build
Bankso Aug 19, 2024
86e0f0e
Add Biospecimen attributes from CDS mapping
Bankso Aug 23, 2024
00c0a43
Separate imaging attributes into level-specific folders
Bankso Aug 23, 2024
b917eea
Add Imaging Channel schema def and attributes
Bankso Aug 23, 2024
71b5358
Add Imaging Level 1 schema def and attributes
Bankso Aug 23, 2024
6a5b7cb
Add Imaging Level 2 schema def and attributes
Bankso Aug 23, 2024
de5556f
Add valid values for imaging terms
Bankso Aug 23, 2024
745f8cf
Add Imaging Level 3 image schema def and attributes
Bankso Aug 23, 2024
e331c03
Add Imaging Level 3 segment schema def and attributes
Bankso Aug 23, 2024
5f9d6ac
Add Imaging Level 4 schema def and attributes
Bankso Aug 23, 2024
4773660
Separate geomx model into level-specific folders
Bankso Aug 23, 2024
df89aab
Update GeoMx Imaging schema and attributes
Bankso Aug 23, 2024
8c97f70
Update GeoMx Level 1 schema and attributes
Bankso Aug 23, 2024
761350f
Update Individual schema def and attributes
Bankso Aug 23, 2024
9176a34
Update Model schema and attributes
Bankso Aug 23, 2024
234ffcb
Add new shared attributes
Bankso Aug 23, 2024
4ee0bc0
Add new Study schema def and attributes
Bankso Aug 23, 2024
9d49225
Add "Whole Animal" as specimen type
Bankso Aug 29, 2024
9d91481
Add new attributes to Biospecimen schema def
Bankso Aug 29, 2024
aa72bad
Add segments key to imaging level 4 schema
Bankso Aug 29, 2024
121214a
Add model acquisition type to model schema
Bankso Aug 29, 2024
65a482d
Update Sequencing L1/L2 Attributes, add schema definitions
Bankso Sep 11, 2024
65e0618
Add Biospecimen timepoint attributes
Bankso Sep 11, 2024
36ff72c
Add timepoint attributes for FileView
Bankso Sep 11, 2024
8c4ba24
Fixed spelling error
Bankso Sep 11, 2024
df1761d
Update mappings for image model
Bankso Sep 11, 2024
4ce91e9
Update valid values and make CSV + JSON-LD
Bankso Sep 11, 2024
ad19afc
Update Visium attribute names and schema definitions
Bankso Sep 26, 2024
4d36664
Update Biospecimen attributes and schema
Bankso Sep 26, 2024
ad8822f
Add CDS terminology as valid values
Bankso Sep 26, 2024
5dae083
Move terms to 'shared'
Bankso Sep 26, 2024
6223668
Use specific Dataset Data Use Codes attribute
Bankso Sep 26, 2024
564a1e8
Add File View attributes and update schema def
Bankso Sep 26, 2024
bb37298
Update GeoMx imaging attributes and schema
Bankso Sep 26, 2024
2539d04
Update GeoMx Level 1 attributes and schema
Bankso Sep 26, 2024
a6e58aa
Update GeoMx Level 2 attributes and schema
Bankso Sep 26, 2024
a2c4f87
Update GeoMx Level 3 attributes and schema
Bankso Sep 26, 2024
9ffeaa1
Update GeoMx ROI attributes and schema
Bankso Sep 26, 2024
78fc66a
Update imaging channel attributes
Bankso Sep 26, 2024
506a708
Add Imaging Level 1 attributes and schema
Bankso Sep 26, 2024
3f6a0f0
Add Imaging Level 2 attributes and schema
Bankso Sep 26, 2024
77f56d7
Add Imaging Level 3 attributes and schema
Bankso Sep 26, 2024
fbd1a91
Add Imaging Level 3 segments attributes and schema
Bankso Sep 26, 2024
2d5f733
Add valid values for Object Class and Segment
Bankso Sep 26, 2024
98b9c2b
Add Imaging Level 4 attributes and schema
Bankso Sep 26, 2024
c28e5d2
Add Summary Statistic valid values
Bankso Sep 26, 2024
c54fe26
Update Individual schema definition
Bankso Sep 26, 2024
f131d25
Add CDS valid values
Bankso Sep 26, 2024
7341abb
Update sequencing level 1 attributes and schema
Bankso Sep 26, 2024
525c400
Add CDS valid values for sequencing
Bankso Sep 26, 2024
4c43241
Update sequencing level 2 attributes and schema
Bankso Sep 26, 2024
8530593
Update sequencing level 3 attributes
Bankso Sep 26, 2024
37df353
Update species to include more human-related terms
Bankso Sep 26, 2024
ed50021
Add CDS valid values
Bankso Sep 26, 2024
060f7b8
Move tumor subtype valid values to shared
Bankso Sep 26, 2024
717d077
Add DSP attributes and update schema
Bankso Sep 26, 2024
8edca2f
Update Study Data Use Codes attribute description
Bankso Sep 26, 2024
d72ebaf
Add CDS valid values for De-id method and License
Bankso Sep 26, 2024
5e9971e
Add additional Keys for component_ids
Bankso Sep 26, 2024
843c97d
Update component_ids for visium model
Bankso Sep 26, 2024
d7d47c8
Add additional component keys
Bankso Sep 26, 2024
d95a0f3
Remove redundant tumorOrigin.csv
Bankso Oct 3, 2024
e3b71c2
Add CDS and HTAN terms + values
Bankso Oct 4, 2024
f469e39
Update dependencies
Bankso Oct 18, 2024
f35492b
Add model definition and primary key
Bankso Oct 18, 2024
7c9d9bc
Update Biospecimen attributes
Bankso Oct 18, 2024
212ae56
Update mapping.yaml
Bankso Oct 18, 2024
ee10cf0
Update from valid values script, add back File Alias
Bankso Oct 18, 2024
130a673
Update annotationProperty.csv
Bankso Oct 18, 2024
f15ecf4
Update annotationProperty.csv
Bankso Oct 18, 2024
8d38493
Update annotationProperty.csv
Bankso Oct 18, 2024
278204a
Update annotationProperty.csv
Bankso Oct 18, 2024
3f98df0
Update annotationProperty.csv
Bankso Oct 18, 2024
131b1c6
Update dataset_file_format.csv
Bankso Oct 18, 2024
01af9dc
Add new models to template list
Bankso Oct 18, 2024
b7f53cd
Update dataset_species.csv
Bankso Oct 18, 2024
dd6cd94
Replace commas in terms with semicolons
Bankso Oct 18, 2024
5393b52
Update valid values via script
Bankso Oct 18, 2024
7bf8bae
Use Study-specific DUO attribute
Bankso Oct 18, 2024
c68de81
Use shared DUO attribute for Dataset View
Bankso Oct 24, 2024
5e5476a
Use shared DUO attribute in File View
Bankso Oct 24, 2024
245a010
Update shared DUO attribute description
Bankso Oct 24, 2024
16d369f
Add validation rule for Study DU Codes
Bankso Oct 24, 2024
7cdfea5
Remove redundant attribute Workflow Link
Bankso Oct 24, 2024
5449d54
Update Filename description
Bankso Oct 24, 2024
edf492c
Update File Alias description
Bankso Oct 24, 2024
d12e969
Update DSP IRB Form attribute
Bankso Oct 24, 2024
1acb26c
Add Study Key to Channel Metadata schema def
Bankso Oct 24, 2024
1bef8ac
Add CDS required attributes to seq lv 2
Bankso Oct 24, 2024
0dc3d02
Fix mapping.yml typo and incorrect attribute
Bankso Oct 24, 2024
dc86b0b
Merge branch 'main' into refactor-add-cds-imaging
Bankso Oct 24, 2024
05da83f
Remove differentiated DUO attribute mapping
Bankso Oct 24, 2024
c57546d
Update all_valid_values.csv
Bankso Oct 24, 2024
1d5529a
Update build-jsonld.yml
Bankso Oct 25, 2024
8e86e1a
Make updated model
Bankso Oct 25, 2024
7edeb4a
Update release_workflow.sh
Bankso Oct 25, 2024
aa1fcfd
Add updated model templates
Bankso Oct 25, 2024
89a8880
Retain json data model schemas in model
Bankso Oct 25, 2024
f079865
Remove maxItems
Bankso Oct 29, 2024
e14aa54
Relocate RNA-specific attributes
Bankso Oct 30, 2024
1b4e394
Move RNA-focused valid values to RNA seq module
Bankso Oct 30, 2024
45c9ced
Update mapping.yaml
Bankso Oct 30, 2024
dfdd54f
Update Visium Aux model definition
Bankso Oct 30, 2024
7540c1c
Update Visium Level 1 model definition
Bankso Oct 30, 2024
0304b1e
Update Visium Level 3 definition
Bankso Oct 30, 2024
46931e1
Update Visium Level 4
Bankso Oct 30, 2024
4458a47
Update valid values
Bankso Oct 30, 2024
cff382a
Update annotationProperty.csv
Bankso Oct 30, 2024
e1f351e
Make and schema convert
Bankso Oct 31, 2024
2e1710e
Generate updated Sequencing Level 1 template
Bankso Oct 31, 2024
3562872
Merge branch 'main' into refactor-add-cds-imaging
Bankso Oct 31, 2024
1883edc
Update valid values
Bankso Oct 31, 2024
632a5bd
Build JSON-LD
Bankso Oct 31, 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 .github/workflows/build-jsonld.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
schematic-version: [ 24.5.1 ]
schematic-version: [ 24.10.2 ]

steps:
- name: Install System Dependencies
Expand Down
10,406 changes: 10,029 additions & 377 deletions all_valid_values.csv

Large diffs are not rendered by default.

147 changes: 147 additions & 0 deletions json_schemas/mc2.10xVisiumAuxiliaryFiles.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://example.com/MC2",
"title": "MC2",
"type": "object",
"properties": {
"Capture Area": {},
"10xVisiumAuxiliaryFiles_id": {
"not": {
"type": "null"
},
"minLength": 1
},
"Run ID": {},
"Workflow Version": {},
"10xVisiumRNALevel3 Key": {},
"10xVisiumRNALevel1 Key": {},
"Slide ID": {},
"Filename": {
"not": {
"type": "null"
},
"minLength": 1
},
"Workflow Link": {},
"10xVisiumRNALevel2 Key": {},
"File Format": {
"enum": [
"GCT",
"FIG",
"FASTQ",
"HDF5",
"SCN",
"R File Format",
"AVI",
"DB",
"TDF",
"cel",
"PKL",
"LIF",
"FASTA",
"RPROJ",
"XML",
"JPG",
"RAW",
"TAR Format",
"RTF",
"unspecified",
"SF",
"CLS",
"pptx",
"CSV",
"xls",
"FREQ",
"DAE",
"MATLAB script",
"Pending Annotation",
"MTX",
"TSV",
"MGF",
"TXT",
"H5AD",
"H5",
"GFF3",
"bed12",
"JSON",
"FCS",
"cloupe",
"MAT",
"BAI",
"ROUT",
"STAT",
"VCF",
"GTF",
"PZFX",
"PNG",
"SGI",
"TIFF",
"RDS",
"Python Script",
"BIGWIG",
"BAM",
"IDAT",
"BED",
"GCG",
"WIG",
"mzIdentML",
"mzXML",
"docx",
"DS_Store",
"SVS",
"CHP",
"bedgraph",
"PDF",
"GCTx",
"MAP",
"HDF",
"maf",
"COOL",
"BPM",
"SRA",
"HTML",
"rcc",
"ZIP",
"GZIP Format",
"xlsx",
"MSF",
"CDS"
]
},
"10xVisiumRNALevel4 Key": {},
"Component": {
"not": {
"type": "null"
},
"minLength": 1
},
"Biospecimen Key": {},
"Visium File Type": {
"enum": [
"reference png",
"json scale factors",
"reference jpg",
"filtered mex",
"fiducial image png",
"tissue_positions",
"features",
"qc result html",
"fiducial image jpg",
"detected jpg",
"detected image png",
"barcodes",
"low res image",
"unfiltered mex",
"probe dataset csv",
"high res image"
]
}
},
"required": [
"10xVisiumAuxiliaryFiles_id",
"Filename",
"File Format",
"Component",
"Visium File Type"
]
}
Loading