Skip to content

Commit 660fa58

Browse files
bump schema version [skip actions]
1 parent 2212a0f commit 660fa58

File tree

5 files changed

+89
-11
lines changed

5 files changed

+89
-11
lines changed

examples/data_description.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/data_description.py",
3-
"schema_version": "0.13.1",
3+
"schema_version": "0.13.2",
44
"license": "CC-BY-4.0",
55
"platform": {
66
"name": "Electrophysiology platform",

schemas/data_description_schema.json

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,33 @@
123123
"title": "AllenInstituteForNeuralDynamics",
124124
"type": "object"
125125
},
126+
"BaseName": {
127+
"additionalProperties": false,
128+
"description": "A simple model associating a name with an abbreviation",
129+
"properties": {
130+
"name": {
131+
"title": "Name",
132+
"type": "string"
133+
},
134+
"abbreviation": {
135+
"anyOf": [
136+
{
137+
"type": "string"
138+
},
139+
{
140+
"type": "null"
141+
}
142+
],
143+
"default": null,
144+
"title": "Abbreviation"
145+
}
146+
},
147+
"required": [
148+
"name"
149+
],
150+
"title": "BaseName",
151+
"type": "object"
152+
},
126153
"BehaviorVideos": {
127154
"additionalProperties": false,
128155
"description": "BehaviorVideos",
@@ -591,6 +618,57 @@
591618
"title": "Other",
592619
"type": "object"
593620
},
621+
"PIDName": {
622+
"additionalProperties": false,
623+
"description": "Model for associate a name with a persistent identifier (PID),\nthe registry for that PID, and abbreviation for that registry",
624+
"properties": {
625+
"name": {
626+
"title": "Name",
627+
"type": "string"
628+
},
629+
"abbreviation": {
630+
"anyOf": [
631+
{
632+
"type": "string"
633+
},
634+
{
635+
"type": "null"
636+
}
637+
],
638+
"default": null,
639+
"title": "Abbreviation"
640+
},
641+
"registry": {
642+
"anyOf": [
643+
{
644+
"$ref": "#/$defs/BaseName"
645+
},
646+
{
647+
"type": "null"
648+
}
649+
],
650+
"default": null,
651+
"title": "Registry"
652+
},
653+
"registry_identifier": {
654+
"anyOf": [
655+
{
656+
"type": "string"
657+
},
658+
{
659+
"type": "null"
660+
}
661+
],
662+
"default": null,
663+
"title": "Registry identifier"
664+
}
665+
},
666+
"required": [
667+
"name"
668+
],
669+
"title": "PIDName",
670+
"type": "object"
671+
},
594672
"POphys": {
595673
"additionalProperties": false,
596674
"description": "POphys",
@@ -1006,8 +1084,8 @@
10061084
"type": "string"
10071085
},
10081086
"schema_version": {
1009-
"const": "0.13.1",
1010-
"default": "0.13.1",
1087+
"const": "0.13.2",
1088+
"default": "0.13.2",
10111089
"title": "Schema Version"
10121090
},
10131091
"license": {
@@ -1193,7 +1271,7 @@
11931271
"investigators": {
11941272
"description": "Full name(s) of key investigators (e.g. PI, lead scientist, contact person)",
11951273
"items": {
1196-
"type": "string"
1274+
"$ref": "#/$defs/PIDName"
11971275
},
11981276
"minItems": 1,
11991277
"title": "Investigators",

schemas/metadata_schema.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3673,8 +3673,8 @@
36733673
"type": "string"
36743674
},
36753675
"schema_version": {
3676-
"const": "0.13.1",
3677-
"default": "0.13.1",
3676+
"const": "0.13.2",
3677+
"default": "0.13.2",
36783678
"title": "Schema Version"
36793679
},
36803680
"license": {
@@ -3860,7 +3860,7 @@
38603860
"investigators": {
38613861
"description": "Full name(s) of key investigators (e.g. PI, lead scientist, contact person)",
38623862
"items": {
3863-
"type": "string"
3863+
"$ref": "#/$defs/PIDName"
38643864
},
38653865
"minItems": 1,
38663866
"title": "Investigators",
@@ -27692,8 +27692,8 @@
2769227692
"type": "string"
2769327693
},
2769427694
"schema_version": {
27695-
"const": "0.1.32",
27696-
"default": "0.1.32",
27695+
"const": "0.1.33",
27696+
"default": "0.1.33",
2769727697
"title": "Schema Version"
2769827698
},
2769927699
"_id": {

src/aind_data_schema/core/data_description.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class DataDescription(AindCoreModel):
9696

9797
_DESCRIBED_BY_URL = AindCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/data_description.py"
9898
describedBy: str = Field(_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
99-
schema_version: Literal["0.13.1"] = Field("0.13.1")
99+
schema_version: Literal["0.13.2"] = Field("0.13.2")
100100
license: Literal["CC-BY-4.0"] = Field("CC-BY-4.0", title="License")
101101

102102
platform: Platform.ONE_OF = Field(

src/aind_data_schema/core/metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Metadata(AindCoreModel):
4646

4747
_DESCRIBED_BY_URL = AindCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/metadata.py"
4848
describedBy: str = Field(_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
49-
schema_version: Literal["0.1.32"] = Field("0.1.32")
49+
schema_version: Literal["0.1.33"] = Field("0.1.33")
5050
id: UUID = Field(
5151
default_factory=uuid4,
5252
alias="_id",

0 commit comments

Comments
 (0)