Skip to content

Feat adding curriculum #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
micahwoodard wants to merge 21 commits into from
Closed

Feat adding curriculum #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b562098
starts on coupled baiting curriculum
micahwoodard Feb 27, 2026
8ad3f02
adds coupled baiting curriculum
micahwoodard Feb 28, 2026
34a649c
adds unit tests
micahwoodard Feb 28, 2026
e53258c
adds tests
micahwoodard Feb 28, 2026
daddc4f
lints
micahwoodard Feb 28, 2026
58614c5
shortens integration
micahwoodard Mar 6, 2026
93be2ed
take one after consumption
micahwoodard Mar 6, 2026
1a08dee
switching null check
micahwoodard Mar 7, 2026
5dc3419
Refactor property unpacking
bruno-f-cruz Mar 9, 2026
f3cfbf6
Simplify ITI logic and next trial setup
bruno-f-cruz Mar 9, 2026
4937731
Include TaskEngine workflow
bruno-f-cruz Mar 9, 2026
8df8dc6
Enable heartbeat at the start to ensure camera trigger is worst case …
bruno-f-cruz Mar 9, 2026
4e615fe
Ensure metadata software events propagate after logger is initialized
bruno-f-cruz Mar 9, 2026
7baa222
Re-enable all trials for generator
bruno-f-cruz Mar 9, 2026
fa300fd
Merge pull request #48 from AllenNeuralDynamics/feat-testing
bruno-f-cruz Mar 9, 2026
a572952
Bump version and regenerate schemas [skip ci]
github-actions[bot] Mar 9, 2026
f2e8b9b
merges with main
micahwoodard Mar 10, 2026
7d3deba
seperate curriculum
micahwoodard Mar 10, 2026
1be3c90
upath comment
micahwoodard Mar 11, 2026
50fe5b9
Merge pull request #39 from AllenNeuralDynamics/feat-warmup-generator
micahwoodard Mar 11, 2026
c2b2519
merges with main
micahwoodard Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Operating System :: Microsoft :: Windows",
]
version = "0.0.2rc16"
version = "0.0.2rc17"
readme = {file = "README.md", content-type = "text/markdown"}

dependencies = [
"aind_behavior_services>=0.13.2",
"pydantic-settings",
"aind-behavior-dynamic-foraging-curricula"
]

[tool.uv.sources]
aind-behavior-dynamic-foraging-curricula = { workspace = true }

[tool.uv.workspace]
members = ["workspaces/*"]

[project.urls]
Documentation = "https://allenneuraldynamics.github.io/Aind.Behavior.DynamicForaging/"
Repository = "https://github.com/AllenNeuralDynamics/Aind.Behavior.DynamicForaging/"
Expand Down
10 changes: 5 additions & 5 deletions schema/aind_behavior_dynamic_foraging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"type": "string"
},
"version": {
"const": "0.0.2-rc16",
"default": "0.0.2-rc16",
"const": "0.0.2-rc17",
"default": "0.0.2-rc17",
"title": "Version",
"type": "string"
},
Expand Down Expand Up @@ -152,8 +152,8 @@
"description": "Parameters of the task logic"
},
"version": {
"const": "0.0.2-rc16",
"default": "0.0.2-rc16",
"const": "0.0.2-rc17",
"default": "0.0.2-rc17",
"title": "Version",
"type": "string"
},
Expand Down Expand Up @@ -3165,7 +3165,7 @@
"rate": 1.0
},
"truncation_parameters": {
"max": 2.0,
"max": 1.0,
"min": 1.0,
"truncation_mode": "exclude"
},
Expand Down
4 changes: 2 additions & 2 deletions src/Extensions/AindBehaviorDynamicForaging.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public partial class AindDynamicForagingRig
public AindDynamicForagingRig()
{
_aindBehaviorServicesPkgVersion = "0.13.2";
_version = "0.0.2-rc16";
_version = "0.0.2-rc17";
_triggeredCameraController = new CameraControllerSpinnakerCamera();
_harpBehavior = new HarpBehavior();
_harpClockGenerator = new HarpWhiteRabbit();
Expand Down Expand Up @@ -433,7 +433,7 @@ public AindDynamicForagingTaskLogic()
_name = "AindDynamicForaging";
_description = "";
_taskParameters = new AindDynamicForagingTaskParameters();
_version = "0.0.2-rc16";
_version = "0.0.2-rc17";
}

