asyncactor 0.28.1__tar.gz → 0.28.2__tar.gz

{asyncactor-0.28.1 → asyncactor-0.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asyncactor
-Version: 0.28.1
+Version: 0.28.2
 Summary: Async decentralized actor
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://github.com/smurfix/asyncactor

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/abc.py

@@ -4,9 +4,8 @@ Abstract classes for the underlying transport
 
 from __future__ import annotations
 
-from abc import ABCMeta, abstractmethod
-
 import anyio
+from abc import ABCMeta, abstractmethod
 
 from typing import TYPE_CHECKING, Union
 

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/actor.py

@@ -6,7 +6,6 @@ from __future__ import annotations
 
 import anyio
 import logging
-import os
 import time
 from random import Random
 
@@ -22,7 +21,7 @@ from .events import (
     TagEvent,
     UntagEvent,
 )
-from .exceptions import ActorCollisionError, ActorTimeoutError
+from .exceptions import ActorCollisionError
 from .messages import HistoryMessage, InitMessage, Message, PingMessage, SetupMessage
 from .nodelist import NodeList
 
@@ -676,9 +675,8 @@ class Actor(CtxObj):
         """
         node = history[0]
         ping = self._recover_pings.get(node, None)
-        if (
-            isinstance(ping, anyio.abc.Event)
-            or isinstance(ping, int)
+        if isinstance(ping, anyio.abc.Event) or (
+            isinstance(ping, int)
             and self._nodes > 1
             and ping < self._valid_pings - self._nodes / 2
         ):

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/backend/__init__.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 def get_transport(name):
     "import the named transport class"
-    from importlib import import_module
+    from importlib import import_module  # noqa:PLC0415
 
     if "." not in name:
         name = "asyncactor.backend." + name

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/backend/moat_kv.py

@@ -4,15 +4,13 @@ Listener on top of a MoaT-KV transport
 
 from __future__ import annotations
 
-from asyncactor.abc import MonitorStream, Transport
-
 from moat.util import CtxObj
+from asyncactor.abc import MonitorStream, Transport
 
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
-
     from typing import Self
 
 

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/backend/moat_link.py

@@ -12,6 +12,7 @@ except ImportError:
     from mqttproto import QoS
 
 from moat.util import CtxObj, NotGiven
+
 try:
     from moat.lib.path import Path
 except ImportError:
@@ -20,11 +21,10 @@ except ImportError:
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncIterator, Awaitable
-
     from moat.lib.codec import Codec
     from moat.link.client import Link
 
+    from collections.abc import AsyncIterator, Awaitable
     from typing import Self
 
 
@@ -52,7 +52,9 @@ class MQTTProtoTransport(Transport):
         """
         Send a message.
         """
-        return self.conn.send(self.topic, payload, qos=QoS.AT_LEAST_ONCE, codec=self.codec, retain=False)
+        return self.conn.send(
+            self.topic, payload, qos=QoS.AT_LEAST_ONCE, codec=self.codec, retain=False
+        )
 
     def __repr__(self):
         return f"<MQTT:{self.topic} @{self.conn!r}>"

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/backend/mqtt.py

@@ -6,13 +6,12 @@ DEPRECATED. Use "mqttproto" instead.
 
 from __future__ import annotations
 
-from asyncactor.abc import MonitorStream, Transport
-
 import msgpack
-
-from moat.util import CtxObj, create_queue
 from moat.mqtt.client import MQTTClient
 from moat.mqtt.mqtt.constants import QOS_0
+from moat.util import CtxObj, create_queue
+
+from asyncactor.abc import MonitorStream, Transport
 
 
 class MQTTTransport(Transport):

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/backend/mqttproto.py

@@ -8,11 +8,12 @@ from asyncactor.abc import MonitorStream, Transport
 
 try:
     from moat.lib.mqtt import QoS
-except importError:
+except ImportError:
     from mqttproto import QoS
 
 from moat.util import CtxObj
 from moat.lib.codec import get_codec
+
 try:
     from moat.lib.path import Path
 except ImportError:

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/events.py

@@ -8,7 +8,7 @@ from contextlib import suppress
 
 from attrs import define
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, TypeName
 
 if TYPE_CHECKING:
     from .messages import Message
@@ -17,18 +17,20 @@ if TYPE_CHECKING:
     from typing import Any, ClassVar
 
 __all__ = [
-    "NodeEvent",
     "AuthPingEvent",
-    "TagEvent",
-    "UntagEvent",
     "DetagEvent",
-    "RawMsgEvent",
-    "PingEvent",
     "GoodNodeEvent",
+    "NodeEvent",
+    "PingEvent",
+    "RawMsgEvent",
     "RecoverEvent",
     "SetupEvent",
+    "TagEvent",
+    "UntagEvent",
 ]
 
+TNode = TypeName("TNode")
+
 
 class NodeEvent:
     "Generic event"
@@ -187,6 +189,6 @@ class SetupEvent(NodeEvent):
 
     def __init__(self, msg):
         self.__attrs_init__()
-        for k in "version cycle gap nodes splits n_hosts".split():
+        for k in ["version", "cycle", "gap", "nodes", "splits", "n_hosts"]:
             with suppress(AttributeError):
-                setattr(self, k, getattr(msg,k))
+                setattr(self, k, getattr(msg, k))

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/messages.py

@@ -9,7 +9,7 @@ from contextlib import suppress
 
 from attrs import asdict, define
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, TypeVar
 
 if TYPE_CHECKING:
     from .node import NodeList
@@ -17,11 +17,11 @@ if TYPE_CHECKING:
     from typing import Any, ClassVar
 
 __all__ = [
-    "Message",
-    "SetupMessage",
+    "HistoryMessage",
     "InitMessage",
+    "Message",
     "PingMessage",
-    "HistoryMessage",
+    "SetupMessage",
 ]
 
 
@@ -34,6 +34,8 @@ class DataError(TypeError):
     """
 
 
+TNode = TypeVar("TNode")
+
 _types = {}
 
 
@@ -118,7 +120,7 @@ class SetupMessage(_NodeMessage):
             raise ValueError("cycle must be >= 1")
         if self.gap < (0.001 if self.override else 0.1):
             raise ValueError("gap must be >= 0.1")
-        if self.cycle < self.gap * 3:
+        if not self.override and self.cycle < self.gap * 3:
             raise ValueError("cycle must be >= 3*gap")
 
     def __repr__(self):
@@ -161,7 +163,7 @@ class HistoryMessage(Message):  # [TNode]
     Your regular actor announcement.
     """
 
-    value:Any = None
+    value: Any = None
     history: NodeList[TNode] = ()
 
     _type: ClassVar[str] = "hist"

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/nodelist.py

@@ -4,10 +4,14 @@ Node list
 
 from __future__ import annotations
 
+from typing import TypeName
+
 __all__ = [
     "NodeList",
 ]
 
+TName = TypeName("TName")
+
 
 class NodeList(list):  # [TName]
     """

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asyncactor
-Version: 0.28.1
+Version: 0.28.2
 Summary: Async decentralized actor
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://github.com/smurfix/asyncactor

{asyncactor-0.28.1 → asyncactor-0.28.2}/pyproject.toml

@@ -48,7 +48,7 @@ extend-exclude = ["tests", "docs", "asyncactor/backend/serf.py", "asyncactor/bac
 
 [tool.ruff.lint]
 select = ["ALL"]
-ignore = ["ANN","PTH","PERF", "D105", "D107","A003","S101","RUF001","RUF002","PLW1514", "D2","D3","D4","T2","FBT","TRY003","EM10","PLR","C","RET50","TD","FIX","N","ERA","BLE001","COM812","ISC001","UP038"]
+ignore = ["ANN","PTH","PERF", "D105", "D107","A003","S101","RUF001","RUF002","PLW1514", "D2","D3","D4","T2","FBT","TRY003","EM10","PLR","C","RET50","TD","FIX","N","ERA","BLE001","COM812","ISC001"]
 explicit-preview-rules = true
 
 [tool.ruff.lint.flake8-comprehensions]
@@ -60,14 +60,23 @@ builtins-ignorelist = ["id","help"]
 [tool.ruff.lint.isort]
 no-lines-before = ["future"]
 required-imports = ["from __future__ import annotations"]
-section-order = ["future","standard-library","first-party","third-party","moat","local-folder","upy","typing"]
+section-order = [
+    "future",
+    "standard-library",
+    "first-party",
+    "third-party",
+    "upy",
+    "moat",
+    "local-folder",
+    "typing",
+]
 extra-standard-library = ["pytest", "anyio"]
 force-to-top = ["moat.util"]
 
 [tool.ruff.lint.isort.sections]
-"moat" = ["moat"]
+"moat" = ["moat","asyncactor"]
 "upy" = ["micropython", "machine", "esp"]
-"typing" = ["typing"]
+"typing" = ["typing","collections"]
 
 [tool.flake8]
 max-line-length = 99

{asyncactor-0.28.1 → asyncactor-0.28.2}/tests/test_actor.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 import logging
-import pytest
 import time
 
+import pytest
+import trio
+
 from asyncactor.actor import (
     Actor,
     GoodNodeEvent,
@@ -14,8 +16,6 @@ from asyncactor.actor import (
     UntagEvent,
 )
 
-import trio
-
 from .mock_serf import stdtest
 
 logging.basicConfig(level=logging.INFO)
@@ -63,7 +63,7 @@ async def test_10_all(autojump_clock):  # pylint: disable=unused-argument
                                 break
                 assert tagged <= 1
                 k.logger.debug("N2 %r", k._values)
-#               # This bit is broken for some reason
+                #               # This bit is broken for some reason
                 if False:
                     for x in range(1, 6):
                         assert k._values["c_" + str(x)] == x * 31

{asyncactor-0.28.1 → asyncactor-0.28.2}/tests/test_mosquitto.py

@@ -2,9 +2,13 @@ from __future__ import annotations
 
 import logging
 import os
-import pytest
 import time
 
+import pytest
+import trio
+from moat.mqtt.client import open_mqttclient
+from moat.util import srepr
+
 from asyncactor.actor import (
     Actor,
     GoodNodeEvent,
@@ -14,10 +18,6 @@ from asyncactor.actor import (
 )
 from asyncactor.backend import get_transport
 
-import trio
-
-from moat.mqtt.client import open_mqttclient
-
 logging.basicConfig(level=logging.INFO)
 
 N = 20
@@ -47,9 +47,9 @@ async def read_loop(client, transport):
 async def test_20_all():
     """
     This test starts multiple servers at the same time and checks that all
-    of them get their turn.
+    of them get their turn. Eventually.
     """
-    N = 5  # pylint: disable=redefined-outer-name
+    N = 6  # pylint: disable=redefined-outer-name
     tagged = False
     msgs = {}
 
@@ -58,7 +58,18 @@ async def test_20_all():
         async with open_mqttclient(client_id="act_test_%d" % (i,), config=Config) as C:
             T = get_transport("mqtt")(C, "test_20")
             C._tg.start_soon(read_loop, C, T)
-            async with Actor(T, "c_" + str(i), cfg={"nodes": N, "gap": 0.1, "cycle": 1}) as k:
+            async with Actor(
+                T,
+                "c_" + str(i),
+                cfg={
+                    "nodes": N,
+                    "gap": 0.15,
+                    "cycle": 0.2,
+                    "force_in": True,
+                    "override": True,
+                    "splits": N,
+                },
+            ) as k:
                 task_status.started()
                 await k.set_value(i * 31)
                 c = 0
@@ -82,12 +93,12 @@ async def test_20_all():
                         if c > 2:
                             break
                 assert tagged <= 1
-                k.logger.debug("N2 %r", k._values)
-                for x in range(1, 6):
+                k.logger.error("N2 %r", k._values)
+                for x in range(1, N):
                     assert k._values["c_" + str(x)] == x * 31
 
     async with trio.open_nursery() as tg:
-        for i in range(1, 6):
+        for i in range(1, N):
             await tg.start(s1, i)
 
 
@@ -109,7 +120,9 @@ async def test_21_some():
             T = get_transport("mqtt")(C, "test_21")
             C._tg.start_soon(read_loop, C, T)
             nonlocal c
-            async with Actor(T, "c_" + str(i), cfg={"nodes": 3, "gap": 0.1, "cycle": 1}) as k:
+            async with Actor(
+                T, "c_" + str(i), cfg={"nodes": 3, "gap": 0.09, "cycle": 0.3, "override": True}
+            ) as k:
                 task_status.started()
                 await k.set_value(i * 31)
                 async for m in k:

{asyncactor-0.28.1 → asyncactor-0.28.2}/tests/test_mqttproto.py

@@ -2,9 +2,11 @@ from __future__ import annotations
 
 import logging
 import os
-import pytest
 import time
 
+import pytest
+import trio
+
 from asyncactor.actor import (
     Actor,
     GoodNodeEvent,
@@ -14,7 +16,6 @@ from asyncactor.actor import (
 )
 from asyncactor.backend import get_transport
 
-import trio
 try:
     from moat.lib.mqtt.async_client import AsyncMQTTClient
 except ImportError:

{asyncactor-0.28.1 → asyncactor-0.28.2}/asyncactor/backend/serf.py

@@ -3,11 +3,11 @@
 #
 from __future__ import annotations
 
-from asyncactor.abc import MonitorStream, Transport
-
 import msgpack
 from asyncserf import Serf
 
+from asyncactor.abc import MonitorStream, Transport
+
 
 class SerfTransport(Transport):
     def __init__(self, conn: Serf, *topic):

{asyncactor-0.28.1 → asyncactor-0.28.2}/tests/mock_serf.py

@@ -5,18 +5,18 @@ try:
 except ImportError:
     from async_exit_stack import AsyncExitStack
     from async_generator import asynccontextmanager
-import anyio
+
 import logging
 import time
 from unittest import mock
 
-from asyncactor.abc import MonitorStream, Transport
-
+import anyio
 import attr
 import trio
-
 from moat.util import create_queue
 
+from asyncactor.abc import MonitorStream, Transport
+
 logger = logging.getLogger(__name__)
 
 otm = time.time

{asyncactor-0.28.1 → asyncactor-0.28.2}/tests/test_serf.py

@@ -2,9 +2,12 @@ from __future__ import annotations
 
 import logging
 import os
-import pytest
 import time
 
+import pytest
+import trio
+from asyncserf import serf_client
+
 from asyncactor.actor import (
     Actor,
     GoodNodeEvent,
@@ -14,9 +17,6 @@ from asyncactor.actor import (
 )
 from asyncactor.backend import get_transport
 
-import trio
-from asyncserf import serf_client
-
 logging.basicConfig(level=logging.INFO)
 
 N = 20