frequenz-dispatch 0.6.1__tar.gz → 0.6.2__tar.gz

{frequenz_dispatch-0.6.1 → frequenz_dispatch-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frequenz-dispatch
-Version: 0.6.1
+Version: 0.6.2
 Summary: A highlevel interface for the dispatch API
 Author-email: Frequenz Energy-as-a-Service GmbH <floss@frequenz.com>
 License: MIT
@@ -21,7 +21,7 @@ Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typing-extensions<5.0.0,>=4.13.0
-Requires-Dist: frequenz-sdk<1.0.0-rc1800,>=1.0.0-rc1302
+Requires-Dist: frequenz-sdk<1.0.0-rc1900,>=1.0.0-rc1302
 Requires-Dist: frequenz-channels<2.0.0,>=1.6.1
 Requires-Dist: frequenz-client-dispatch<0.9.0,>=0.8.4
 Provides-Extra: dev-flake8

frequenz_dispatch-0.6.2/RELEASE_NOTES.md

@@ -0,0 +1,18 @@
+# Dispatch Highlevel Interface Release Notes
+
+## Summary
+
+<!-- Here goes a general summary of what this release is about -->
+
+## Upgrading
+
+<!-- Here goes notes on how to upgrade from previous versions, including deprecations and what they should be replaced with -->
+
+## New Features
+
+<!-- Here goes the main new features and examples or instructions on how to use them -->
+
+## Bug Fixes
+
+* ActorDispatcher: Fix that every actor instance wrongly received all updates for their dispatch type. This is only relevant to you if your actor has more than one running instance at any time.
+

{frequenz_dispatch-0.6.1 → frequenz_dispatch-0.6.2}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
   # Make sure to update the version for cross-referencing also in the
   # mkdocs.yml file when changing the version here (look for the config key
   # plugins.mkdocstrings.handlers.python.import)
-  "frequenz-sdk >= 1.0.0-rc1302, < 1.0.0-rc1800",
+  "frequenz-sdk >= 1.0.0-rc1302, < 1.0.0-rc1900",
   "frequenz-channels >= 1.6.1, < 2.0.0",
   "frequenz-client-dispatch >= 0.8.4, < 0.9.0",
 ]

{frequenz_dispatch-0.6.1 → frequenz_dispatch-0.6.2}/src/frequenz/dispatch/_actor_dispatcher.py

@@ -10,7 +10,7 @@ from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any, Awaitable
 
-from frequenz.channels import Broadcast, Receiver, select
+from frequenz.channels import Broadcast, Receiver, Sender, select
 from frequenz.client.dispatch.types import TargetComponents
 from frequenz.sdk.actor import Actor, BackgroundService
 
@@ -189,6 +189,19 @@ class ActorDispatcher(BackgroundService):
             _logger.info("Retrying dispatch %s now", dispatch.id)
             await self._sender.send(dispatch)
 
