rabbitmq-amqp-python-client 0.7.0__tar.gz → 0.8.0__tar.gz

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rabbitmq-amqp-python-client
-Version: 0.7.0
+Version: 0.8.0
 Summary: Python RabbitMQ client for AMQP 1.0 protocol
 License: Apache-2.0 license
 License-File: LICENSE
@@ -19,7 +19,7 @@ Requires-Dist: typing-extensions (>=4.15.0,<5.0.0)
 Description-Content-Type: text/markdown
 
 ## RabbitMQ AMQP 1.0 Python Client
-This library is meant to be used with RabbitMQ `4.x`. Suitable for testing in pre-production environments.
+This library is meant to be used with RabbitMQ `4.x`. 
 
 The client is distributed via [`PIP`](https://pypi.org/project/rabbitmq-amqp-python-client/):
 ```bash

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/README.md

@@ -1,5 +1,5 @@
 ## RabbitMQ AMQP 1.0 Python Client
-This library is meant to be used with RabbitMQ `4.x`. Suitable for testing in pre-production environments.
+This library is meant to be used with RabbitMQ `4.x`. 
 
 The client is distributed via [`PIP`](https://pypi.org/project/rabbitmq-amqp-python-client/):
 ```bash

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rabbitmq-amqp-python-client"
-version = "0.7.0"
+version = "0.8.0"
 description = "Python RabbitMQ client for AMQP 1.0 protocol"
 authors = ["RabbitMQ team"]
 license = "Apache-2.0 license"

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/rabbitmq_amqp_python_client/__init__.py

@@ -15,6 +15,7 @@ from .connection import Connection
 from .consumer import Consumer
 from .entities import (
     AbcConsumerOptions,
+    AmqpUri,
     ConsumerOptions,
     ConsumerSettleStrategy,
     ExchangeCustomSpecification,
@@ -73,6 +74,7 @@ del metadata
 OutcomeState = Disposition
 
 __all__ = [
+    "AmqpUri",
     "Connection",
     "Management",
     "ExchangeSpecification",

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/rabbitmq_amqp_python_client/asyncio/environment.py

@@ -4,7 +4,11 @@ import asyncio
 import logging
 from typing import Optional, Union
 
-from ..entities import OAuth2Options, RecoveryConfiguration
+from ..entities import (
+    AmqpUri,
+    OAuth2Options,
+    RecoveryConfiguration,
+)
 from ..ssl_configuration import (
     PosixSslConfigurationContext,
     WinSslConfigurationContext,
@@ -38,6 +42,8 @@ class AsyncEnvironment:
         uri: Optional[str] = None,
         # multi-node mode
         uris: Optional[list[str]] = None,
+        # structured single-node mode
+        amqp_uri: Optional[AmqpUri] = None,
         ssl_context: Union[
             PosixSslConfigurationContext, WinSslConfigurationContext, None
         ] = None,
@@ -47,25 +53,38 @@ class AsyncEnvironment:
         """
         Initialize AsyncEnvironment.
 
+        Exactly one of ``uri``, ``uris``, or ``amqp_uri`` must be provided.
+
         Args:
-            uri: Single node connection URI
-            uris: List of URIs for multi-node setup
-            ssl_context: SSL configuration for secure connections
-            oauth2_options: OAuth2 options for authentication
-            recovery_configuration: Configuration for connection recovery
+            uri: Single node connection URI string (e.g. ``"amqp://guest:guest@localhost:5672/"``).
+            uris: List of URI strings for multi-node setup.
+            amqp_uri: Structured single-node connection parameters as an :class:`AmqpUri`
+                instance.  Converted to a URI string internally.
+            ssl_context: SSL configuration for secure connections.
+            oauth2_options: OAuth2 options for authentication.
+            recovery_configuration: Configuration for connection recovery.
 
         Raises:
-            ValueError: If both 'uri' and 'uris' are specified or if neither is specified.
+            ValueError: If more than one of 'uri', 'uris', 'amqp_uri' is specified,
+                or if none is specified.
         """
-        if uri is not None and uris is not None:
+        set_count = sum(x is not None for x in [uri, uris, amqp_uri])
+        if set_count > 1:
+            raise ValueError(
+                "Cannot specify more than one of 'uri', 'uris', or 'amqp_uri'. "
+                "Choose one connection mode."
+            )
+        if set_count == 0:
             raise ValueError(
-                "Cannot specify both 'uri' and 'uris'. Choose one connection mode."
+                "Must specify exactly one of 'uri', 'uris', or 'amqp_uri' for connection."
             )
-        if uri is None and uris is None:
-            raise ValueError("Must specify either 'uri' or 'uris' for connection.")
 
-        self._uri = uri
-        self._uris = uris
+        if amqp_uri is not None:
+            self._uri: Optional[str] = amqp_uri.to_uri()
+            self._uris: Optional[list[str]] = None
+        else:
+            self._uri = uri
+            self._uris = uris
         self._ssl_context = ssl_context
         self._oauth2_options = oauth2_options
         self._recovery_configuration = recovery_configuration

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/rabbitmq_amqp_python_client/connection.py

@@ -274,6 +274,9 @@ class Connection:
             else:
                 typing_extensions.assert_never(self._conf_ssl_context)
             self._ssl_domain.set_trusted_ca_db(ca_cert)
+            self._ssl_domain.set_peer_authentication(
+                SSLDomain.VERIFY_PEER_NAME, ca_cert
+            )
 
             # for mutual authentication
             if self._conf_ssl_context.client_cert is not None:

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/rabbitmq_amqp_python_client/entities.py

@@ -551,6 +551,48 @@ class RecoveryConfiguration:
     MaxReconnectAttempts: int = 5
 
 
+@dataclass
+class AmqpUri:
+    """
+    Configuration for an AMQP connection using individual fields.
+
+    Provides a structured alternative to a raw URI string, building the
+    connection URI from its component parts.
+
+    Attributes:
+        schema: The URI scheme (``"amqp"`` or ``"amqps"``). Defaults to ``"amqp"``.
+        host: The broker hostname or IP address. Defaults to ``"localhost"``.
+        port: The broker port. Defaults to ``5672``.
+        user: The authentication username. Defaults to ``"guest"``.
+        password: The authentication password. Defaults to ``"guest"``.
+        vhost: The target virtual host. Defaults to ``"/"``.
+    """
+
+    schema: str = "amqp"
+    host: str = "localhost"
+    port: int = 5672
+    user: str = "guest"
+    password: str = "guest"
+    vhost: str = "/"
+
+    def to_uri(self) -> str:
+        """
+        Build an AMQP URI string from the individual fields.
+
+        Returns:
+            str: A URI in the form ``schema://user:password@host:port/vhost``.
+        """
+        from urllib.parse import quote
+
+        user_enc = quote(self.user, safe="")
+        password_enc = quote(self.password, safe="")
+        if self.vhost == "/":
+            vhost_path = "/"
+        else:
+            vhost_path = "/" + quote(self.vhost, safe="")
+        return f"{self.schema}://{user_enc}:{password_enc}@{self.host}:{self.port}{vhost_path}"
+
+
 @dataclass
 class OAuth2Options:
     token: str

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/rabbitmq_amqp_python_client/environment.py

@@ -9,7 +9,11 @@ from typing import (
 )
 
 from .connection import Connection
-from .entities import OAuth2Options, RecoveryConfiguration
+from .entities import (
+    AmqpUri,
+    OAuth2Options,
+    RecoveryConfiguration,
+)
 from .ssl_configuration import (
     PosixSslConfigurationContext,
     WinSslConfigurationContext,
@@ -38,6 +42,8 @@ class Environment:
         uri: Optional[str] = None,
         # multi-node mode
         uris: Optional[list[str]] = None,
+        # structured single-node mode
+        amqp_uri: Optional[AmqpUri] = None,
         ssl_context: Union[
             PosixSslConfigurationContext, WinSslConfigurationContext, None
         ] = None,
@@ -49,21 +55,33 @@ class Environment:
 
         Creates an empty list to track active connections.
 
-        Args:
-            uri: Single node connection URI
-            uris: List of URIs for multi-node setup
-            ssl_context: SSL configuration for secure connections
-            on_disconnection_handler: Callback for handling disconnection events
+        Exactly one of ``uri``, ``uris``, or ``amqp_uri`` must be provided.
 
+        Args:
+            uri: Single node connection URI string (e.g. ``"amqp://guest:guest@localhost:5672/"``).
+            uris: List of URI strings for multi-node setup.
+            amqp_uri: Structured single-node connection parameters as an :class:`AmqpUri`
+                instance.  Converted to a URI string internally.
+            ssl_context: SSL configuration for secure connections.
+            oauth2_options: OAuth2 authentication options.
+            recovery_configuration: Automatic reconnection configuration.
         """
-        if uri is not None and uris is not None:
+        set_count = sum(x is not None for x in [uri, uris, amqp_uri])
+        if set_count > 1:
+            raise ValueError(
+                "Cannot specify more than one of 'uri', 'uris', or 'amqp_uri'. "
+                "Choose one connection mode."
+            )
+        if set_count == 0:
             raise ValueError(
-                "Cannot specify both 'uri' and 'uris'. Choose one connection mode."
+                "Must specify exactly one of 'uri', 'uris', or 'amqp_uri' for connection."
             )
-        if uri is None and uris is None:
-            raise ValueError("Must specify either 'uri' or 'uris' for connection.")
-        self._uri = uri
-        self._uris = uris
+        if amqp_uri is not None:
+            self._uri: Optional[str] = amqp_uri.to_uri()
+            self._uris: Optional[list[str]] = None
+        else:
+            self._uri = uri
+            self._uris = uris
         self._ssl_context = ssl_context
         self._recovery_configuration = recovery_configuration
         self._connections: list[Connection] = []

{rabbitmq_amqp_python_client-0.7.0 → rabbitmq_amqp_python_client-0.8.0}/rabbitmq_amqp_python_client/utils.py

@@ -12,17 +12,18 @@ def validate_annotations(annotations: []) -> bool:  # type: ignore
 class Converter:
 
     @staticmethod
-    def bytes_to_string(body: bytes) -> str:
+    def bytes_to_string(body: bytes, encoding: str = "utf-8") -> str:
         """
         Convert the body of a message to a string.
 
         Args:
             body: The body of the message
+            encoding: The character encoding to use for decoding (default: utf-8)
 
         Returns:
             str: The string representation of the body
         """
-        return "".join(map(chr, body))
+        return bytes(body).decode(encoding)
 
     @staticmethod
     def string_to_bytes(body: str) -> bytes: