Merge branch 'dev' into feat-fix-schema-bump

AllenNeuralDynamics · Jan 10, 2025 · a4ba580 · a4ba580
2 parents ad64ec7 + 0dfb05f
commit a4ba580
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/examples/bergamo_ophys_session.json b/examples/bergamo_ophys_session.json
@@ -153,6 +153,7 @@
          "stimulus_device_names": [],
          "speaker_config": null,
          "light_source_config": [],
+         "objects_in_arena": null,
          "output_parameters": {},
          "reward_consumed_during_epoch": null,
          "reward_consumed_unit": "microliter",

diff --git a/examples/ephys_session.json b/examples/ephys_session.json
@@ -326,6 +326,7 @@
          "stimulus_device_names": [],
          "speaker_config": null,
          "light_source_config": [],
+         "objects_in_arena": null,
          "output_parameters": {},
          "reward_consumed_during_epoch": null,
          "reward_consumed_unit": "microliter",
@@ -368,6 +369,7 @@
          "stimulus_device_names": [],
          "speaker_config": null,
          "light_source_config": [],
+         "objects_in_arena": null,
          "output_parameters": {},
          "reward_consumed_during_epoch": null,
          "reward_consumed_unit": "microliter",

diff --git a/src/aind_data_schema/core/session.py b/src/aind_data_schema/core/session.py
@@ -47,6 +47,7 @@ class StimulusModality(str, Enum):
     """Types of stimulus modalities"""
 
     AUDITORY = "Auditory"
+    FREE_MOVING = "Free moving"
     OLFACTORY = "Olfactory"
     OPTOGENETICS = "Optogenetics"
     NONE = "None"
@@ -523,6 +524,7 @@ class StimulusEpoch(AindModel):
     light_source_config: Optional[List[LIGHT_SOURCE_CONFIGS]] = Field(
         default=[], title="Light source config", description="Light sources for stimulation"
     )
+    objects_in_arena: Optional[List[str]] = Field(default=None, title="Objects in arena")
     output_parameters: AindGenericType = Field(default=AindGeneric(), title="Performance metrics")
     reward_consumed_during_epoch: Optional[Decimal] = Field(default=None, title="Reward consumed during training (uL)")
     reward_consumed_unit: VolumeUnit = Field(default=VolumeUnit.UL, title="Reward consumed unit")