Add launcher for fip experiment

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/aind_behavior_vr_foraging/curricula/aind.Behavior.VrForaging.Curricula"]
 	path = src/aind_behavior_vr_foraging/curricula/aind.Behavior.VrForaging.Curricula
 	url = https://github.com/AllenNeuralDynamics/Aind.Behavior.VrForaging.Curricula
+[submodule "src/platforms/FIP_DAQ_Control"]
+	path = src/platforms/FIP_DAQ_Control
+	url = https://github.com/AllenNeuralDynamics/FIP_DAQ_Control.git

pyproject.toml

@@ -12,7 +12,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Operating System :: Microsoft :: Windows",
 ]
-version = "0.6.0"
+version = "0.6.1rc1"
 readme = {file = "README.md", content-type = "text/markdown"}
 
 dependencies = [
@@ -30,8 +30,10 @@ Changelog = "https://github.com/AllenNeuralDynamics/Aind.Behavior.VrForaging/rel
 
 data = ["contraqctor<0.6.0"]
 
+platform_fip = ["aind_physiology_fip"]
+
 launcher = [
-    "aind-clabe[aind-services] >= 0.8.0 ,<0.9.0",
+    "aind-clabe[aind-services] >= 0.8.2 ,<0.9.0",
     "aind-data-schema>=2",
     "aind_behavior_vr_foraging[data]",
     ]
@@ -75,3 +77,6 @@ ignore-words-list = 'nd'
 [tool.uv]
 default-groups = ['dev']
 required-version = '>=0.8.4'
+
+[tool.uv.sources]
+aind_physiology_fip = { path = "./src/Platforms/FIP_DAQ_Control" }

src/DataSchemas/aind_behavior_vr_foraging.json

@@ -359,8 +359,8 @@
           "type": "string"
         },
         "version": {
-          "const": "0.6.0",
-          "default": "0.6.0",
+          "const": "0.6.1-rc1",
+          "default": "0.6.1-rc1",
           "title": "Version",
           "type": "string"
         },
@@ -568,8 +568,8 @@
           "description": "Parameters of the task logic"
         },
         "version": {
-          "const": "0.6.0",
-          "default": "0.6.0",
+          "const": "0.6.1-rc1",
+          "default": "0.6.1-rc1",
           "title": "Version",
           "type": "string"
         },

src/Extensions/AindBehaviorVrForaging.Generated.cs

@@ -955,7 +955,7 @@ public partial class AindVrForagingRig
         public AindVrForagingRig()
         {
             _aindBehaviorServicesPkgVersion = "0.12.3";
-            _version = "0.6.0";
+            _version = "0.6.1-rc1";
             _triggeredCameraController = new CameraControllerSpinnakerCamera();
             _harpBehavior = new HarpBehavior();
             _harpOlfactometer = new Olfactometer();
@@ -1362,7 +1362,7 @@ public AindVrForagingTaskLogic()
             _name = "AindVrForaging";
             _description = "";
             _taskParameters = new AindVrForagingTaskParameters();
-            _version = "0.6.0";
+            _version = "0.6.1-rc1";
         }
 
         protected AindVrForagingTaskLogic(AindVrForagingTaskLogic other)

src/aind_behavior_vr_foraging/launcher.py

@@ -1,7 +1,9 @@
+import asyncio
 import logging
 from pathlib import Path
 from typing import Any, cast
 
+import aind_physiology_fip.rig
 from aind_behavior_services.calibration.aind_manipulator import ManipulatorPosition
 from aind_behavior_services.session import AindBehaviorSessionModel
 from clabe import resource_monitor
@@ -14,7 +16,7 @@
 )
 from clabe.data_transfer.aind_watchdog import WatchdogDataTransferService, WatchdogSettings
 from clabe.launcher import Launcher, LauncherCliArgs
-from clabe.pickers import DefaultBehaviorPickerSettings
+from clabe.pickers import DefaultBehaviorPicker, DefaultBehaviorPickerSettings
 from clabe.pickers.dataverse import DataversePicker
 from contraqctor.contract.json import SoftwareEvents
 from pydantic_settings import CliApp
@@ -27,7 +29,7 @@
 logger = logging.getLogger(__name__)
 
 
-def experiment(launcher: Launcher) -> None:
+async def experiment(launcher: Launcher) -> None:
     monitor = resource_monitor.ResourceMonitor(
         constrains=[
             resource_monitor.available_storage_constraint_factory(launcher.settings.data_dir, 2e11),
@@ -39,6 +41,13 @@ def experiment(launcher: Launcher) -> None:
 
     # Start experiment setup
     picker = DataversePicker(launcher=launcher, settings=DefaultBehaviorPickerSettings())
+
+    fip_picker = DefaultBehaviorPicker(
+        launcher=launcher,
+        settings=DefaultBehaviorPickerSettings(
+            config_library_dir=Path(r"\\allen\aind\scratch\AindBehavior.db\AindPhysiologyFip")
+        ),
+    )
     manipulator_modifier = ByAnimalManipulatorModifier(picker, launcher)
 
     # Pick and register session
@@ -52,13 +61,29 @@ def experiment(launcher: Launcher) -> None:
     # Fetch rig settings
     rig = picker.pick_rig(AindVrForagingRig)
 
+    fip_rig = fip_picker.pick_rig(aind_physiology_fip.rig.AindPhysioFipRig)
+
     # Post-fetching modifications
     manipulator_modifier.inject(rig)
 
     # Run the task via Bonsai
     bonsai_app = AindBehaviorServicesBonsaiApp(BonsaiAppSettings(workflow=Path(r"./src/main.bonsai")))
+
+    fip_app = AindBehaviorServicesBonsaiApp(
+        BonsaiAppSettings(
+            workflow=Path(r"./src/platforms/FIP_DAQ_Control/main.bonsai"),
+            executable=Path(r"./src/platforms/FIP_DAQ_Control/bonsai/bonsai.exe"),
+            is_editor_mode=True,
+            is_start_flag=True,
+        )
+    )
     bonsai_app.add_app_settings(launcher, rig=rig, session=session, task_logic=task_logic)
-    bonsai_app.run().get_result(allow_stderr=True)
+    fip_app.add_app_settings(launcher=launcher, session=session, rig=fip_rig)
+
+    await asyncio.gather(bonsai_app.run_async(), fip_app.run_async())
+
+    bonsai_app.get_result(allow_stderr=True)
+    fip_app.get_result(allow_stderr=True)
 
     # Update manipulator initial position for next session
     manipulator_modifier.dump()