Remove Harp clock generator requirement from workflow

bonsai/Bonsai.config

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Packages>
-    <Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.8.0" />
+    <Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.10.2" />
     <Package id="AllenNeuralDynamics.AindManipulator" version="0.1.6" />
-    <Package id="AllenNeuralDynamics.Core" version="0.3.0" />
+    <Package id="AllenNeuralDynamics.Core" version="0.4.0" />
     <Package id="AllenNeuralDynamics.Core.Design" version="0.2.3" />
     <Package id="AllenNeuralDynamics.EnvironmentSensor" version="0.2.0" />
-    <Package id="AllenNeuralDynamics.HarpUtils" version="0.2.0" />
+    <Package id="AllenNeuralDynamics.HarpUtils" version="0.3.2" />
     <Package id="AllenNeuralDynamics.LicketySplit" version="0.2.0" />
     <Package id="AllenNeuralDynamics.SniffDetector" version="0.2.0" />
     <Package id="AllenNeuralDynamics.Treadmill" version="0.2.0" />
@@ -37,12 +37,11 @@
     <Package id="Bonsai.VR" version="0.6.0" />
     <Package id="Bonsai.Windows.Input" version="2.7.0" />
     <Package id="BonVision" version="0.11.0" />
-    <Package id="Harp.AnalogInput" version="0.1.0" />
+    <Package id="Harp.AnalogInput" version="0.2.0" />
     <Package id="Harp.Behavior" version="0.1.0" />
-    <Package id="Harp.LoadCells" version="0.1.0" />
-    <Package id="Harp.Olfactometer" version="0.1.0-build231127" />
+    <Package id="Harp.LoadCells" version="0.2.0" />
+    <Package id="Harp.Olfactometer" version="0.2.0" />
     <Package id="Harp.StepperDriver" version="0.3.0" />
-    <Package id="Harp.TimestampGeneratorGen3" version="0.1.1" />
     <Package id="jacobslusser.ScintillaNET" version="3.6.3" />
     <Package id="LibGit2Sharp" version="0.27.2" />
     <Package id="LibGit2Sharp.NativeBinaries" version="2.0.320" />
@@ -65,7 +64,7 @@
     <Package id="System.Numerics.Vectors" version="4.5.0" />
     <Package id="System.Resources.Extensions" version="8.0.0" />
     <Package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
-    <Package id="YamlDotNet" version="13.1.1" />
+    <Package id="YamlDotNet" version="16.0.0" />
     <Package id="ZedGraph" version="5.1.7" />
   </Packages>
   <AssemblyReferences>
@@ -109,15 +108,14 @@
     <AssemblyReference assemblyName="Harp.LoadCells" />
     <AssemblyReference assemblyName="Harp.Olfactometer" />
     <AssemblyReference assemblyName="Harp.StepperDriver" />
-    <AssemblyReference assemblyName="Harp.TimestampGeneratorGen3" />
   </AssemblyReferences>
   <AssemblyLocations>
-    <AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.8.0/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
+    <AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.10.2/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.AindManipulator" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindManipulator.0.1.6/lib/net48/AllenNeuralDynamics.AindManipulator.dll" />
-    <AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.3.0/lib/net472/AllenNeuralDynamics.Core.dll" />
+    <AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.4.0/lib/net472/AllenNeuralDynamics.Core.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.Core.Design" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.Design.0.2.3/lib/net472/AllenNeuralDynamics.Core.Design.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.EnvironmentSensor" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.EnvironmentSensor.0.2.0/lib/net462/AllenNeuralDynamics.EnvironmentSensor.dll" />
-    <AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.2.0/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
+    <AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.3.2/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.LicketySplit" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.LicketySplit.0.2.0/lib/net462/AllenNeuralDynamics.LicketySplit.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.SniffDetector" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.SniffDetector.0.2.0/lib/net462/AllenNeuralDynamics.SniffDetector.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.Treadmill" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Treadmill.0.2.0/lib/net462/AllenNeuralDynamics.Treadmill.dll" />
@@ -148,12 +146,11 @@
     <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.7.0/lib/net462/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.1.0/lib/net462/Harp.AnalogInput.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" />
