- push version

- ensures correct profile hash computation on "Save As" (Issue #2205)
- lib updates

Author: MAKOMO

src/artisanlib/__init__.py

@@ -1,9 +1,9 @@
-__version__ = '4.2.0'
+__version__ = '4.2.1'
 __revision__ = ''
-__build__ = '1'
+__build__ = '0'
 __artisan_os__ = 'Linux'
 
 __release_sponsor_name__ = 'LABEL!ISTEN'
 __release_sponsor_domain__ = 'labelisten.com'
 __release_sponsor_url__ = 'https://labelisten.com/'
-__signature__ = '29f13f2dbeacd4b04901ccd9a8848c5160d74ecaefdaf4fa565347cfdd820eeac3f92392ccc847f5bb5f58c08ad39be16514a7279141913f0572664b21591b0c'
+__signature__ = '4857e858c31f5a78c45bbee1a8e3d89d7b177feacefe47052d5029d4f8fc6ff4f82829c4e6b04b9ee11e1602613b523a98e6bffe0581793afb50238dafeb1e08'

src/artisanlib/main.py

@@ -7643,7 +7643,7 @@ def curveSimilarity(self) -> tuple[float|None, float|None]: # pylint: disable=no
                 try:
                     # we masked the -1 error values
                     np_etb_masked = numpy.ma.masked_equal(np_etb, -1)
-                    np_timeB_etb_masked = numpy.ma.masked_array(np_timeB, np_etb_masked.mask) # type:ignore[operator,unused-ignore] # ty:ignore[call-non-callable] # pylint:disable=no-member
+                    np_timeB_etb_masked = numpy.ma.masked_array(np_timeB, np_etb_masked.mask) # type:ignore[operator,unused-ignore] # pylint:disable=no-member
                     # ignore the masked error values on computing the interpolation and fill (especially on the left) with -1 values
                     interp_np_etb = numpy.interp(np_timex,np_timeB_etb_masked.compressed(),np_etb_masked.compressed(),left=-1,right=-1) # pyright:ignore[reportUnknownArgumentType]  # pylint:disable=no-member
 
@@ -7668,7 +7668,7 @@ def curveSimilarity(self) -> tuple[float|None, float|None]: # pylint: disable=no
                 try:
                     # we masked the -1 error values
                     np_btb_masked = numpy.ma.masked_equal(np_btb, -1)
-                    np_timeB_btb_masked = numpy.ma.masked_array(np_timeB, np_btb_masked.mask) # type:ignore[operator,unused-ignore] # ty:ignore[call-non-callable] # pylint:disable=no-member
+                    np_timeB_btb_masked = numpy.ma.masked_array(np_timeB, np_btb_masked.mask) # type:ignore[operator,unused-ignore] pylint:disable=no-member
                     # ignore the masked error values on computing the interpolation and fill (especially on the left) with -1 values
                     interp_np_btb = numpy.interp(np_timex,np_timeB_btb_masked.compressed(),np_btb_masked.compressed(),left=-1,right=-1) # pyright:ignore[reportUnknownArgumentType]  # pylint:disable=no-member
 
@@ -13350,12 +13350,7 @@ def automaticsave(self, interactive:bool = True) -> str|None:
                 if res:
                     #write
                     pf = self.getProfile()
-                    sync_record_hash = plus.controller.updateSyncRecordHashAndSync()
-                    if sync_record_hash is not None:
-                        # we add the hash over the sync record to be able to detect offline changes
-                        hash_encoded = encodeLocal(sync_record_hash)
-                        if hash_encoded is not None:
-                            pf['plus_sync_record_hash'] = hash_encoded
+                    # pf should not be modified before saving anymore this would break its hash
                     self.plusAddPath(cast(dict[str, Any], pf), filename_path)
                     serialize(filename_path, cast(dict[str, Any], pf))
                     self.sendmessage(QApplication.translate('Message','Profile {0} saved in: {1}').format(filename,self.qmc.autosavepath))
@@ -17027,7 +17022,7 @@ def computedProfileInformation(self) -> 'ComputedProfileInformation':
 
     #used by filesave()
     #wrap values in unicode(.) if and only if those are of type string
-    def getProfile(self) -> 'ProfileData':
+    def getProfile(self, copy:bool = False) -> 'ProfileData':
         try:
             profile = ProfileData()
             profile['recording_version'] = self.recording_version
@@ -17120,10 +17115,15 @@ def getProfile(self) -> 'ProfileData':
             profile['roastbatchnr'] = self.qmc.roastbatchnr
             profile['roastbatchprefix'] = encodeLocalStrict(self.qmc.roastbatchprefix)
             profile['roastbatchpos'] = self.qmc.roastbatchpos
-            if self.qmc.roastUUID is None:
+            if copy:
+                # if the copy flag is set, we generate a new roastUUID
                 import uuid
-                self.qmc.roastUUID = uuid.uuid4().hex # generate UUID
-            profile['roastUUID'] = self.qmc.roastUUID
+                profile['roastUUID'] = uuid.uuid4().hex # generate UUID
+            else:
+                if self.qmc.roastUUID is None:
+                    import uuid
+                    self.qmc.roastUUID = uuid.uuid4().hex # generate UUID
+                profile['roastUUID'] = self.qmc.roastUUID
             if self.qmc.scheduleID is not None:
                 profile['scheduleID'] = self.qmc.scheduleID
             if self.qmc.scheduleDate is not None:
@@ -17304,6 +17304,14 @@ def getProfile(self) -> 'ProfileData':
                 _, _, exc_tb = sys.exc_info()
                 self.qmc.adderror((QApplication.translate('Error Message', 'Exception:') + ' getProfile(): {0}').format(str(ex)),getattr(exc_tb, 'tb_lineno', '?'))
 
+            # set sync_record_hash if any
+            sync_record_hash = plus.controller.updateSyncRecordHashAndSync()
+            if sync_record_hash is not None:
+                # we add the hash over the sync record to be able to detect offline changes
+                srh = encodeLocal(sync_record_hash)
+                if srh is not None:
+                    profile['plus_sync_record_hash'] = srh
+
             # add hash
             import hashlib
             import json
@@ -17353,20 +17361,9 @@ def fileSave(self, fname:str|None, copy:bool = False) -> bool:
                 filename = self.ArtisanSaveFileDialog(msg=QApplication.translate('Message', 'Save Profile'), path=fname)
             if filename:
                 #write
-                pf = self.getProfile()
+                pf = self.getProfile(copy)
+                # pf should not be modified before saving anymore this would break its hash
                 if pf:
-                    # if the copy flag is set, we generate a new roastUUID
-                    if copy:
-                        import uuid
-                        pf['roastUUID'] = uuid.uuid4().hex # generate UUID
-
-                    sync_record_hash = plus.controller.updateSyncRecordHashAndSync()
-                    if sync_record_hash is not None:
-                        # we add the hash over the sync record to be able to detect offline changes
-                        srh = encodeLocal(sync_record_hash)
-                        if srh is not None:
-                            pf['plus_sync_record_hash'] = srh
-
                     # we save the file and set the filename
                     self.plusAddPath(cast(dict[str,Any], pf), filename)
                     serialize(filename, cast(dict[str,Any], pf))

src/artisanlib/roast_properties.py

@@ -1364,7 +1364,7 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0, st
             self.plus_amount_replace_selected:float|None = None # holds the max amount of the selected coffee/blend incl. replacements if known
             plusCoffeeslabel = QLabel('<b>' + QApplication.translate('Label', 'Stock') + '</b>')
             plusCoffeeslabel.setToolTip(QApplication.translate('Tooltip','Select beans from your inventory'))
-            self.plusStoreslabel = QLabel('<b>' + QApplication.translate('Label', 'Store') + '</b>')
+            self.plusStoreslabel = QLabel('<b>' + QApplication.translate('Label', 'Space') + '</b>')
             self.plusStoreslabel.setToolTip(QApplication.translate('Tooltip','Select a storage location'))
             self.plusBlendslabel = QLabel('<b>' + QApplication.translate('Label', 'Blend') + '</b>')
             self.plusBlendslabel.setToolTip(QApplication.translate('Tooltip','Select a blend from your inventory'))

src/requirements-dev.txt

@@ -29,8 +29,8 @@ pytest-datadir==1.8.0
 #PyVirtualDisplay==3.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
-hypothesis>=6.155.7
-coverage>=7.14.3
+hypothesis>=6.156.1
+coverage>=7.15.0
 coverage-badge==1.1.2
 codespell==2.4.2
 # the following 2 packages are not installed along aiohttp on Python3.12 and make mypy complain

src/requirements.txt

@@ -26,7 +26,7 @@
 ######
 # packages that are required on all platforms
 #
-setuptools==82.0.1
+setuptools==81.0.0 # forced by numpy 25.1 (current would be 83.0.0)
 wheel==0.47.0
 pyserial==3.5
 pymodbus==3.13.1
@@ -44,7 +44,7 @@ websockets==16.0
 PyYAML==6.0.3
 psutil==7.2.2
 protobuf==7.35.1
-numpy==2.5.0
+numpy==2.5.1
 scipy==1.18.0
 wquantiles==0.6
 colorspacious==1.1.2
@@ -56,9 +56,9 @@ matplotlib==3.11.0
 jinja2==3.1.6
 aiohttp==3.14.1
 aiohttp_jinja2==1.6
-python-bidi==0.6.10
+python-bidi==0.6.11
 arabic-reshaper==3.0.1
-pillow==12.2.0
+pillow==12.3.0
 pydantic==2.13.4
 babel==2.18.0
 bleak==3.0.2