microagent 1.7.2__tar.gz → 1.8.0__tar.gz

microagent-1.8.0/.github/workflows/python-app.yml

@@ -0,0 +1,43 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  tests:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Lint with ruff
+        run: uvx ruff check microagent
+
+      - name: Lint with mypy
+        run: uvx mypy microagent
+
+      - name: Testing
+        run: uvx --with .[dev] pytest tests
+
+  check:
+    if: always()
+
+    needs:
+    - tests
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Decide whether the needed jobs succeeded or failed
+      uses: re-actors/alls-green@release/v1
+      with:
+        jobs: ${{ toJSON(needs) }}

{microagent-1.7.2 → microagent-1.8.0}/CHANGELOG.rst

@@ -2,6 +2,26 @@
 Changelog
 =========
 
+
+1.8.0 (2026-02-26)
+==================
+
+- The broker now supports the use of exchanges and topic-based routing
+- Drop support python 3.9, add python 3.13, 3.14
+
+
+1.7.3 (2024-03-12)
+================
+
+- RPC bugfix
+
+
+1.7.2 (2024-03-05)
+================
+
+- Typing fixes
+
+
 1.7 (2023-10-01)
 ================
 

{microagent-1.7.2 → microagent-1.8.0}/Makefile

@@ -4,7 +4,7 @@ clean:
 	find . -name '*.pyc' | xargs rm -rf
 
 test:
-	python -m ruff microagent tests
+	python -m ruff check microagent tests
 	python -m mypy microagent
 	python -m pytest tests
 

