Skip to content

Commit bbe2425

Browse files
Add defaults (#777)
* Add dcc nf-osi and dataSubtype processed defaults * Add resourceType defaults * Add defaults for species and model system fields * Add default dataType values based on match * Add default assay values based on match * Add image as dataType default for imaging templates * Add dataType default for epidemiology * Fix: Use label instead of class name * Update Data.yaml * Revision --------- Co-authored-by: Anh Nguyet Vu <32753274+anngvu@users.noreply.github.com> Co-authored-by: Anh Nguyet Vu <anngvu@gmail.com>
1 parent 6da7d66 commit bbe2425

File tree

5 files changed

+67
-4
lines changed

5 files changed

+67
-4
lines changed

modules/Template/Biosample.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,6 @@ classes:
106106
- lenticularOpacity
107107
- nonvestibularSchwannomas
108108
- numberOfSchwannomas
109+
slot_usage:
110+
species:
111+
ifabsent: string(Homo sapiens)

modules/Template/Data.yaml

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ classes:
186186
slot_usage:
187187
assay:
188188
range: SequencingAssayEnum
189+
ifabsent: string(ChIP-seq)
189190
platform:
190191
range: SequencingPlatformEnum
191192
fileFormat:
@@ -211,9 +212,7 @@ classes:
211212
- clinical
212213
required: false
213214
requiresComponent: ''
214-
description: 'General template for typically tabular **individual-level** data. This can include repeated measures and a drug treatment context.
215-
216-
'
215+
description: 'General template for typically tabular **individual-level** data. This can include repeated measures and a drug treatment context.'
217216
is_a: BiologicalAssayDataTemplate
218217
slots:
219218
- experimentalFactor
@@ -223,13 +222,18 @@ classes:
223222
- compoundDose
224223
- compoundDoseUnit
225224
- comments
225+
- isCellLine
226226
slot_usage:
227227
assay:
228228
range: ClinicalBehavioralAssayEnum
229229
fileFormat:
230230
any_of:
231231
- range: TabularFileFormatEnum
232232
- range: DocumentFileFormatEnum
233+
dataType:
234+
ifabsent: string(clinical)
235+
isCellLine:
236+
ifabsent: string(No)
233237
rules:
234238
- description: If compoundDose is provided, compoundDoseUnit must be provided
235239
preconditions:
@@ -283,6 +287,9 @@ classes:
283287
- dataType
284288
- populationCoverage
285289
- epidemiologyMetric
290+
slot_usage:
291+
dataType:
292+
ifabsent: string(epidemiology)
286293
EpigeneticsAssayTemplate:
287294
annotations:
288295
required: false
@@ -339,6 +346,7 @@ classes:
339346
slot_usage:
340347
assay:
341348
range: CellBasedAssayEnum
349+
ifabsent: string(flow cytometry)
342350
platform:
343351
range: FlowCytometryPlatformEnum
344352
fileFormat:
@@ -496,14 +504,17 @@ classes:
496504
is_a: BulkSequencingAssayTemplate
497505
notes:
498506
- It's possible that not all raw genomics data equates to sequencing output.
499-
slots: null
507+
slots:
508+
- isXenograft
500509
slot_usage:
501510
assay:
502511
range: SequencingAssayEnum
503512
platform:
504513
range: SequencingPlatformEnum
505514
fileFormat:
506515
range: SequencingFileFormatEnum
516+
isXenograft:
517+
ifabsent: string(No)
507518
GenomicsAssayTemplateExtended:
508519
annotations:
509520
required: false
@@ -573,6 +584,8 @@ classes:
573584
- range: ImagingSystemPlatformEnum
574585
fileFormat:
575586
range: ImagingFileFormatEnum
587+
dataType:
588+
ifabsent: string(image)
576589
slots:
577590
- platform
578591
- assayTarget
@@ -653,6 +666,8 @@ classes:
653666
range: MRIPlatformEnum
654667
fileFormat:
655668
range: ImagingFileFormatEnum
669+
dataType:
670+
ifabsent: string(image)
656671
rules:
657672
- description: If experimentalTimepoint is provided, timepointUnit must be provided
658673
preconditions:
@@ -748,6 +763,7 @@ classes:
748763
slot_usage:
749764
assay:
750765
range: SequencingAssayEnum
766+
ifabsent: string(methylation array)
751767
platform:
752768
range: ArrayPlatformEnum
753769
fileFormat:
@@ -786,6 +802,8 @@ classes:
786802
range: MicroscopyImagingPlatformEnum
787803
fileFormat:
788804
range: ImagingFileFormatEnum
805+
dataType:
806+
ifabsent: string(image)
789807
rules:
790808
- description: If workingDistance is provided, workingDistanceUnit must be provided
791809
preconditions:
@@ -1020,6 +1038,10 @@ classes:
10201038
- auxiliaryAsset
10211039
- specimenID
10221040
slot_usage:
1041+
dataType:
1042+
ifabsent: string(aligned reads)
1043+
dataSubtype:
1044+
ifabsent: string(processed)
10231045
fileFormat:
10241046
range: SequencingFileFormatEnum
10251047
rules:
@@ -1066,6 +1088,9 @@ classes:
10661088
- workflowLink
10671089
- auxiliaryAsset
10681090
- specimenID
1091+
slot_usage:
1092+
dataSubtype:
1093+
ifabsent: string(processed)
10691094
rules:
10701095
- description: If workflow is provided, workflowLink must be provided
10711096
preconditions:
@@ -1099,6 +1124,9 @@ classes:
10991124
- workflowLink
11001125
- auxiliaryAsset
11011126
- assay
1127+
slot_usage:
1128+
dataSubtype:
1129+
ifabsent: string(processed)
11021130
rules:
11031131
- description: If workflow is provided, workflowLink must be provided
11041132
preconditions:
@@ -1137,6 +1165,8 @@ classes:
11371165
- auxiliaryAsset
11381166
- specimenID
11391167
slot_usage:
1168+
dataSubtype:
1169+
ifabsent: string(processed)
11401170
fileFormat:
11411171
range: SequencingFileFormatEnum
11421172
rules:
@@ -1165,6 +1195,7 @@ classes:
11651195
slot_usage:
11661196
assay:
11671197
range: MassSpectrometryAssayEnum
1198+
ifabsent: string(RPPA)
11681199
platform:
11691200
range: ArrayPlatformEnum
11701201
fileFormat:
@@ -1223,13 +1254,18 @@ classes:
12231254
- genePerturbationTechnology
12241255
- experimentalCondition
12251256
- isCellLine
1257+
- isPrimaryCell
12261258
slot_usage:
12271259
assay:
12281260
range: SequencingAssayEnum
12291261
platform:
12301262
range: SequencingPlatformEnum
12311263
fileFormat:
12321264
range: SequencingFileFormatEnum
1265+
dataType:
1266+
ifabsent: string(sequence reads)
1267+
isPrimaryCell:
1268+
ifabsent: string(Yes)
12331269
rules:
12341270
- description: If genePerturbed is provided, genePerturbationType must be provided
12351271
preconditions:
@@ -1272,6 +1308,8 @@ classes:
12721308
range: SequencingPlatformEnum
12731309
fileFormat:
12741310
range: SequencingFileFormatEnum
1311+
dataType:
1312+
ifabsent: string(gene expression)
12751313
rules:
12761314
- description: If genePerturbed is provided, genePerturbationType must be provided
12771315
preconditions:
@@ -1362,6 +1400,8 @@ classes:
13621400
range: SequencingPlatformEnum
13631401
fileFormat:
13641402
range: SequencingFileFormatEnum
1403+
dataType:
1404+
ifabsent: string(sequence reads)
13651405
WGSTemplate:
13661406
annotations:
13671407
match:
@@ -1381,6 +1421,8 @@ classes:
13811421
range: SequencingPlatformEnum
13821422
fileFormat:
13831423
range: SequencingFileFormatEnum
1424+
dataType:
1425+
ifabsent: string(sequence reads)
13841426
WorkflowReport:
13851427
description: Template used for miscellaneous workflow reports and accessory files
13861428
is_a: FileBasedTemplate
@@ -1392,6 +1434,9 @@ classes:
13921434
- relatedDataset
13931435
- workflow
13941436
- workflowLink
1437+
slot_usage:
1438+
resourceType:
1439+
ifabsent: string(report)
13951440
rules:
13961441
- description: If workflow is provided, workflowLink must be provided
13971442
preconditions:

modules/Template/Protocol.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ classes:
1616
- protocolPurpose
1717
- sampleType
1818
- comments
19+
- resourceType
1920
source: https://bioschemas.org/profiles/LabProtocol/0.7-DRAFT
21+
slot_usage:
22+
resourceType:
23+
ifabsent: string(protocol)

modules/Template/Tool.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ classes:
1313
- programmingLanguage
1414
- runtimePlatform
1515
- documentation
16+
- resourceType
17+
slot_usage:
18+
resourceType:
19+
ifabsent: string(tool)

modules/props.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,13 @@ slots:
377377
- portal
378378
title: Data Type
379379
required: true
380+
dataCoordinatingCenter:
381+
description: The Data Coordinating Center (DCC) that manages and coordinates the data.
382+
ifabsent: string(NF-OSI)
383+
in_subset:
384+
- portal
385+
range: string
386+
required: false
380387
datasetItemCount:
381388
description: Count of files in dataset. Auto-calculated by Synapse.
382389
in_subset:

0 commit comments

Comments
 (0)