Skip to content

Commit daf4889

Browse files
authored
Merge pull request #335 from AllenNeuralDynamics/feat-device-metadata
Output harp device metadata at logging time
2 parents 60882f5 + ec601d2 commit daf4889

File tree

6 files changed

+1704
-270
lines changed

6 files changed

+1704
-270
lines changed

bonsai/Bonsai.config

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<Package id="AForge" version="2.2.5" />
55
<Package id="AForge.Video" version="2.2.5" />
66
<Package id="AForge.Video.DirectShow" version="2.2.5" />
7-
<Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.8.0" />
7+
<Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.10.2" />
88
<Package id="AllenNeuralDynamics.AindManipulator" version="0.1.6" />
9-
<Package id="AllenNeuralDynamics.Core" version="0.3.0" />
9+
<Package id="AllenNeuralDynamics.Core" version="0.4.0" />
1010
<Package id="AllenNeuralDynamics.Core.Design" version="0.2.3" />
1111
<Package id="AllenNeuralDynamics.EnvironmentSensor" version="0.2.0" />
12-
<Package id="AllenNeuralDynamics.HarpUtils" version="0.2.0" />
12+
<Package id="AllenNeuralDynamics.HarpUtils" version="0.3.2" />
1313
<Package id="AllenNeuralDynamics.LicketySplit" version="0.2.0" />
1414
<Package id="AllenNeuralDynamics.SniffDetector" version="0.2.0" />
1515
<Package id="AllenNeuralDynamics.Treadmill" version="0.2.0" />
@@ -45,12 +45,11 @@
4545
<Package id="Bonsai.VR" version="0.6.0" />
4646
<Package id="Bonsai.Windows.Input" version="2.7.0" />
4747
<Package id="BonVision" version="0.11.0" />
48-
<Package id="Harp.AnalogInput" version="0.1.0" />
48+
<Package id="Harp.AnalogInput" version="0.2.0" />
4949
<Package id="Harp.Behavior" version="0.1.0" />
50-
<Package id="Harp.LoadCells" version="0.1.0" />
51-
<Package id="Harp.Olfactometer" version="0.1.0-build231127" />
50+
<Package id="Harp.LoadCells" version="0.2.0" />
51+
<Package id="Harp.Olfactometer" version="0.2.0" />
5252
<Package id="Harp.StepperDriver" version="0.3.0" />
53-
<Package id="Harp.TimestampGeneratorGen3" version="0.1.1" />
5453
<Package id="jacobslusser.ScintillaNET" version="3.6.3" />
5554
<Package id="LibGit2Sharp" version="0.27.2" />
5655
<Package id="LibGit2Sharp.NativeBinaries" version="2.0.320" />
@@ -74,7 +73,7 @@
7473
<Package id="System.Numerics.Vectors" version="4.5.0" />
7574
<Package id="System.Resources.Extensions" version="8.0.0" />
7675
<Package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
77-
<Package id="YamlDotNet" version="13.1.1" />
76+
<Package id="YamlDotNet" version="16.0.0" />
7877
<Package id="ZedGraph" version="5.1.7" />
7978
</Packages>
8079
<AssemblyReferences>
@@ -122,18 +121,17 @@
122121
<AssemblyReference assemblyName="Harp.LoadCells" />
123122
<AssemblyReference assemblyName="Harp.Olfactometer" />
124123
<AssemblyReference assemblyName="Harp.StepperDriver" />
125-
<AssemblyReference assemblyName="Harp.TimestampGeneratorGen3" />
126124
</AssemblyReferences>
127125
<AssemblyLocations>
128126
<AssemblyLocation assemblyName="AForge" processorArchitecture="MSIL" location="Packages/AForge.2.2.5/lib/AForge.dll" />
129127
<AssemblyLocation assemblyName="AForge.Video" processorArchitecture="MSIL" location="Packages/AForge.Video.2.2.5/lib/AForge.Video.dll" />
130128
<AssemblyLocation assemblyName="AForge.Video.DirectShow" processorArchitecture="MSIL" location="Packages/AForge.Video.DirectShow.2.2.5/lib/AForge.Video.DirectShow.dll" />
131-
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.8.0/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
129+
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.10.2/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
132130
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindManipulator" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindManipulator.0.1.6/lib/net48/AllenNeuralDynamics.AindManipulator.dll" />
133-
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.3.0/lib/net472/AllenNeuralDynamics.Core.dll" />
131+
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.4.0/lib/net472/AllenNeuralDynamics.Core.dll" />
134132
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core.Design" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.Design.0.2.3/lib/net472/AllenNeuralDynamics.Core.Design.dll" />
135133
<AssemblyLocation assemblyName="AllenNeuralDynamics.EnvironmentSensor" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.EnvironmentSensor.0.2.0/lib/net462/AllenNeuralDynamics.EnvironmentSensor.dll" />
136-
<AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.2.0/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
134+
<AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.3.2/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
137135
<AssemblyLocation assemblyName="AllenNeuralDynamics.LicketySplit" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.LicketySplit.0.2.0/lib/net462/AllenNeuralDynamics.LicketySplit.dll" />
138136
<AssemblyLocation assemblyName="AllenNeuralDynamics.SniffDetector" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.SniffDetector.0.2.0/lib/net462/AllenNeuralDynamics.SniffDetector.dll" />
139137
<AssemblyLocation assemblyName="AllenNeuralDynamics.Treadmill" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Treadmill.0.2.0/lib/net462/AllenNeuralDynamics.Treadmill.dll" />
@@ -168,12 +166,11 @@
168166
<AssemblyLocation assemblyName="Bonsai.VR" processorArchitecture="MSIL" location="Packages/Bonsai.VR.0.6.0/lib/net45/Bonsai.VR.dll" />
169167
<AssemblyLocation assemblyName="Bonsai.Windows.Input" processorArchitecture="MSIL" location="Packages/Bonsai.Windows.Input.2.7.0/lib/net462/Bonsai.Windows.Input.dll" />
170168
<AssemblyLocation assemblyName="BonVision" processorArchitecture="MSIL" location="Packages/BonVision.0.11.0/lib/net462/BonVision.dll" />
171-
<AssemblyLocation assemblyName="Harp.AnalogInput" processorArchitecture="MSIL" location="Packages/Harp.AnalogInput.0.1.0/lib/net462/Harp.AnalogInput.dll" />
169+
<AssemblyLocation assemblyName="Harp.AnalogInput" processorArchitecture="MSIL" location="Packages/Harp.AnalogInput.0.2.0/lib/net462/Harp.AnalogInput.dll" />
172170
<AssemblyLocation assemblyName="Harp.Behavior" processorArchitecture="MSIL" location="Packages/Harp.Behavior.0.1.0/lib/net462/Harp.Behavior.dll" />
173-
<AssemblyLocation assemblyName="Harp.LoadCells" processorArchitecture="MSIL" location="Packages/Harp.LoadCells.0.1.0/lib/net462/Harp.LoadCells.dll" />
174-
<AssemblyLocation assemblyName="Harp.Olfactometer" processorArchitecture="MSIL" location="Packages/Harp.Olfactometer.0.1.0-build231127/lib/net462/Harp.Olfactometer.dll" />
171+
<AssemblyLocation assemblyName="Harp.LoadCells" processorArchitecture="MSIL" location="Packages/Harp.LoadCells.0.2.0/lib/net462/Harp.LoadCells.dll" />
172+
<AssemblyLocation assemblyName="Harp.Olfactometer" processorArchitecture="MSIL" location="Packages/Harp.Olfactometer.0.2.0/lib/net462/Harp.Olfactometer.dll" />
175173
<AssemblyLocation assemblyName="Harp.StepperDriver" processorArchitecture="MSIL" location="Packages/Harp.StepperDriver.0.3.0/lib/net462/Harp.StepperDriver.dll" />
176-
<AssemblyLocation assemblyName="Harp.TimestampGeneratorGen3" processorArchitecture="MSIL" location="Packages/Harp.TimestampGeneratorGen3.0.1.1/lib/net462/Harp.TimestampGeneratorGen3.dll" />
177174
<AssemblyLocation assemblyName="LibGit2Sharp" processorArchitecture="MSIL" location="Packages/LibGit2Sharp.0.27.2/lib/net472/LibGit2Sharp.dll" />
178175
<AssemblyLocation assemblyName="Markdig" processorArchitecture="MSIL" location="Packages/Markdig.0.18.1/lib/net40/Markdig.dll" />
179176
<AssemblyLocation assemblyName="MathNet.Numerics" processorArchitecture="MSIL" location="Packages/MathNet.Numerics.4.15.0/lib/net461/MathNet.Numerics.dll" />
@@ -199,7 +196,7 @@
199196
<AssemblyLocation assemblyName="System.Reactive.PlatformServices" processorArchitecture="MSIL" location="Packages/Rx-PlatformServices.2.2.5/lib/net45/System.Reactive.PlatformServices.dll" />
200197
<AssemblyLocation assemblyName="System.Resources.Extensions" processorArchitecture="MSIL" location="Packages/System.Resources.Extensions.8.0.0/lib/net462/System.Resources.Extensions.dll" />
201198
<AssemblyLocation assemblyName="System.Runtime.CompilerServices.Unsafe" processorArchitecture="MSIL" location="Packages/System.Runtime.CompilerServices.Unsafe.6.0.0/lib/net461/System.Runtime.CompilerServices.Unsafe.dll" />
202-
<AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.13.1.1/lib/net47/YamlDotNet.dll" />
199+
<AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.16.0.0/lib/net47/YamlDotNet.dll" />
203200
<AssemblyLocation assemblyName="ZedGraph" processorArchitecture="MSIL" location="Packages/ZedGraph.5.1.7/lib/net35-Client/ZedGraph.dll" />
204201
</AssemblyLocations>
205202
<LibraryFolders>

src/DataSchemas/aind_behavior_vr_foraging/launcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def make_launcher(settings: behavior_launcher.BehaviorCliArgs) -> behavior_launc
3030
watchdog_data_transfer_factory(
3131
remote_dir,
3232
project_name="Cognitive flexibility in patch foraging",
33-
transfer_endpoint="http://aind-data-transfer-service-dev/api/v1/submit_jobs",
33+
transfer_endpoint="http://aind-data-transfer-service/api/v1/submit_jobs",
3434
upload_job_configs=[
3535
ModalityConfigs(
3636
modality=Modality.BEHAVIOR_VIDEOS, source="This will get replaced later", compress_raw_data=True

0 commit comments

Comments
 (0)