-    <AssemblyLocation assemblyName="Harp.LoadCells" processorArchitecture="MSIL" location="Packages/Harp.LoadCells.0.1.0/lib/net462/Harp.LoadCells.dll" />
-    <AssemblyLocation assemblyName="Harp.Olfactometer" processorArchitecture="MSIL" location="Packages/Harp.Olfactometer.0.1.0-build231127/lib/net462/Harp.Olfactometer.dll" />
+    <AssemblyLocation assemblyName="Harp.LoadCells" processorArchitecture="MSIL" location="Packages/Harp.LoadCells.0.2.0/lib/net462/Harp.LoadCells.dll" />
+    <AssemblyLocation assemblyName="Harp.Olfactometer" processorArchitecture="MSIL" location="Packages/Harp.Olfactometer.0.2.0/lib/net462/Harp.Olfactometer.dll" />
     <AssemblyLocation assemblyName="Harp.StepperDriver" processorArchitecture="MSIL" location="Packages/Harp.StepperDriver.0.3.0/lib/net462/Harp.StepperDriver.dll" />
-    <AssemblyLocation assemblyName="Harp.TimestampGeneratorGen3" processorArchitecture="MSIL" location="Packages/Harp.TimestampGeneratorGen3.0.1.1/lib/net462/Harp.TimestampGeneratorGen3.dll" />
     <AssemblyLocation assemblyName="LibGit2Sharp" processorArchitecture="MSIL" location="Packages/LibGit2Sharp.0.27.2/lib/net472/LibGit2Sharp.dll" />
     <AssemblyLocation assemblyName="Markdig" processorArchitecture="MSIL" location="Packages/Markdig.0.18.1/lib/net40/Markdig.dll" />
     <AssemblyLocation assemblyName="MathNet.Numerics" processorArchitecture="MSIL" location="Packages/MathNet.Numerics.4.15.0/lib/net461/MathNet.Numerics.dll" />
@@ -179,7 +176,7 @@
     <AssemblyLocation assemblyName="System.Reactive.PlatformServices" processorArchitecture="MSIL" location="Packages/Rx-PlatformServices.2.2.5/lib/net45/System.Reactive.PlatformServices.dll" />
     <AssemblyLocation assemblyName="System.Resources.Extensions" processorArchitecture="MSIL" location="Packages/System.Resources.Extensions.8.0.0/lib/net462/System.Resources.Extensions.dll" />
     <AssemblyLocation assemblyName="System.Runtime.CompilerServices.Unsafe" processorArchitecture="MSIL" location="Packages/System.Runtime.CompilerServices.Unsafe.6.0.0/lib/net461/System.Runtime.CompilerServices.Unsafe.dll" />
-    <AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.13.1.1/lib/net47/YamlDotNet.dll" />
+    <AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.16.0.0/lib/net47/YamlDotNet.dll" />
     <AssemblyLocation assemblyName="ZedGraph" processorArchitecture="MSIL" location="Packages/ZedGraph.5.1.7/lib/net35-Client/ZedGraph.dll" />
   </AssemblyLocations>
   <LibraryFolders>

examples/example.py

@@ -54,7 +54,6 @@ def mock_rig() -> AindBehaviorWaterTunerRig:
     return AindBehaviorWaterTunerRig(
         rig_name="testrig",
         harp_behavior=rig.HarpBehavior(port_name="COM3"),
-        harp_clock_generator=rig.HarpClockGenerator(port_name="COM17"),
         manipulator=aind_manipulator.AindManipulatorDevice(port_name="COM10", calibration=manipulator_calibration),
         scale=SerialScale(port_name="COM12"),
     )

pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "aind_behavior_services >= 0.9, < 0.10",
+  "aind_behavior_services < 0.11",
 ]
 
 [project.urls]
@@ -29,7 +29,7 @@ Changelog = "https://github.com/AllenNeuralDynamics/Aind.Behavior.WaterTuner/rel
 
 [project.optional-dependencies]
 
