Feat coupled trial generator

bonsai/Bonsai.config

@@ -34,6 +34,7 @@
     <Package id="Bonsai.Vision" version="2.8.1" />
     <Package id="Bonsai.Vision.Design" version="2.8.1" />
     <Package id="Bonsai.VR" version="0.6.0" />
+    <Package id="Bonsai.Windows.Input" version="2.9.0" />
     <Package id="BonVision" version="0.11.0" />
     <Package id="DockPanelSuite" version="3.1.1" />
     <Package id="DockPanelSuite.ThemeVS2015" version="3.1.1" />
@@ -107,6 +108,7 @@
     <AssemblyReference assemblyName="Bonsai.Vision" />
     <AssemblyReference assemblyName="Bonsai.Vision.Design" />
     <AssemblyReference assemblyName="Bonsai.VR" />
+    <AssemblyReference assemblyName="Bonsai.Windows.Input" />
     <AssemblyReference assemblyName="BonVision" />
     <AssemblyReference assemblyName="Harp.AnalogInput" />
     <AssemblyReference assemblyName="Harp.Behavior" />
@@ -149,6 +151,7 @@
     <AssemblyLocation assemblyName="Bonsai.Vision" processorArchitecture="MSIL" location="Packages/Bonsai.Vision.2.8.1/lib/net462/Bonsai.Vision.dll" />
     <AssemblyLocation assemblyName="Bonsai.Vision.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Vision.Design.2.8.1/lib/net462/Bonsai.Vision.Design.dll" />
     <AssemblyLocation assemblyName="Bonsai.VR" processorArchitecture="MSIL" location="Packages/Bonsai.VR.0.6.0/lib/net45/Bonsai.VR.dll" />
+    <AssemblyLocation assemblyName="Bonsai.Windows.Input" processorArchitecture="MSIL" location="Packages/Bonsai.Windows.Input.2.9.0/lib/net472/Bonsai.Windows.Input.dll" />
     <AssemblyLocation assemblyName="BonVision" processorArchitecture="MSIL" location="Packages/BonVision.0.11.0/lib/net462/BonVision.dll" />
     <AssemblyLocation assemblyName="Harp.AnalogInput" processorArchitecture="MSIL" location="Packages/Harp.AnalogInput.0.2.0/lib/net462/Harp.AnalogInput.dll" />
     <AssemblyLocation assemblyName="Harp.Behavior" processorArchitecture="MSIL" location="Packages/Harp.Behavior.0.1.0/lib/net462/Harp.Behavior.dll" />

examples/coupled_trial_generator.py

@@ -0,0 +1,22 @@
+import logging
+import random
+
+from aind_behavior_dynamic_foraging.task_logic.trial_generators.coupled_trial_generator import CoupledTrialGeneratorSpec
+from aind_behavior_dynamic_foraging.task_logic.trial_models import Trial, TrialOutcome
+
+
+def main():
+    coupled_trial_generator = CoupledTrialGeneratorSpec().create_generator()
+    trial = Trial()
+    for i in range(100):
+        trial_outcome = TrialOutcome(
+            trial=trial, is_right_choice=random.choice([True, False, None]), is_rewarded=random.choice([True, False])
+        )
+        coupled_trial_generator.update(trial_outcome)
+        trial = coupled_trial_generator.next()
+        print(f"Next trial: {trial}")
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    main()

examples/task_logic.py

@@ -8,27 +8,12 @@
 task_logic = AindDynamicForagingTaskLogic(
     task_parameters=AindDynamicForagingTaskParameters(
         rng_seed=42,
-        warmup=df_task_logic.Warmup(min_trial=50, max_choice_ratio_bias=0.1, min_finish_ratio=0.8, windowsize=20),
-        reward_probability=df_task_logic.RewardProbability(base_reward_sum=0.8, family=3, pairs_n=1),
-        block_parameters=df_task_logic.BlockParameters(min=10, max=30, beta=10, min_reward=0),
-        inter_trial_interval=df_task_logic.InterTrialInterval(min=1, max=7, beta=3),
-        delay_period=df_task_logic.DelayPeriod(min=0, max=0, beta=0),
-        reward_delay=0.1,
         reward_size=df_task_logic.RewardSize(right_value_volume=4.0, left_value_volume=4.0),
-        auto_water=df_task_logic.AutoWater(
-            auto_water_type="Natural",
-            multiplier=0.5,
-            unrewarded=3,
-            ignored=3,
-        ),
-        auto_block=df_task_logic.AutoBlock(advanced_block_auto="now", switch_thr=0.5, points_in_a_row=5),
-        response_time=df_task_logic.Response(response_time=5, reward_consume_time=1),
-        uncoupled_reward=[0.1, 0.3, 0.7],
     )
 )
 
 
-def main(path_seed: str = "./local/PatchForaging_{schema}.json"):
+def main(path_seed: str = "./local/DynamicForaging_{schema}.json"):
     example_task_logic = task_logic
     example_trainer_state = TrainerState(
         stage=Stage(name="example_stage", task=example_task_logic), curriculum=None, is_on_curriculum=False

pyproject.toml

@@ -19,7 +19,7 @@ version = "0.0.2rc13"
 readme = {file = "README.md", content-type = "text/markdown"}
 
 dependencies = [
-    "aind_behavior_services<0.14",
+    "aind_behavior_services>=0.13.2",
     "pydantic-settings",
 ]