suppresses pick year from artisan.plus beans selector and roast name suggestion if origin/name combination is unique

Author: MAKOMO

src/artisanlib/roast_properties.py

@@ -2228,10 +2228,14 @@ def coffeeSelectionChanged(self, n:int) -> None:
             self.plus_coffee_selected = cd.get('hr_id','')
             origin = ''
             if 'origin' in cd and cd['origin'] is not None:
-                origin = cd['origin'] + ' '
+                origin = cd['origin']
             picked = ''
-            if 'crop_date' in cd and 'picked' in cd['crop_date'] and len(cd['crop_date']['picked']) > 0 and cd['crop_date']['picked'][0] is not None:
+            if 'crop_date' in cd and 'picked' in cd['crop_date'] and len(cd['crop_date']['picked']) > 0 and cd['crop_date']['picked'][0] is not None and plus.stock.has_duplicate_origin_label(cd):
                 picked = f"{cd['crop_date']['picked'][0]}, "
+                if origin:
+                    origin = f'{origin} '
+            elif origin:
+                picked = ', '
             self.plus_coffee_selected_label = f"{origin}{picked}{cd.get('label','')}"
             self.plus_blend_selected_label = None
             self.plus_blend_selected_spec = None

src/includes/Machines/Santoker/Cube_Bluetooth_PID.aset

@@ -124,7 +124,7 @@ alarmcond=1, 1, 1, 1, 1, 1, 1
 alarmflag=1, 1, 1, 1, 1, 1, 1
 alarmguard=-1, -1, -1, -1, -1, 3, -1
 alarmnegguard=-1, -1, -1, -1, -1, -1, -1
-alarmoffset=1, 1, 1, 1, 1, 90, 1
+alarmoffset=2, 3, 1, 1, 1, 90, 1
 alarmsetlabel=
 alarmsfile=
 alarmsource=-3, -3, -3, -3, -3, -3, -3

src/plus/stock.py

@@ -39,7 +39,7 @@
 from artisanlib.util import (decodeLocal, encodeLocal, getDirectory, is_int_list, is_float_list, render_weight,
     weight_units, float2float, convertWeight)
 from plus import config, connection, controller, util
-from typing import Final, TypedDict, List, Union, Optional, Tuple, Dict, TextIO
+from typing import Final, TypedDict, List, Union, Optional, Tuple, Dict, TextIO, Set
 from typing_extensions import NotRequired # Python <=3.10
 
 
@@ -138,6 +138,7 @@ class Stock(TypedDict, total=False):
 BlendList = List[Union[str, List[List[Union[str,float]]]]]
 
 stock:Optional[Stock] = None  # holds the dict with the current stock data (coffees, blends,..)
+duplicate_coffee_origin_labels:Set[str] = set() # set of coffee origin+labels which need to be discrimiated by picked year if available
 
 # in kg; only stock larger than stock_epsilon (10g)
 # will be considered, the rest ignored
@@ -149,6 +150,24 @@ class Stock(TypedDict, total=False):
 # updates the stock cache
 
 
+# re-calculate duplicate coffee origin labels
+def update_duplicate_coffee_origin_labels() -> None:
+    global duplicate_coffee_origin_labels  # pylint: disable=global-statement
+    duplicate_coffee_origin_labels = set()
+    if stock is not None and 'coffees' in stock:
+        seen = set()
+        for c in stock['coffees']:
+            origin_label = f"{c.get('origin', '')}{c.get('label', '')}"
+            if origin_label in seen:
+                duplicate_coffee_origin_labels.add(origin_label)
+            else:
+                seen.add(origin_label)
+
+def has_duplicate_origin_label(c:Coffee) -> bool:
+    origin_label = f"{c.get('origin', '')}{c.get('label', '')}"
+    return origin_label in duplicate_coffee_origin_labels
+
+
 ####### Stock Update Thread
 
 worker:Optional['Worker'] = None
@@ -207,6 +226,7 @@ def fetch(self) -> bool:
                         stock = j['result']
                         if stock is not None:
                             stock['retrieved'] = time.time()
+                            update_duplicate_coffee_origin_labels()
                         _log.debug('-> retrieved')
 #                        _log.debug("stock = %s", stock)
                     finally:
@@ -285,6 +305,7 @@ def load() -> None:
         f:TextIO
         with open(stock_cache_path, encoding='utf-8') as f:
             stock = json.load(f)
+            update_duplicate_coffee_origin_labels()
     except Exception as e:  # pylint: disable=broad-except
         _log.info(e)
     finally:
@@ -584,7 +605,7 @@ def coffeeLabel(c:Coffee) -> str:
         pass
     if origin != '':
         try:
-            if 'crop_date' in c:
+            if 'crop_date' in c and has_duplicate_origin_label(c):
                 cy = c['crop_date']
                 if (
                     'picked' in cy
@@ -653,7 +674,7 @@ def getCoffees(weight_unit_idx:int, store:Optional[str]=None) -> List[Tuple[str,
                         pass
                     if origin != '':
                         try:
-                            if 'crop_date' in c:
+                            if 'crop_date' in c and has_duplicate_origin_label(c):
                                 cy = c['crop_date']
                                 if (
                                     'picked' in cy

src/requirements-dev.txt

@@ -1,21 +1,21 @@
 types-openpyxl>=3.1.5.20250306
 types-Pillow>=10.2.0.20240822
-types-protobuf>=5.29.1.20250208
+types-protobuf>=5.29.1.20250315
 types-psutil>=7.0.0.20250218
 types-pyserial>=3.5.0.20250304
 types-python-dateutil==2.9.0.20241206
-types-pytz>=2025.1.0.20250204
+types-pytz>=2025.1.0.20250318
 types-pyyaml>=6.0.12.20241230
 types-requests>=2.32.0.20250306
 types-setuptools>=76.0.0.20250313
 types-urllib3>=1.26.25.14
 types-docutils>=0.21.0.20241128
 lxml-stubs>=0.5.1
 mypy==1.15.0
-pyright==1.1.396
-ruff>=0.11.0
-pylint==3.3.5
-pre-commit>=4.1.0
+pyright==1.1.397
+ruff>=0.11.2
+pylint==3.3.6
+pre-commit>=4.2.0
 pytest>=8.3.5
 pytest-cov==6.0.0
 #pytest-qt==4.4.0
@@ -25,8 +25,8 @@ pytest-cov==6.0.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.129.3
-coverage>=7.7.0
+hypothesis>=6.130.3
+coverage>=7.7.1
 coverage-badge==1.1.2
 codespell==2.4.1
 # the following 2 packages are not installed along aiohttp on Python3.12 and make mypy complain

wiki/ReleaseHistory.md

@@ -53,6 +53,8 @@ v3.1.1
   - improved accuracy on rendering [artisan.plus](https://artisan.plus) blend component weights
   - improved Cropster importer
   - event replay not at any time ensures that only future events are replayed. As the set of future events may change on moving the background profile, an event can be replayed again. In previous Artisan versions, events did replay only once.
+  - persist Energy Tab summary choice
+  - suppresses pick year from [artisan.plus](https://artisan.plus) beans pop up and roast name suggestion if origin/name combination is unique
 
 * FIXES
   - ensure complete reset to defaults in energy tab loads tab