- adds validation of schedule items against retrieved stock

- adds some memoization to stock access
- removes conflicting cancel gesture for weighing states in tap_cancel_green_task_slot

Author: MAKOMO

src/artisanlib/acaia.py

@@ -311,6 +311,8 @@ def on_connect(self) -> None:
                 else:
                     self.max_weight = 1000
                     self.readability = 0.1
+                self.fast_notifications()
+                self.fast_notifications_sent = False
 
         else: #connected_service_UUID == ACAIA_SERVICE_UUID:
             _log.debug('connected to Acaia Scale (%s)', connected_device_name)
@@ -401,9 +403,9 @@ def decode_weight(self, payload:bytes) -> Tuple[Optional[float], bool]:
             return None, False
 
     def update_weight(self, value:Optional[float], stable:Optional[bool] = False) -> None:
-#        _log.debug('PRINT update_weight(%s,%s)', value, stable)
+        _log.debug('PRINT update_weight(%s,%s)', value, stable)
         if value is not None and (not self.stable_only or stable):
-            # convert the weight in g delivered with one decimals to an int
+            # convert the weight in g delivered with one decimal to an int
             value_rounded:float = float2float(value, self.decimals)
             if stable and value_rounded != self.stable_weight:
                 # if value is fresh and reading is stable (if self.stable_only is set)
@@ -674,13 +676,15 @@ def parse_data(self, msg_type:int, data:bytes) -> None:
         try:
             if msg_type == CMD.INFO_A:
                 self.parse_info(data)
-                self.send_ID() # send also after very INFO_A as handshake confirmation
+                self.send_ID() # send after very INFO_A as handshake confirmation
             elif msg_type == CMD.STATUS_A:
                 self.parse_status(data)
             elif msg_type == CMD.EVENT_SA:
                 self.parse_scale_events(data)
             #
-            if self.id_sent and not self.fast_notifications_sent:
+            if self.id_sent and (not self.fast_notifications_sent or not self.slow_notifications_sent):
+                # NOTE: in some cases previously send fast_notifications are ignore so we have to repeat sending them until we received some initial weight data
+                #   (until self.slow_notifications_sent is set)
                 # we configure the scale to receive the initial
                 # weight notification as fast as possible
                 # Note: this event is needed to have the connected scale start to send weight messages even on relay scales which ignore the settings

src/artisanlib/async_comm.py

@@ -61,7 +61,7 @@ def start_background_loop(loop:asyncio.AbstractEventLoop) -> None:
     def __del__(self) -> None:
         self.__loop.call_soon_threadsafe(self.__loop.stop) # pyrefly: ignore[bad-argument-type]
 #        self.__thread.join()
-# WARNING: we don't join and expect the clients running on this thread to stop themself
+# WARNING: we don't join and expect the clients running on this thread to stop them
 # (using self._running) to finally get rid of this thread to prevent hangs
 
     @property
