aind-data-schema-models 4.2.2__tar.gz → 4.2.4__tar.gz

{aind_data_schema_models-4.2.2/src/aind_data_schema_models.egg-info → aind_data_schema_models-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aind-data-schema-models
-Version: 4.2.2
+Version: 4.2.4
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT

aind_data_schema_models-4.2.4/src/aind_data_schema_models/__init__.py

@@ -0,0 +1,3 @@
+"""Init package"""
+
+__version__ = "4.2.4"

{aind_data_schema_models-4.2.2 → aind_data_schema_models-4.2.4}/src/aind_data_schema_models/_generators/models/species.csv

@@ -1,4 +1,4 @@
-species,species_registry_abbreviation,species_registry_identifier,strain,strain_registry_abbreviation,strain_registry_identifier,common_name
+name,species_registry_abbreviation,species_registry_identifier,strain,strain_registry_abbreviation,strain_registry_identifier,common_name
 Callithrix jacchus,NCBI,NCBI:txid9483,default,,,Common marmoset
 Homo sapiens,NCBI,NCBI:txid9606,default,,,Human
 Macaca mulatta,NCBI,NCBI:txid9544,default,,,Rhesus macaque

{aind_data_schema_models-4.2.2 → aind_data_schema_models-4.2.4}/src/aind_data_schema_models/_generators/templates/species.txt

@@ -21,7 +21,7 @@ class StrainModel(BaseModel):
 class {{ row['strain'] | to_class_name_underscored }}(StrainModel):
     """Model {{row['strain']}}"""
     name: Literal["{{ row['strain'] }}"] = "{{ row['strain'] }}"
-    species: Literal["{{ row['species'] }}"] = "{{ row['species'] }}"
+    species: Literal["{{ row['name'] }}"] = "{{ row['name'] }}"
     {%- set reg_abb = row['strain_registry_abbreviation'] %}
     registry: {{"Registry.ONE_OF" if reg_abb == reg_abb else "None"}} = {{None if reg_abb != reg_abb else "Registry." + (reg_abb | upper)}}
     registry_identifier: Literal["{{ row['strain_registry_identifier'] }}"] = "{{ row['strain_registry_identifier'] }}"
@@ -49,9 +49,9 @@ class SpeciesModel(BaseModel):
     registry_identifier: str
 
 {% for _, row in species_data.iterrows() %}
-class {{ row['species'] | to_class_name_underscored }}(SpeciesModel):
-    """Model {{row['species']}}"""
-    name: Literal["{{ row['species'] }}"] = "{{ row['species'] }}"
+class {{ row['name'] | to_class_name_underscored }}(SpeciesModel):
+    """Model {{row['name']}}"""
+    name: Literal["{{ row['name'] }}"] = "{{ row['name'] }}"
     common_name: Literal["{{ row['common_name'] }}"] = "{{ row['common_name'] }}"
     registry: Registry.ONE_OF = Registry.{{ row['species_registry_abbreviation'] | upper }}
     registry_identifier: Literal["{{ row['species_registry_identifier'] }}"] = "{{ row['species_registry_identifier'] }}"
@@ -60,7 +60,7 @@ class {{ row['species'] | to_class_name_underscored }}(SpeciesModel):
 class Species:
     """Species"""
 {% for _, row in species_data.iterrows() %}
-    {{ row['species'] | to_class_name | upper }} = {{ row['species'] | to_class_name_underscored }}()
+    {{ row['name'] | to_class_name | upper }} = {{ row['name'] | to_class_name_underscored }}()
 {%- endfor %}
 
     ALL = tuple(SpeciesModel.__subclasses__())

{aind_data_schema_models-4.2.2 → aind_data_schema_models-4.2.4}/src/aind_data_schema_models/reagent.py

@@ -6,9 +6,12 @@ from enum import Enum
 class StainType(str, Enum):
     """Stain types for probes describing what is being labeled"""
 
+    CYTOSKELETON = "Cytoskeleton"
+    FILL = "Fill"
     RNA = "RNA"
+    PROTEIN = "Protein"
     NUCLEAR = "Nuclear"
-    FILL = "Fill"
+    VASCULATURE = "Vasculature"
 
 
 class FluorophoreType(str, Enum):

{aind_data_schema_models-4.2.2 → aind_data_schema_models-4.2.4/src/aind_data_schema_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aind-data-schema-models
-Version: 4.2.2
+Version: 4.2.4
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT

aind_data_schema_models-4.2.2/src/aind_data_schema_models/__init__.py

@@ -1,3 +0,0 @@
-"""Init package"""
-
-__version__ = "4.2.2"