Skip to content
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.

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

AddingAindBehaviorTaskLogicModel #1223

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies = [
"aind-auto-train@git+https://github.com/AllenNeuralDynamics/aind-foraging-behavior-bonsai-automatic-training.git@main",
"aind-slims-api@git+https://github.com/AllenNeuralDynamics/aind-slims-api@main",
"aind-dynamic-foraging-models@git+https://github.com/AllenNeuralDynamics/aind-dynamic-foraging-models@main",
"aind-behavior-dynamic-foraging@git+https://github.com/AllenNeuralDynamics/Aind.Behavior.DynamicForaging@main",
"aind-behavior-services >=0.8, <0.9",
"pynwb >=2, <3",
"requests >=2, <3",
Expand Down
8 changes: 4 additions & 4 deletions src/foraging_gui/Dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2656,7 +2656,7 @@ def _update_stage_to_apply(self):
self.stage_in_use = self.last_session['next_stage_suggested']
else:
self.stage_in_use = 'unknown training stage'

self.pushButton_apply_auto_train_paras.setText(
f"Apply and lock\n"
+ '\n'.join(get_curriculum_string(self.curriculum_in_use).split('(')).strip(')')
Expand All @@ -2665,7 +2665,7 @@ def _update_stage_to_apply(self):

logger.info(f"Current stage to apply: {self.stage_in_use} @"
f"{get_curriculum_string(self.curriculum_in_use)}")

def _apply_curriculum(self):
# Check if a curriculum is selected
if not hasattr(self, 'selected_curriculum') or self.selected_curriculum is None:
Expand Down Expand Up @@ -2885,10 +2885,10 @@ def _set_training_parameters(self, paras_dict, if_apply_and_lock=False):

# Set warmup to off first so that all AutoTrain parameters
# can be correctly registered in WarmupBackup if warmup is turned on later
if paras_dict and paras_dict['warmup'] != self.MainWindow.warmup.currentText():
if paras_dict and paras_dict['warmup'] != self.MainWindow.task_logic.task_parameters.warmup:
widgets_changed.update(
{self.MainWindow.warmup:
self.MainWindow.warmup.currentText()
self.MainWindow.task_logic.task_parameters.warmup
}
) # Track the changes

Expand Down
240 changes: 193 additions & 47 deletions src/foraging_gui/Foraging.py

Large diffs are not rendered by default.

120 changes: 60 additions & 60 deletions src/foraging_gui/ForagingGUI.ui

Large diffs are not rendered by default.

Loading