protected AindDynamicForagingTaskLogic(AindDynamicForagingTaskLogic other)
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/HarpBehavior.bonsai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<harp:OperationLed>On</harp:OperationLed>
<harp:DumpRegisters>true</harp:DumpRegisters>
<harp:VisualIndicators>On</harp:VisualIndicators>
<harp:Heartbeat>Disabled</harp:Heartbeat>
<harp:Heartbeat>Enabled</harp:Heartbeat>
<harp:IgnoreErrors>false</harp:IgnoreErrors>
<harp:PortName>COMx</harp:PortName>
</Combinator>
Expand Down
60 changes: 31 additions & 29 deletions src/Extensions/Logging.bonsai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,62 +771,48 @@
<Modality xsi:nil="true" />
</Expression>
<Expression xsi:type="WorkflowOutput" />
<Expression xsi:type="GroupWorkflow">
<Name>DumpMetadata</Name>
<Expression xsi:type="rx:Defer">
<Name>AdditionalSoftwareEvents</Name>
<Workflow>
<Nodes>
<Expression xsi:type="SubscribeSubject">
<Name>RngSeedValue</Name>
<Name>ManipulatorPosition</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:Take">
<rx:Count>1</rx:Count>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="p1:CreateSoftwareEvent">
<p1:EventName>RngSeed</p1:EventName>
<p1:EventName>InitialManipulatorPosition</p1:EventName>
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>SoftwareEvent</Name>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>EndExperiment</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="StringProperty">
<Value>ExperimentCompleted</Value>
</Combinator>
<Name>RngSeedValue</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="p1:CreateSoftwareEvent">
<p1:EventName>EndSession</p1:EventName>
<p1:EventName>RngSeed</p1:EventName>
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>SoftwareEvent</Name>
</Expression>
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
<Edge From="3" To="4" Label="Source1" />
<Edge From="4" To="5" Label="Source1" />
<Edge From="5" To="6" Label="Source1" />
</Edges>
</Workflow>
</Expression>
<Expression xsi:type="GroupWorkflow">
<Name>AdditionalSoftwareEvents</Name>
<Workflow>
<Nodes>
<Expression xsi:type="SubscribeSubject">
<Name>ManipulatorPosition</Name>
<Name>EndExperiment</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:Take">
<rx:Count>1</rx:Count>
<Combinator xsi:type="StringProperty">
<Value>ExperimentCompleted</Value>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="p1:CreateSoftwareEvent">
<p1:EventName>InitialManipulatorPosition</p1:EventName>
<p1:EventName>EndSession</p1:EventName>
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
Expand All @@ -837,9 +823,23 @@
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
<Edge From="2" To="3" Label="Source1" />
<Edge From="4" To="5" Label="Source1" />
<Edge From="5" To="6" Label="Source1" />
<Edge From="7" To="8" Label="Source1" />
<Edge From="8" To="9" Label="Source1" />
<Edge From="9" To="10" Label="Source1" />
</Edges>
</Workflow>
</Expression>
<Expression xsi:type="Annotation">
<Name>Wait for logger to initialize</Name>
<Text><![CDATA[]]></Text>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:DelaySubscription">
<rx:DueTime>PT0.5S</rx:DueTime>
</Combinator>
</Expression>
</Nodes>
<Edges>
<Edge From="0" To="2" Label="Source1" />
Expand All @@ -850,6 +850,8 @@
<Edge From="5" To="6" Label="Source1" />
<Edge From="6" To="7" Label="Source2" />
<Edge From="7" To="8" Label="Source1" />
<Edge From="9" To="11" Label="Source1" />
<Edge From="10" To="11" Label="Source2" />
</Edges>
</Workflow>
</Expression>
Expand Down
Loading
Loading