Skip to content

Commit 86038d4

Browse files
github-actions[bot]github-actions[bot]
committed
bump schema version [skip actions]
1 parent 79889a5 commit 86038d4

10 files changed

Lines changed: 106 additions & 30 deletions

‎schemas/acquisition_schema.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11640,8 +11640,8 @@
1164011640
"type": "string"
1164111641
},
1164211642
"schema_version": {
11643-
"const": "2.3.0",
11644-
"default": "2.3.0",
11643+
"const": "2.3.1",
11644+
"default": "2.3.1",
1164511645
"title": "Schema Version",
1164611646
"type": "string"
1164711647
},
@@ -11671,6 +11671,9 @@
1167111671
},
1167211672
"acquisition_start_tz": {
1167311673
"anyOf": [
11674+
{
11675+
"type": "integer"
11676+
},
1167411677
{
1167511678
"enum": [
1167611679
"Africa/Abidjan",
@@ -12281,7 +12284,7 @@
1228112284
}
1228212285
],
1228312286
"default": null,
12284-
"description": "Automatically populated by a validator based on acquisition_start_time.",
12287+
"description": "Automatically populated by a validator based on acquisition_start_time. Will be a TimeZoneName (IANA name) when the datetime uses a ZoneInfo timezone, or an integer UTC offset in hours for fixed-offset timezones. Use ZoneInfo (from the zoneinfo standard library) to preserve the named timezone.",
1228512288
"title": "Acquisition start timezone"
1228612289
},
1228712290
"acquisition_end_time": {

‎schemas/instrument_schema.json‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3971,6 +3971,7 @@
39713971
"enum": [
39723972
"Camera",
39733973
"Photomultiplier Tube",
3974+
"Silicon Photomultiplier",
39743975
"Other"
39753976
],
39763977
"title": "DetectorType",
@@ -6432,7 +6433,7 @@
64326433
},
64336434
"EphysAssembly": {
64346435
"additionalProperties": false,
6435-
"description": "Named assembly for combining a manipulator and ephys probes",
6436+
"description": "Named assembly for combining a manipulator and extracellular ephys probes",
64366437
"properties": {
64376438
"object_type": {
64386439
"const": "Ephys assembly",
@@ -6465,7 +6466,7 @@
64656466
},
64666467
"EphysProbe": {
64676468
"additionalProperties": false,
6468-
"description": "Probe used in an ephys experiment",
6469+
"description": "Probe used in an extracellular ephys experiment",
64696470
"properties": {
64706471
"object_type": {
64716472
"const": "Ephys probe",
@@ -13933,6 +13934,36 @@
1393313934
"title": "Origin",
1393413935
"type": "string"
1393513936
},
13937+
"PatchClampEphysAssembly": {
13938+
"additionalProperties": false,
13939+
"description": "Assembly combining a manipulator and headstage used for Patch clamp ephys",
13940+
"properties": {
13941+
"object_type": {
13942+
"const": "Patch clamp ephys assembly",
13943+
"default": "Patch clamp ephys assembly",
13944+
"title": "Object Type",
13945+
"type": "string"
13946+
},
13947+
"name": {
13948+
"title": "Patch clamp Assembly Name",
13949+
"type": "string"
13950+
},
13951+
"manipulator": {
13952+
"$ref": "#/$defs/Manipulator"
13953+
},
13954+
"headstage": {
13955+
"$ref": "#/$defs/Device",
13956+
"title": "Headstage"
13957+
}
13958+
},
13959+
"required": [
13960+
"name",
13961+
"manipulator",
13962+
"headstage"
13963+
],
13964+
"title": "PatchClampEphysAssembly",
13965+
"type": "object"
13966+
},
1393613967
"PockelsCell": {
1393713968
"additionalProperties": false,
1393813969
"description": "Description of a Pockels Cell",
@@ -24817,8 +24848,8 @@
2481724848
"type": "string"
2481824849
},
2481924850
"schema_version": {
24820-
"const": "2.2.1",
24821-
"default": "2.2.1",
24851+
"const": "2.2.2",
24852+
"default": "2.2.2",
2482224853
"title": "Schema Version",
2482324854
"type": "string"
2482424855
},
@@ -25049,6 +25080,7 @@
2504925080
"Objective": "#/$defs/Objective",
2505025081
"Olfactometer": "#/$defs/Olfactometer",
2505125082
"Open ephys acquisition board": "#/$defs/OpenEphysAcquisitionBoard",
25083+
"Patch clamp ephys assembly": "#/$defs/PatchClampEphysAssembly",
2505225084
"Pockels cell": "#/$defs/PockelsCell",
2505325085
"Polygonal scanner": "#/$defs/PolygonalScanner",
2505425086
"Scanner": "#/$defs/Scanner",
@@ -25127,6 +25159,9 @@
2512725159
{
2512825160
"$ref": "#/$defs/DigitalMicromirrorDevice"
2512925161
},
25162+
{
25163+
"$ref": "#/$defs/PatchClampEphysAssembly"
25164+
},
2513025165
{
2513125166
"$ref": "#/$defs/PolygonalScanner"
2513225167
},

‎schemas/metadata_schema.json‎

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"type": "string"
1818
},
1919
"schema_version": {
20-
"const": "2.3.0",
21-
"default": "2.3.0",
20+
"const": "2.3.1",
21+
"default": "2.3.1",
2222
"title": "Schema Version",
2323
"type": "string"
2424
},
@@ -48,6 +48,9 @@
4848
},
4949
"acquisition_start_tz": {
5050
"anyOf": [
51+
{
52+
"type": "integer"
53+
},
5154
{
5255
"enum": [
5356
"Africa/Abidjan",
@@ -658,7 +661,7 @@
658661
}
659662
],
660663
"default": null,
661-
"description": "Automatically populated by a validator based on acquisition_start_time.",
664+
"description": "Automatically populated by a validator based on acquisition_start_time. Will be a TimeZoneName (IANA name) when the datetime uses a ZoneInfo timezone, or an integer UTC offset in hours for fixed-offset timezones. Use ZoneInfo (from the zoneinfo standard library) to preserve the named timezone.",
662665
"title": "Acquisition start timezone"
663666
},
664667
"acquisition_end_time": {
@@ -7714,6 +7717,7 @@
77147717
"enum": [
77157718
"Camera",
77167719
"Photomultiplier Tube",
7720+
"Silicon Photomultiplier",
77177721
"Other"
77187722
],
77197723
"title": "DetectorType",
@@ -10197,7 +10201,7 @@
1019710201
},
1019810202
"EphysAssembly": {
1019910203
"additionalProperties": false,
10200-
"description": "Named assembly for combining a manipulator and ephys probes",
10204+
"description": "Named assembly for combining a manipulator and extracellular ephys probes",
1020110205
"properties": {
1020210206
"object_type": {
1020310207
"const": "Ephys assembly",
@@ -10281,7 +10285,7 @@
1028110285
},
1028210286
"EphysProbe": {
1028310287
"additionalProperties": false,
10284-
"description": "Probe used in an ephys experiment",
10288+
"description": "Probe used in an extracellular ephys experiment",
1028510289
"properties": {
1028610290
"object_type": {
1028710291
"const": "Ephys probe",
@@ -15462,8 +15466,8 @@
1546215466
"type": "string"
1546315467
},
1546415468
"schema_version": {
15465-
"const": "2.2.1",
15466-
"default": "2.2.1",
15469+
"const": "2.2.2",
15470+
"default": "2.2.2",
1546715471
"title": "Schema Version",
1546815472
"type": "string"
1546915473
},
@@ -15694,6 +15698,7 @@
1569415698
"Objective": "#/$defs/Objective",
1569515699
"Olfactometer": "#/$defs/Olfactometer",
1569615700
"Open ephys acquisition board": "#/$defs/OpenEphysAcquisitionBoard",
15701+
"Patch clamp ephys assembly": "#/$defs/PatchClampEphysAssembly",
1569715702
"Pockels cell": "#/$defs/PockelsCell",
1569815703
"Polygonal scanner": "#/$defs/PolygonalScanner",
1569915704
"Scanner": "#/$defs/Scanner",
@@ -15772,6 +15777,9 @@
1577215777
{
1577315778
"$ref": "#/$defs/DigitalMicromirrorDevice"
1577415779
},
15780+
{
15781+
"$ref": "#/$defs/PatchClampEphysAssembly"
15782+
},
1577515783
{
1577615784
"$ref": "#/$defs/PolygonalScanner"
1577715785
},
@@ -23485,6 +23493,36 @@
2348523493
"title": "PIDName",
2348623494
"type": "object"
2348723495
},
23496+
"PatchClampEphysAssembly": {
23497+
"additionalProperties": false,
23498+
"description": "Assembly combining a manipulator and headstage used for Patch clamp ephys",
23499+
"properties": {
23500+
"object_type": {
23501+
"const": "Patch clamp ephys assembly",
23502+
"default": "Patch clamp ephys assembly",
23503+
"title": "Object Type",
23504+
"type": "string"
23505+
},
23506+
"name": {
23507+
"title": "Patch clamp Assembly Name",
23508+
"type": "string"
23509+
},
23510+
"manipulator": {
23511+
"$ref": "#/$defs/Manipulator"
23512+
},
23513+
"headstage": {
23514+
"$ref": "#/$defs/Device",
23515+
"title": "Headstage"
23516+
}
23517+
},
23518+
"required": [
23519+
"name",
23520+
"manipulator",
23521+
"headstage"
23522+
],
23523+
"title": "PatchClampEphysAssembly",
23524+
"type": "object"
23525+
},
2348823526
"PatchCordConfig": {
2348923527
"additionalProperties": false,
2349023528
"description": "Configuration of a patch cord and its output power to another device",
@@ -26249,8 +26287,8 @@
2624926287
"type": "string"
2625026288
},
2625126289
"schema_version": {
26252-
"const": "2.1.0",
26253-
"default": "2.1.0",
26290+
"const": "2.1.1",
26291+
"default": "2.1.1",
2625426292
"title": "Schema Version",
2625526293
"type": "string"
2625626294
},
@@ -26412,8 +26450,8 @@
2641226450
"type": "string"
2641326451
},
2641426452
"schema_version": {
26415-
"const": "2.2.2",
26416-
"default": "2.2.2",
26453+
"const": "2.2.3",
26454+
"default": "2.2.3",
2641726455
"title": "Schema Version",
2641826456
"type": "string"
2641926457
},
@@ -39303,8 +39341,8 @@
3930339341
"type": "string"
3930439342
},
3930539343
"schema_version": {
39306-
"const": "2.3.2",
39307-
"default": "2.3.2",
39344+
"const": "2.3.3",
39345+
"default": "2.3.3",
3930839346
"title": "Schema Version",
3930939347
"type": "string"
3931039348
},

‎schemas/procedures_schema.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@
21242124
},
21252125
"EphysProbe": {
21262126
"additionalProperties": false,
2127-
"description": "Probe used in an ephys experiment",
2127+
"description": "Probe used in an extracellular ephys experiment",
21282128
"properties": {
21292129
"object_type": {
21302130
"const": "Ephys probe",
@@ -14475,8 +14475,8 @@
1447514475
"type": "string"
1447614476
},
1447714477
"schema_version": {
14478-
"const": "2.1.0",
14479-
"default": "2.1.0",
14478+
"const": "2.1.1",
14479+
"default": "2.1.1",
1448014480
"title": "Schema Version",
1448114481
"type": "string"
1448214482
},

‎schemas/processing_schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,8 @@
743743
"type": "string"
744744
},
745745
"schema_version": {
746-
"const": "2.2.2",
747-
"default": "2.2.2",
746+
"const": "2.2.3",
747+
"default": "2.2.3",
748748
"title": "Schema Version",
749749
"type": "string"
750750
},

‎src/aind_data_schema/core/acquisition.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class Acquisition(DataCoreModel):
331331
# Meta metadata
332332
_DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/acquisition.py"
333333
describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
334-
schema_version: SkipValidation[Literal["2.3.0"]] = Field(default="2.3.0")
334+
schema_version: SkipValidation[Literal["2.3.1"]] = Field(default="2.3.1")
335335

336336
# ID
337337
subject_id: str = Field(default=..., title="Subject ID", description="Unique identifier for the subject")

‎src/aind_data_schema/core/instrument.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Instrument(DataCoreModel):
7676
# metametadata
7777
_DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/instrument.py"
7878
describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
79-
schema_version: SkipValidation[Literal["2.2.1"]] = Field(default="2.2.1")
79+
schema_version: SkipValidation[Literal["2.2.2"]] = Field(default="2.2.2")
8080

8181
# instrument definition
8282
location: Optional[str] = Field(default=None, title="Location", description="Location of the instrument")

‎src/aind_data_schema/core/metadata.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Metadata(DataCoreModel):
7171

7272
_DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/metadata.py"
7373
describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
74-
schema_version: SkipValidation[Literal["2.3.2"]] = Field(default="2.3.2")
74+
schema_version: SkipValidation[Literal["2.3.3"]] = Field(default="2.3.3")
7575
name: str = Field(
7676
...,
7777
description="Name of the data asset.",

‎src/aind_data_schema/core/procedures.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Procedures(DataCoreModel):
2424
_DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/procedures.py"
2525
describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
2626

27-
schema_version: SkipValidation[Literal["2.1.0"]] = Field(default="2.1.0")
27+
schema_version: SkipValidation[Literal["2.1.1"]] = Field(default="2.1.1")
2828
subject_id: str = Field(
2929
...,
3030
description="Unique identifier for the subject of data acquisition",

‎src/aind_data_schema/core/processing.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class Processing(DataCoreModel):
9999

100100
_DESCRIBED_BY_URL: str = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/processing.py"
101101
describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL})
102-
schema_version: SkipValidation[Literal["2.2.2"]] = Field(default="2.2.2")
102+
schema_version: SkipValidation[Literal["2.2.3"]] = Field(default="2.2.3")
103103

104104
data_processes: List[DataProcess] = Field(..., title="Data processing")
105105
pipelines: Optional[List[Code]] = Field(

0 commit comments

Comments
 (0)