Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions bonsai/Bonsai.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<Package id="AForge" version="2.2.5" />
<Package id="AForge.Video" version="2.2.5" />
<Package id="AForge.Video.DirectShow" version="2.2.5" />
<Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.12.5" />
<Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.13.4" />
<Package id="AllenNeuralDynamics.AindBehaviorServices.MessageProtocol" version="0.13.7" />
<Package id="AllenNeuralDynamics.Core" version="0.4.1" />
<Package id="AllenNeuralDynamics.Core.Design" version="0.4.0" />
<Package id="AllenNeuralDynamics.EnvironmentSensor" version="0.2.0" />
Expand Down Expand Up @@ -89,6 +90,7 @@
</Packages>
<AssemblyReferences>
<AssemblyReference assemblyName="AllenNeuralDynamics.AindBehaviorServices" />
<AssemblyReference assemblyName="AllenNeuralDynamics.AindBehaviorServices.MessageProtocol" />
<AssemblyReference assemblyName="AllenNeuralDynamics.Core" />
<AssemblyReference assemblyName="AllenNeuralDynamics.Core.Design" />
<AssemblyReference assemblyName="AllenNeuralDynamics.EnvironmentSensor" />
Expand Down Expand Up @@ -137,7 +139,8 @@
<AssemblyLocation assemblyName="AForge" processorArchitecture="MSIL" location="Packages/AForge.2.2.5/lib/AForge.dll" />
<AssemblyLocation assemblyName="AForge.Video" processorArchitecture="MSIL" location="Packages/AForge.Video.2.2.5/lib/AForge.Video.dll" />
<AssemblyLocation assemblyName="AForge.Video.DirectShow" processorArchitecture="MSIL" location="Packages/AForge.Video.DirectShow.2.2.5/lib/AForge.Video.DirectShow.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.12.5/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.13.4/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices.MessageProtocol" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.0.13.7/lib/net472/AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.4.1/lib/net472/AllenNeuralDynamics.Core.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core.Design" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.Design.0.4.0/lib/net472/AllenNeuralDynamics.Core.Design.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.EnvironmentSensor" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.EnvironmentSensor.0.2.0/lib/net462/AllenNeuralDynamics.EnvironmentSensor.dll" />
Expand Down
14 changes: 7 additions & 7 deletions src/DataSchemas/aind_behavior_just_frames.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"AindJustFramesRig": {
"properties": {
"aind_behavior_services_pkg_version": {
"default": "0.13.0",
"default": "0.13.7",
"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"
Expand Down Expand Up @@ -266,7 +266,7 @@
"SatelliteRig": {
"properties": {
"aind_behavior_services_pkg_version": {
"default": "0.13.0",
"default": "0.13.7",
"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"
Expand Down Expand Up @@ -344,14 +344,14 @@
"Session": {
"properties": {
"aind_behavior_services_pkg_version": {
"default": "0.13.0",
"default": "0.13.7",
"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.13.0",
"default": "0.13.0",
"const": "0.13.7",
"default": "0.13.7",
"title": "Version",
"type": "string"
},
Expand Down Expand Up @@ -916,13 +916,13 @@
"type": "integer"
},
"container_extension": {
"default": "mp4",
"default": "mkv",
"description": "Container extension",
"title": "Container Extension",
"type": "string"
},
"output_arguments": {
"default": "-vf \"scale=out_color_matrix=bt709:out_range=full,format=bgr24,scale=out_range=full\" -c:v h264_nvenc -pix_fmt yuv420p -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p4 -rc vbr -cq 12 -b:v 0M -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M",
"default": "-vf \"scale=out_range=full,setparams=range=full:colorspace=bt709:color_primaries=bt709:color_trc=linear\" -c:v h264_nvenc -pix_fmt yuv420p -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p3 -rc vbr -cq 18 -b:v 0M -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M -f matroska -write_crc32 0",
"description": "Output arguments",
"title": "Output Arguments",
"type": "string"
Expand Down
15 changes: 10 additions & 5 deletions src/DataSchemas/aind_physiology_fip_message_protocol.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"status"
],
"title": "HeartbeatPayload",
"type": "object"
"type": "object",
"x-sgen-typename": "AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.HeartbeatPayload"
},
"HeartbeatStatus": {
"description": "Enumeration of possible heartbeat status values.\n\nRepresents the health status of a system component,\nwith higher values indicating more severe issues.\n\nExamples:\n ```python\n HeartbeatStatus.OK # <HeartbeatStatus.OK: 0>\n HeartbeatStatus.CRITICAL > HeartbeatStatus.WARNING # True\n int(HeartbeatStatus.ERROR) # 2\n ```",
Expand All @@ -46,7 +47,8 @@
"Warning",
"Error",
"Critical"
]
],
"x-sgen-typename": "AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.HeartbeatStatus"
},
"LogLevel": {
"description": "Enumeration of log levels for the logging system.\n\nFollows standard Python logging levels with integer values\nthat allow for easy comparison and filtering.\n\nExamples:\n ```python\n LogLevel.ERROR > LogLevel.WARNING # True\n LogLevel.DEBUG.value # 10\n str(LogLevel.INFO) # 'LogLevel.INFO'\n ```",
Expand All @@ -67,7 +69,8 @@
"Info",
"Debug",
"Notset"
]
],
"x-sgen-typename": "AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.LogLevel"
},
"LogPayload": {
"description": "Payload for log messages containing logging information.\n\nThis payload carries log data including the message content,\nseverity level, optional context, and application version.\n\nAttributes:\n message: The actual log message text\n level: Severity level of the log entry\n context: Optional additional data related to the log\n application_version: Version of the application generating the log\n\nExamples:\n ```python\n log_payload = LogPayload(\n message=\"System startup complete\",\n level=LogLevel.INFO,\n context={\"operator\": \"John Doe\"},\n application_version=\"1.0.0\"\n )\n print(log_payload.level) # LogLevel.INFO\n ```",
Expand Down Expand Up @@ -117,7 +120,8 @@
"message"
],
"title": "LogPayload",
"type": "object"
"type": "object",
"x-sgen-typename": "AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.LogPayload"
},
"Message": {
"$ref": "#/$defs/_Message_Any_",
Expand All @@ -131,7 +135,8 @@
"event"
],
"title": "MessageType",
"type": "string"
"type": "string",
"x-sgen-typename": "AllenNeuralDynamics.AindBehaviorServices.MessageProtocol.MessageType"
},
"RegisteredMessages": {
"properties": {
Expand Down
1 change: 1 addition & 0 deletions src/Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PackageReference Include="Bonsai.Harp" Version="3.5.0" />
<PackageReference Include="NetMQ" Version="4.0.1.12" />
<PackageReference Include="Bonsai.ZeroMQ" Version="0.3.0" />
<PackageReference Include="AllenNeuralDynamics.AindBehaviorServices.MessageProtocol" Version="0.13.5" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions src/Extensions/AindBehaviorJustFrames.Generated.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public partial class AindJustFramesRig

public AindJustFramesRig()
{
_aindBehaviorServicesPkgVersion = "0.13.0";
_aindBehaviorServicesPkgVersion = "0.13.7";
_version = "0.5.1";
_harpBehavior = new HarpBehavior();
_satelliteRigs = new System.Collections.Generic.List<SatelliteRig>();
Expand Down Expand Up @@ -873,7 +873,7 @@ public partial class SatelliteRig

public SatelliteRig()
{
_aindBehaviorServicesPkgVersion = "0.13.0";
_aindBehaviorServicesPkgVersion = "0.13.7";
_version = "0.5.1";
_zmqProtocolConfig = new NetworkConfig();
_zmqTriggerConfig = new NetworkConfig();
Expand Down Expand Up @@ -1126,8 +1126,8 @@ public partial class Session

public Session()
{
_aindBehaviorServicesPkgVersion = "0.13.0";
_version = "0.13.0";
_aindBehaviorServicesPkgVersion = "0.13.7";
_version = "0.13.7";
_experimenter = new System.Collections.Generic.List<string>();
_allowDirtyRepo = false;
_skipHardwareValidation = false;
Expand Down Expand Up @@ -2213,8 +2213,8 @@ public partial class VideoWriterFfmpeg : VideoWriter
public VideoWriterFfmpeg()
{
_frameRate = 30;
_containerExtension = "mp4";
_outputArguments = "-vf \"scale=out_color_matrix=bt709:out_range=full,format=bgr24,scale=out_range=full\" -c:v h264_nvenc -pix_fmt yuv420p -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p4 -rc vbr -cq 12 -b:v 0M -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M";
_containerExtension = "mkv";
_outputArguments = "-vf \"scale=out_range=full,setparams=range=full:colorspace=bt709:color_primaries=bt709:color_trc=linear\" -c:v h264_nvenc -pix_fmt yuv420p -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p3 -rc vbr -cq 18 -b:v 0M -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M -f matroska -write_crc32 0";
_inputArguments = "-colorspace bt709 -color_primaries bt709 -color_range full -color_trc linear";
}

Expand Down
Loading
Loading