- additional lazy imports to speed up startup time

 . internal: pid, piddialogs, large_lcds, simulator, scheduler
 . external: babel, scipy, mqtt, s7
- drop pyyaml and switch to JSON for logging configuration
- prevent loading of large module cocoa if not strictly needed

Author: MAKOMO

src/artisan-mac.spec

@@ -122,7 +122,7 @@ DATA_FILES = [
         (r'includes/Machines', './Machines'),
         (r'includes/Themes', './Themes'),
         (r'includes/Icons', './Icons'),
-        (r'includes/logging.yaml', '.')
+        (r'includes/logging.json', '.')
 ]
 
 # add Artisan translations to DATA_FILES

src/artisan-win.spec

@@ -313,7 +313,7 @@ for fn in [
     r'includes\mstile-150x150.png',
     r'includes\safari-pinned-tab.svg',
     r'includes\site.webmanifest',
-    r'includes\logging.yaml',
+    r'includes\logging.json',
     r'includes\artisan_public_key.pem',
     ]:
     copy_file(fn, TARGET)

src/artisanlib/button_style.py

@@ -147,7 +147,7 @@
         }}
     """,
     'ON': """
-        QPushButton {
+        QPushButton {{
             min-width: {min_width}px;
             border-style:solid;
             border-radius:20px;
@@ -157,22 +157,22 @@
             font-weight: bold;
             color: #cc0f50;
             background-color: white;
-        }
-        QPushButton:!enabled {
+        }}
+        QPushButton:!enabled {{
             color: darkgrey;
             background-color: #E0E0E0;
-        }
-        QPushButton:pressed {
+        }}
+        QPushButton:pressed {{
             color: #c70d49;
             background-color: #EEEEEE;
-        }
-        QPushButton:hover:!pressed {
+        }}
+        QPushButton:hover:!pressed {{
             color: #d4336a;
             background-color: #F5F5F5;
-        }
+        }}
     """,
     'STOP':  """
-        QPushButton {
+        QPushButton {{
             min-width: {min_width}px;
             border-style:solid;
             border-radius:20px;
@@ -182,22 +182,22 @@
             font-weight: bold;
             color: #147bb3;
             background-color: white;
-        }
-        QPushButton:!enabled {
+        }}
+        QPushButton:!enabled {{
             color: #EFEFEF;
             background-color: darkgrey;
-        }
-        QPushButton:pressed {
+        }}
+        QPushButton:pressed {{
             color: #116999;
             background-color: #EEEEEE;
-        }
-        QPushButton:hover:!pressed {
+        }}
+        QPushButton:hover:!pressed {{
             color: #1985ba;
             background-color: #F5F5F5;
-        }
+        }}
     """,
     'START': """
