- adds public key

- hardnes profile loading by adding type checking and further checks
- fixes a regression in the software PID calculation of the Dterm (thanks Peter for reporting!)
- better handling of empty profiles by Comparator
- update libs

Author: MAKOMO

src/artisan-mac.spec

@@ -103,6 +103,7 @@ DATA_FILES = [
         (r'includes/dijkstra.ttf', '.'),
         (r'includes/ComicNeue-Regular.ttf', '.'),
         (r'includes/xkcd-script.ttf', '.'),
+        (r'includes/artisan_public_key.pem', '.'),
         (r'includes/Machines', './Machines'),
         (r'includes/Themes', './Themes'),
         (r'includes/Icons', './Icons'),

src/artisan-win.spec

@@ -294,6 +294,7 @@ for fn in [
     r'includes\safari-pinned-tab.svg',
     r'includes\site.webmanifest',
     r'includes\logging.yaml',
+    r'includes\artisan_public_key.pem',
     ]:
     copy_file(fn, TARGET)
 

src/artisanlib/__init__.py

@@ -1,6 +1,7 @@
 __version__ = '4.0.3'
 __revision__ = ''
 __build__ = '0'
+__signature__ = ''
 
 __release_sponsor_name__ = 'artisan.plus'
 __release_sponsor_domain__ = 'artisan.plus'

src/artisanlib/alarms.py

@@ -633,7 +633,7 @@ def deletealarm(self, _:bool = False) -> None:
     def importalarms(self, _:bool = False) -> None:
         self.aw.fileImport(QApplication.translate('Message', 'Load Alarms'),self.importalarmsJSON,ext='*.alrm *.alog')
 
-    def importalarmsJSON(self, filename:str) -> None:
+    def importalarmsJSON(self, filename:str) -> bool:
         try:
             _,ext = os.path.splitext(filename)
             if ext == '.alrm':
@@ -662,19 +662,22 @@ def importalarmsJSON(self, filename:str) -> None:
             elif ext == '.alog':
                 obj = deserialize(filename)
                 self.aw.plusAddPath(obj, filename)
-                self.aw.loadAlarmsFromProfile(filename, cast('ProfileData', obj))
+                profile:ProfileData = self.aw.validateProfileDict(obj)
+                self.aw.loadAlarmsFromProfile(filename, profile)
                 self.alarmsfile.setText(self.aw.qmc.alarmsfile)
             self.aw.qmc.alarmstate = [-1]*len(self.aw.qmc.alarmflag)
             aitems = self.buildAlarmSourceList()
             for i, _ in enumerate(self.aw.qmc.alarmsource):
                 if self.aw.qmc.alarmsource[i] + 3 >= len(aitems):
                     self.aw.qmc.alarmsource[i] = 1 # BT
             self.createalarmtable()
+            return True
         except Exception as ex: # pylint: disable=broad-except
             _log.exception(ex)
             _, _, exc_tb = sys.exc_info()
             self.aw.sendmessage(QApplication.translate('Message','Error loading alarm file'))
             self.aw.qmc.adderror((QApplication.translate('Error Message','Exception:') + ' importalarmsJSON() {0}').format(str(ex)),getattr(exc_tb, 'tb_lineno', '?'))
+        return False
 
     @pyqtSlot(bool)
     def exportalarms(self, _:bool = False) -> None:

src/artisanlib/async_comm.py

@@ -21,7 +21,6 @@
 import logging
 import serial as pyserial
 import asyncio
-import platform
 
 from contextlib import suppress
 from threading import Thread
@@ -215,7 +214,7 @@ async def create_serial_connection(
     if clear_HUPCL:
         # the transport serial port is not open yet in this case
         try:
-            if platform.system() == 'Linux': # seems not to resolve the issue on macOS
+            if sys.platform.startswith('linux'): # seems not to resolve the issue on macOS
                 import termios # pylint: disable=C0415,E0401
                 # the following might hang on macOS for non-callup devices
                 #url = url.replace('/dev/tty.','/dev/cu.')

src/artisanlib/atypes.py

@@ -132,6 +132,7 @@ class ProfileData(TypedDict, total=False):
     version: str
     revision: str
     build: str
+    signature: str
     artisan_os: str
     artisan_os_version: str
     artisan_os_arch: str

src/artisanlib/canvas.py

@@ -7934,7 +7934,7 @@ def resetButtonAction(self,_:bool=False) -> None:
     # if keepProperties=True (a call from OnMonitor()), we keep all the pre-set roast properties
     # onMonitor is set if called from onMonitor
     def reset(self,redraw:bool = True, soundOn:bool = True, keepProperties:bool = False, fireResetAction:bool = True, onMonitor:bool = False) -> bool:
-        _log.debug('PRINT reset(keepProperties=%s,onMonitor=%s)',keepProperties,onMonitor)
+#        _log.debug('PRINT reset(keepProperties=%s,onMonitor=%s)',keepProperties,onMonitor)
         try:
             focused_widget = QApplication.focusWidget()
             if focused_widget and focused_widget != self.aw.centralWidget():

src/artisanlib/comm.py

@@ -2890,7 +2890,7 @@ def DT301temperature(self, retry:int=2) -> tuple[float, float]:
                 libtime.sleep(0.01)  # this may not be necessary but works well
                 r = self.SP.read(11)
                 if len(r)==11:
-                    data = bytearray(r)
+                    data = bytes(r)
                     if len(data)==11 and data[0] == 0xfc and data[1] == 0x13 and data[10] == 0xf3:
                         for i in range(2,6):
                             temp = (temp << 4) | (data[i] & 0xf)

src/artisanlib/comparator.py

@@ -331,7 +331,7 @@ def __init__(self, aw:'ApplicationWindow', profile:'ProfileData', filepath:str,
             self.metadata['ambient_humidity'] = f"{float2float(profile['ambient_humidity']):g}%"
         if 'ambient_pressure' in profile and profile['ambient_pressure'] != 0:
             self.metadata['ambient_pressure'] = f"{float2float(profile['ambient_pressure']):g}hPa"
-        if 'computed' in profile and 'weight_loss' in profile['computed']:
+        if 'computed' in profile and 'weight_loss' in profile['computed'] and 'weight' in profile and profile['weight'][1] != 0.0:
             self.metadata['weight_loss'] = f"-{profile['computed']['weight_loss']:g}%"
         if 'ground_color' in profile and profile['ground_color'] != 0:
             self.metadata['ground_color'] = f"#{float2str(profile['ground_color'])}"
@@ -420,16 +420,17 @@ def recompute(self) -> None:
         self.events_timex = []
         if self.stemp1 is not None and self.stemp2 is not None: # type:ignore[redundant-expr]
             for ti in self.timeindex[:-1]:
-                temp1:float|None = (self.stemp1[ti] if len(self.stemp1)>ti else None)
-                temp2:float|None = (self.stemp2[ti] if len(self.stemp2)>ti else None)
-                if ((len(self.events1) == 0 and ti != -1) or ti > 0):
-                    self.events1.append(temp1)
-                    self.events2.append(temp2)
-                    self.events_timex.append(self.timex[ti])
-                else:
-                    self.events1.append(None)
-                    self.events2.append(None)
-                    self.events_timex.append(None)
+                if ti >= 0 and len(self.timex)>0:
+                    temp1:float|None = (self.stemp1[ti] if len(self.stemp1)>ti else None)
+                    temp2:float|None = (self.stemp2[ti] if len(self.stemp2)>ti else None)
+                    if ((len(self.events1) == 0 and ti != -1) or ti > 0):
+                        self.events1.append(temp1)
+                        self.events2.append(temp2)
+                        self.events_timex.append(self.timex[ti])
+                    else:
+                        self.events1.append(None)
+                        self.events2.append(None)
+                        self.events_timex.append(None)
         # update special events
         if self.specialevents is not None and self.specialeventstype is not None and self.specialeventsvalue is not None:
             # calculated bot and top corresponding to the temperature positions of the event values 0 and 100
@@ -497,19 +498,21 @@ def recompute(self) -> None:
                 except Exception as ex: # pylint: disable=broad-except
                     _log.exception(ex)
             # add a last event at DROP/END to extend the lines to the end of roast
-            if not self.aw.qmc.compareRoast and self.aw.qmc.compareBBP:
-                # BBP-only mode
-                end = (self.timex[-1] if self.timeindex[0] == -1 else self.timex[self.timeindex[0]])
-            else:
-                end = (self.timex[-1] if self.timeindex[6] == 0 else self.timex[self.timeindex[6]])
-            if self.E1:
-                self.E1.append((end,self.E1[-1][1]))
-            if self.E2:
-                self.E2.append((end,self.E2[-1][1]))
-            if self.E3:
-                self.E3.append((end,self.E3[-1][1]))
-            if self.E4:
-                self.E4.append((end,self.E4[-1][1]))
+            # (only for non-empty profiles)
+            if len(self.timex)>0:
+                if not self.aw.qmc.compareRoast and self.aw.qmc.compareBBP:
+                    # BBP-only mode
+                    end = (self.timex[-1] if self.timeindex[0] == -1 else self.timex[self.timeindex[0]])
+                else:
+                    end = (self.timex[-1] if self.timeindex[6] == 0 else self.timex[self.timeindex[6]])
+                if self.E1:
+                    self.E1.append((end,self.E1[-1][1]))
+                if self.E2:
+                    self.E2.append((end,self.E2[-1][1]))
+                if self.E3:
+                    self.E3.append((end,self.E3[-1][1]))
+                if self.E4:
+                    self.E4.append((end,self.E4[-1][1]))
 
     def firstTime(self) -> float:
         try:
@@ -527,7 +530,7 @@ def endTime(self) -> float:
         try:
             return self.timex[self.endTimeIdx]
         except Exception: # pylint: disable=broad-except
-            return self.timex[-1]
+            return (self.timex[-1] if len(self.timex)>0 else 0)
 
     def setVisible(self, b:bool) -> None:
         self.visible = b
@@ -2034,21 +2037,24 @@ def addProfileFromFile(self, filename:str) -> None:
                 if firstChar == '{':
                     f.close()
                     obj = deserialize(filename)
+                    profile_data = self.aw.validateProfileDict(obj)
                     self.aw.plusAddPath(obj, filename)
-                    self.addProfile(filename,cast('ProfileData', obj))
+                    self.addProfile(filename,profile_data)
         except Exception as ex: # pylint: disable=broad-except
+            self.aw.sendmessage(f"{filename}: {QApplication.translate('Message','invalid artisan file')}")
             _log.exception(ex)
 
     def addProfiles(self, filenames:list[str]) -> None:
         if len(filenames) > 0:
             for filename in filenames:
                 self.addProfileFromFile(filename)
-            self.updateMenus()
-            self.realign()
-            self.updateZorders()
-            self.redrawOnDeltaAxisVisibilityChanged()
-            if self.aw.qpc is not None:
-                self.aw.qpc.update_phases(self.getPhasesData())
+            if len(self.profiles)>0:
+                self.updateMenus()
+                self.realign()
+                self.updateZorders()
+                self.redrawOnDeltaAxisVisibilityChanged()
+                if self.aw.qpc is not None:
+                    self.aw.qpc.update_phases(self.getPhasesData())
 
     def deleteProfile(self, i:int) -> None:
         self.profileTable.removeRow(i)
@@ -2084,17 +2090,17 @@ def getPhasesData(self) -> list[tuple[str, float, tuple[float,float,float], bool
         for p in reversed(profiles):
             if p.visible:
                 start_idx = p.timeindex[0] if p.timeindex[0] != -1 else 0
-                start:float = p.timex[start_idx]
-                total:float = p.timex[p.timeindex[6]] - start if p.timeindex[6] != 0 else p.timex[-1]
-                dry:float = p.timex[p.timeindex[1]] - start if p.timeindex[1] != 0 else 0
-                fcs:float = p.timex[p.timeindex[2]] - start if p.timeindex[2] != 0 else 0
+                start:float = (p.timex[start_idx] if len(p.timex)>start_idx else 0)
+                total:float = (p.timex[p.timeindex[6]] - start if p.timeindex[6] != 0 else p.timex[-1] if len(p.timex) > p.timeindex[6] else 0)
+                dry:float = p.timex[p.timeindex[1]] - start if len(p.timex) > p.timeindex[1] > 0 else 0
+                fcs:float = p.timex[p.timeindex[2]] - start if len(p.timex) > p.timeindex[2] > 0 else 0
                 p1:float = dry
                 p3:float = total - fcs if fcs != 0 else 0
                 p2:float = total - p1 - p3 if p1 != 0 and p3 != 0 else 0
                 c:QColor = QColor.fromRgbF(*p.color)
-                t1:float = p.temp2[p.timeindex[1]] if p.timeindex[1] != 0 and len(p.temp2) > p.timeindex[1] else -1
-                t2:float = p.temp2[p.timeindex[2]] if p.timeindex[2] != 0 and len(p.temp2) > p.timeindex[2] else -1
-                t3:float = p.temp2[p.timeindex[6]] if p.timeindex[6] != 0 and len(p.temp2) > p.timeindex[6] else (p.temp2[-1] if len(p.temp2)>0 else -1)
+                t1:float = p.temp2[p.timeindex[1]] if len(p.temp2) > p.timeindex[1] > 0 else -1
+                t2:float = p.temp2[p.timeindex[2]] if len(p.temp2) > p.timeindex[2] > 0 else -1
+                t3:float = p.temp2[p.timeindex[6]] if len(p.temp2) > p.timeindex[6] > 0 else (p.temp2[-1] if len(p.temp2)>0 else -1)
                 r1:float = -1
                 r2:float = -1
                 r3:float = -1