psychopy 2025.1.1__py3-none-any.whl → 2025.2.1__py3-none-any.whl

psychopy/experiment/routines/visualValidator/__init__.py

@@ -2,11 +2,13 @@
 # -*- coding: utf-8 -*-
 
 from pathlib import Path
+from psychopy.preferences import prefs
 from psychopy.alerts._alerts import alert
 from psychopy.experiment import Param
-from psychopy.experiment.plugins import PluginDevicesMixin, DeviceBackend
+from psychopy.experiment.plugins import PluginDevicesMixin
 from psychopy.experiment.components import getInitVals
 from psychopy.experiment.routines import Routine, BaseValidatorRoutine
+from psychopy.experiment.devices import DeviceBackend
 from psychopy.localization import _translate
 
 
@@ -23,6 +25,10 @@ class VisualValidatorRoutine(BaseValidatorRoutine, PluginDevicesMixin):
     )
     deviceClasses = []
     version = "2025.1.0"
+    legacyParams = [
+        # old device setup params, no longer needed as this is handled by DeviceManager
+        "deviceBackend"
+    ]
 
     def __init__(
             self,
@@ -124,24 +130,17 @@ class VisualValidatorRoutine(BaseValidatorRoutine, PluginDevicesMixin):
             "deviceBackend",
             "channel",
         ]
-        self.params['deviceLabel'] = Param(
-            deviceLabel, valType="str", inputType="single", categ="Device",
-            label=_translate("Device name"),
-            hint=_translate(
-                "A name to refer to this Component's associated hardware device by. If using the "
-                "same device for multiple components, be sure to use the same name here."
-            )
-        )
-        self.params['deviceBackend'] = Param(
-            deviceBackend, valType="code", inputType="choice", categ="Device",
-            allowedVals=self.getBackendKeys,
-            allowedLabels=self.getBackendLabels,
-            label=_translate("Light sensor type"),
-            hint=_translate(
-                "Type of light sensor to use."
-            ),
-            direct=False
-        )
+        # label to refer to device by
+        def getDeviceLabels():
+            # start with none
+            labels = []
+            # iterate through saved devices
+            for name, profile in prefs.devices.items():
+                # if device is the correct type, include it
+                if profile.get("deviceClass", None) in self.deviceClasses:
+                    labels.append(name)
+
+            return labels
         self.params['channel'] = Param(
             channel, valType="code", inputType="single", categ="Device",
             label=_translate("Light sensor channel"),
@@ -152,8 +151,6 @@ class VisualValidatorRoutine(BaseValidatorRoutine, PluginDevicesMixin):
             )
         )
 
-        self.loadBackends()
-
     def writeDeviceCode(self, buff):
         """
         Code to setup the CameraDevice for this component.
@@ -367,10 +364,9 @@ class ScreenBufferVisualValidatorBackend(DeviceBackend):
     example for implementing other light sensor device backends.
     """
 
-    key = "screenbuffer"
-    label = _translate("Screen Buffer (Debug)")
-    component = VisualValidatorRoutine
-    deviceClasses = ["psychopy.hardware.lightsensor.ScreenBufferSampler"]
+    backendLabel = "Screen Buffer Sampler (Debug)"
+    deviceClass = "psychopy.hardware.lightsensor.ScreenBufferSampler"
+    icon = "light/visual_validator.png"
 
     def getParams(self: VisualValidatorRoutine):
         # define order
@@ -397,3 +393,7 @@ class ScreenBufferVisualValidatorBackend(DeviceBackend):
             ")\n"
         )
         buff.writeOnceIndentedLines(code % inits)
+
+
+# register backend with Component
+VisualValidatorRoutine.registerBackend(ScreenBufferVisualValidatorBackend)

psychopy/hardware/__init__.py

@@ -110,9 +110,9 @@ def getPhotometerByName(name):
         we were unable to find it.
 
     """
-    for photom in getAllPhotometers():
+    for thisName, photom in getAllPhotometers().items():
         # longName is used from the GUI and driverFor is for coders
-        if name.lower() in photom.driverFor or name == photom.longName:
+        if name.lower() == thisName:
             return photom
 
 
@@ -154,61 +154,24 @@ def findPhotometer(ports=None, device=None):
             print(photom.getSpectrum())
 
     """
