rbfly 0.10.0.dev1__tar.gz → 0.10.0.dev3__tar.gz

{rbfly-0.10.0.dev1/rbfly.egg-info → rbfly-0.10.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbfly
-Version: 0.10.0.dev1
+Version: 0.10.0.dev3
 Summary: RbFly - a library for RabbitMQ Streams using Python asyncio
 Home-page: https://wrobell.dcmod.org/rbfly/
 Author: Artur Wroblewski
@@ -12,13 +12,12 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
 Classifier: Development Status :: 4 - Beta
-Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Provides-Extra: tests
 Requires-Dist: bandit; extra == "tests"
 Requires-Dist: cython-lint; extra == "tests"
-Requires-Dist: mypy==1.11.1; extra == "tests"
+Requires-Dist: mypy==1.11.2; extra == "tests"
 Requires-Dist: pika; extra == "tests"
 Requires-Dist: pytest-asyncio; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -30,7 +29,7 @@ Requires-Dist: uvloop>=0.19.0; extra == "tests"
 Provides-Extra: performance
 Requires-Dist: msgpack; extra == "performance"
 Requires-Dist: aiokafka==0.8.1; extra == "performance"
-Requires-Dist: rstream==0.13.0; extra == "performance"
+Requires-Dist: rstream==0.20.3; extra == "performance"
 Requires-Dist: uamqp==1.6.9; extra == "performance"
 Requires-Dist: python-qpid-proton==0.39.0; extra == "performance"
 Provides-Extra: doc

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/pyproject.toml

@@ -26,6 +26,7 @@ omit = ["rbfly/tests/*"]
 lint.select = ['F', 'N', 'E', 'W', 'PL', 'C90', 'RUF', 'SLF', 'UP']
 # drop from ignore: PLR2004, E501
 lint.ignore = ['E731', 'PLR2004', 'E501', 'UP032', 'E721']
+target-version = "py311"
 
 [tool.cython-lint]
 ignore = ['E252', 'E302', 'E305']

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/rbfly/amqp/_message.c

@@ -5640,9 +5640,9 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_pf_5rbfly_4amqp
 static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_8_message_c_decode_amqp(struct __pyx_t_5rbfly_7_buffer_Buffer *__pyx_v_buffer, CYTHON_UNUSED Py_ssize_t __pyx_v_size) {
   uint32_t __pyx_v_desc_code;
   uint8_t __pyx_v_type_code;
-  CYTHON_UNUSED PyObject *__pyx_v_msg_header = 0;
+  CYTHON_UNUSED PyObject *__pyx_v__msg_header = 0;
   PyObject *__pyx_v_msg_annotations = 0;
-  CYTHON_UNUSED PyObject *__pyx_v_msg_properties = 0;
+  CYTHON_UNUSED PyObject *__pyx_v__msg_properties = 0;
   PyObject *__pyx_v_app_properties = 0;
   PyObject *__pyx_v_body = 0;
   struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_r = NULL;
@@ -5664,20 +5664,20 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
   /* "rbfly/amqp/_message.pyx":226
  *         uint32_t desc_code
  *         uint8_t type_code
- *         object msg_header = {}             # <<<<<<<<<<<<<<
+ *         object _msg_header = {}             # <<<<<<<<<<<<<<
  *         object msg_annotations = {}
- *         object msg_properties = {}
+ *         object _msg_properties = {}
  */
   __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 226, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_v_msg_header = __pyx_t_1;
+  __pyx_v__msg_header = __pyx_t_1;
   __pyx_t_1 = 0;
 
   /* "rbfly/amqp/_message.pyx":227
  *         uint8_t type_code
- *         object msg_header = {}
+ *         object _msg_header = {}
  *         object msg_annotations = {}             # <<<<<<<<<<<<<<
- *         object msg_properties = {}
+ *         object _msg_properties = {}
  *         object app_properties = {}
  */
   __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 227, __pyx_L1_error)
@@ -5686,20 +5686,20 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
   __pyx_t_1 = 0;
 
   /* "rbfly/amqp/_message.pyx":228
- *         object msg_header = {}
+ *         object _msg_header = {}
  *         object msg_annotations = {}
- *         object msg_properties = {}             # <<<<<<<<<<<<<<
+ *         object _msg_properties = {}             # <<<<<<<<<<<<<<
  *         object app_properties = {}
  *         object body
  */
   __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 228, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_v_msg_properties = __pyx_t_1;
+  __pyx_v__msg_properties = __pyx_t_1;
   __pyx_t_1 = 0;
 
   /* "rbfly/amqp/_message.pyx":229
  *         object msg_annotations = {}
- *         object msg_properties = {}
+ *         object _msg_properties = {}
  *         object app_properties = {}             # <<<<<<<<<<<<<<
  *         object body
  * 
@@ -5714,7 +5714,7 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
  * 
  *     _next_code(buffer, &desc_code, &type_code)             # <<<<<<<<<<<<<<
  *     if desc_code == MESSAGE_HEADER:
- *         msg_header = _decode_value(buffer, type_code)
+ *         _msg_header = _decode_value(buffer, type_code)
  */
   __pyx_f_5rbfly_4amqp_8_message__next_code(__pyx_v_buffer, (&__pyx_v_desc_code), (&__pyx_v_type_code)); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 232, __pyx_L1_error)
 
