amqp-client-python 0.2.1.dev1__tar.gz → 0.2.2.dev1__tar.gz

{amqp_client_python-0.2.1.dev1 → amqp_client_python-0.2.2.dev1}/.github/workflows/lint.yml

@@ -19,10 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.8"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

amqp_client_python-0.2.2.dev1/.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish to PyPI
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Build and publish
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          uv build
+          uv publish

{amqp_client_python-0.2.1.dev1 → amqp_client_python-0.2.2.dev1}/.github/workflows/test.yml

@@ -42,10 +42,10 @@ jobs:
         echo "Waiting for RabbitMQ to initialize..."
         # Give the container time to start up and apply the configuration.
         sleep 8
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.8"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

{amqp_client_python-0.2.1.dev1 → amqp_client_python-0.2.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: amqp-client-python
-Version: 0.2.1.dev1
+Version: 0.2.2.dev1
 Summary: Python AMQP Client Library
 Project-URL: Homepage, https://github.com/nutes-uepb/amqp-client-python
 Project-URL: Repository, https://github.com/nutes-uepb/amqp-client-python
@@ -17,7 +17,6 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -28,7 +27,7 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Networking
-Requires-Python: <4.0,>=3.9
+Requires-Python: <4.0,>=3.10
 Requires-Dist: pika<2.0.0,>=1.3.0
 Description-Content-Type: text/markdown
 
@@ -57,16 +56,6 @@ A Python client providing a high-level abstraction for interacting with RabbitMQ
 
 **Discord Server**: <a href="https://discord.gg/RkXNeZpNZk" target="_blank">https://discord.gg/RkXNeZpNZk</a>
 
-### 🦀 Looking for higher performance? Try `amqp-rs`!
-If you need higher throughput, thread safety, and built-in compression, check out [**amqp-rs**](https://pypi.org/project/amqp-rs/).
-
-It is a high-performance Python extension developed in Rust using PyO3 and `tokio`. It shares a similar API and design philosophy with this library, but adds native thread safety, `zstd`/`zlib`/`lz4` compression, robust TLS/SSL support, and graceful shutdowns. 
-
-You can install it via `pip` or `uv`:
-```bash
-pip install amqp-rs
-```
-
 ---
 ### Features:
 - Automatic creation and management of queues, exchanges and channels;
@@ -80,19 +69,22 @@ pip install amqp-rs
 ### Table of Compatibility
 | version  | compatible with |
 | ---- | ---- |
+| 0.2.1 | ~0.2.0 |
 | 0.2.0 | 0.2.0 |
 | 0.1.14 | ~0.1.12 |
 
 ### Installation
 
-You can install `amqp-client-python` using pip:
+You can install `amqp-client-python` using uv or pip:
 ```bash
+uv add amqp-client-python
+# or
 pip install amqp-client-python
 ```
 
 ### Prerequisites
 
-*   Python 3.7+
+*   Python 3.9+
 *   A running RabbitMQ instance.
 
 ### Examples:
@@ -109,15 +101,18 @@ from amqp_client_python import (
 )
 config = Config(Options("queue", "rpc_queue", "rpc_exchange"))
 eventbus = AsyncEventbusRabbitMQ(config)
-# publish
+# publish (supports dict/str with auto-JSON, or raw bytes/bytearray without overhead)
+await eventbus.publish("rpc_exchange", "routing.key", {"message": "content"})
+await eventbus.publish("rpc_exchange", "routing.key", b"raw_binary_payload")
 
-eventbus.publish("rpc_exchange", "routing.key", "message_content")
-# subscribe
+# subscribe (auto_decode=True delivers parsed JSON dict; auto_decode=False delivers raw bytes)
 async def subscribe_handler(body) -> None:
     print(body, type(body), flush=True) # handle messages
 await eventbus.subscribe("rpc_exchange", "routing.key", subscribe_handler)
+
 # rpc_publish
-response = await eventbus.rpc_client("rpc_exchange", "user.find", "message_content")
+response = await eventbus.rpc_client("rpc_exchange", "user.find", {"name": "alice"})
+
 # provider
 async def rpc_provider_handler(body) -> bytes:
     print(f"body: {body}")

{amqp_client_python-0.2.1.dev1 → amqp_client_python-0.2.2.dev1}/README.md

@@ -23,16 +23,6 @@ A Python client providing a high-level abstraction for interacting with RabbitMQ
 
 **Discord Server**: <a href="https://discord.gg/RkXNeZpNZk" target="_blank">https://discord.gg/RkXNeZpNZk</a>
 
-### 🦀 Looking for higher performance? Try `amqp-rs`!
-If you need higher throughput, thread safety, and built-in compression, check out [**amqp-rs**](https://pypi.org/project/amqp-rs/).
-
-It is a high-performance Python extension developed in Rust using PyO3 and `tokio`. It shares a similar API and design philosophy with this library, but adds native thread safety, `zstd`/`zlib`/`lz4` compression, robust TLS/SSL support, and graceful shutdowns. 
-
-You can install it via `pip` or `uv`:
-```bash
-pip install amqp-rs
-```
-
 ---
 ### Features:
 - Automatic creation and management of queues, exchanges and channels;
@@ -46,19 +36,22 @@ pip install amqp-rs
 ### Table of Compatibility
 | version  | compatible with |
 | ---- | ---- |
+| 0.2.1 | ~0.2.0 |
 | 0.2.0 | 0.2.0 |
 | 0.1.14 | ~0.1.12 |
 
 ### Installation
 
-You can install `amqp-client-python` using pip:
+You can install `amqp-client-python` using uv or pip:
 ```bash
+uv add amqp-client-python
+# or
 pip install amqp-client-python
 ```
 
 ### Prerequisites
 
-*   Python 3.7+
+*   Python 3.9+
 *   A running RabbitMQ instance.
 
 ### Examples:
@@ -75,15 +68,18 @@ from amqp_client_python import (
 )
 config = Config(Options("queue", "rpc_queue", "rpc_exchange"))
 eventbus = AsyncEventbusRabbitMQ(config)
-# publish
+# publish (supports dict/str with auto-JSON, or raw bytes/bytearray without overhead)
+await eventbus.publish("rpc_exchange", "routing.key", {"message": "content"})
+await eventbus.publish("rpc_exchange", "routing.key", b"raw_binary_payload")
 
-eventbus.publish("rpc_exchange", "routing.key", "message_content")
-# subscribe
+# subscribe (auto_decode=True delivers parsed JSON dict; auto_decode=False delivers raw bytes)
 async def subscribe_handler(body) -> None:
     print(body, type(body), flush=True) # handle messages
 await eventbus.subscribe("rpc_exchange", "routing.key", subscribe_handler)
+
 # rpc_publish
-response = await eventbus.rpc_client("rpc_exchange", "user.find", "message_content")
+response = await eventbus.rpc_client("rpc_exchange", "user.find", {"name": "alice"})
+
 # provider
 async def rpc_provider_handler(body) -> bytes:
     print(f"body: {body}")

{amqp_client_python-0.2.1.dev1 → amqp_client_python-0.2.2.dev1}/amqp_client_python/domain/models/options.py

@@ -15,6 +15,12 @@ class Options:
         vhost: str = "/",
         heartbeat: Optional[int] = 60,
         publisher_confirms: bool = False,
+        rpc_exchange_type: str = "topic",
+        rpc_queue_durable: bool = True,
+        rpc_queue_auto_delete: bool = False,
+        exchange_type: str = "topic",
+        queue_durable: bool = True,
+        queue_auto_delete: bool = False,
         **kwargs: Dict[str, Any]
     ) -> None:
         """
@@ -32,6 +38,12 @@ class Options:
             vhost: vhost information
             heartbeat: interval between heartbeat
             publisher_confirms: wait for publisher confirmations
+            rpc_exchange_type: exchange type for RPC server (default 'topic')
+            rpc_queue_durable: durability for RPC server queue (default True)
+            rpc_queue_auto_delete: auto_delete for RPC server queue (default False)
+            exchange_type: exchange type for pub/sub subscriptions (default 'topic')
+            queue_durable: durability for pub/sub subscriptions queue (default True)
+            queue_auto_delete: auto_delete for pub/sub subscriptions queue (default False)
             **kwargs: pika options
 
         Examples:
@@ -56,4 +68,10 @@ class Options:
         self.vhost = vhost
         self.heartbeat = heartbeat
         self.publisher_confirms = publisher_confirms
+        self.rpc_exchange_type = kwargs.pop("rpc_exchange_type", rpc_exchange_type)
+        self.rpc_queue_durable = kwargs.pop("rpc_queue_durable", rpc_queue_durable)
+        self.rpc_queue_auto_delete = kwargs.pop("rpc_queue_auto_delete", rpc_queue_auto_delete)
+        self.exchange_type = kwargs.pop("exchange_type", exchange_type)
+        self.queue_durable = kwargs.pop("queue_durable", queue_durable)
+        self.queue_auto_delete = kwargs.pop("queue_auto_delete", queue_auto_delete)
         self.kwargs = kwargs

{amqp_client_python-0.2.1.dev1 → amqp_client_python-0.2.2.dev1}/amqp_client_python/rabbitmq/async_channel.py

@@ -1,5 +1,5 @@
 from collections import deque
-from typing import MutableMapping, Mapping, Optional, Union, Dict, List
+from typing import MutableMapping, Mapping, Optional, Union, Dict, List, Tuple, Any
 from .async_channel_factory import AsyncChannelFactoryRabbitMQ
 from amqp_client_python.exceptions import (
     NackException,
@@ -54,11 +54,20 @@ class AsyncChannel:
         self.auto_ack = auto_ack
         self.subscribes: Dict[str, Dict[str, HandlerType]] = {}
         self.re_subscribes: List[str] = []
+        self._compiled_patterns: Dict[str, List[Tuple[str, Any]]] = {}
+        self._queue_exchange_type: Dict[str, str] = {}
         self.consumers: Dict[str, bool] = {}
         self.publisher_confirms = False
         self._message_number = 0
         self._deliveries: MutableMapping[int, Future] = {}
         self.response_timeout = 60
+        self._declared_exchanges: Dict[str, Tuple[str, bool]] = {}
+
+    @staticmethod
+    def _serialize_payload(body, content_type: str = "application/json"):
+        if isinstance(body, (bytes, bytearray, memoryview)):
+            return body
+        return dumps(body)
 
     @property
     def is_open(self) -> Optional[bool]:
@@ -81,6 +90,7 @@ class AsyncChannel:
         """
         LOGGER.info("Channel opened")
         self._channel = channel
+        self._declared_exchanges.clear()
         self.add_on_channel_close_callback()
         self.publisher_confirms and self.add_publish_confirms()
         self._prefetch_count and self.set_qos(self._prefetch_count)
@@ -114,12 +124,14 @@ class AsyncChannel:
         :param pika.channel.Channel: The closed channel
         :param Exception reason: why the channel was closed
         """
-        LOGGER.info(f"Channel {channel} was closed: {reason}")
+        LOGGER.warning(f"Channel {channel} was closed by RabbitMQ: {reason}")
         self._consuming = False
+        if hasattr(self, "_declared_exchanges"):
+            self._declared_exchanges.clear()
         if self._connection.is_closing or self._connection.is_closed:
             LOGGER.info("Connection is closing or already closed")
         else:
-            LOGGER.info("Closing connection")
+            LOGGER.info(f"Closing connection due to channel closure: {reason}")
             self._connection.close()
 
     def add_publish_confirms(self):
@@ -154,14 +166,36 @@ class AsyncChannel:
         be invoked by pika.
         :param str|unicode exchange_name: The name of the exchange to declare
         """
-        LOGGER.info(f"Declaring exchange: {exchange_name}")
+        if not exchange_name:
+            return
+
+        exchange_type_str = str(getattr(exchange_type, "value", exchange_type))
+        durable_bool = bool(durable)
+
+        if not hasattr(self, "_declared_exchanges"):
+            self._declared_exchanges = {}
+
+        if exchange_name in self._declared_exchanges:
+            prev_type, prev_durable = self._declared_exchanges[exchange_name]
+            if (prev_type, prev_durable) == (exchange_type_str, durable_bool):
+                return
+            LOGGER.warning(
+                f"Exchange '{exchange_name}' was already declared as type='{prev_type}', durable={prev_durable}. "
+                f"Re-declaring with type='{exchange_type_str}', durable={durable_bool} on the same channel may "
+                f"trigger PRECONDITION_FAILED."
+            )
+
+        self._declared_exchanges[exchange_name] = (exchange_type_str, durable_bool)
+        LOGGER.info(
+            f"Declaring exchange: {exchange_name} (type={exchange_type_str}, durable={durable_bool})"
+        )
         # Note: using functools.partial is not required, it is demonstrating
         # how arbitrary data can be passed to the callback when it is called
         cb = partial(self.on_exchange_declareok, userdata=exchange_name)
         self._channel.exchange_declare(
             exchange=exchange_name,
-            exchange_type=exchange_type,
-            durable=durable,
+            exchange_type=exchange_type_str,
+            durable=durable_bool,
             callback=cb,
         )
 
@@ -361,7 +395,7 @@ class AsyncChannel:
         self._channel.basic_publish(
             exchange_name,
             routing_key,
-            dumps(body),  # Serialize payload to JSON
+            self._serialize_payload(body, content_type),
             properties=BasicProperties(
                 reply_to=self._callback_queue,  # Response queue address
                 correlation_id=corr_id,  # Request/response matching ID
@@ -436,7 +470,7 @@ class AsyncChannel:
         self._channel.basic_publish(
             exchange_name,
             routing_key,
-            dumps(body),
+            self._serialize_payload(body, content_type),
             properties=BasicProperties(
                 reply_to=self._callback_queue,
                 content_type=content_type,
@@ -491,13 +525,14 @@ class AsyncChannel:
         exchange_type="topic",
         durable=True,
         auto_delete=False,
+        auto_decode=True,
     ):
         await self.start_rpc_publisher()
         self.register_queue(
             exchange_name, queue_name, exchange_type, durable, auto_delete
         )
         self.register_handler(
-            queue_name, routing_key, callback, content_type, timeout
+            queue_name, routing_key, callback, content_type, timeout, auto_decode=auto_decode
         )
 
         self.queue_bind(queue_name, exchange_name, routing_key)
@@ -518,30 +553,52 @@ class AsyncChannel:
         self,
         exchange_name,
         queue_name: str,
-        exchange_type="direct",
+        exchange_type="topic",
         durable=True,
         auto_delete=False,
     ):
         if queue_name not in self.subscribes:
-            if not len(self.subscribes):
-                self.subscribes[queue_name] = {}
-        self.setup_exchange(exchange_name, exchange_type)
+            self.subscribes[queue_name] = {}
+        exchange_type_str = str(getattr(exchange_type, "value", exchange_type))
+        if not hasattr(self, "_queue_exchange_type"):
+            self._queue_exchange_type = {}
+        self._queue_exchange_type[queue_name] = exchange_type_str
+
+        self.setup_exchange(exchange_name, exchange_type, durable=durable)
         self.queue_declare(queue_name, durable=durable, auto_delete=auto_delete)
 
         if queue_name not in self.consumers:
             self.consumers[queue_name] = False
 
+    def _compile_routing_pattern(self, queue_name: str, routing_key: str):
+        if not hasattr(self, "_compiled_patterns"):
+            self._compiled_patterns = {}
+        if queue_name not in self._compiled_patterns:
+            self._compiled_patterns[queue_name] = []
+
+        if "*" in routing_key or "#" in routing_key:
+            # AMQP topic wildcard pattern (* = single word [^.]+, # = zero or more words .*)
+            amqp_regex = "^" + re.escape(routing_key).replace(r"\*", r"[^.]+").replace(r"\#", r".*") + "$"
+            try:
+                self._compiled_patterns[queue_name].append((routing_key, re.compile(amqp_regex)))
+            except re.error:
+                pass
+
     def register_handler(
-        self, queue_name, routing_key, callback, content_type, response_timeout
+        self, queue_name, routing_key, callback, content_type, response_timeout, auto_decode=True
     ):
+        if queue_name not in self.subscribes:
+            self.subscribes[queue_name] = {}
         if routing_key not in self.subscribes[queue_name]:
             self.subscribes[queue_name][routing_key] = {
                 "handle": callback,
                 "content_type": content_type,
                 "response_timeout": response_timeout or self.response_timeout,
+                "auto_decode": auto_decode,
             }
             if "*" in routing_key and routing_key not in self.re_subscribes:
                 self.re_subscribes.append(routing_key)
+            self._compile_routing_pattern(queue_name, routing_key)
 
     async def subscribe(
         self,
@@ -554,12 +611,13 @@ class AsyncChannel:
         exchange_type: str = "topic",
         durable: bool = True,
         auto_delete: bool = False,
+        auto_decode: bool = True,
     ) -> None:
         self.register_queue(
             exchange_name, queue_name, exchange_type, durable, auto_delete
         )
         self.register_handler(
-            queue_name, routing_key, callback, content_type, timeout
+            queue_name, routing_key, callback, content_type, timeout, auto_decode=auto_decode
         )
 
         self.queue_bind(queue_name, exchange_name, routing_key)
@@ -587,7 +645,11 @@ class AsyncChannel:
 
         async def process_message(handler: HandlerType):
             nonlocal body
-            body = loads(body)
+            if handler.get("auto_decode", True) and handler.get("content_type") == "application/json":
+                try:
+                    body = loads(body)
+                except Exception:
+                    pass
             response = await wait_for(
                 handler["handle"](body),
                 timeout=handler["response_timeout"],
@@ -609,30 +671,39 @@ class AsyncChannel:
 
         async def handle_message(queue_name, basic_deliver, props):
             try:
-                if basic_deliver.routing_key in self.subscribes[queue_name]:
-                    await process_message(
-                        self.subscribes[queue_name][basic_deliver.routing_key]
-                    )
-                else:
-                    for routing_key in self.re_subscribes:
-                        if re.match(routing_key, basic_deliver.routing_key):
-                            return await process_message(
-                                self.subscribes[queue_name][routing_key]
-                            )
-                    if self.rpc_publisher_started and props.reply_to:
-                        self._channel_rpc.basic_publish(
-                            "",
-                            props.reply_to,
-                            "Provider Error: routing_key not binded",
-                            properties=BasicProperties(
-                                correlation_id=props.correlation_id,
-                                content_type="text/plain",
-                                type="error",
-                            ),
-                        )
-                    return not self.auto_ack and self._channel.is_open and self._channel.basic_nack(
-                        basic_deliver.delivery_tag, requeue=False
+                handlers = self.subscribes.get(queue_name, {})
+                handler = handlers.get(basic_deliver.routing_key)
+                if handler:
+                    return await process_message(handler)
+
+                queue_type = getattr(self, "_queue_exchange_type", {}).get(queue_name, "topic")
+                if queue_type != "direct":
+                    patterns = getattr(self, "_compiled_patterns", {}).get(queue_name)
+                    if patterns:
+                        for pattern_key, pattern in patterns:
+                            if pattern.match(basic_deliver.routing_key):
+                                pattern_handler = handlers.get(pattern_key)
+                                if pattern_handler:
+                                    return await process_message(pattern_handler)
+                    elif self.re_subscribes:
+                        for routing_key in self.re_subscribes:
+                            if routing_key in handlers and re.match(routing_key, basic_deliver.routing_key):
+                                return await process_message(handlers[routing_key])
+
+                if self.rpc_publisher_started and props.reply_to:
+                    self._channel_rpc.basic_publish(
+                        "",
+                        props.reply_to,
+                        "Provider Error: routing_key not binded",
+                        properties=BasicProperties(
+                            correlation_id=props.correlation_id,
+                            content_type="text/plain",
+                            type="error",
+                        ),
                     )
+                return not self.auto_ack and self._channel.is_open and self._channel.basic_nack(
+                    basic_deliver.delivery_tag, requeue=False
+                )
 
             except BaseException as err:
                 if self.rpc_publisher_started and props.reply_to: