Skip to content

Commit

Permalink
1.x merge 1.0.0 snapshot work (#109)
Browse files Browse the repository at this point in the history
* MappableConcept inherent properties
* Updates to Coding in gks-core-source.yaml
* renamed label/altLabels to name/aliases as discussed with AW/MB.
  • Loading branch information
larrybabb authored Feb 10, 2025
1 parent bd61edb commit a4b4f81
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion examples/mappable-concept-gene.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id: HGNC:1101
primaryCode: BRCA2
label: BRCA2 DNA repair associated
name: BRCA2 DNA repair associated
conceptType: Gene
mappings:
- coding:
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-coding.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: foo
name: foo
system: https://bar.com
systemVersion: "2"
code: "SCV213.1"
6 changes: 3 additions & 3 deletions schema/gks-core/def/Coding.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. note:: This data class is at a **trial use** maturity level and may \
change in future releases. Maturity \
.. warning:: This data class is at a **draft** maturity level and may \
change significantly in future releases. Maturity \
levels are described in the :ref:`maturity-model`.

**Computational Definition**
Expand Down Expand Up @@ -34,7 +34,7 @@ Some Coding attributes are inherited from :ref:`Element`.
- :ref:`Extension`
- 0..m
- A list of extensions to the Entity, that allow for capture of information not directly supported by elements defined in the model.
* - label
* - name
-
- string
- 0..1
Expand Down
4 changes: 2 additions & 2 deletions schema/gks-core/def/ConceptMapping.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. note:: This data class is at a **trial use** maturity level and may \
change in future releases. Maturity \
.. warning:: This data class is at a **draft** maturity level and may \
change significantly in future releases. Maturity \
levels are described in the :ref:`maturity-model`.

**Computational Definition**
Expand Down
4 changes: 2 additions & 2 deletions schema/gks-core/def/Entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Anything that exists, has existed, or will exist.
- string
- 1..1
- The name of the class that is instantiated by a data object representing the Entity.
* - label
* - name
-
- string
- 0..1
Expand All @@ -40,7 +40,7 @@ Anything that exists, has existed, or will exist.
- string
- 0..1
- A free-text description of the Entity.
* - alternativeLabels
* - aliases
-
.. raw:: html

Expand Down
8 changes: 4 additions & 4 deletions schema/gks-core/def/MappableConcept.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.. note:: This data class is at a **trial use** maturity level and may \
change in future releases. Maturity \
.. warning:: This data class is at a **draft** maturity level and may \
change significantly in future releases. Maturity \
levels are described in the :ref:`maturity-model`.

**Computational Definition**

A concept label that may be mapped to one or more :ref:`Codings <Coding>`.
A concept name that may be mapped to one or more :ref:`Codings <Coding>`.

**Information Model**

Expand Down Expand Up @@ -39,7 +39,7 @@ Some MappableConcept attributes are inherited from :ref:`Element`.
- string
- 0..1
- A term indicating the type of concept being represented by the MappableConcept.
* - label
* - name
-
- string
- 0..1
Expand Down
22 changes: 11 additions & 11 deletions schema/gks-core/gks-core-source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $defs:
description: Anything that exists, has existed, or will exist.
$comment: >-
Entity is the root class of the 'gks-core' information model. All core classes that
have ids and other general metadata like label, description, type, or extensions descend from
have ids and other general metadata like name, description, type, or extensions descend from
this class and inherit its attributes.
heritableProperties:
id:
Expand All @@ -30,14 +30,14 @@ $defs:
type: string
description: >-
The name of the class that is instantiated by a data object representing the Entity.
$comment: MUST be the label of a concrete class from the data model.
label:
$comment: MUST be the name of a concrete class from the data model.
name:
type: string
description: A primary name for the entity.
description:
type: string
description: A free-text description of the Entity.
alternativeLabels:
aliases:
type: array
ordered: false
items:
Expand Down Expand Up @@ -116,12 +116,12 @@ $defs:
MappableConcept:
inherits: Element
type: object
maturity: trial use
maturity: draft
ga4gh:
inherent:
- primaryCode
description: >-
A concept label that may be mapped to one or more :ref:`Codings <Coding>`.
A concept name that may be mapped to one or more :ref:`Codings <Coding>`.
properties:
conceptType:
type: string
Expand All @@ -131,7 +131,7 @@ $defs:
This attribute can be used to indicate the type of concept being represented by the MappableConcept.
For example, in a variant pathogenicity assessment, the conceptType could be 'Pathogenicity Strength',
'Disease', 'Phenotype', 'Drug', 'Tumor Type', 'Evidence Direction', 'Evidence Strength', etc.
label:
name:
type: string
description: A primary name for the concept.
primaryCode:
Expand All @@ -152,14 +152,14 @@ $defs:
include a coding and a relation.
anyOf:
- required:
- label
- name
- required:
- primaryCode

ConceptMapping:
type: object
inherits: Element
maturity: trial use
maturity: draft
description: >-
A mapping to a concept in a terminology or code system.
properties:
Expand All @@ -184,11 +184,11 @@ $defs:
Coding:
inherits: Element
type: object
maturity: trial use
maturity: draft
description: >-
A structured representation of a code for a defined concept in a terminology or code system.
properties:
label:
name:
type: string
description: The human-readable name for the coded concept, as defined by the code system.
system:
Expand Down
4 changes: 2 additions & 2 deletions schema/gks-core/json/Coding
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$id": "https://w3id.org/ga4gh/schema/gks-core/1.x/json/Coding",
"title": "Coding",
"type": "object",
"maturity": "trial use",
"maturity": "draft",
"description": "A structured representation of a code for a defined concept in a terminology or code system.",
"properties": {
"id": {
Expand All @@ -19,7 +19,7 @@
"description": "A list of extensions to the Entity, that allow for capture of information not directly supported by elements defined in the model.",
"$comment": "Extension objects have a key-value data structure that allows definition of custom fields in the data itself. Extensions are not expected to be natively understood, but may be used for pre-negotiated exchange of message attributes between systems."
},
"label": {
"name": {
"type": "string",
"description": "The human-readable name for the coded concept, as defined by the code system."
},
Expand Down
2 changes: 1 addition & 1 deletion schema/gks-core/json/ConceptMapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$id": "https://w3id.org/ga4gh/schema/gks-core/1.x/json/ConceptMapping",
"title": "ConceptMapping",
"type": "object",
"maturity": "trial use",
"maturity": "draft",
"description": "A mapping to a concept in a terminology or code system.",
"properties": {
"id": {
Expand Down
8 changes: 4 additions & 4 deletions schema/gks-core/json/MappableConcept
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"$id": "https://w3id.org/ga4gh/schema/gks-core/1.x/json/MappableConcept",
"title": "MappableConcept",
"type": "object",
"maturity": "trial use",
"maturity": "draft",
"ga4gh": {
"inherent": [
"primaryCode"
]
},
"description": "A concept label that may be mapped to one or more Codings.",
"description": "A concept name that may be mapped to one or more Codings.",
"properties": {
"id": {
"type": "string",
Expand All @@ -29,7 +29,7 @@
"description": "A term indicating the type of concept being represented by the MappableConcept.",
"$comment": "This attribute can be used to indicate the type of concept being represented by the MappableConcept. For example, in a variant pathogenicity assessment, the conceptType could be 'Pathogenicity Strength', 'Disease', 'Phenotype', 'Drug', 'Tumor Type', 'Evidence Direction', 'Evidence Strength', etc."
},
"label": {
"name": {
"type": "string",
"description": "A primary name for the concept."
},
Expand All @@ -49,7 +49,7 @@
"anyOf": [
{
"required": [
"label"
"name"
]
},
{
Expand Down

0 comments on commit a4b4f81

Please sign in to comment.