@@ -5722,7 +5722,7 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
  * 
  *     _next_code(buffer, &desc_code, &type_code)
  *     if desc_code == MESSAGE_HEADER:             # <<<<<<<<<<<<<<
- *         msg_header = _decode_value(buffer, type_code)
+ *         _msg_header = _decode_value(buffer, type_code)
  *         _next_code(buffer, &desc_code, &type_code)
  */
   __pyx_t_2 = (__pyx_v_desc_code == 0x5370);
@@ -5731,18 +5731,18 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
     /* "rbfly/amqp/_message.pyx":234
  *     _next_code(buffer, &desc_code, &type_code)
  *     if desc_code == MESSAGE_HEADER:
- *         msg_header = _decode_value(buffer, type_code)             # <<<<<<<<<<<<<<
+ *         _msg_header = _decode_value(buffer, type_code)             # <<<<<<<<<<<<<<
  *         _next_code(buffer, &desc_code, &type_code)
  * 
  */
     __pyx_t_1 = __pyx_f_5rbfly_4amqp_8_message__decode_value(__pyx_v_buffer, __pyx_v_type_code); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 234, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __Pyx_DECREF_SET(__pyx_v_msg_header, __pyx_t_1);
+    __Pyx_DECREF_SET(__pyx_v__msg_header, __pyx_t_1);
     __pyx_t_1 = 0;
 
     /* "rbfly/amqp/_message.pyx":235
  *     if desc_code == MESSAGE_HEADER:
- *         msg_header = _decode_value(buffer, type_code)
+ *         _msg_header = _decode_value(buffer, type_code)
  *         _next_code(buffer, &desc_code, &type_code)             # <<<<<<<<<<<<<<
  * 
  *     if desc_code == MESSAGE_ANNOTATIONS:
@@ -5753,7 +5753,7 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
  * 
  *     _next_code(buffer, &desc_code, &type_code)
  *     if desc_code == MESSAGE_HEADER:             # <<<<<<<<<<<<<<
- *         msg_header = _decode_value(buffer, type_code)
+ *         _msg_header = _decode_value(buffer, type_code)
  *         _next_code(buffer, &desc_code, &type_code)
  */
   }
@@ -5802,7 +5802,7 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
  *         _next_code(buffer, &desc_code, &type_code)
  * 
  *     if desc_code == MESSAGE_PROPERTIES:             # <<<<<<<<<<<<<<
- *         msg_properties = _decode_value(buffer, type_code)
+ *         _msg_properties = _decode_value(buffer, type_code)
  *         _next_code(buffer, &desc_code, &type_code)
  */
   __pyx_t_2 = (__pyx_v_desc_code == 0x5373);
@@ -5811,18 +5811,18 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
     /* "rbfly/amqp/_message.pyx":242
  * 
  *     if desc_code == MESSAGE_PROPERTIES:
- *         msg_properties = _decode_value(buffer, type_code)             # <<<<<<<<<<<<<<
+ *         _msg_properties = _decode_value(buffer, type_code)             # <<<<<<<<<<<<<<
  *         _next_code(buffer, &desc_code, &type_code)
  * 
  */
     __pyx_t_1 = __pyx_f_5rbfly_4amqp_8_message__decode_value(__pyx_v_buffer, __pyx_v_type_code); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 242, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __Pyx_DECREF_SET(__pyx_v_msg_properties, __pyx_t_1);