{microagent-1.7.2 → microagent-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: microagent
-Version: 1.7.2
+Version: 1.8.0
 Summary: Tool for agent ecosystem
 Author-email: Dmitriy Vlasov <scailer@yandex.ru>
 License: MIT License
@@ -39,17 +39,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Framework :: AsyncIO
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Provides-Extra: redis
-Requires-Dist: redis[hiredis]==5.*; extra == "redis"
+Requires-Dist: redis[hiredis]>5; extra == "redis"
 Provides-Extra: amqp
-Requires-Dist: aiormq==6.8.*; extra == "amqp"
+Requires-Dist: aiormq==6.9.*; extra == "amqp"
 Provides-Extra: kafka
-Requires-Dist: aiokafka==0.10.*; extra == "kafka"
+Requires-Dist: aiokafka==0.13.*; extra == "kafka"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-runner; extra == "dev"
@@ -58,9 +60,10 @@ Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
-Requires-Dist: redis==5.*; extra == "dev"
-Requires-Dist: aiormq==6.8.*; extra == "dev"
-Requires-Dist: aiokafka==0.10.*; extra == "dev"
+Requires-Dist: redis[hiredis]>5; extra == "dev"
+Requires-Dist: aiormq==6.9.*; extra == "dev"
+Requires-Dist: aiokafka==0.13.*; extra == "dev"
+Dynamic: license-file
 
 MicroAgent
 ==========
@@ -77,18 +80,15 @@ MicroAgent
 .. image:: https://img.shields.io/pypi/status/microagent.svg
   :target: https://pypi.python.org/pypi/microagent
 
-.. image:: https://img.shields.io/pypi/dd/microagent.svg
+.. image:: https://img.shields.io/pypi/dm/microagent.svg
   :target: https://pypi.python.org/pypi/microagent
 
-.. image:: https://codecov.io/gh/scailer/microagent/branch/master/graph/badge.svg
-  :target: https://codecov.io/gh/scailer/microagent
-
-.. image:: https://travis-ci.com/scailer/microagent.svg?branch=master
-  :target: https://travis-ci.con/scailer/microagent
-
 .. image:: https://readthedocs.org/projects/microagent/badge/?version=latest&style=flat
   :target: https://microagent.readthedocs.io/
 
+.. image:: https://github.com/scailer/microagent/workflows/Tests/badge.svg
+   :target: https://github.com/scailer/microagent/actions
+
 
 The goal of this project is to facilitate the creation of **microservices**
 interacting via a **signal bus** and/or **queue broker**.
@@ -107,7 +107,7 @@ Tool provide features:
 
 * running a **periodical tasks** (interval or as CRON)
 * specification of signals (events), their sending and receiving via the bus (redis_)
-* description of queues, sending and receiving messages via the queue broker (aioamqp_, kafka_, redis_)
+* description of queues, sending and receiving messages via the queue broker (aiormq_, kafka_, redis_)
 * limited **RPC** via signal bus
 * launching sub-services (in the same process)
 * launching a group of microagents (each in a separate process)
@@ -164,7 +164,7 @@ With redis_ backend provide signal bus and list-based queues::
 
     pip install 'microagent[redis]'
 
-With aioamqp_ backend provide queues over AMQP (RabbitMQ)::
+With aiormq_ backend provide queues over AMQP (RabbitMQ)::
 
     pip install 'microagent[amqp]'
 
@@ -174,6 +174,6 @@ With kafka_ backend provide queues over Kafka (experemental)::
 
 
 .. _redis: https://pypi.org/project/redis/
-.. _aioamqp: https://pypi.org/project/aioamqp/
+.. _aiormq: https://pypi.org/project/aiormq/
 .. _kafka: https://pypi.org/project/aiokafka/
 .. _documentation: https://microagent.readthedocs.io/

{microagent-1.7.2 → microagent-1.8.0}/README.rst

@@ -13,18 +13,15 @@ MicroAgent
 .. image:: https://img.shields.io/pypi/status/microagent.svg
   :target: https://pypi.python.org/pypi/microagent
 
-.. image:: https://img.shields.io/pypi/dd/microagent.svg
+.. image:: https://img.shields.io/pypi/dm/microagent.svg
   :target: https://pypi.python.org/pypi/microagent
 
-.. image:: https://codecov.io/gh/scailer/microagent/branch/master/graph/badge.svg
-  :target: https://codecov.io/gh/scailer/microagent
-
-.. image:: https://travis-ci.com/scailer/microagent.svg?branch=master
-  :target: https://travis-ci.con/scailer/microagent
-
 .. image:: https://readthedocs.org/projects/microagent/badge/?version=latest&style=flat
   :target: https://microagent.readthedocs.io/
 
+.. image:: https://github.com/scailer/microagent/workflows/Tests/badge.svg
+   :target: https://github.com/scailer/microagent/actions
+
 
 The goal of this project is to facilitate the creation of **microservices**
 interacting via a **signal bus** and/or **queue broker**.
@@ -43,7 +40,7 @@ Tool provide features:
 
 * running a **periodical tasks** (interval or as CRON)
 * specification of signals (events), their sending and receiving via the bus (redis_)
-* description of queues, sending and receiving messages via the queue broker (aioamqp_, kafka_, redis_)
+* description of queues, sending and receiving messages via the queue broker (aiormq_, kafka_, redis_)
 * limited **RPC** via signal bus
 * launching sub-services (in the same process)
 * launching a group of microagents (each in a separate process)
@@ -100,7 +97,7 @@ With redis_ backend provide signal bus and list-based queues::
 
     pip install 'microagent[redis]'
 
-With aioamqp_ backend provide queues over AMQP (RabbitMQ)::
+With aiormq_ backend provide queues over AMQP (RabbitMQ)::
 
     pip install 'microagent[amqp]'
 
@@ -110,6 +107,6 @@ With kafka_ backend provide queues over Kafka (experemental)::
 
 
 .. _redis: https://pypi.org/project/redis/
-.. _aioamqp: https://pypi.org/project/aioamqp/
+.. _aiormq: https://pypi.org/project/aiormq/
 .. _kafka: https://pypi.org/project/aiokafka/
 .. _documentation: https://microagent.readthedocs.io/

{microagent-1.7.2 → microagent-1.8.0}/docs/conf.py

@@ -220,7 +220,7 @@ epub_exclude_files = ['search.html']
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+# intersphinx_mapping = {'https://docs.python.org/': None}
 
 # -- Options for todo extension ----------------------------------------------
 
@@ -229,6 +229,6 @@ todo_include_todos = True
 
 extlinks = {
     'redis': ('https://redis.readthedocs.io/%s', ''),
-    'aioamqp': ('https://aioamqp.readthedocs.io/%s', ''),
+    'aiormq': ('https://github.com/mosquito/aiormq/blob/master/README.rst%s', ''),
     'kafka': ('https://aiokafka.readthedocs.io/%s', ''),
 }

{microagent-1.7.2 → microagent-1.8.0}/docs/example_agents.rst

@@ -4,6 +4,12 @@ Agent examples
 ======================================
 
 
+signals.json
+
+.. include:: ../examples/signals.json
+   :code: json
+
+
 user_agent.py
 
 .. include:: ../examples/user_agent.py
@@ -22,7 +28,7 @@ email_agent.py
    :code: python
 
 
-signals.json
+push_agent.py
 
-.. include:: ../examples/signals.json
-   :code: json
+.. include:: ../examples/push_agent.py
+   :code: python

microagent-1.8.0/examples/push_agent.py

@@ -0,0 +1,59 @@
+# mypy: ignore-errors
+import asyncio
+import logging
+import os
+import sys
+
+from microagent import MicroAgent, consumer, load_stuff, on, periodic
+from microagent.tools import amqp, redis
+
+logging.basicConfig(format=(
+    '%(levelname)-8s [pid#%(process)d] %(asctime)s %(name)s '
+    '%(filename)s:%(lineno)d %(message)s'
+), stream=sys.stdout, level=logging.INFO)
+
+cur_dir = os.path.dirname(os.path.realpath(__file__))
+signals, queues = load_stuff('file://' + os.path.join(cur_dir, 'signals.json'))
+
+
+class UserAgent(MicroAgent):
+    @on('pre_start')
+    def setup(self):
+        self.log.info('Run ...\n %s', self.info())
+
+    @periodic(period=15, timeout=10, start_after=3)
+    async def example_periodic_task_send_push(self):
+        self.log.info('Run periodic task')
+        await self.broker.push3.send({'text': 'informer text'}, topic='msg.ios')
+        await self.broker.push.send({'text': 'informer 1'})
+
+    @consumer(queues.android)
+    async def example_read_queue_android(self, **kwargs):
+        self.log.info('Catch android %s', kwargs)
+
+    @consumer(queues.ios)
+    async def example_read_queue_ios(self, **kwargs):
+        self.log.info('Catch ios %s', kwargs)
+
+    @consumer(queues.android_a)
+    async def example_read_queue_android_a(self, **kwargs):
+        self.log.info('Catch android_a %s', kwargs)
+
+    @consumer(queues.ios_a)
+    async def example_read_queue_ios_a(self, **kwargs):
+        self.log.info('Catch ios_a %s', kwargs)
+
+
+async def main():
+    bus = redis.RedisSignalBus('redis://localhost/7')
+    broker = amqp.AMQPBroker('amqp://guest:guest@localhost:5672/')
+    await broker.push3.send({'q':1}, topic='msg.android')
+
+    agent = UserAgent(bus=bus, broker=broker)
+    await agent.start()
+
+    while True:
+        await asyncio.sleep(1)
+
+
+asyncio.run(main())

{microagent-1.7.2 → microagent-1.8.0}/examples/signals.json

@@ -11,6 +11,10 @@
         }}
     ],
     "queues": [
-        {"name": "mailer"}
+        {"name": "mailer"},
+        {"name": "android", "exchange": "push3", "topics": ["*.android"]},
+        {"name": "ios", "exchange": "push3", "topics": ["*.ios"]},
+        {"name": "android_a", "exchange": "push"},
+        {"name": "ios_a", "exchange": "push"}
     ]
 }

{microagent-1.7.2 → microagent-1.8.0}/microagent/__init__.py

@@ -1,9 +1,8 @@
-__version__ = '1.7.2'
+__version__ = '1.8.0'
 
 import importlib
 import json
 import urllib.request
-
 from collections import abc
 from typing import Any, NamedTuple
 
@@ -16,7 +15,6 @@ from .signal import Receiver, ReceiverArgs, Signal
 from .timer import CRONArgs, CRONTask, PeriodicArgs, PeriodicTask, cron_parser
 from .utils import make_bound_key
 
-
 __all__ = ['Signal', 'Queue', 'MicroAgent', 'ServerInterrupt', 'receiver', 'consumer',
            'periodic', 'cron', 'on', 'load_stuff', 'load_signals', 'load_queues']
 
@@ -58,10 +56,18 @@ def load_stuff(source: str) -> tuple[Any, Any]:
             type_map = {name: get_types(_type) for name, _type in providing_args.items()}
             providing_args = list(providing_args)
 
-        Signal(name=_data['name'], providing_args=providing_args, type_map=type_map)
+        Signal(
+            name=_data['name'],
+            providing_args=providing_args,
+            type_map=type_map
+        )
 
     for _data in data.get('queues', []):
-        Queue(name=_data['name'])
+        Queue(
+            name=_data['name'],
+            exchange=_data.get('exchange', ''),
+            topics=_data.get('topics', [])
+        )
 
     if data.get('jsonlib'):
         jsonlib = importlib.import_module(data['jsonlib'])  # type: ignore