@@ -149,8 +149,8 @@ def __init__(self, host:str = '127.0.0.1', port:int = 8080, serial:Optional['Ser
                 disconnected_handler:Optional[Callable[[], None]] = None) -> None:
         # internals
         self._asyncLoopThread: Optional[AsyncLoopThread]       = None # the asyncio AsyncLoopThread object
-        self._write_queue: 'Optional[asyncio.Queue[bytes]]'    = None # noqa: UP037 # quotes for Python3.8 # the write queue
-        self._running:bool                                     = False              # while True we keep running the thread
+        self._write_queue: 'Optional[asyncio.Queue[bytes]]'    = None # noqa: UP037 # quotes for Python3.8 # the write_queue
+        self._running:bool                                     = False              # while true we keep running the thread
 
         # connection
         self._host:str = host
@@ -256,7 +256,7 @@ async def handle_writes(self, writer: asyncio.StreamWriter, queue: 'asyncio.Queu
             with suppress(asyncio.CancelledError, ConnectionResetError):
                 await writer.drain()
 
-    # if serial settings are given, host/port are ignore and communication is handled by the given serial port
+    # if serial settings are given, the host/port settings are ignored and communication is handled by the given serial port
     async def connect(self, connect_timeout:float=5) -> None:
         writer:Optional[asyncio.StreamWriter] = None
         while self._running:

src/artisanlib/ble_port.py

@@ -326,7 +326,7 @@ async def _connect(self, case_sensitive:bool=True, scan_timeout:float=6, connect
                     _log.error(e)
                 if self._connected_service_uuid is None:
                     # the client does not offer our service thus we put its
-                    # address on the blacklist to be ignore on next discover
+                    # address on the blacklist to be ignored on next discover
                     # and disconnect
                     ##blacklist.add(self._ble_client.address) # we don't blacklist as the searched for service might just not yet be discovered
                     self._disconnect()

src/artisanlib/main.py

@@ -5390,7 +5390,7 @@ def setRecentRoast(self, rr:'RecentRoast') -> None:
             if self.qmc.plus_blend_spec is not None and 'hr_id' in self.qmc.plus_blend_spec and self.qmc.plus_store is not None:
                 try:
                     weight_unit_idx = weight_units.index(rr['weightUnit'])
-                    blends = plus.stock.getBlends(weight_unit_idx,self.qmc.plus_store)
+                    blends = plus.stock.getStandardBlends(weight_unit_idx,self.qmc.plus_store)
                     blend = next(b for b in blends if \
                         plus.stock.getBlendId(b) == self.qmc.plus_blend_spec['hr_id'] and
                         plus.stock.getBlendStockDict(b)['location_hr_id'] == self.qmc.plus_store)

src/artisanlib/roast_properties.py

@@ -4394,6 +4394,7 @@ def roastpropertiesChanged(self, _:int = 0) -> None:
     @pyqtSlot(int)
     def labelOriginFlagChanged(self, _:int = 0) -> None:
         plus.stock.coffee_label_normal_order = self.label_origin_flag.isChecked()
+        plus.stock.clearStockCaches() # we need to clear the stock caches to receive the updated coffee labels
         self.populatePlusCoffeeBlendCombos()  # update the plus stock popups to display the correct bean label format
 
     @pyqtSlot(int)

src/artisanlib/scale.py

@@ -108,9 +108,11 @@ def tare_scale(self) -> None:
     def is_connected(self) -> bool: # pylint: disable=no-self-use
         return False
 
+    # weight in g
     def max_weight(self) -> float: # pylint: disable=no-self-use
         return 0
 
+    # readability in g
     def readability(self) -> float: # pylint: disable=no-self-use
         return 0
 
@@ -302,6 +304,7 @@ def scale1_disconnected_slot(self) -> None:
         self.scale1_disconnected_signal.emit()
 
     ## try to catch a last non weight change and send as stable state
+    # weight in g
     @pyqtSlot(float, bool)
     def scale1_weight_changed_slot(self, weight:float, stable:bool) -> None:
         weight = int(round(weight))
@@ -410,6 +413,7 @@ def scale2_disconnected_slot(self) -> None:
         self.scale2_disconnected_signal.emit()
 
     ## try to catch a last non weight change and send as stable state
+    # weight in g
     @pyqtSlot(float, bool)
     def scale2_weight_changed_slot(self, weight:float, stable:bool) -> None:
         weight = int(round(weight))

src/plus/schedule.py

@@ -831,7 +831,7 @@ def set_visible(plus_account_id:Optional[str], item:ScheduledItem) -> None:
 # returns blend name or None and list of components (just one if item is about a coffee
 def scheduleditem_beans_descriptions(weight_unit_idx:int, item:ScheduledItem) -> Tuple[Optional[str], List[Tuple[float,str]]]:
     if item.blend is not None:
-        blends = plus.stock.getBlends(weight_unit_idx, item.store)
+        blends = plus.stock.getStandardBlends(weight_unit_idx, item.store)
         blend = next((b for b in blends if plus.stock.getBlendId(b) == item.blend and plus.stock.getBlendStockDict(b)['location_hr_id'] == item.store), None)
         if blend is not None:
             return plus.stock.blend2ratio_beans(blend, item.weight, html_escape=False)
@@ -840,6 +840,7 @@ def scheduleditem_beans_descriptions(weight_unit_idx:int, item:ScheduledItem) ->
         coffee = plus.stock.getCoffee(item_coffee)
         if coffee is not None:
             return None, [(1,plus.stock.coffeeLabel(coffee))]
+    _log.error('scheduleditem_beans_descriptions(%s,%s) could not be resolved', weight_unit_idx, item)
     return None, []
 
 def scheduleditem_beans_description(weight_unit_idx:int, item:ScheduledItem) -> str:
@@ -853,7 +854,7 @@ def scheduleditem_beans_description(weight_unit_idx:int, item:ScheduledItem) ->
                 store_label = f'<br>[{html.escape(store_label)}]'
             beans_description = f'<b>{html.escape(plus.stock.coffeeLabel(coffee))}</b>{store_label}'
     else:
-        blends = plus.stock.getBlends(weight_unit_idx, item.store)
+        blends = plus.stock.getStandardBlends(weight_unit_idx, item.store)
         blend = next((b for b in blends if plus.stock.getBlendId(b) == item.blend and plus.stock.getBlendStockDict(b)['location_hr_id'] == item.store), None)
         if blend is not None:
             blend_lines = ''.join([f'<tr><td>{html.escape(bl[0])}</td><td>{html.escape(bl[1])}</td></tr>'
@@ -2787,7 +2788,7 @@ def set_roast_properties(self, item:ScheduledItem, overwrite_nondefault_title:bo
                     except Exception as e:  # pylint: disable=broad-except
                         _log.error(e)
             elif item.blend is not None:
-                blends:List[plus.stock.BlendStructure] = plus.stock.getBlends(weight_unit_idx, item.store)
+                blends:List[plus.stock.BlendStructure] = plus.stock.getStandardBlends(weight_unit_idx, item.store)
                 # NOTE: a blend might not have an hr_id as is the case for all custom blends
                 blend_structure:Optional[plus.stock.BlendStructure] = next((bs for bs in blends if plus.stock.getBlendId(bs) == item.blend), None)
                 if blend_structure is not None:
@@ -3908,9 +3909,9 @@ def show_item(self, item:'WeightItem', state:PROCESS_STATE = PROCESS_STATE.DISCO
 
             self.rendered_task['timer'] = 0 # clear timer start trigger immediately
 
-
     # current_weight indicates total measured weight over both containers in g (not including the bucket weights)
     def show_progress(self, state:PROCESS_STATE, component:int, bucket:int, current_weight:int) -> None:
+#        _log.debug("PRINT show_progress(%s,%s,%s,%s)",state,component,bucket,current_weight)
         if (self.last_item is not None and (self.last_process_state != state or self.last_component != component or self.last_bucket != bucket or
                 self.last_current_weight != current_weight)):
             self.last_process_state = state
@@ -3927,6 +3928,7 @@ def show_progress(self, state:PROCESS_STATE, component:int, bucket:int, current_
                 self.rendered_task['blend_percent'] = ''
                 self.rendered_task['subtitle'] = ''
             self.rendered_task['bucket'] = bucket
+
             if state == PROCESS_STATE.WEIGHING and len(self.last_item.descriptions)>component and len(self.last_item.descriptions[component])>0:
                 target = self.last_item.weight * 1000 # target in g
                 self.rendered_task['total_percent'] = 100 * current_weight / target