+    __Pyx_DECREF_SET(__pyx_v__msg_properties, __pyx_t_1);
     __pyx_t_1 = 0;
 
     /* "rbfly/amqp/_message.pyx":243
  *     if desc_code == MESSAGE_PROPERTIES:
- *         msg_properties = _decode_value(buffer, type_code)
+ *         _msg_properties = _decode_value(buffer, type_code)
  *         _next_code(buffer, &desc_code, &type_code)             # <<<<<<<<<<<<<<
  * 
  *     if desc_code == MESSAGE_APP_PROPERTIES:
@@ -5833,7 +5833,7 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
  *         _next_code(buffer, &desc_code, &type_code)
  * 
  *     if desc_code == MESSAGE_PROPERTIES:             # <<<<<<<<<<<<<<
- *         msg_properties = _decode_value(buffer, type_code)
+ *         _msg_properties = _decode_value(buffer, type_code)
  *         _next_code(buffer, &desc_code, &type_code)
  */
   }
@@ -6200,9 +6200,9 @@ static struct __pyx_obj_5rbfly_4amqp_8_message_MessageCtx *__pyx_f_5rbfly_4amqp_
   __Pyx_AddTraceback("rbfly.amqp._message.c_decode_amqp", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_msg_header);
+  __Pyx_XDECREF(__pyx_v__msg_header);
   __Pyx_XDECREF(__pyx_v_msg_annotations);
-  __Pyx_XDECREF(__pyx_v_msg_properties);
+  __Pyx_XDECREF(__pyx_v__msg_properties);
   __Pyx_XDECREF(__pyx_v_app_properties);
   __Pyx_XDECREF(__pyx_v_body);
   __Pyx_XGIVEREF((PyObject *)__pyx_r);

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/rbfly/amqp/_message.pyx

@@ -223,15 +223,15 @@ cdef MessageCtx c_decode_amqp(Buffer *buffer, Py_ssize_t size):
     cdef:
         uint32_t desc_code
         uint8_t type_code
-        object msg_header = {}
+        object _msg_header = {}
         object msg_annotations = {}
-        object msg_properties = {}
+        object _msg_properties = {}
         object app_properties = {}
         object body
 
     _next_code(buffer, &desc_code, &type_code)
     if desc_code == MESSAGE_HEADER:
-        msg_header = _decode_value(buffer, type_code)
+        _msg_header = _decode_value(buffer, type_code)
         _next_code(buffer, &desc_code, &type_code)
 
     if desc_code == MESSAGE_ANNOTATIONS:
@@ -239,7 +239,7 @@ cdef MessageCtx c_decode_amqp(Buffer *buffer, Py_ssize_t size):
         _next_code(buffer, &desc_code, &type_code)
 
     if desc_code == MESSAGE_PROPERTIES:
-        msg_properties = _decode_value(buffer, type_code)
+        _msg_properties = _decode_value(buffer, type_code)
         _next_code(buffer, &desc_code, &type_code)
 
     if desc_code == MESSAGE_APP_PROPERTIES:

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/rbfly/streams/protocol.py

@@ -632,6 +632,11 @@ class RabbitMQStreamsProtocol(asyncio.Protocol):
         """
         Send RabbitMQ streams frame to broker.
         """
+        # multiple participants might kill connection for each other,
+        # reconnect then
+        if self.transport.empty:
+            logger.warning('connection lost on frame send')
+            raise ConnectionError('Connection lost on frame send')
         transport = self.transport.value
         transport.write(data)
 
@@ -648,7 +653,11 @@ class RabbitMQStreamsProtocol(asyncio.Protocol):
                 'request sent, key=0x{:02x}, correlation_id={}'
                 .format(key, correlation_id)
             )