@@ -129,7 +135,10 @@ def load_queues(source: str) -> NamedTuple:
             {
                 "queues": [
                     {"name": "mailer"},
-                    {"name": "pusher"},
+                    {"name": "pusher1", "exchange": "push"},
+                    {"name": "pusher2", "exchange": "push"},
+                    {"name": "create_event", "exchange": "logs", "topics": ["*created"]},
+                    {"name": "update_event", "exchange": "logs", "topics": ["*updated"]},
                 ]
             }
     '''

{microagent-1.7.2 → microagent-1.8.0}/microagent/abc.py

@@ -1,9 +1,7 @@
 import logging
-
 from collections.abc import Awaitable, Callable
 from typing import Any, Literal, Protocol
 
-
 HookLabel = Literal['server', 'pre_start', 'post_start', 'pre_stop']
 HookFunc = Callable[[Any], Awaitable[None]]
 PeriodicFunc = Callable[[Any], Awaitable[None]]

{microagent-1.7.2 → microagent-1.8.0}/microagent/agent.py

@@ -77,7 +77,6 @@ Using MicroAgent resources.
 
 import asyncio
 import logging
-
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta, timezone
@@ -90,7 +89,6 @@ from .queue import Consumer
 from .signal import Receiver
 from .timer import CRONTask, PeriodicTask
 
-
 HandlerTypes = TypeVar('HandlerTypes', Receiver, Consumer, PeriodicTask, CRONTask, Hook)
 
 

{microagent-1.7.2 → microagent-1.8.0}/microagent/broker.py

@@ -7,10 +7,17 @@ The broker performs the functions of guaranteed and consistent transmission of m
 from the product to the consumer, many to one (or according to the broker's own logic).
 The message has a free structure, fully defined in the user area.
 
+The broker supports three types of architecture:
+
+-   **Simple:** messages are delivered to a single queue.
+-   **Branching:** a message is sent to an exchange, from which it is copied to multiple queues.
+-   **Topics:** a message is sent to an exchange and, based on the topic, \ 
+    is routed to queues subscribed to that topic.
+
 Implementations:
 
 * :ref:`redis <tools-redis>`
-* :ref:`aioamqp <tools-amqp>`
+* :ref:`aiormq <tools-amqp>`
 * :ref:`kafka <tools-kafka>`
 
 
@@ -22,9 +29,13 @@ Using QueueBroker separately (sending only)
     from microagent.tools.redis import RedisBroker
 
     queues = load_queues('file://queues.json')
-
     broker = RedisBroker('redis://localhost/7')
-    await broker.user_created.send({'user_id': 1})
+
+    await broker.user_created.send({'user_id': 1})  # send to queue
+
+    await broker.push.send({'user_id': 1, 'text': 'hi!'})  # send to exchange
+
+    await broker.logs.send({'text': 'success'}, topic='user.message')  # send with topic
 
 
 Using with MicroAgent
@@ -47,7 +58,6 @@ Using with MicroAgent
 '''
 import logging
 import uuid
-
 from abc import abstractmethod
 from dataclasses import dataclass, field
 from typing import Any
@@ -160,6 +170,8 @@ class BoundQueue(QueueProtocol):
     queue: Queue
 
     async def send(self, message: dict, **options: Any) -> None:
+        if 'exchange' not in options and self.queue.exchange:
+            options['exchange'] = self.queue.exchange
         await self.broker.send(self.queue.name, self.queue.serialize(message), **options)
 
     async def length(self) -> int:

{microagent-1.7.2 → microagent-1.8.0}/microagent/bus.py

@@ -49,7 +49,6 @@ import contextlib
 import logging
 import time
 import uuid
-
 from abc import abstractmethod
 from collections import abc, defaultdict
 from dataclasses import dataclass, field
@@ -333,6 +332,6 @@ def check_types(signal: Signal, data: dict, log: logging.Logger) -> None:
     if signal.type_map:
         for key, value in data.items():
             if key not in signal.type_map:
-                log.warning('Receiver get unknown arg "%s" %s', key, value)
+                log.warning('Receiver "%s" get unknown arg "%s" %s', signal.name, key, value)
             elif not isinstance(value, signal.type_map[key]):
