upgrade psychopy (#396)

* upgrade psychopy

* update the pull request template to remove ticket link

update mac builds (failing lsl)

* gui fixes and small fix to evidence eval for EEG

Author: tab-cmd

.github/pull_request_template.md

@@ -1,10 +1,6 @@
 # Overview
 
-Define what you did...
-
-## Ticket
-
-Link a pivotal ticket here
+Define what you did... why is this change required? What problem does it solve?
 
 ## Contributions
 

.github/workflows/main.yml

@@ -115,9 +115,9 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         brew update
+        brew uninstall cmake
         sh scripts/shell/m2chip_install.sh
         brew install labstreaminglayer/tap/lsl
-        pip install psychopy --no-deps
         make install
     - name: install dependencies
       run: |

bcipy/gui/BCInterface.py

@@ -172,8 +172,8 @@ def _build_action_buttons(self) -> None:
             (self.ui_config.btn_width * 2) + 20
         self.add_button(
             message='Train',
-            position=(btn_auc_x, 450),
-            size=(self.ui_config.btn_width, self.ui_config.btn_height),
+            position=[btn_auc_x, 450],
+            size=[self.ui_config.btn_width, self.ui_config.btn_height],
             background_color='LightSeaGreen',
             text_color='black',
             font_family=self.ui_config.font,
@@ -182,7 +182,7 @@ def _build_action_buttons(self) -> None:
     def _build_start_button(self) -> None:
         """Build the Start Session button."""
         btn_start_width = self.ui_config.btn_width * 2 + 10
-        btn_start_x = self.width - (self.ui_config.padding + btn_start_width)
+        btn_start_x = self._width - (self.ui_config.padding + btn_start_width)
         self.add_button(
             message='Start Session',
             position=[btn_start_x, 440],
@@ -196,7 +196,7 @@ def _build_create_experiment_button(self) -> None:
         """Build the Create Experiment button."""
         self.add_button(
             message='+',
-            position=[self.width - self.ui_config.padding - 200, 260],
+            position=[self._width - self.ui_config.padding - 200, 260],
             size=[35, self.ui_config.btn_height - 10],
             background_color='green',
             action=self.create_experiment,
@@ -301,7 +301,7 @@ def build_images(self) -> None:
         # NEU logo
         self.add_image(
             path=f'{STATIC_IMAGES_PATH}/gui/neu.png',
-            position=[self.width - self.ui_config.padding - 110, 0],
+            position=[self._width - self.ui_config.padding - 110, 0],
             size=100)
 
     def build_assets(self) -> None:
@@ -517,7 +517,7 @@ def load_experiments(self) -> List[str]:
         Returns:
             List[str]: List of experiment names.
         """
-        return load_experiments().keys()
+        return list(load_experiments().keys())
 
     def start_experiment(self) -> None:
         """Start an experiment session."""

bcipy/task/control/evidence.py

@@ -61,6 +61,7 @@ def __init__(
         self.symbol_set = symbol_set
         self.signal_model = signal_model
         self.device_spec = device_spec
+        self.parameters = parameters
 
     @property
     def consumes(self) -> ContentType:
@@ -80,7 +81,7 @@ def produces(self) -> EvidenceType:
         """
         raise NotImplementedError()
 
-    def evaluate(self, **kwargs: Any) -> np.ndarray:
+    def evaluate(self, *args: Any, **kwargs: Any) -> np.ndarray:
         """Evaluate the evidence from raw data.
 
         Args:
@@ -167,7 +168,8 @@ def evaluate(
             times: List[float],
             target_info: List[str],
             window_length: float,
-            *args: Any) -> np.ndarray:
+            *args: Any,
+            **kwargs: Any) -> np.ndarray:
         """Evaluate EEG evidence.
 
         Args:
@@ -270,10 +272,9 @@ def evaluate(
             raw_data: np.ndarray,
             symbols: List[str],
             times: List[float],
-            target_info: List[str],
-            window_length: float,
             flash_time: float,
-            stim_length: float) -> np.ndarray:
+            *args: Any,
+            **kwargs: Any) -> np.ndarray:
         """Evaluate gaze evidence.
 
         Args:
@@ -382,7 +383,7 @@ def preprocess(
     # pylint: disable=arguments-differ
     def evaluate(self, raw_data: np.ndarray, symbols: List[str],
                  times: List[float], target_info: List[str],
-                 window_length: float) -> np.ndarray:
+                 window_length: float, *args: Any, **kwargs: Any) -> np.ndarray:
         """Evaluate the evidence.
 
         Parameters

bcipy/task/paradigm/rsvp/copy_phrase.py

@@ -648,7 +648,7 @@ def evaluate_evidence(self) -> Decision:
         return Decision(decision_made, selection, spelled_text, new_sti)
 
     def add_evidence(
-        self, stim_times: List[List], proceed: bool = True
+        self, stim_times: List[Tuple], proceed: bool = True
     ) -> List[EvidenceType]:
         """Add all evidence used to make a decision.
 

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "pybv==0.7.5",
     "pyo==1.0.5",
     "pyglet<=1.5.27,>=1.4",
-    "PsychoPy==2024.2.1",
+    "PsychoPy==2025.1.1",
     "openpyxl==3.1.2",
     "numpy==1.24.4",
     "sounddevice==0.4.4",