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

Added data_access module for managed access data. Fixes #1535 #1537

Merged
merged 20 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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 docs/jsonBrowser/module.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,17 @@ text | The primary role of the contributor in the project. | string | yes | | C
ontology | An ontology term identifier in the form prefix:accession. | string | no | | Contributor role ontology ID | | EFO:0009736; EFO:0009741
ontology_label | The preferred label for the ontology term referred to in the ontology field. This may differ from the user-supplied value in the text field. | string | no | | Contributor role ontology label | | principal investigator; experimental scientist

## Data access<a name='Data access'></a>
_A term that may be associated with a data use restriction ontology term._

Location: module/ontology/data_access_ontology.json

Property name | Description | Type | Required? | Object reference? | User friendly name | Allowed values | Example
--- | --- | --- | --- | --- | --- | --- | ---
text | Type of data access permissions associated with the project. | string | yes | | Data access type | | No restriction
ontology | An ontology term identifier in the form prefix:accession. | string | no | | Data access ontology ID | DUO:0000004, DUO:0000046, DUO:0000042 | DUO:0000004
ontology_label | The preferred label for the ontology term referred to in the ontology field. This may differ from the user-supplied value in the text field. | string | no | | Data access ontology label | | no restriction

## Ethnicity ontology<a name='Ethnicity ontology'></a>
_A term that may be associated with a ethnicity-related ontology term._

Expand Down
5 changes: 5 additions & 0 deletions docs/jsonBrowser/required_fields.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ Property name | Description | Type | Object reference? | User friendly name | Al
schema_type | The type of the metadata schema entity. | string | | | project |
project_core | Core project-level information. | object | [See core project_core](core.md#project-core) | Project core | |
funders | Funding source(s) supporting the project. | array | [See module funder](module.md#funder) | Funding source(s) | |
data_access | Information about the data access type for the project. | object | [See module data_access_ontology](module.md#data-access-ontology) | Data access | |
### Specimen from organism
Property name | Description | Type | Object reference? | User friendly name | Allowed values | Example
--- | --- | --- | --- | --- | --- | ---
Expand Down Expand Up @@ -239,6 +240,10 @@ text | The name of a library amplification approach being used. | string | | Li
Property name | Description | Type | Object reference? | User friendly name | Allowed values | Example
--- | --- | --- | --- | --- | --- | ---
text | The primary role of the contributor in the project. | string | | Contributor role | | principal investigator; experimental scientist
### Data access<a name='Data access'></a>
Property name | Description | Type | Object reference? | User friendly name | Allowed values | Example
--- | --- | --- | --- | --- | --- | ---
text | Type of data access permissions associated with the project. | string | | Data access type | | No restriction
### Ethnicity ontology<a name='Ethnicity ontology'></a>
Property name | Description | Type | Object reference? | User friendly name | Allowed values | Example
--- | --- | --- | --- | --- | --- | ---
Expand Down
1 change: 1 addition & 0 deletions docs/jsonBrowser/type.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ insdc_study_accessions | An International Nucleotide Sequence Database Collabora
biostudies_accessions | A BioStudies study accession. | array | no | | BioStudies accession | | S-EXMP1; S-HCAS33
funders | Funding source(s) supporting the project. | array | yes | [See module funder](module.md#funder) | Funding source(s) | |
estimated_cell_count | An estimated number of cells in this project | integer | no | | Estimated cell count | | 10000; 2100000
data_access | Information about the data access type for the project. | object | yes | [See module data_access_ontology](module.md#data-access-ontology) | Data access | |

## Specimen from organism
_Information about the specimen that was collected from the donor organism._
Expand Down
48 changes: 48 additions & 0 deletions json_schema/module/ontology/data_access_ontology.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "A term that may be associated with a data use restriction ontology term.",
"additionalProperties": false,
"required": [
"text"
],
"title": "Data access",
"name": "data_access_ontology",
"type": "object",
"properties": {
"describedBy": {
"description": "The URL reference to the schema.",
"type": "string",
"pattern" : "^(http|https)://schema.(.*?)humancellatlas.org/module/ontology/(([0-9]{1,}.[0-9]{1,}.[0-9]{1,})|([a-zA-Z]*?))/data_access_ontology"
},
"schema_version": {
"description": "The version number of the schema in major.minor.patch format.",
"type": "string",
"pattern": "^[0-9]{1,}.[0-9]{1,}.[0-9]{1,}$",
"example": "4.6.1"
},
"text": {
"description": "Type of data access permissions associated with the project.",
"type": "string",
"user_friendly": "Data access type",
"example": "No restriction "
},
"ontology": {
"description": "An ontology term identifier in the form prefix:accession.",
"type": "string",
"enum": [
"DUO:0000004",
"DUO:0000046",
"DUO:0000042"
],
"user_friendly": "Data access ontology ID",
"guidelines": "Must be one of: DUO:0000004, DUO:0000046, DUO:0000042",
"example": "DUO:0000004"
},
"ontology_label": {
idazucchi marked this conversation as resolved.
Show resolved Hide resolved
"description": "The preferred label for the ontology term referred to in the ontology field. This may differ from the user-supplied value in the text field.",
"type": "string",
"user_friendly": "Data access ontology label",
"example": "no restriction"
}
}
}
7 changes: 7 additions & 0 deletions json_schema/property_migrations.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"migrations": [
{
"source_schema": "project",
"property": "data_access",
"effective_from": "18.0.0",
"reason": "Data access is now recorded as a mandatory field",
"type": "new required property"
},
{
"source_schema": "cell_line",
"property": "timecourse",
Expand Down
9 changes: 8 additions & 1 deletion json_schema/type/project/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"describedBy",
"schema_type",
"project_core",
"funders"
"funders",
"data_access"
],
"title": "Project",
"name": "project",
Expand Down Expand Up @@ -164,6 +165,12 @@
"type": "integer",
"example": "10000; 2100000",
"user_friendly": "Estimated cell count"
},
"data_access": {
idazucchi marked this conversation as resolved.
Show resolved Hide resolved
"description": "Information about the data access type for the project.",
"type": "object",
idazucchi marked this conversation as resolved.
Show resolved Hide resolved
"$ref": "module/ontology/data_access_ontology.json",
idazucchi marked this conversation as resolved.
Show resolved Hide resolved
"user_friendly": "Data access"
}
}
}
2 changes: 2 additions & 0 deletions json_schema/update_log.csv
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
Schema,Change type,Change message,Version,Date
type/project/project,major,"Added data_access field",,
module/ontology/data_access_ontology,major,"Added data access type ontology module",,
3 changes: 2 additions & 1 deletion json_schema/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"cell_type_ontology": "5.3.6",
"cellular_component_ontology": "1.0.5",
"contributor_role_ontology": "2.0.0",
"data_access_ontology": "0.0.0",
"development_stage_ontology": "5.3.6",
"disease_ontology": "5.4.0",
"enrichment_ontology": "1.2.6",
Expand Down Expand Up @@ -137,4 +138,4 @@
}
}
}
}
}