-                log.warning('Receiver get wrong type for "%s" %s', key, value)
+                log.warning('Receiver "%s" get wrong type for "%s" %s', signal.name, key, value)

{microagent-1.7.2 → microagent-1.8.0}/microagent/hooks.py

@@ -24,14 +24,12 @@ allow provide endpoints for microagent, such as http, websocket, smtp or other.
 '''
 
 import inspect
-
 from collections import abc, defaultdict
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, ClassVar, TypedDict
 
 from .abc import BoundKey, HookFunc
 
-
 if TYPE_CHECKING:
     from .agent import MicroAgent
 

{microagent-1.7.2 → microagent-1.8.0}/microagent/launcher.py

@@ -23,13 +23,11 @@ import multiprocessing
 import os
 import signal
 import time
-
 from collections.abc import Iterator
 from functools import partial
 from itertools import chain
 from typing import TYPE_CHECKING, Any
 
-
 if TYPE_CHECKING:
     from .agent import MicroAgent
     from .broker import AbstractQueueBroker

{microagent-1.7.2 → microagent-1.8.0}/microagent/queue.py

@@ -1,12 +1,10 @@
 import json
-
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from types import ModuleType
 from typing import TYPE_CHECKING, ClassVar, TypedDict
 
 from .abc import BoundKey, ConsumerFunc
 
-
 if TYPE_CHECKING:
     from .agent import MicroAgent
 
@@ -41,8 +39,10 @@ class Queue:
 
             {
                 "queues": [
-                    {"name": "mailer"},
-                    {"name": "pusher"},
+                    {"name": "mailer"},  // simple
+                    {"name": "pusher", "exchange": "events"},  // fanout
+                    {"name": "logger", "exchange": "events"},
+                    {"name": "save", "exchange": "msg", "topics": "m.*"},  // topics
                 ]
             }
 
@@ -53,14 +53,30 @@ class Queue:
             some_queue = Queue(
                 name='some_queue'
             )
+
+            else_queue = Queue(
+                name='else_queue',
+                exchange='fanout_exchange'
+            )
+
+            topic_queue = Queue(
+                name='topic_queue',
+                exchange='topic_exchange',
+                topics=['message.*']
+            )
     '''
     name: str
+    exchange: str = ''
+    topics: list[str] = field(default_factory=list)
 
     _queues: ClassVar[dict[str, 'Queue']] = {}
+    _exchanges: ClassVar[dict[str, 'Queue']] = {}
     _jsonlib: ClassVar[ModuleType] = json
 
     def __post_init__(self) -> None:
         self._queues[self.name] = self
+        if self.exchange:
+            self._exchanges[self.exchange] = self
 
     def __repr__(self) -> str:
         return f'<Queue {self.name}>'
@@ -81,7 +97,7 @@ class Queue:
     def get(cls, name: str) -> 'Queue':
         ''' Get the queue instance by name '''
         try:
-            return cls._queues[name]
+            return cls._exchanges.get(name) or cls._queues[name]
         except KeyError as exc:
             raise QueueNotFound(f'No such queue {name}') from exc
 

{microagent-1.7.2 → microagent-1.8.0}/microagent/signal.py

@@ -1,12 +1,10 @@
 import json
-
 from dataclasses import dataclass
 from types import ModuleType
 from typing import TYPE_CHECKING, ClassVar, TypedDict
 
 from .abc import BoundKey, ReceiverFunc
 
-
 if TYPE_CHECKING:
     from .agent import MicroAgent
 

{microagent-1.7.2 → microagent-1.8.0}/microagent/timer.py

@@ -23,7 +23,6 @@ import asyncio
 import inspect
 import re
 import time
-
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
@@ -31,7 +30,6 @@ from typing import TYPE_CHECKING, ClassVar, NamedTuple, TypedDict
 
 from .abc import BoundKey, PeriodicFunc
 
-
 if TYPE_CHECKING:
     from .agent import MicroAgent
 
@@ -75,7 +73,7 @@ class PeriodicMixin:
             self.agent.log.exception(f'Periodic Exception: {exc}')
 
     def start(self, start_after: float) -> None:
-        asyncio.get_running_loop().call_later(start_after, _periodic, self)
+        asyncio.get_running_loop().call_later(start_after, _periodic, self)  # type: ignore[arg-type]
 
 
 class PeriodicArgs(TypedDict):