Skip to content

Commit e92fce2

Browse files
bruno-f-cruzbruno-f-cruz
committed
Update schemas and regenerate
1 parent 015612c commit e92fce2

File tree

12 files changed

+132
-30
lines changed

12 files changed

+132
-30
lines changed

‎clabe_default.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data_dir: C:/Data

‎examples/example.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def mock_rig() -> AindBehaviorWaterTunerRig:
5353

5454
return AindBehaviorWaterTunerRig(
5555
rig_name="testrig",
56-
harp_behavior=rig.HarpBehavior(port_name="COM3"),
56+
harp_behavior=rig.harp.HarpBehavior(port_name="COM3"),
5757
manipulator=aind_manipulator.AindManipulatorDevice(port_name="COM10", calibration=manipulator_calibration),
5858
scale=SerialScale(port_name="COM12"),
5959
)

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ classifiers = [
1818
]
1919

2020
dependencies = [
21-
"aind_behavior_services < 0.11",
21+
"aind_behavior_services < 0.12",
2222
]
2323

2424
[project.urls]

‎src/DataSchemas/aind_behavior_session_model.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"properties": {
33
"aind_behavior_services_pkg_version": {
4-
"default": "0.10.2",
4+
"default": "0.11.0",
55
"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-]+)*))?$",
66
"title": "aind_behavior_services package version",
77
"type": "string"

‎src/DataSchemas/aind_behavior_water_tuner_rig.json‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,19 @@
156156
"title": "Device Type",
157157
"type": "string"
158158
},
159+
"device_name": {
160+
"default": null,
161+
"description": "Device name",
162+
"oneOf": [
163+
{
164+
"type": "string"
165+
},
166+
{
167+
"type": "null"
168+
}
169+
],
170+
"title": "Device Name"
171+
},
159172
"additional_settings": {
160173
"default": null,
161174
"description": "Additional settings",
@@ -300,6 +313,19 @@
300313
"title": "Device Type",
301314
"type": "string"
302315
},
316+
"device_name": {
317+
"default": null,
318+
"description": "Device name",
319+
"oneOf": [
320+
{
321+
"type": "string"
322+
},
323+
{
324+
"type": "null"
325+
}
326+
],
327+
"title": "Device Name"
328+
},
303329
"additional_settings": {
304330
"default": null,
305331
"description": "Additional settings",
@@ -419,6 +445,19 @@
419445
"title": "Device Type",
420446
"type": "string"
421447
},
448+
"device_name": {
449+
"default": null,
450+
"description": "Device name",
451+
"oneOf": [
452+
{
453+
"type": "string"
454+
},
455+
{
456+
"type": "null"
457+
}
458+
],
459+
"title": "Device Name"
460+
},
422461
"additional_settings": {
423462
"default": null,
424463
"description": "Additional settings",
@@ -458,7 +497,7 @@
458497
},
459498
"properties": {
460499
"aind_behavior_services_pkg_version": {
461-
"default": "0.10.2",
500+
"default": "0.11.0",
462501
"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-]+)*))?$",
463502
"title": "aind_behavior_services package version",
464503
"type": "string"

‎src/DataSchemas/aind_behavior_water_tuner_task_logic.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"title": "Rng Seed"
1818
},
1919
"aind_behavior_services_pkg_version": {
20-
"default": "0.10.2",
20+
"default": "0.11.0",
2121
"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-]+)*))?$",
2222
"title": "aind_behavior_services package version",
2323
"type": "string"

‎src/Extensions/AindBehaviorSessionModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace AindBehaviorWaterTuner.Session
1515
public partial class AindBehaviorSessionModel
1616
{
1717

18-
private string _aindBehaviorServicesPkgVersion = "0.10.2";
18+
private string _aindBehaviorServicesPkgVersion = "0.11.0";
1919

2020
private string _version = "0.3.1";
2121

‎src/Extensions/AindBehaviorWaterTunerRig.cs‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ public partial class AindManipulatorDevice
334334

335335
private string _deviceType = "StepperDriver";
336336

337+
private string _deviceName;
338+
337339
private BaseModel _additionalSettings;
338340

339341
private AindManipulatorCalibration _calibration;
@@ -351,6 +353,7 @@ public AindManipulatorDevice()
351353
protected AindManipulatorDevice(AindManipulatorDevice other)
352354
{
353355
_deviceType = other._deviceType;
356+
_deviceName = other._deviceName;
354357
_additionalSettings = other._additionalSettings;
355358
_calibration = other._calibration;
356359
_whoAmI = other._whoAmI;
@@ -371,6 +374,23 @@ public string DeviceType
371374
}
372375
}
373376

377+
/// <summary>
378+
/// Device name
379+
/// </summary>
380+
[Newtonsoft.Json.JsonPropertyAttribute("device_name")]
381+
[System.ComponentModel.DescriptionAttribute("Device name")]
382+
public string DeviceName
383+
{
384+
get
385+
{
386+
return _deviceName;
387+
}
388+
set
389+
{
390+
_deviceName = value;
391+
}
392+
}
393+
374394
/// <summary>
375395
/// Additional settings
376396
/// </summary>
@@ -463,6 +483,7 @@ public System.IObservable<AindManipulatorDevice> Process<TSource>(System.IObserv
463483
protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
464484
{
465485
stringBuilder.Append("device_type = " + _deviceType + ", ");
486+
stringBuilder.Append("device_name = " + _deviceName + ", ");
466487
stringBuilder.Append("additional_settings = " + _additionalSettings + ", ");
467488
stringBuilder.Append("calibration = " + _calibration + ", ");
468489
stringBuilder.Append("who_am_i = " + _whoAmI + ", ");
@@ -757,6 +778,8 @@ public partial class HarpBehavior
757778

758779
private string _deviceType = "Behavior";
759780

781+
private string _deviceName;
782+
760783
private BaseModel _additionalSettings;
761784

762785
private BaseModel _calibration;
@@ -774,6 +797,7 @@ public HarpBehavior()
774797
protected HarpBehavior(HarpBehavior other)
775798
{
776799
_deviceType = other._deviceType;
800+
_deviceName = other._deviceName;
777801
_additionalSettings = other._additionalSettings;
778802
_calibration = other._calibration;
779803
_whoAmI = other._whoAmI;
@@ -794,6 +818,23 @@ public string DeviceType
794818
}
795819
}
796820

821+
/// <summary>
822+
/// Device name
823+
/// </summary>
824+
[Newtonsoft.Json.JsonPropertyAttribute("device_name")]
825+
[System.ComponentModel.DescriptionAttribute("Device name")]
826+
public string DeviceName
827+
{
828+
get
829+
{
830+
return _deviceName;
831+
}
832+
set
833+
{
834+
_deviceName = value;
835+
}
836+
}
837+
797838
/// <summary>
798839
/// Additional settings
799840
/// </summary>
@@ -890,6 +931,7 @@ public System.IObservable<HarpBehavior> Process<TSource>(System.IObservable<TSou
890931
protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
891932
{
892933
stringBuilder.Append("device_type = " + _deviceType + ", ");
934+
stringBuilder.Append("device_name = " + _deviceName + ", ");
893935
stringBuilder.Append("additional_settings = " + _additionalSettings + ", ");
894936
stringBuilder.Append("calibration = " + _calibration + ", ");
895937
stringBuilder.Append("who_am_i = " + _whoAmI + ", ");
@@ -1063,6 +1105,8 @@ public partial class SerialScale
10631105

10641106
private string _deviceType = "SerialScale";
10651107

1108+
private string _deviceName;
1109+
10661110
private BaseModel _additionalSettings;
10671111

10681112
private BaseModel _calibration;
@@ -1076,6 +1120,7 @@ public SerialScale()
10761120
protected SerialScale(SerialScale other)
10771121
{
10781122
_deviceType = other._deviceType;
1123+
_deviceName = other._deviceName;
10791124
_additionalSettings = other._additionalSettings;
10801125
_calibration = other._calibration;
10811126
_portName = other._portName;
@@ -1094,6 +1139,23 @@ public string DeviceType
10941139
}
10951140
}
10961141

1142+
/// <summary>
1143+
/// Device name
1144+
/// </summary>
1145+
[Newtonsoft.Json.JsonPropertyAttribute("device_name")]
1146+
[System.ComponentModel.DescriptionAttribute("Device name")]
1147+
public string DeviceName
1148+
{
1149+
get
1150+
{
1151+
return _deviceName;
1152+
}
1153+
set
1154+
{
1155+
_deviceName = value;
1156+
}
1157+
}
1158+
10971159
/// <summary>
10981160
/// Additional settings
10991161
/// </summary>
@@ -1160,6 +1222,7 @@ public System.IObservable<SerialScale> Process<TSource>(System.IObservable<TSour
11601222
protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
11611223
{
11621224
stringBuilder.Append("device_type = " + _deviceType + ", ");
1225+
stringBuilder.Append("device_name = " + _deviceName + ", ");
11631226
stringBuilder.Append("additional_settings = " + _additionalSettings + ", ");
11641227
stringBuilder.Append("calibration = " + _calibration + ", ");
11651228
stringBuilder.Append("port_name = " + _portName);
@@ -1187,7 +1250,7 @@ public override string ToString()
11871250
public partial class AindBehaviorWaterTunerRig
11881251
{
11891252

1190-
private string _aindBehaviorServicesPkgVersion = "0.10.2";
1253+
private string _aindBehaviorServicesPkgVersion = "0.11.0";
11911254

11921255
private string _version = "0.2.0";
11931256

‎src/Extensions/AindBehaviorWaterTunerTaskLogic.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class AindBehaviorWaterTunerParameters
1717

1818
private double? _rngSeed;
1919

20-
private string _aindBehaviorServicesPkgVersion = "0.10.2";
20+
private string _aindBehaviorServicesPkgVersion = "0.11.0";
2121

2222
private System.Collections.Generic.List<double> _valveOpenTime = new System.Collections.Generic.List<double>();
2323

‎src/aind_behavior_device_water_tuner/launcher.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
from aind_behavior_experiment_launcher import resource_monitor
55
from aind_behavior_experiment_launcher.apps import BonsaiApp
66
from aind_behavior_services.session import AindBehaviorSessionModel
7+
from pydantic_settings import CliApp
78

89
from aind_behavior_device_water_tuner.rig import AindBehaviorWaterTunerRig
910
from aind_behavior_device_water_tuner.task_logic import AindBehaviorWaterTunerTaskLogic
1011

1112

12-
def make_launcher() -> behavior_launcher.BehaviorLauncher:
13+
def make_launcher(settings: behavior_launcher.BehaviorCliArgs) -> behavior_launcher.BehaviorLauncher:
1314
data_dir = r"C:/Data"
1415
srv = behavior_launcher.BehaviorServicesFactoryManager()
15-
srv.attach_bonsai_app(BonsaiApp(Path(r"./src/main.bonsai")))
16+
srv.attach_app(BonsaiApp(Path(r"./src/main.bonsai")))
1617
srv.attach_resource_monitor(
1718
resource_monitor.ResourceMonitor(
1819
constrains=[
@@ -25,20 +26,17 @@ def make_launcher() -> behavior_launcher.BehaviorLauncher:
2526
rig_schema_model=AindBehaviorWaterTunerRig,
2627
session_schema_model=AindBehaviorSessionModel,
2728
task_logic_schema_model=AindBehaviorWaterTunerTaskLogic,
28-
data_dir=data_dir,
29-
config_library_dir=r"\\allen\aind\scratch\AindBehavior.db\AindBehaviorWaterTuner",
30-
temp_dir=r"./local/.temp",
31-
allow_dirty=False,
32-
skip_hardware_validation=False,
33-
debug_mode=False,
34-
group_by_subject_log=True,
29+
settings=settings,
30+
picker=behavior_launcher.DefaultBehaviorPicker(
31+
config_library_dir=Path(r"\\allen\aind\scratch\AindBehavior.db\AindBehaviorWaterTuner")
32+
),
3533
services=srv,
36-
validate_init=True,
3734
)
3835

3936

4037
def main():
41-
launcher = make_launcher()
38+
args = CliApp().run(behavior_launcher.BehaviorCliArgs)
39+
launcher = make_launcher(args)
4240
launcher.main()
4341
return None
4442

0 commit comments

Comments
 (0)