- exclude more packages on builds

- upgrades WebSockets lib
- fixes automatic reloading of non-genuine profiles

Author: MAKOMO

README.md

@@ -1,6 +1,6 @@
 <img align="right" src="https://raw.githubusercontent.com/artisan-roaster-scope/artisan/master/wiki/screenshots/artisan.png" width="70">
 
-Artisan
+Artisan Scope
 ==========
 Visual scope for coffee roasters
 

src/artisan-linux.spec

@@ -47,6 +47,10 @@ hiddenimports_list=[
 ] + collect_submodules('dbus_fast')
 
 EXCLUDES = [
+    'tkinter',
+    'mypy',
+    'hypothesis',
+    'tornado',
     'pkg_resources',
     'PyQt5',
     'PyQt6.Multimedia',

src/artisan-win.spec

@@ -158,7 +158,7 @@ a = Analysis(['artisan.py'],
              hookspath=[],
              runtime_hooks=[r'pyinstaller_hooks\rthooks\pyi_rth_mplconfig.py'], # overwrites default MPL runtime hook which keeps loading font cache from (new) temp directory
              additional_hooks_dir=[],
-             excludes=['pkg_resources'],
+             excludes=['tkinter', 'mypy', 'hypothesis', 'tornado', 'pkg_resources'],
              hiddenimports=hiddenimports_list,
              win_no_prefer_redirects=False,
              win_private_assemblies=False,

src/artisanlib/acaia.py

@@ -237,7 +237,8 @@ class ACAIA_TIMER(IntEnum):
 HEARTBEAT_FREQUENCY:Final[int] = 5 # send the heartbeat every 5 sec
 
 RELAY_STREAMING:Final[bool] = False # if set, configure Acaia relay (and COSMO) scales to streaming mode, otherwise they work in non-streaming mode reporting only weight changes
-WEIGHT_ROUNDING:Final[bool] = False # if set, received weights are rounded to appropriate values based on scale max weight
+WEIGHT_ROUNDING:Final[bool] = False # if set, received weights are rounded to appropriate values based on scales readability
+# rounding for scales with readability>1 (to 4g), no rounding otherwise
 
 
 # ISP versions -> device model (CSMO series)
@@ -269,7 +270,7 @@ def __init__(self,
             weight_changed_handler:Callable[[float,bool], None],
             battery_changed_handler: Callable[[int], None],
             tare_pressed_handler: Callable[[], None],
-            stable_only:bool=True, # if True only stable weight readings are reported by weight_changed_signal
+            stable_only:bool=False, # if True only stable weight readings are reported by weight_changed_signal
             decimals:int=1) -> None: # number of significant decimals (0, 1, ..) of the weight signal
         super().__init__()
 
@@ -554,9 +555,9 @@ def update_weight(self, value:float|None, stable:bool|None = False) -> None:
         if self._logging:
             _log.debug('update_weight(%s,%s)', value, stable)
         if value is not None and (not self.stable_only or stable):
-            if WEIGHT_ROUNDING and self.repeatability > 1:
-                # round to full 5g
-                value = round_base(value, 5)
+            if WEIGHT_ROUNDING and self.repeatability >= 1:
+                # round to full 4g
+                value = round_base(value, 4)
                 ## round to full 10g
                 ##value = round(value, -1)
             # convert the weight in g delivered with one decimal to an int

src/artisanlib/main.py

@@ -2264,6 +2264,7 @@ def __init__(self, parent:QWidget|None = None, *, locale:str, artisanviewerFirst
 #        self.exportMenu.addAction(fileExportRoastLoggerAction)
 
         self.convMenu:QMenu = QMenu(QApplication.translate('Menu', 'Convert To'))
+
         fileConvertFahrenheitAction = QAction(QApplication.translate('Menu', 'Fahrenheit...'), self)
         fileConvertFahrenheitAction.triggered.connect(self.fileConvertToFahrenheit)
         self.convMenu.addAction(fileConvertFahrenheitAction)
@@ -12424,7 +12425,7 @@ def keyPressEvent(self, a0: 'QKeyEvent|None') -> None: # pyright: ignore [report
                 #meta_modifier = modifiers == Qt.KeyboardModifier.MetaModifier # Control on macOS, Meta on Windows
                 #uncomment next line to find the integer value of a k
                 #print(k,a0.text())
-                #_log.debug("PRINT key: %s",k)
+#                _log.debug("PRINT key: %s",k)
 
 #                numberkeys = [48,49,50,51,52,53,54,55,56,57] # keycodes for number keys 0,1,...,9
                 numberkeys = [
@@ -13714,7 +13715,9 @@ def loadFile(self, filename:str, quiet:bool = False) -> None:
                 org_obj_extra_devs = []
             if res:
                 # we avoid the reset within setProfile as we just did a reset and do not want to confuse the ExtraDeviceSettingsBackup
-                res = self.setProfileDict(filename,obj_dict,quiet=quiet,reset=False, validate_signature=True)
+                # if quite=True (eg on reloading profile after conversions) we don't validate the signature to allow the
+                #   reloading of non-valid profiles that have been loaded before the conversion
+                res = self.setProfileDict(filename,obj_dict,quiet=quiet,reset=False, validate_signature=not quiet)
             if res:
                 #order custom events
                 self.orderEvents()
@@ -15659,7 +15662,7 @@ def validateProfileDict(self, profile_dict:dict[str,Any], quiet:bool=True, valid
         profile:ProfileData = ta.validate_python(profile_dict)
         if self.official_build and validate_signature and ('version' not in profile or QVersionNumber.fromString(profile['version'])[0] >= QVersionNumber(4,2,0)):
 #        # testing:
-#        if self.official_build and validate_signature and 'version' in profile and 'signature' in profile:
+#        if validate_signature and 'version' in profile and 'signature' in profile:
             # official builds validate all profile signatures for files generated by Artisan versions >= v4.2
             # we validate the signature
             try:

src/artisanlib/util.py

@@ -51,7 +51,6 @@
     from artisanlib.atypes import ProfileData # pylint: disable=unused-import
     from proto import artisan_roast_pb2 # pylint: disable=unused-import
 
-from artisanlib.atypes import ProfileData
 
 ##
 
@@ -1379,7 +1378,7 @@ def deserialize(filename:str) -> dict[str, Any]:
 
 def csv_load(csvFile:io.TextIOWrapper) -> 'ProfileData':
     import csv
-    profile = ProfileData()
+    profile:ProfileData = {}
 
     data = csv.reader(csvFile,delimiter='\t')
     #read file header

src/artisanlib/weblcds.py

@@ -45,14 +45,17 @@
 
 class WebView:
 
-    __slots__ = [ '_loop', '_thread', '_app', '_port', '_last_send', '_last_message', '_min_send_interval', '_resource_path', '_index_path', '_websocket_path', '_runner'  ]
+    __slots__ = [ '_loop', '_thread', '_app', 'websockets_appkey', '_port', '_last_send', '_last_message',
+        '_min_send_interval', '_resource_path', '_index_path', '_websocket_path', '_runner'  ]
 
     def __init__(self, port:int, resource_path:str, index_path:str, websocket_path:str) -> None:
 
         self._loop:        asyncio.AbstractEventLoop|None = None # the asyncio loop
         self._thread:      Thread|None                    = None # the thread running the asyncio loop
         self._app = web.Application(debug=True)
-        self._app['websockets'] = weakref.WeakSet()
+        self.websockets_appkey = web.AppKey('websockets', weakref.WeakSet[web.WebSocketResponse])
+        self._app[self.websockets_appkey] = weakref.WeakSet()
+
         self._app.on_shutdown.append(self.on_shutdown)
 
         self._last_send:float = time.time() # timestamp of the last message send to the clients
@@ -88,13 +91,13 @@ async def send_msg_to_ws(self, ws:web.WebSocketResponse, message:str) -> None:
         except Exception as e: # pylint: disable=broad-except
             _log.exception(e)
             try:
-                self._app['websockets'].discard(ws)
+                self._app[self.websockets_appkey].discard(ws)
             except Exception as ex: # pylint: disable=broad-except
                 _log.exception(ex)
 
     async def send_msg_to_all(self, message:str) -> None:
-        if 'websockets' in self._app and self._app['websockets'] is not None:
-            ws_set = set(self._app['websockets'])
+        if self.websockets_appkey in self._app:
+            ws_set = self._app[self.websockets_appkey]
             for ws in ws_set:
                 await self.send_msg_to_ws(ws, message)
 
@@ -116,7 +119,7 @@ def send_msg(self, message:str, timeout:float|None = 0.2) -> None:
     async def websocket_handler(self, request: 'Request') -> web.WebSocketResponse:
         ws:web.WebSocketResponse = web.WebSocketResponse()
         await ws.prepare(request)
-        request.app['websockets'].add(ws)
+        request.app[self.websockets_appkey].add(ws)
         try:
             async for msg in ws:
                 if msg.type == WSMsgType.TEXT:
@@ -126,14 +129,14 @@ async def websocket_handler(self, request: 'Request') -> web.WebSocketResponse:
                 elif msg.type == WSMsgType.ERROR:
                     _log.error('ws connection closed with exception %s', ws.exception())
         finally:
-            request.app['websockets'].discard(ws)
+            request.app[self.websockets_appkey].discard(ws)
         return ws
 
-    @staticmethod
-    async def on_shutdown(app:web.Application) -> None:
-        for ws in set(app['websockets']):
+#    @staticmethod
+    async def on_shutdown(self, app:web.Application) -> None:
+        for ws in app[self.websockets_appkey]:
             await ws.close(code=WSCloseCode.GOING_AWAY,
-                           message='Server shutdown')
+                           message=b'Server shutdown')
 
     async def startup(self) -> None:
         self._runner = web.AppRunner(self._app)

src/plus/controller.py

@@ -284,9 +284,10 @@ def connect(clear_on_failure: bool =False, interactive: bool = True) -> None:
                         message = QApplication.translate(
                             'Plus', 'Authentication failed'
                         )
-                        message = (
-                            f'{aw.plus_account} {message}'
-                        )  # @UndefinedVariable
+                        if aw.plus_account is not None: # pyright:ignore[reportUnnecessaryComparison] # pyright infers type str here, which is wrong!
+                            message = (
+                                f'{aw.plus_account} {message}'
+                            )  # @UndefinedVariable
                         aw.sendmessageSignal.emit(
                             message, True, None
                         )  # @UndefinedVariable

src/requirements-dev.txt

@@ -29,7 +29,7 @@ pytest-datadir==1.8.0
 #PyVirtualDisplay==3.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
-hypothesis>=6.161.6
+hypothesis>=6.163.0
 coverage>=7.15.2
 coverage-badge==1.1.2
 codespell==2.4.3

src/requirements.txt

@@ -40,7 +40,7 @@ pyusb==1.3.1
 persist-queue==1.1.0
 portalocker==3.2.0
 xlrd==2.0.2
-websockets==16.1
+websockets==17.0
 PyYAML==6.0.3
 psutil==7.2.2
 protobuf==7.35.1