-        QPushButton {
+        QPushButton {{
             min-width: {min_width}px;
             border-style:solid;
             border-radius:20px;
@@ -207,19 +207,19 @@
             font-weight: bold;
             color: yellow;
             background-color: #ff3d00;
-        }
-        QPushButton:!enabled {
+        }}
+        QPushButton:!enabled {{
             color: darkgrey;
             background-color: #E0E0E0;
-        }
-        QPushButton:pressed {
+        }}
+        QPushButton:pressed {{
             color: #EEEEEE;
             background-color: #116999;
-        }
-        QPushButton:hover:!pressed {
+        }}
+        QPushButton:hover:!pressed {{
             color: white;
             background-color: red;
-        }
+        }}
     """,
 }
 

src/artisanlib/canvas.py

@@ -48,7 +48,6 @@
 import functools
 import psutil
 from psutil._common import bytes2human # pyright:ignore[reportPrivateImportUsage]
-from babel.units import get_unit_name
 
 from collections.abc import Callable, Sequence
 from typing import override, Final, Literal, Any, cast, TYPE_CHECKING
@@ -9383,17 +9382,24 @@ def default_xlabel_text(self) -> str:
         if self.flagstart or self.xgrid == 0:
             return ''
         if self.roastersize_setup == 0 and self.roastertype_setup == '':
+
             if self.aw.qmc.xgrid < 3600:
+                res = 'mins'
+                if self.aw.locale_str != 'en':
+                    try:
+                        from babel.units import get_unit_name
+                        res = get_unit_name('duration-minute', length='short', locale=self.aw.locale_str) or 'mins'
+                    except Exception as e:  # pylint: disable=broad-except # UnknownLocaleError
+                        _log.exception(e)
+                return res
+            res = 'h'
+            if self.aw.locale_str != 'en':
                 try:
-                    return get_unit_name('duration-minute', length='short', locale=self.aw.locale_str) or 'min'
+                    from babel.units import get_unit_name
+                    return get_unit_name('duration-hour', length='short', locale=self.aw.locale_str) or 'h'
                 except Exception as e:  # pylint: disable=broad-except # UnknownLocaleError
                     _log.exception(e)
-                    return get_unit_name('duration-minute', length='short', locale='en') or 'min'
-            try:
-                return get_unit_name('duration-hour', length='short', locale=self.aw.locale_str) or 'h'
-            except Exception as e:  # pylint: disable=broad-except # UnknownLocaleError
-                _log.exception(e)
-                return get_unit_name('duration-hour', length='short', locale='en') or 'h'
+            return res
         if right_to_left(self.locale_str):
             return f"{(render_weight(self.roastersize_setup, 1, weight_units.index(self.weight[2]), right_to_left_lang=True) if self.roastersize_setup>=0 else '')}  {self.__dijkstra_to_ascii(self.roastertype_setup)}"
         return f"{self.__dijkstra_to_ascii(self.roastertype_setup)} {(render_weight(self.roastersize_setup, 1, weight_units.index(self.weight[2])) if self.roastersize_setup>0 else '')}"

src/artisanlib/comm.py

@@ -711,8 +711,8 @@ def piddutycycle(self) -> tuple[float,float,float]:
             self.aw.qmc.updateLargePIDLCDs(sv='', duty='')
             return self.aw.qmc.timeclock.elapsedMilli(),-1,-1
         lcdformat = ('%.1f' if self.aw.qmc.LCDdecimalplaces else '%.0f')
-        if (self.aw.qmc.device == 19 and not self.aw.pidcontrol.externalPIDControl()) or \
-                (self.aw.qmc.device in {29, 79} and not self.aw.pidcontrol.externalPIDControl()):
+        if not self.aw.pidcontrol.externalPIDControl() and \
+            (self.aw.qmc.device == 19 or self.aw.qmc.device in {29, 79}):
                 # TC4 (19) or MODBUS/S7 (29/79) with Artisan Software PID
             duty = self.aw.qmc.pid.getDuty()
             duty = (-1.0 if duty is None else min(100.0, max(-100.0, duty)))

src/artisanlib/devices.py

@@ -32,7 +32,6 @@
 import platform
 import logging
 from PIL import ImageColor
-from babel.units import get_unit_name
 from typing import override, Final, cast, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -2012,7 +2011,10 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
             self.automaticRegistrationPeriod.setToolTip(QApplication.translate('Tooltip','Register the weight of a roasted batch automatically\nafter the given time (if not set to zero) without removing the filled container,\nenabling the addition of more batches'))
             self.automaticRegistrationPeriod.setRange(0, 30)
             self.automaticRegistrationPeriod.setAlignment(Qt.AlignmentFlag.AlignRight)
+
+            from babel.units import get_unit_name
             unit_name = get_unit_name('duration-minute', length='short', locale=self.aw.locale_str)
+
             self.automaticRegistrationPeriod.setSuffix(f" {unit_name if unit_name is not None else 'min'}")
             self.automaticRegistrationPeriod.setValue(int(round(self.aw.automatic_registration_period/60.)))