Merge pull request psychopy#6941 from TEParsons/dev-enh-launch-speed

ENH: Improvements to app launch speed

psychopy/experiment/components/camera/__init__.py

@@ -8,24 +8,9 @@
 from psychopy.experiment.components import (
     BaseComponent, BaseDeviceComponent, Param, _translate, getInitVals
 )
-from psychopy.sound.audiodevice import sampleRateQualityLevels
 from psychopy.tools import stringtools as st, systemtools as syst, audiotools as at
 
 
-_hasPTB = True
-try:
-    import psychtoolbox.audio as audio
-except (ImportError, ModuleNotFoundError):
-    logging.warning(
-        "The 'psychtoolbox' library cannot be loaded but is required for audio "
-        "capture (use `pip install psychtoolbox` to get it). Microphone "
-        "recording will be unavailable this session. Note that opening a "
-        "microphone stream will raise an error.")
-    _hasPTB = False
-# Get list of sample rates
-micSampleRates = {r[1]: r[0] for r in sampleRateQualityLevels.values()}
-
-
 class CameraComponent(BaseDeviceComponent):
     """
     This component provides a way to use the webcam to record participants during an experiment.
@@ -370,11 +355,16 @@ def getMicDeviceNames():
             hint=msg,
             label=_translate("Channels"))
 
+        def getSampleRates():
+            return [r[0] for r in at.sampleRateQualityLevels.values()]
+        def getSampleRateLabels():
+            return [r[1] for r in at.sampleRateQualityLevels.values()]
         msg = _translate(
             "How many samples per second (Hz) to record at")
         self.params['micSampleRate'] = Param(
             sampleRate, valType='num', inputType="choice", categ='Audio',
-            allowedVals=list(micSampleRates),
+            allowedVals=getSampleRates,
+            allowedLabels=getSampleRateLabels,
             hint=msg, direct=False,
             label=_translate("Sample rate (hz)"))
 
@@ -417,8 +407,9 @@ def writeDeviceCode(self, buff):
         inits = getInitVals(self.params)
         self.setupMicNameInInits(inits)
         # --- setup mic ---
-        # substitute sample rate value for numeric equivalent
-        inits['micSampleRate'] = micSampleRates[inits['micSampleRate'].val]
+        # make sure mic sample rate is numeric
+        if inits['micSampleRate'].val in at.sampleRateLabels:
+            inits['micSampleRate'].val = at.sampleRateLabels[inits['micSampleRate'].val]
         # substitute channel value for numeric equivalent
         inits['micChannels'] = {'mono': 1, 'stereo': 2, 'auto': None}[self.params['micChannels'].val]
         # initialise mic device

psychopy/experiment/components/eyetracker_record/__init__.py

@@ -38,6 +38,10 @@ def __init__(self, exp, parentName, name='etRecord',
         self.type = 'EyetrackerRecord'
         self.url = "https://www.psychopy.org/builder/components/eyetracker.html"
         self.exp.requirePsychopyLibs(['iohub', 'hardware'])
+        self.exp.requireImport(
+            importName="EyetrackerControl",
+            importFrom="psychopy.hardware.eyetracker"
+        )
 
         self.params['actionType'] = Param(
             actionType,
@@ -113,7 +117,7 @@ def writeInitCode(self, buff):
         inits = self.params
         # Make a controller object
         code = (
-            "%(name)s = hardware.eyetracker.EyetrackerControl(\n"
+            "%(name)s = EyetrackerControl(\n"
         )
         buff.writeIndentedLines(code % inits)
         buff.setIndentLevel(1, relative=True)

psychopy/experiment/components/microphone/__init__.py

@@ -14,21 +14,6 @@
 from psychopy.experiment.components import (
     BaseComponent, BaseDeviceComponent, Param, getInitVals, _translate
 )
-from psychopy.tools.audiotools import sampleRateQualityLevels
-
-_hasPTB = True
-try:
-    import psychtoolbox.audio as audio
-except (ImportError, ModuleNotFoundError):
-    logging.warning(
-        "The 'psychtoolbox' library cannot be loaded but is required for audio "
-        "capture (use `pip install psychtoolbox` to get it). Microphone "
-        "recording will be unavailable this session. Note that opening a "
-        "microphone stream will raise an error.")
-    _hasPTB = False
-
-# Get list of sample rates
-sampleRates = {r[1]: r[0] for r in sampleRateQualityLevels.values()}
 
 
 class MicrophoneComponent(BaseDeviceComponent):
@@ -136,9 +121,15 @@ def getDeviceNames():
                 "many channels as the selected device allows."
             )
         )
+
+        def getSampleRates():
+            return [r[0] for r in at.sampleRateQualityLevels.values()]
+        def getSampleRateLabels():
+            return [r[1] for r in at.sampleRateQualityLevels.values()]
         self.params['sampleRate'] = Param(
             sampleRate, valType='num', inputType="choice", categ='Device',
-            allowedVals=list(sampleRates),
+            allowedVals=getSampleRates,
+            allowedLabels=getSampleRateLabels,
             label=_translate("Sample rate (hz)"),
             hint=_translate(
                 "How many samples per second (Hz) to record at"
@@ -323,8 +314,9 @@ def writeDeviceCode(self, buff):
         inits = getInitVals(self.params)
 
         # --- setup mic ---
-        # Substitute sample rate value for numeric equivalent
-        inits['sampleRate'] = sampleRates[inits['sampleRate'].val]
+        # make sure sample rate is numeric
+        if inits['sampleRate'].val in at.sampleRateLabels:
+            inits['sampleRate'].val = at.sampleRateLabels[inits['sampleRate'].val]
         # Substitute channel value for numeric equivalent
         inits['channels'] = {'mono': 1, 'stereo': 2, 'auto': None}[self.params['channels'].val]
         # initialise mic device
@@ -417,7 +409,9 @@ def writeInitCode(self, buff):
 
     def writeInitCodeJS(self, buff):
         inits = getInitVals(self.params)
-        inits['sampleRate'] = sampleRates[inits['sampleRate'].val]
+        # make sure sample rate is numeric
+        if inits['sampleRate'].val in at.sampleRateLabels:
+            inits['sampleRate'].val = at.sampleRateLabels[inits['sampleRate'].val]
         # Alert user if non-default value is selected for device
         if inits['device'].val != 'default':
             alert(5055, strFields={'name': inits['name'].val})

psychopy/experiment/routines/eyetracker_calibrate/__init__.py

@@ -27,6 +27,10 @@ def __init__(self, exp, name='calibration',
         self.url = "https://psychopy.org/builder/components/eyetracker_calibration.html"
 
         self.exp.requirePsychopyLibs(['iohub', 'hardware'])
+        self.exp.requireImport(
+            importName="EyetrackerControl",
+            importFrom="psychopy.hardware.eyetracker"
+        )
 
         # Basic params
         self.order += [
@@ -252,7 +256,7 @@ def writeMainCode(self, buff):
         # Make config object
         code = (
             "# define parameters for %(name)s\n"
-            "%(name)s = hardware.eyetracker.EyetrackerCalibration(win, \n"
+            "%(name)s = EyetrackerCalibration(win, \n"
         )
         buff.writeIndentedLines(code % inits)
         buff.setIndentLevel(1, relative=True)

psychopy/hardware/__init__.py

@@ -5,7 +5,6 @@
 import glob
 from itertools import chain
 from psychopy import logging
-from . import eyetracker, listener
 from .manager import DeviceManager, deviceManager
 from .base import BaseDevice, BaseResponse, BaseResponseDevice
 

psychopy/monitors/calibTools.py

@@ -9,7 +9,7 @@
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from .calibData import wavelength_5nm, juddVosXYZ1976_5nm, cones_SmithPokorny
-from psychopy import __version__, logging, hardware
+from psychopy import __version__, logging
 
 try:
     import serial
@@ -1116,6 +1116,7 @@ def getRGBspectra(stimSize=0.3, winSize=(800, 600), photometer='COM1'):
         photom = photometer
     else:
         # setup photom
+        from psychopy import hardware
         photom = hardware.Photometer(photometer)
     if photom != None:
         havephotom = 1

psychopy/tools/audiotools.py

@@ -98,6 +98,9 @@
     4: (SAMPLE_RATE_96kHz, 'High-Def (96kHz)'),
     5: (SAMPLE_RATE_192kHz, 'Ultra High-Def (192kHz)')
 }
+sampleRateLabels = {
+    r[1]: r[0] for r in sampleRateQualityLevels.values()
+}
 
 # supported formats for loading and saving audio samples to file
 try: