chatgraph 1.2.3__tar.gz → 1.2.4__tar.gz

{chatgraph-1.2.3 → chatgraph-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatgraph
-Version: 1.2.3
+Version: 1.2.4
 Summary: A user-friendly chatbot library
 Project-URL: Homepage, https://github.com/irissonnlima/chatgraph
 Project-URL: Repository, https://github.com/irissonnlima/chatgraph

{chatgraph-1.2.3 → chatgraph-1.2.4}/chatgraph/messages/message_consumer.py

@@ -32,6 +32,8 @@ class MessageConsumer:
         virtual_host: str = '/',
         heartbeat: int = 60,
         reconnect_interval: float = 5.0,
+        x_expires: int = 86400000,
+        x_message_ttl: int = 3600000,
     ) -> None:
         if heartbeat < 0:
             raise ValueError('heartbeat must be >= 0')
@@ -39,6 +41,8 @@ class MessageConsumer:
             raise ValueError('reconnect_interval must be >= 0')
         self.__virtual_host = virtual_host
         self.__prefetch_count = prefetch_count
+        self.__x_expires = x_expires
+        self.__x_message_ttl = x_message_ttl
         self.__queue_consume = queue_consume
         self.__amqp_url = amqp_url
         self.__router_url = router_url
@@ -61,6 +65,8 @@ class MessageConsumer:
         router_token_env: str = 'ROUTER_TOKEN',
         heartbeat_env: str = 'RABBIT_HEARTBEAT',
         reconnect_interval_env: str = 'RABBIT_RECONNECT_INTERVAL',
+        x_expires_env: str = 'RABBIT_X_EXPIRES',
+        x_message_ttl_env: str = 'RABBIT_X_MESSAGE_TTL',
     ) -> 'MessageConsumer':
         username = os.getenv(user_env)
         password = os.getenv(pass_env)
@@ -72,6 +78,8 @@ class MessageConsumer:
         router_token = os.getenv(router_token_env)
         heartbeat = os.getenv(heartbeat_env, '60')
         reconnect_interval = os.getenv(reconnect_interval_env, '5.0')
+        x_expires = os.getenv(x_expires_env, '86400000')
+        x_message_ttl = os.getenv(x_message_ttl_env, '3600000')
 
         envs_essentials = {
             username: user_env,
@@ -98,6 +106,8 @@ class MessageConsumer:
             router_token=router_token,
             heartbeat=int(heartbeat),
             reconnect_interval=float(reconnect_interval),
+            x_expires=int(x_expires),
+            x_message_ttl=int(x_message_ttl),
         )
 
     async def __initialize_router(self) -> RouterHTTPClient:
@@ -119,8 +129,8 @@ class MessageConsumer:
     async def __declare_queue(self, channel) -> aio_pika.abc.AbstractQueue:
         arguments = {
             'x-dead-letter-exchange': 'log_error',
-            'x-expires': 86400000,
-            'x-message-ttl': 300000,
+            'x-expires': self.__x_expires,
+            'x-message-ttl': self.__x_message_ttl,
         }
         queue = await channel.declare_queue(
             self.__queue_consume,

{chatgraph-1.2.3 → chatgraph-1.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chatgraph"
-version = "1.2.3"
+version = "1.2.4"
 description = "A user-friendly chatbot library"
 authors = [
     {name = "Irisson N. Lima", email = "irisson.lima@verdecard.com.br"}

{chatgraph-1.2.3 → chatgraph-1.2.4}/tests/unit/test_message_consumer.py

@@ -162,11 +162,33 @@ class TestDeclareQueue:
             arguments={
                 'x-dead-letter-exchange': 'log_error',
                 'x-expires': 86400000,
-                'x-message-ttl': 300000,
+                'x-message-ttl': 3600000,
             },
         )
         assert result is mock_queue
 
+    @pytest.mark.asyncio
+    async def test_declares_queue_with_custom_ttl_arguments(self):
+        consumer = make_consumer(
+            queue_consume='my_queue', x_expires=60000, x_message_ttl=10000
+        )
+        mock_queue = MagicMock()
+        mock_queue.bind = AsyncMock()
+        mock_channel = AsyncMock()
+        mock_channel.declare_queue = AsyncMock(return_value=mock_queue)
+
+        await consumer._MessageConsumer__declare_queue(mock_channel)
+
+        mock_channel.declare_queue.assert_called_once_with(
+            'my_queue',
+            durable=True,
+            arguments={
+                'x-dead-letter-exchange': 'log_error',
+                'x-expires': 60000,
+                'x-message-ttl': 10000,
+            },
+        )
+
     @pytest.mark.asyncio
     async def test_binds_queue_with_expected_exchange_and_routing_key(self):
         consumer = make_consumer(
@@ -362,3 +384,20 @@ class TestLoadDotenv:
 
         assert consumer._MessageConsumer__heartbeat == 60
         assert consumer._MessageConsumer__reconnect_interval == 5.0
+        assert consumer._MessageConsumer__x_expires == 86400000
+        assert consumer._MessageConsumer__x_message_ttl == 3600000
+
+    def test_loads_custom_ttl_from_env(self, monkeypatch):
+        monkeypatch.setenv('RABBIT_USER', 'user')
+        monkeypatch.setenv('RABBIT_PASS', 'pass')
+        monkeypatch.setenv('RABBIT_URI', 'rabbitmq.example.com:5672')
+        monkeypatch.setenv('RABBIT_QUEUE', 'test_queue')
+        monkeypatch.setenv('ROUTER_URL', 'http://router')
+        monkeypatch.setenv('ROUTER_TOKEN', 'token')
+        monkeypatch.setenv('RABBIT_X_EXPIRES', '60000')
+        monkeypatch.setenv('RABBIT_X_MESSAGE_TTL', '10000')
+
+        consumer = MessageConsumer.load_dotenv()
+
+        assert consumer._MessageConsumer__x_expires == 60000
+        assert consumer._MessageConsumer__x_message_ttl == 10000