-        return await task
+        try:
+            return await task
+        except asyncio.CancelledError:
+            if correlation_id in self._requests:
+                del self._requests[correlation_id]
 
     def create_waiter(self, key: int) -> asyncio.Future[None]:
         """
@@ -672,11 +681,11 @@ class RabbitMQStreamsProtocol(asyncio.Protocol):
         )
 
         task = self._requests.pop(correlation_id, None)
-        if not task:
+        if not task or task.done():
             # maybe wrong response from the broker, maybe task no longer
             # valid due to disconnection process in progress
             logger.warning(
-                'request task not found, correlation id={}'
+                'request task not found or done, correlation id={}'
                 .format(correlation_id)
             )
             return

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/rbfly/tests/amqp/test_message.py

@@ -18,7 +18,7 @@
 #
 
 import uuid
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 
 from rbfly.amqp._message import MessageCtx, encode_amqp, decode_amqp
 from rbfly.types import Symbol
@@ -66,7 +66,7 @@ DATA = (
 
     # timestamp
     (
-        MessageCtx(datetime(2022, 8, 14, 16, 1, 13, 567000, tzinfo=timezone.utc)),
+        MessageCtx(datetime(2022, 8, 14, 16, 1, 13, 567000, tzinfo=UTC)),
         b'\x00Sw\x83\x00\x00\x01\x82\x9d\x16\x7f_'
     ),
 

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/rbfly/tests/streams/test_codec.py

@@ -23,7 +23,6 @@ commands.
 """
 
 import struct
-import typing as tp
 
 from rbfly.amqp import MessageCtx
 from rbfly.error import RbFlyBufferError
@@ -563,7 +562,7 @@ def test_frame_incomplete() -> None:
     assert next(it, None) is None
     assert decoder.data == b''
 
-def create_frame(data: bytes, n: tp.Optional[int]=None) -> bytes:
+def create_frame(data: bytes, n: int | None=None) -> bytes:
     """
     Utility function to create RabbitMQ Streams protocol frame.
     """

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3/rbfly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbfly
-Version: 0.10.0.dev1
+Version: 0.10.0.dev3
 Summary: RbFly - a library for RabbitMQ Streams using Python asyncio
 Home-page: https://wrobell.dcmod.org/rbfly/
 Author: Artur Wroblewski
@@ -12,13 +12,12 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
 Classifier: Development Status :: 4 - Beta
-Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Provides-Extra: tests
 Requires-Dist: bandit; extra == "tests"
 Requires-Dist: cython-lint; extra == "tests"
-Requires-Dist: mypy==1.11.1; extra == "tests"
+Requires-Dist: mypy==1.11.2; extra == "tests"
 Requires-Dist: pika; extra == "tests"
 Requires-Dist: pytest-asyncio; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -30,7 +29,7 @@ Requires-Dist: uvloop>=0.19.0; extra == "tests"
 Provides-Extra: performance
 Requires-Dist: msgpack; extra == "performance"
 Requires-Dist: aiokafka==0.8.1; extra == "performance"
-Requires-Dist: rstream==0.13.0; extra == "performance"
+Requires-Dist: rstream==0.20.3; extra == "performance"
 Requires-Dist: uamqp==1.6.9; extra == "performance"
 Requires-Dist: python-qpid-proton==0.39.0; extra == "performance"
 Provides-Extra: doc

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/rbfly.egg-info/requires.txt

@@ -5,14 +5,14 @@ sphinx_rtd_theme
 [performance]
 msgpack
 aiokafka==0.8.1
-rstream==0.13.0
+rstream==0.20.3
 uamqp==1.6.9
 python-qpid-proton==0.39.0
 
 [tests]
 bandit
 cython-lint
-mypy==1.11.1
+mypy==1.11.2
 pika
 pytest-asyncio
 pytest-cov

{rbfly-0.10.0.dev1 → rbfly-0.10.0.dev3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = rbfly
-version = 0.10.0.dev1
+version = 0.10.0.dev3
 author = Artur Wroblewski
 author_email = wrobell@riseup.net
 license = GPLv3+
@@ -19,7 +19,6 @@ classifiers =
 
 [options]
 packages = find:
-python_requires = >= 3.11
 include_package_data = True
 
 [options.package_data]
@@ -34,7 +33,7 @@ include_package_data = True
 tests = 
 	bandit
 	cython-lint
-	mypy == 1.11.1
+	mypy == 1.11.2
 	pika  # required for integration tests
 	pytest-asyncio
 	pytest-cov
@@ -46,7 +45,7 @@ tests =
 performance = 
 	msgpack
 	aiokafka == 0.8.1
-	rstream == 0.13.0
+	rstream == 0.20.3
 	uamqp == 1.6.9
 	python-qpid-proton == 0.39.0
 doc =