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.

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

Remodeling of range for analyte_cateogry #2249

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions src/data/invalid/MassSpectrometry-working.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
id: nmdc:dgms-99-oW43DzG1
type: nmdc:MassSpectrometry
has_input:
- nmdc:procsm-11-9gjxns61
has_output:
- nmdc:dobj-00-9n9n9n
has_mass_spectrometry_configuration: nmdc:mscon-99-oW43DzG0
eluent_introduction_category: direct_infusion_syringe
analyte_category: metagenome
associated_studies:
- nmdc:sty-00-555xxx
19 changes: 19 additions & 0 deletions src/data/invalid/NucleotideSequencing-working.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#test to check readding prefix 'omprc' as a valid id pattern
id: nmdc:omprc-99-zUCd5N
type: nmdc:NucleotideSequencing
analyte_category: metaproteome
alternative_identifiers:
- gold:Gp0108335
name: Thawing permafrost microbial communities from the Arctic, studying carbon
transformations - Permafrost 712P3D
has_input:
- nmdc:bsm-00-red
add_date: 30-OCT-14 12.00.00.000000000 AM
mod_date: 22-MAY-20 06.13.12.927000000 PM
has_output:
- nmdc:dobj-00-9n9n9n
ncbi_project_name: Thawing permafrost microbial communities from the Arctic, studying
carbon transformations - Permafrost 712P3D
processing_institution: JGI
associated_studies:
- nmdc:sty-00-xxx
25 changes: 18 additions & 7 deletions src/schema/basic_slots.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ slots:
description: >
The type of analyte(s) that were measured in the data generation process and analyzed
in the Workflow Chain
range: AnalyteCategoryEnum

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 - so for now, we fall back to "string" for the range of analyte_category if not otherwise defined in slot_usage.


type:
required: true
Expand Down Expand Up @@ -1081,27 +1081,38 @@ enums:
# submitted: { }
# superseded: { }
# withdrawn: { }

AnalyteCategoryEnum:
NucleotideSequencingEnum:
permissible_values:
metagenome:
aliases:
- metaG
title: Metagenome
metatranscriptome:
aliases:
- metaT
- metaT
title: Metatranscriptome
amplicon_sequencing_assay:
meaning: OBI:0002767
title: Amplicon

MassSpectrometryEnum:
permissible_values:
metaproteome:
aliases:
- metaP
title: Metaproteome
metabolome:
aliases:
- metaB
lipidome: { }
title: Metabolome
lipidome:
title: Lipidome
nom:
aliases:
- natural organic matter
amplicon_sequencing_assay:
meaning: OBI:0002767
title: Natural Organic Matter

ExtractionTargetEnum:
permissible_values:
DNA: { }
Expand Down
4 changes: 4 additions & 0 deletions src/schema/nmdc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ classes:
structured_pattern:
syntax: "{id_nmdc_prefix}:(dgns|omprc)-{id_shoulder}-{id_blade}$"
interpolated: true
analyte_category:
range: NucleotideSequencingEnum

MassSpectrometry:
class_uri: nmdc:MassSpectrometry
Expand All @@ -173,6 +175,8 @@ classes:
structured_pattern:
syntax: "{id_nmdc_prefix}:mscon-{id_shoulder}-{id_blade}$"
interpolated: true
analyte_category:
range: MassSpectrometryEnum
rules:
- title: generates_calibration_required_if_gc
description: >-
Expand Down
Loading