asyncactor 0.25.2__tar.gz → 0.26.0__tar.gz

{asyncactor-0.25.2 → asyncactor-0.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: asyncactor
-Version: 0.25.2
+Version: 0.26.0
 Summary: Async decentralized actor
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://github.com/smurfix/asyncactor
@@ -32,6 +32,7 @@ Requires-Dist: pytest-cov>=2.3; extra == "dev"
 Requires-Dist: pytest-trio; extra == "dev"
 Requires-Dist: pytest>=2.5.2; extra == "dev"
 Requires-Dist: trio>=0.23; extra == "dev"
+Dynamic: license-file
 
 asyncactor
 ==========

{asyncactor-0.25.2 → asyncactor-0.26.0}/asyncactor/actor.py

@@ -127,7 +127,7 @@ class Actor(CtxObj):
         self._version = SetupMessage(node=self._name, **(cfg or {}))
         self._version_job = None
         self._off_nodes = self._version.nodes
-        self._self_seen = False
+        self._self_seen = anyio.Event()
 
         self._evt_q = create_queue(1)
         self._rdr_q = create_queue(99)
@@ -315,10 +315,14 @@ class Actor(CtxObj):
             await self.post_event(RawMsgEvent(msg))
         msg = Message.read(msg)
         if type(msg) is InitMessage and msg.node == self._name:
-            if self._self_seen:
-                # We may see our own Hello only once
+            if self._self_seen.is_set():
+                # We may see our own Init only once.
                 raise ActorCollisionError
-            self._self_seen = True
+
+                # This may not hold if your bronze-age MQTT server doesn't
+                # do subscription IDs. Sorry, but that's not supported.
+
+            self._self_seen.set()
 
         await self._rdr_q.put(msg)
 
@@ -327,9 +331,8 @@ class Actor(CtxObj):
         await self._send_msg(InitMessage(node=self._name))
         await self._send_msg(self._version)
 
-        await anyio.sleep((self.random / 2 + 1.5) * self._gap + self._cycle)
-        if not self._self_seen:
-            raise ActorTimeoutError
+        with anyio.fail_after((self.random / 2 + 1.5) * self._gap + self._cycle):
+            await self._self_seen.wait()
         await self._send_ping()
 
         t_dest = 0
@@ -711,7 +714,7 @@ class Actor(CtxObj):
         """
         # For pos=0 this is a no-op and times out immediately
         try:
-            async with anyio.open_cancel_scope() as xx:
+            async with anyio.CancelScope() as xx:
                 if self._version_job is not None:
                     self._version_job.cancel()
                 self._version_job = xx

{asyncactor-0.25.2 → asyncactor-0.26.0}/asyncactor/backend/moat_link.py

@@ -8,7 +8,7 @@ from asyncactor.abc import MonitorStream, Transport
 
 from mqttproto import QoS
 
-from moat.util import CtxObj, Path
+from moat.util import CtxObj, Path, NotGiven
 
 from typing import TYPE_CHECKING
 
@@ -26,7 +26,7 @@ class MQTTPTransport(Transport):
     MQTTProto Transport for AsyncActor.
     """
 
-    def __init__(self, conn: Link, topic: Path, codec: Codec | str = None):
+    def __init__(self, conn: Link, topic: Path, codec: Codec | str = NotGiven):
         self.conn = conn
         self.topic = topic
         self.codec = codec
@@ -48,7 +48,7 @@ class MQTTPTransport(Transport):
         return self.conn.send(self.topic, payload, qos=QoS.AT_LEAST_ONCE, codec=self.codec)
 
     def __repr__(self):
-        return f"<MQTT:[self.tag] @{self.conn!r}>"
+        return f"<MQTT:{self.topic} @{self.conn!r}>"
 
 
 class MQTTMonitor(MonitorStream, CtxObj):
@@ -56,7 +56,7 @@ class MQTTMonitor(MonitorStream, CtxObj):
 
     async def _ctx(self) -> AsyncIterator[Self]:
         c = self.transport
-        async with c.conn.monitor(c.tag, maximum_qos=QoS.AT_LEAST_ONCE, codec=self.codec) as mon:
+        async with c.conn.monitor(c.topic, qos=QoS.AT_LEAST_ONCE, codec=c.codec) as mon:
             self._it = aiter(mon)
             try:
                 yield self

{asyncactor-0.25.2 → asyncactor-0.26.0}/asyncactor/events.py

@@ -44,7 +44,7 @@ class AuthPingEvent(NodeEvent):
 
 
 @define
-class TagEvent[TNode](AuthPingEvent):
+class TagEvent(AuthPingEvent):  # [TNode]
     """
     This event says that for the moment, you're "it".
 
@@ -69,7 +69,7 @@ class UntagEvent(NodeEvent):
 
 
 @define
-class DetagEvent[TNode](UntagEvent):
+class DetagEvent(UntagEvent):  # [TNode]
     """
     A ping from another node has arrived while you're "it".
     Unfortunately, it is "better" than ours.
@@ -186,8 +186,7 @@ class SetupEvent(NodeEvent):
     force_in: bool = False
 
     def __init__(self, msg):
-        if msg and "version" not in msg:
-            self.version = 1
+        self.__attrs_init__()
         for k in "version cycle gap nodes splits n_hosts".split():
-            with suppress(KeyError):
-                setattr(self, k, msg[k])
+            with suppress(AttributeError):
+                setattr(self, k, getattr(msg,k))

{asyncactor-0.25.2 → asyncactor-0.26.0}/asyncactor/messages.py

@@ -74,7 +74,7 @@ class Message:
 
 
 @define
-class _NodeMessage[TNode](Message):
+class _NodeMessage(Message):  # [TNode]
     node: TNode = None
 
     def __attrs_post_init__(self):
@@ -138,7 +138,7 @@ class InitMessage(_NodeMessage):
 
 @_reg
 @define
-class PingMessage[TNode](_NodeMessage):
+class PingMessage(_NodeMessage):  # [TNode]
     """
     Your regular actor announcement.
     """
@@ -155,12 +155,12 @@ class PingMessage[TNode](_NodeMessage):
 
 @_reg
 @define
-class HistoryMessage[TNode](Message):
+class HistoryMessage(Message):  # [TNode]
     """
     Your regular actor announcement.
     """
 
-    value = None
+    value:Any = None
     history: NodeList[TNode] = ()
 
     _type: ClassVar[str] = "hist"

{asyncactor-0.25.2 → asyncactor-0.26.0}/asyncactor/nodelist.py

@@ -9,7 +9,7 @@ __all__ = [
 ]
 
 
-class NodeList[TName](list):
+class NodeList(list):  # [TName]
     """
     This is an augmented :class: `list`, used to store unique node names,
     up to some maximum (if used).

{asyncactor-0.25.2 → asyncactor-0.26.0}/asyncactor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: asyncactor
-Version: 0.25.2
+Version: 0.26.0
 Summary: Async decentralized actor
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://github.com/smurfix/asyncactor
@@ -32,6 +32,7 @@ Requires-Dist: pytest-cov>=2.3; extra == "dev"
 Requires-Dist: pytest-trio; extra == "dev"
 Requires-Dist: pytest>=2.5.2; extra == "dev"
 Requires-Dist: trio>=0.23; extra == "dev"
+Dynamic: license-file
 
 asyncactor
 ==========

{asyncactor-0.25.2 → asyncactor-0.26.0}/docs/source/actor.rst

@@ -19,8 +19,8 @@ AsyncActor is based on timeslots. At the start of each slot, one
 participant is selected as the leader (or, like we said when we were
 children: *you're "it"*).
 
-Some time after the end of the slot, a participating actor broadcasts a
-``ping`` message. The first actor that does this starts the next slot.
+Some time after the end of the slot, another participating actor broadcasts
+a ``ping`` message. The first actor that does this starts the next slot.
 Collisions are avoided by appropriately modelling the "some time after"
 part; if that fails and messages cross each other, collisions are resolved
 deterministically.
@@ -38,7 +38,7 @@ value.
 The resolution method may be changed, if necessary, by overriding
 :meth:`Actor.has_priority`. Note that this method **must** be deterministic,
 i.e. every recipient of a set of messages must select the same node as
-the new leader.
+the new leader, irrespective of the order these messages arrive in.
 
 Depending on the parameters, the default implementation randomly selects a
 number of participating actors and round-robins the "it" role between them.
@@ -59,6 +59,20 @@ participate in the protocol. You can use this to selectively enable or
 disable actors if you want e.g. to only let the highest-priority actors
 be *it*.
 
+Message Transport
++++++++++++++++++
+
+AsyncActor messages can be transported by any method that doesn't lose
+messages (except in case of a network split). MQTT with CBOR or MsgPack
+encoding are good examples.
+
+Messages *must not* be duplicated by the transport. In practice this means
+that your MQTT server and library either must support subscription IDs, or
+you need to be very careful not to create overlapping subscriptions. We
+strongly recommend the former strategy because subscription IDs also avoid
+redundant topic comparisons by the client.
+
+
 API
 ===