-launcher = ["aind_behavior_experiment_launcher[aind-services] >= 0.3, < 0.4"]
+launcher = ["aind_behavior_experiment_launcher[aind-services]"]
 
 dev = [
     "aind_behavior_device_water_tuner[launcher]",

src/DataSchemas/aind_behavior_session_model.json

@@ -1,14 +1,14 @@
 {
   "properties": {
     "aind_behavior_services_pkg_version": {
-      "default": "0.9.0",
+      "default": "0.10.2",
       "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
       "title": "aind_behavior_services package version",
       "type": "string"
     },
     "version": {
-      "const": "0.3.0",
-      "default": "0.3.0",
+      "const": "0.3.1",
+      "default": "0.3.1",
       "title": "Version",
       "type": "string"
     },

src/DataSchemas/aind_behavior_water_tuner_rig.json

@@ -151,8 +151,8 @@
     "AindManipulatorDevice": {
       "properties": {
         "device_type": {
-          "const": "stepperdriver",
-          "default": "stepperdriver",
+          "const": "StepperDriver",
+          "default": "StepperDriver",
           "title": "Device Type",
           "type": "string"
         },
@@ -292,39 +292,11 @@
       "title": "BaseModel",
       "type": "object"
     },
-    "ConnectedClockOutput": {
-      "properties": {
-        "target_device": {
-          "default": null,
-          "description": "Optional device name to provide user additional information",
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "title": "Target Device"
-        },
-        "output_channel": {
-          "description": "Output channel",
-          "minimum": 0,
-          "title": "Output Channel",
-          "type": "integer"
-        }
-      },
-      "required": [
-        "output_channel"
-      ],
-      "title": "ConnectedClockOutput",
-      "type": "object"
-    },
     "HarpBehavior": {
       "properties": {
         "device_type": {
-          "const": "behavior",
-          "default": "behavior",
+          "const": "Behavior",
+          "default": "Behavior",
           "title": "Device Type",
           "type": "string"
         },
@@ -383,78 +355,6 @@
       "title": "HarpBehavior",
       "type": "object"
     },
-    "HarpClockGenerator": {
-      "properties": {
-        "device_type": {
-          "const": "clockgenerator",
-          "default": "clockgenerator",
-          "title": "Device Type",
-          "type": "string"
-        },
-        "additional_settings": {
-          "default": null,
-          "description": "Additional settings",
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BaseModel"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "calibration": {
-          "default": null,
-          "description": "Calibration",
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BaseModel"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "who_am_i": {
-          "const": 1158,
-          "default": 1158,
-          "title": "Who Am I",
-          "type": "integer"
-        },
-        "serial_number": {
-          "default": null,
-          "description": "Device serial number",
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "title": "Serial Number"
-        },
-        "port_name": {
-          "description": "Device port name",
-          "title": "Port Name",
-          "type": "string"
-        },
-        "connected_clock_outputs": {
-          "default": [],
-          "description": "Connected clock outputs",
-          "items": {
-            "$ref": "#/definitions/ConnectedClockOutput"
-          },
-          "title": "Connected Clock Outputs",
-          "type": "array"
-        }
-      },
-      "required": [
-        "port_name"
-      ],
-      "title": "HarpClockGenerator",
-      "type": "object"
-    },
     "ManipulatorPosition": {
       "properties": {
         "x": {
@@ -558,14 +458,14 @@
   },
   "properties": {
     "aind_behavior_services_pkg_version": {
-      "default": "0.9.0",
+      "default": "0.10.2",
       "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
       "title": "aind_behavior_services package version",
       "type": "string"
     },
     "version": {
-      "const": "0.1.0",
-      "default": "0.1.0",
+      "const": "0.2.0",
+      "default": "0.2.0",
       "title": "Version",
       "type": "string"
     },
@@ -587,21 +487,23 @@
       "$ref": "#/definitions/HarpBehavior",
       "description": "Harp behavior"
     },
-    "harp_clock_generator": {
-      "$ref": "#/definitions/HarpClockGenerator",
-      "description": "Harp clock generator"
-    },
     "manipulator": {
-      "$ref": "#/definitions/AindManipulatorDevice",
-      "description": "Manipulator"
+      "default": null,
+      "description": "Manipulator",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/AindManipulatorDevice"
+        },
+        {
+          "type": "null"
+        }
+      ]
     }
   },
   "required": [
     "rig_name",
     "scale",
-    "harp_behavior",
-    "harp_clock_generator",
-    "manipulator"
+    "harp_behavior"
   ],
   "title": "AindBehaviorWaterTunerRig",
   "type": "object"

src/DataSchemas/aind_behavior_water_tuner_task_logic.json

@@ -17,15 +17,15 @@
           "title": "Rng Seed"
         },
         "aind_behavior_services_pkg_version": {
-          "default": "0.9.0",
+          "default": "0.10.2",
           "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
           "title": "aind_behavior_services package version",
           "type": "string"
         },
         "valve_open_time": {
           "description": "An array with the times (s) the valve is open during calibration",
           "items": {
-            "exclusiveMinimum": 0.0,
+            "exclusiveMinimum": 0,
             "type": "number"
           },
           "minItems": 1,
@@ -35,7 +35,7 @@
         "valve_open_interval": {
           "default": 0.2,
           "description": "Time between two consecutive valve openings (s)",
-          "exclusiveMinimum": 0.0,
+          "exclusiveMinimum": 0,
           "title": "Valve open interval",
           "type": "number"
         },
@@ -73,8 +73,8 @@
       "title": "Task parameters"
     },
     "version": {
-      "const": "0.1.0",
-      "default": "0.1.0",
+      "const": "0.2.0",
+      "default": "0.2.0",
       "title": "Version",
       "type": "string"
     },