diff --git a/pyproject.toml b/pyproject.toml index 6d3388d68..88e665273 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ readme = "README.md" dynamic = ["version"] dependencies = [ - 'aind-data-schema-models>=5.7.1,<6', + 'aind-data-schema-models==5.7.3', 'pydantic>=2.7, <2.12', 'pydantic-extra-types', 'tzdata', diff --git a/schemas/acquisition_schema.json b/schemas/acquisition_schema.json index b965d10a2..fe5f89c63 100644 --- a/schemas/acquisition_schema.json +++ b/schemas/acquisition_schema.json @@ -1601,6 +1601,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -1653,6 +1654,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -2067,6 +2071,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -2119,6 +2124,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -10437,6 +10445,26 @@ "title": "_Olympus", "type": "object" }, + "_One_Photon": { + "additionalProperties": false, + "description": "Model one-photon", + "properties": { + "name": { + "const": "One-photon imaging", + "default": "One-photon imaging", + "title": "Name", + "type": "string" + }, + "abbreviation": { + "const": "one-photon", + "default": "one-photon", + "title": "Abbreviation", + "type": "string" + } + }, + "title": "_One_Photon", + "type": "object" + }, "_Open_Ephys_Production_Site": { "description": "Model Open Ephys Production Site", "properties": { @@ -12108,8 +12136,8 @@ "type": "string" }, "schema_version": { - "const": "2.5.1", - "default": "2.5.1", + "const": "2.5.2", + "default": "2.5.2", "title": "Schema Version", "type": "string" }, diff --git a/schemas/data_description_schema.json b/schemas/data_description_schema.json index 7b863b87e..05e3afcfc 100644 --- a/schemas/data_description_schema.json +++ b/schemas/data_description_schema.json @@ -4545,6 +4545,26 @@ "title": "_Olympus", "type": "object" }, + "_One_Photon": { + "additionalProperties": false, + "description": "Model one-photon", + "properties": { + "name": { + "const": "One-photon imaging", + "default": "One-photon imaging", + "title": "Name", + "type": "string" + }, + "abbreviation": { + "const": "one-photon", + "default": "one-photon", + "title": "Abbreviation", + "type": "string" + } + }, + "title": "_One_Photon", + "type": "object" + }, "_Open_Ephys_Production_Site": { "description": "Model Open Ephys Production Site", "properties": { @@ -6216,8 +6236,8 @@ "type": "string" }, "schema_version": { - "const": "2.3.4", - "default": "2.3.4", + "const": "2.4.0", + "default": "2.4.0", "title": "Schema Version", "type": "string" }, @@ -6854,6 +6874,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -6906,6 +6927,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, diff --git a/schemas/instrument_schema.json b/schemas/instrument_schema.json index 8f4a00ac2..e01af9de3 100644 --- a/schemas/instrument_schema.json +++ b/schemas/instrument_schema.json @@ -29728,6 +29728,26 @@ "title": "_Olympus", "type": "object" }, + "_One_Photon": { + "additionalProperties": false, + "description": "Model one-photon", + "properties": { + "name": { + "const": "One-photon imaging", + "default": "One-photon imaging", + "title": "Name", + "type": "string" + }, + "abbreviation": { + "const": "one-photon", + "default": "one-photon", + "title": "Abbreviation", + "type": "string" + } + }, + "title": "_One_Photon", + "type": "object" + }, "_Open_Ephys_Production_Site": { "description": "Model Open Ephys Production Site", "properties": { @@ -31837,8 +31857,8 @@ "type": "string" }, "schema_version": { - "const": "2.2.5", - "default": "2.2.5", + "const": "2.2.6", + "default": "2.2.6", "title": "Schema Version", "type": "string" }, @@ -31888,6 +31908,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -31940,6 +31961,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, diff --git a/schemas/metadata_schema.json b/schemas/metadata_schema.json index 9c0e182de..11aa94442 100644 --- a/schemas/metadata_schema.json +++ b/schemas/metadata_schema.json @@ -17,8 +17,8 @@ "type": "string" }, "schema_version": { - "const": "2.5.1", - "default": "2.5.1", + "const": "2.5.2", + "default": "2.5.2", "title": "Schema Version", "type": "string" }, @@ -7168,6 +7168,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -7220,6 +7221,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -8104,8 +8108,8 @@ "type": "string" }, "schema_version": { - "const": "2.3.4", - "default": "2.3.4", + "const": "2.4.0", + "default": "2.4.0", "title": "Schema Version", "type": "string" }, @@ -8742,6 +8746,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -8794,6 +8799,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -9055,6 +9063,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -9107,6 +9116,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -13507,6 +13519,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -13559,6 +13572,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -19757,8 +19773,8 @@ "type": "string" }, "schema_version": { - "const": "2.2.5", - "default": "2.2.5", + "const": "2.2.6", + "default": "2.2.6", "title": "Schema Version", "type": "string" }, @@ -19808,6 +19824,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -19860,6 +19877,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -35886,8 +35906,8 @@ "type": "string" }, "schema_version": { - "const": "2.2.9", - "default": "2.2.9", + "const": "2.3.0", + "default": "2.3.0", "title": "Schema Version", "type": "string" }, @@ -36118,6 +36138,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -36170,6 +36191,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -36312,8 +36336,8 @@ "type": "string" }, "schema_version": { - "const": "2.4.1", - "default": "2.4.1", + "const": "2.4.2", + "default": "2.4.2", "title": "Schema Version", "type": "string" }, @@ -47479,6 +47503,26 @@ "title": "_Olympus", "type": "object" }, + "_One_Photon": { + "additionalProperties": false, + "description": "Model one-photon", + "properties": { + "name": { + "const": "One-photon imaging", + "default": "One-photon imaging", + "title": "Name", + "type": "string" + }, + "abbreviation": { + "const": "one-photon", + "default": "one-photon", + "title": "Abbreviation", + "type": "string" + } + }, + "title": "_One_Photon", + "type": "object" + }, "_Open_Ephys_Production_Site": { "description": "Model Open Ephys Production Site", "properties": { @@ -49716,8 +49760,8 @@ "type": "string" }, "schema_version": { - "const": "2.7.2", - "default": "2.7.2", + "const": "2.7.3", + "default": "2.7.3", "title": "Schema Version", "type": "string" }, diff --git a/schemas/processing_schema.json b/schemas/processing_schema.json index ccd8b8c09..5703da04b 100644 --- a/schemas/processing_schema.json +++ b/schemas/processing_schema.json @@ -778,8 +778,8 @@ "type": "string" }, "schema_version": { - "const": "2.2.9", - "default": "2.2.9", + "const": "2.3.0", + "default": "2.3.0", "title": "Schema Version", "type": "string" }, diff --git a/schemas/quality_control_schema.json b/schemas/quality_control_schema.json index 9c49a1554..4475e85c2 100644 --- a/schemas/quality_control_schema.json +++ b/schemas/quality_control_schema.json @@ -61,6 +61,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -113,6 +114,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -256,6 +260,7 @@ "fib": "#/$defs/_Fib", "icephys": "#/$defs/_Icephys", "merfish": "#/$defs/_Merfish", + "one-photon": "#/$defs/_One_Photon", "pophys": "#/$defs/_Pophys", "scRNAseq": "#/$defs/_Scrnaseq", "slap2": "#/$defs/_Slap2" @@ -308,6 +313,9 @@ { "$ref": "#/$defs/_Merfish" }, + { + "$ref": "#/$defs/_One_Photon" + }, { "$ref": "#/$defs/_Pophys" }, @@ -754,6 +762,26 @@ "title": "_Mri", "type": "object" }, + "_One_Photon": { + "additionalProperties": false, + "description": "Model one-photon", + "properties": { + "name": { + "const": "One-photon imaging", + "default": "One-photon imaging", + "title": "Name", + "type": "string" + }, + "abbreviation": { + "const": "one-photon", + "default": "one-photon", + "title": "Abbreviation", + "type": "string" + } + }, + "title": "_One_Photon", + "type": "object" + }, "_Pophys": { "additionalProperties": false, "description": "Model pophys", @@ -871,8 +899,8 @@ "type": "string" }, "schema_version": { - "const": "2.4.1", - "default": "2.4.1", + "const": "2.4.2", + "default": "2.4.2", "title": "Schema Version", "type": "string" }, diff --git a/src/aind_data_schema/__init__.py b/src/aind_data_schema/__init__.py index b44bb5ea4..92b414dd1 100755 --- a/src/aind_data_schema/__init__.py +++ b/src/aind_data_schema/__init__.py @@ -1,3 +1,3 @@ """base module for aind-data-schema""" -__version__ = "2.8.0" +__version__ = "2.8.1" diff --git a/src/aind_data_schema/core/acquisition.py b/src/aind_data_schema/core/acquisition.py index 4b4acfcbe..cde881f4e 100644 --- a/src/aind_data_schema/core/acquisition.py +++ b/src/aind_data_schema/core/acquisition.py @@ -356,7 +356,7 @@ class Acquisition(ProtocolListMixin, DataCoreModel): # Meta metadata _DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/acquisition.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["2.5.1"]] = Field(default="2.5.1") + schema_version: SkipValidation[Literal["2.5.2"]] = Field(default="2.5.2") # ID subject_id: str = Field(default=..., title="Subject ID", description="Unique identifier for the subject") diff --git a/src/aind_data_schema/core/instrument.py b/src/aind_data_schema/core/instrument.py index 2fbd9d1bc..c4aaed99d 100644 --- a/src/aind_data_schema/core/instrument.py +++ b/src/aind_data_schema/core/instrument.py @@ -77,7 +77,7 @@ class Instrument(DataCoreModel): # metametadata _DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/instrument.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["2.2.5"]] = Field(default="2.2.5") + schema_version: SkipValidation[Literal["2.2.6"]] = Field(default="2.2.6") # instrument definition location: Optional[str] = Field(default=None, title="Location", description="Location of the instrument") diff --git a/src/aind_data_schema/core/metadata.py b/src/aind_data_schema/core/metadata.py index 0dc3783f9..59e5f130b 100644 --- a/src/aind_data_schema/core/metadata.py +++ b/src/aind_data_schema/core/metadata.py @@ -73,7 +73,7 @@ class Metadata(DataCoreModel): _DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/metadata.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["2.7.2"]] = Field(default="2.7.2") + schema_version: SkipValidation[Literal["2.7.3"]] = Field(default="2.7.3") name: str = Field( ..., description="Name of the data asset.", diff --git a/src/aind_data_schema/core/quality_control.py b/src/aind_data_schema/core/quality_control.py index f86d94509..9b0bb53a0 100644 --- a/src/aind_data_schema/core/quality_control.py +++ b/src/aind_data_schema/core/quality_control.py @@ -123,7 +123,7 @@ class QualityControl(DataCoreModel): _DESCRIBED_BY_URL = DataCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/quality_control.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["2.4.1"]] = Field(default="2.4.1") + schema_version: SkipValidation[Literal["2.4.2"]] = Field(default="2.4.2") metrics: DiscriminatedList[QCMetric | CurationMetric] = Field(..., title="Evaluations") key_experimenters: Optional[List[str]] = Field( default=None,