remoulade 3.2.4.dev0__tar.gz → 3.2.5.dev0__tar.gz

{remoulade-3.2.4.dev0/remoulade.egg-info → remoulade-3.2.5.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: remoulade
-Version: 3.2.4.dev0
+Version: 3.2.5.dev0
 Summary: Background Processing for Python 3.
 Author: Wiremind
 Author-email: dev@wiremind.io
@@ -36,25 +36,25 @@ Provides-Extra: pydantic
 Requires-Dist: pydantic>=2.0; extra == "pydantic"
 Requires-Dist: simplejson; extra == "pydantic"
 Provides-Extra: all
+Requires-Dist: flask-apispec; extra == "all"
 Requires-Dist: amqpstorm<3,>=2.6; extra == "all"
-Requires-Dist: marshmallow>=3; extra == "all"
 Requires-Dist: pydantic>=2.0; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "all"
-Requires-Dist: flask>=1.1,~=2.3.3; extra == "all"
 Requires-Dist: psycopg2==2.9.5; extra == "all"
 Requires-Dist: redis~=5.0; extra == "all"
-Requires-Dist: flask-apispec; extra == "all"
+Requires-Dist: flask>=1.1,~=2.3.3; extra == "all"
+Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "all"
+Requires-Dist: marshmallow>=3; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Provides-Extra: dev
+Requires-Dist: flask-apispec; extra == "dev"
 Requires-Dist: amqpstorm<3,>=2.6; extra == "dev"
-Requires-Dist: marshmallow>=3; extra == "dev"
 Requires-Dist: pydantic>=2.0; extra == "dev"
-Requires-Dist: simplejson; extra == "dev"
-Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "dev"
-Requires-Dist: flask>=1.1,~=2.3.3; extra == "dev"
 Requires-Dist: psycopg2==2.9.5; extra == "dev"
 Requires-Dist: redis~=5.0; extra == "dev"
-Requires-Dist: flask-apispec; extra == "dev"
+Requires-Dist: flask>=1.1,~=2.3.3; extra == "dev"
+Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "dev"
+Requires-Dist: marshmallow>=3; extra == "dev"
+Requires-Dist: simplejson; extra == "dev"
 Requires-Dist: alabaster; extra == "dev"
 Requires-Dist: sphinx==4.1.1; extra == "dev"
 Requires-Dist: sphinxcontrib-napoleon; extra == "dev"

{remoulade-3.2.4.dev0 → remoulade-3.2.5.dev0}/remoulade/__init__.py

@@ -90,4 +90,4 @@ __all__ = [
     "set_scheduler",
 ]
 
-__version__ = "3.2.4-dev"
+__version__ = "3.2.5-dev"

{remoulade-3.2.4.dev0 → remoulade-3.2.5.dev0}/remoulade/results/backends/redis.py

@@ -114,7 +114,8 @@ class RedisBackend(ResultBackend):
         timeout = int(timeout / 1000)
         deadline = time.monotonic() + timeout
         retry_count, data = 0, None
-
+        end_time = self.get_end_time(timeout)
+        attempts = 0
         while data is None:
             try:
                 if timeout > 0:
@@ -127,8 +128,9 @@ class RedisBackend(ResultBackend):
                     else:
                         data = await self.async_client.brpoplpush(message_key, message_key, timeout=timeout)
                 if data is None:
-                    raise ResultMissing(message_id)
-            except (redis.ConnectionError, redis.TimeoutError):
+                    forget_delay = self.check_timeout(attempts, end_time, message_id)
+                    await asyncio.sleep(forget_delay)
+            except (redis.ConnectionError, redis.TimeoutError, ResultTimeout):
                 if data is not None:
                     break
                 if retry_count >= self.max_retries:

{remoulade-3.2.4.dev0 → remoulade-3.2.5.dev0/remoulade.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: remoulade
-Version: 3.2.4.dev0
+Version: 3.2.5.dev0
 Summary: Background Processing for Python 3.
 Author: Wiremind
 Author-email: dev@wiremind.io
@@ -36,25 +36,25 @@ Provides-Extra: pydantic
 Requires-Dist: pydantic>=2.0; extra == "pydantic"
 Requires-Dist: simplejson; extra == "pydantic"
 Provides-Extra: all
+Requires-Dist: flask-apispec; extra == "all"
 Requires-Dist: amqpstorm<3,>=2.6; extra == "all"
-Requires-Dist: marshmallow>=3; extra == "all"
 Requires-Dist: pydantic>=2.0; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "all"
-Requires-Dist: flask>=1.1,~=2.3.3; extra == "all"
 Requires-Dist: psycopg2==2.9.5; extra == "all"
 Requires-Dist: redis~=5.0; extra == "all"
-Requires-Dist: flask-apispec; extra == "all"
+Requires-Dist: flask>=1.1,~=2.3.3; extra == "all"
+Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "all"
+Requires-Dist: marshmallow>=3; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Provides-Extra: dev
+Requires-Dist: flask-apispec; extra == "dev"
 Requires-Dist: amqpstorm<3,>=2.6; extra == "dev"
-Requires-Dist: marshmallow>=3; extra == "dev"
 Requires-Dist: pydantic>=2.0; extra == "dev"
-Requires-Dist: simplejson; extra == "dev"
-Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "dev"
-Requires-Dist: flask>=1.1,~=2.3.3; extra == "dev"
 Requires-Dist: psycopg2==2.9.5; extra == "dev"
 Requires-Dist: redis~=5.0; extra == "dev"
-Requires-Dist: flask-apispec; extra == "dev"
+Requires-Dist: flask>=1.1,~=2.3.3; extra == "dev"
+Requires-Dist: sqlalchemy<2,>=1.4.29; extra == "dev"
+Requires-Dist: marshmallow>=3; extra == "dev"
+Requires-Dist: simplejson; extra == "dev"
 Requires-Dist: alabaster; extra == "dev"
 Requires-Dist: sphinx==4.1.1; extra == "dev"
 Requires-Dist: sphinxcontrib-napoleon; extra == "dev"

{remoulade-3.2.4.dev0 → remoulade-3.2.5.dev0}/tests/test_results.py

@@ -568,6 +568,27 @@ async def test_redis_async_get_results_with_forget(
         assert result == 42
 
 
+@pytest.mark.parametrize("forget", [True])
+async def test_redis_async_get_results_with_forget_timeout(
+    rabbitmq_broker: RabbitmqBroker,
+    rabbitmq_worker: Worker,
+    redis_result_backend,
+    forget: bool,
+):
+    rabbitmq_broker.add_middleware(Results(backend=redis_result_backend))
+
+    @remoulade.actor(store_results=True)
+    def do_work():
+        time.sleep(0.2)
+        return 42
+
+    rabbitmq_broker.declare_actor(do_work)
+    message = do_work.send()
+    rabbitmq_broker.join(do_work.queue_name)
+    with pytest.raises(ResultTimeout):
+        await message.result.async_get(forget=forget, timeout=1)
+
+
 def test_completed_count_no_messages(stub_broker, result_middleware):
     result = CollectionResults([])
     assert result.completed_count == 0

{remoulade-3.2.4.dev0 → remoulade-3.2.5.dev0}/remoulade.egg-info/requires.txt

@@ -5,26 +5,26 @@ typing-extensions>=3.8
 attrs>=19.2.0
 
 [all]
+flask-apispec
 amqpstorm<3,>=2.6
-marshmallow>=3
 pydantic>=2.0
-simplejson
-sqlalchemy<2,>=1.4.29
-flask>=1.1,~=2.3.3
 psycopg2==2.9.5
 redis~=5.0
-flask-apispec
+flask>=1.1,~=2.3.3
+sqlalchemy<2,>=1.4.29
+marshmallow>=3
+simplejson
 
 [dev]
+flask-apispec
 amqpstorm<3,>=2.6
-marshmallow>=3
 pydantic>=2.0
-simplejson
-sqlalchemy<2,>=1.4.29
-flask>=1.1,~=2.3.3
 psycopg2==2.9.5
 redis~=5.0
-flask-apispec
+flask>=1.1,~=2.3.3
+sqlalchemy<2,>=1.4.29
+marshmallow>=3
+simplejson
 alabaster
 sphinx==4.1.1
 sphinxcontrib-napoleon