streamlit-octostar-utils 0.5.0.dev11__tar.gz → 0.5.0.dev13__tar.gz

{streamlit_octostar_utils-0.5.0.dev11 → streamlit_octostar_utils-0.5.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlit-octostar-utils
-Version: 0.5.0.dev11
+Version: 0.5.0.dev13
 Summary: 
 License: MIT
 License-File: LICENSE

{streamlit_octostar_utils-0.5.0.dev11 → streamlit_octostar_utils-0.5.0.dev13}/pyproject.toml

@@ -5,7 +5,7 @@ include = '\.pyi?$'
 
 [tool.poetry]
 name = "streamlit-octostar-utils"
-version = "0.5.0-dev.11"
+version = "0.5.0-dev.13"
 description = ""
 license = "MIT"
 authors = ["Octostar"]

{streamlit_octostar_utils-0.5.0.dev11 → streamlit_octostar_utils-0.5.0.dev13}/streamlit_octostar_utils/api_crafter/celery.py

@@ -295,8 +295,12 @@ class CeleryExecutor(object):
         time_limit = request_timelimit[0] or getattr(task, "time_limit", None) or 0
         extended_ttl = int(time_limit) + int(self.app.conf.result_expires)
         if extended_ttl > int(self.app.conf.result_expires):
-            self.redis_client.expire(
-                f"{CeleryExecutor.CELERY_BROKER_PREFIX}{task_id}", extended_ttl
+            self.redis_client.eval(
+                "for _, k in ipairs(KEYS) do redis.call('expire', k, ARGV[1]) end",
+                2,
+                f"{CeleryExecutor.CELERY_BROKER_PREFIX}{task_id}",
+                f"task:queue:{task_id}",
+                extended_ttl,
             )
 
     def register_worker_initialization(self):
@@ -310,6 +314,8 @@ class CeleryExecutor(object):
             ) if task else None
             if queue:
                 self.redis_client.set(f"queue:last_completed:{queue}", str(time.time()))
+            if task_id:
+                self.redis_client.delete(f"task:queue:{task_id}")
         except Exception:
             pass
 
@@ -826,6 +832,7 @@ class CeleryExecutor(object):
 
         def _remove_task_data(celery_app, in_folder, out_folder, task_id):
             celery_app.AsyncResult(task_id).forget()
+            self.redis_client.delete(f"task:queue:{task_id}")
             if os.path.isfile(os.path.join(in_folder, task_id)):
                 with RedisFileLock(self.redis_client, os.path.join(self.in_folder, task_id)):
                     os.remove(os.path.join(in_folder, task_id))
@@ -885,6 +892,7 @@ class CeleryExecutor(object):
 
         def _remove_task_data(celery_app, in_folder, out_folder, task_id):
             celery_app.AsyncResult(task_id).forget()
+            self.redis_client.delete(f"task:queue:{task_id}")
             if os.path.isfile(os.path.join(in_folder, task_id)):
                 with RedisFileLock(self.redis_client, os.path.join(self.in_folder, task_id)):
                     os.remove(os.path.join(in_folder, task_id))