+    @dataclass(frozen=True, kw_only=True)
+    class ActorAndChannel:
+        """Actor and its sender."""
+
+        actor: Actor
+        """The actor."""
+
+        channel: Broadcast[DispatchInfo]
+        """The channel for dispatch updates."""
+
+        sender: Sender[DispatchInfo]
+        """The sender for dispatch updates."""
+
     def __init__(  # pylint: disable=too-many-arguments, too-many-positional-arguments
         self,
         actor_factory: Callable[
@@ -215,11 +228,8 @@ class ActorDispatcher(BackgroundService):
 
         self._dispatch_rx = running_status_receiver
         self._actor_factory = actor_factory
-        self._actors: dict[int, Actor] = {}
-        self._updates_channel = Broadcast[DispatchInfo](
-            name="dispatch_updates_channel", resend_latest=True
-        )
-        self._updates_sender = self._updates_channel.new_sender()
+        self._actors: dict[int, ActorDispatcher.ActorAndChannel] = {}
+
         self._retrier = ActorDispatcher.FailedDispatchesRetrier(retry_interval)
 
     def start(self) -> None:
@@ -236,24 +246,25 @@ class ActorDispatcher(BackgroundService):
         )
 
         identity = self._dispatch_identity(dispatch)
-        actor: Actor | None = self._actors.get(identity)
+        actor_and_channel = self._actors.get(identity)
 
-        if actor:
-            sent_str = ""
-            if self._updates_sender is not None:
-                sent_str = ", sent a dispatch update instead of creating a new actor"
-                await self._updates_sender.send(dispatch_update)
+        if actor_and_channel:
+            await actor_and_channel.sender.send(dispatch_update)
             _logger.info(
-                "Actor for dispatch type %r is already running%s",
+                "Actor for dispatch type %r is already running, "
+                "sent a dispatch update instead of creating a new actor",
                 dispatch.type,
-                sent_str,
             )
         else:
             try:
                 _logger.info("Starting actor for dispatch type %r", dispatch.type)
+                channel = Broadcast[DispatchInfo](
+                    name=f"dispatch_updates_channel_instance={identity}",
+                    resend_latest=True,
+                )
                 actor = await self._actor_factory(
                     dispatch_update,
-                    self._updates_channel.new_receiver(limit=1, warn_on_overflow=False),
+                    channel.new_receiver(limit=1, warn_on_overflow=False),
                 )
 
                 actor.start()
@@ -267,7 +278,9 @@ class ActorDispatcher(BackgroundService):
                 self._retrier.retry(dispatch)
             else:
                 # No exception occurred, so we can add the actor to the list
-                self._actors[identity] = actor
+                self._actors[identity] = ActorDispatcher.ActorAndChannel(
+                    actor=actor, channel=channel, sender=channel.new_sender()
+                )
 
     async def _stop_actor(self, stopping_dispatch: Dispatch, msg: str) -> None:
         """Stop all actors.
@@ -278,8 +291,9 @@ class ActorDispatcher(BackgroundService):
         """
         identity = self._dispatch_identity(stopping_dispatch)
 
-        if actor := self._actors.pop(identity, None):
-            await actor.stop(msg)
+        if actor_and_channel := self._actors.pop(identity, None):
+            await actor_and_channel.actor.stop(msg)
+            await actor_and_channel.channel.close()
         else:
             _logger.warning(
                 "Actor for dispatch type %r is not running", stopping_dispatch.type

{frequenz_dispatch-0.6.1 → frequenz_dispatch-0.6.2}/src/frequenz_dispatch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frequenz-dispatch
-Version: 0.6.1
+Version: 0.6.2
 Summary: A highlevel interface for the dispatch API
 Author-email: Frequenz Energy-as-a-Service GmbH <floss@frequenz.com>
 License: MIT
@@ -21,7 +21,7 @@ Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typing-extensions<5.0.0,>=4.13.0
-Requires-Dist: frequenz-sdk<1.0.0-rc1800,>=1.0.0-rc1302
+Requires-Dist: frequenz-sdk<1.0.0-rc1900,>=1.0.0-rc1302
 Requires-Dist: frequenz-channels<2.0.0,>=1.6.1
 Requires-Dist: frequenz-client-dispatch<0.9.0,>=0.8.4
 Provides-Extra: dev-flake8

{frequenz_dispatch-0.6.1 → frequenz_dispatch-0.6.2}/src/frequenz_dispatch.egg-info/requires.txt

@@ -1,5 +1,5 @@
 typing-extensions<5.0.0,>=4.13.0
-frequenz-sdk<1.0.0-rc1800,>=1.0.0-rc1302
+frequenz-sdk<1.0.0-rc1900,>=1.0.0-rc1302
 frequenz-channels<2.0.0,>=1.6.1
 frequenz-client-dispatch<0.9.0,>=0.8.4
 

frequenz_dispatch-0.6.1/RELEASE_NOTES.md

@@ -1,9 +0,0 @@
-# Dispatch Highlevel Interface Release Notes
-
-## Upgrading
-
-- Some minimal dependencies were updated, you might need to adjust your project's dependencies too.
-
-## New Features
-
-- `DispatchInfo._src` was added for rare complex scenarios where the source of a dispatch needs to be accessed.