-    if isinstance(device, str):
-        photometers = [getPhotometerByName(device)]
-    elif isinstance(device, Iterable):
-        # if we find a string assume it is a name, otherwise treat it like a
-        # photometer
-        photometers = [getPhotometerByName(d)
-                       if isinstance(d, str) else d
-                       for d in device]
-    else:
-        photometers = getAllPhotometers()
-
-    # determine candidate ports
-    if ports is None:
-        ports = getSerialPorts()
-    elif type(ports) in (int, float, str):
-        ports = [ports]  # so that we can iterate
-
-    # go through each port in turn
-    photom = None
-    logging.info('scanning serial ports...')
-    logging.flush()
-    for thisPort in ports:
-        logging.info('...{}'.format(thisPort))
-        logging.flush()
-        for Photometer in photometers:
-            # Looks like we got an invalid photometer, carry on
-            if Photometer is None:
-                continue
-            try:
-                photom = Photometer(port=thisPort)
-            except Exception as ex:
-                msg = "Couldn't initialize photometer {0}: {1}"
-                logging.error(msg.format(Photometer.__name__, ex))
-                # We threw an exception so we should just skip ahead
-                continue
-            if photom.OK:
-                logging.info(' ...found a %s\n' % (photom.type))
-                logging.flush()
-                # we're now sure that this is the correct device and that
-                # it's configured now increase the number of attempts made
-                # to communicate for temperamental devices!
-                if hasattr(photom, 'setMaxAttempts'):
-                    photom.setMaxAttempts(10)
-                # we found one so stop looking
-                return photom
-            else:
-                if photom.com and photom.com.isOpen:
-                    logging.info('closing port')
-                    photom.com.close()
-
-        # If we got here we didn't find one
-        logging.info('...nope!\n\t')
-        logging.flush()
-
-    return None
+    from .photometer import getAllPhotometerClasses
+    # try each port
+    if isinstance(ports, str) or ports is None:
+        ports = [ports]
+    for port in ports:
+        # get all available devices
+        for cls, profiles in DeviceManager.getAvailableDevices(
+            list(getAllPhotometerClasses().values())
+        ).items():
+            # iterate through each
+            for profile in profiles:
+                # if port matches, or device matches and no port given, initialise from this profile
+                if (
+                    port is None and device == cls.__name__
+                ) or (
+                    port and "port" in profile and profile['port'] in port
+                ):
+                    return DeviceManager.addDevice(**profile)
 
 
 if __name__ == "__main__":

psychopy/hardware/button.py

@@ -29,6 +29,13 @@ class ButtonResponse(base.BaseResponse):
         # match an integer to channel
         if isinstance(other, int):
             return other == self.channel
+        # match a dict by converting it to a ButtonResponse, if possible
+        if isinstance(other, dict):
+            try:
+                return ButtonResponse(**other) == self
+            except:
+                # if it can't instantiate a ButtonResponse, it's not the same as this
+                return False
         
         return False
 
@@ -188,6 +195,9 @@ class ButtonBox:
     Builder-friendly wrapper around BaseButtonGroup.
     """
     def __init__(self, device):
+        # start off with None for device
+        self.device = None
+
         if isinstance(device, BaseButtonGroup):
             # if given a button group, use it
             self.device = device
@@ -198,10 +208,13 @@ class ButtonBox:
             else:
                 # don't use formatted string literals in _translate()
                 raise ValueError(_translate(
-                    "Could not find device named '{device}', make sure it has been set up "
+                    "Could not find device named '{}', make sure it has been set up "
                     "in DeviceManager."
                 ).format(device))
-
+        # if given None, use first button group we find in DeviceManager
+        for name, device in DeviceManager.getInitialisedDevices(BaseButtonGroup).items():
+            self.device = device
+            break
         # starting value for status (Builder)
         self.status = constants.NOT_STARTED
         # arrays to store info (Builder)