p1-taskqueue 0.1.10__tar.gz → 0.1.12__tar.gz

{p1_taskqueue-0.1.10 → p1_taskqueue-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.10
+Version: 0.1.12
 Summary: A Task Queue Wrapper for Dekoruma Backend
 Author-email: Chalvin <engineering@dekoruma.com>
 Project-URL: Homepage, https://github.com/Dekoruma/p1-taskqueue
@@ -13,11 +13,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: celery>=5.4.0
-Requires-Dist: flower>=2.0.1
-Requires-Dist: redis>=6.2.0
-Requires-Dist: kombu>=5.3.4
+Requires-Dist: celery>=5.5.3
+Requires-Dist: redis>=6.4.0
+Requires-Dist: kombu>=5.5.4
 Requires-Dist: django>=4.0.0
+Requires-Dist: django-celery-results>=2.6.0
+Requires-Dist: django-celery-beat>=2.8.1
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"

{p1_taskqueue-0.1.10 → p1_taskqueue-0.1.12}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "p1-taskqueue"
 # DO NOT CHANGE THIS VERSION - it gets automatically replaced by CI/CD with the git tag version
-version = "0.1.10"
+version = "0.1.12"
 description = "A Task Queue Wrapper for Dekoruma Backend"
 authors = [
     {name = "Chalvin", email = "engineering@dekoruma.com"}
@@ -20,11 +20,12 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "celery>=5.4.0",
-    "flower>=2.0.1",
-    "redis>=6.2.0",
-    "kombu>=5.3.4",
+    "celery>=5.5.3",
+    "redis>=6.4.0",
+    "kombu>=5.5.4",
     "django>=4.0.0",
+    "django-celery-results>=2.6.0",
+    "django-celery-beat>=2.8.1",
 ]
 
 [project.optional-dependencies]

{p1_taskqueue-0.1.10 → p1_taskqueue-0.1.12}/src/p1_taskqueue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.10
+Version: 0.1.12
 Summary: A Task Queue Wrapper for Dekoruma Backend
 Author-email: Chalvin <engineering@dekoruma.com>
 Project-URL: Homepage, https://github.com/Dekoruma/p1-taskqueue
@@ -13,11 +13,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: celery>=5.4.0
-Requires-Dist: flower>=2.0.1
-Requires-Dist: redis>=6.2.0
-Requires-Dist: kombu>=5.3.4
+Requires-Dist: celery>=5.5.3
+Requires-Dist: redis>=6.4.0
+Requires-Dist: kombu>=5.5.4
 Requires-Dist: django>=4.0.0
+Requires-Dist: django-celery-results>=2.6.0
+Requires-Dist: django-celery-beat>=2.8.1
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"

{p1_taskqueue-0.1.10 → p1_taskqueue-0.1.12}/src/p1_taskqueue.egg-info/requires.txt

@@ -1,8 +1,9 @@
-celery>=5.4.0
-flower>=2.0.1
-redis>=6.2.0
-kombu>=5.3.4
+celery>=5.5.3
+redis>=6.4.0
+kombu>=5.5.4
 django>=4.0.0
+django-celery-results>=2.6.0
+django-celery-beat>=2.8.1
 
 [dev]
 pytest>=7.0.0

{p1_taskqueue-0.1.10 → p1_taskqueue-0.1.12}/src/taskqueue/celery_app.py

@@ -33,6 +33,8 @@ def create_celery_app():
         'timezone': getattr(settings, 'CELERY_TIMEZONE', 'UTC+7'),
         'task_time_limit': getattr(settings, 'CELERY_TASK_TIME_LIMIT', 30 * 60),
         'task_soft_time_limit': getattr(settings, 'CELERY_TASK_SOFT_TIME_LIMIT', 25 * 60),
+        # 14 days
+        'result_expires': getattr(settings, 'CELERY_RESULT_EXPIRES', 14 * 24 * 60 * 60),
         'task_track_started': True,
         'task_always_eager': False,
         'task_eager_propagates': True,

{p1_taskqueue-0.1.10 → p1_taskqueue-0.1.12}/src/taskqueue/cmanager.py

@@ -8,7 +8,6 @@ from typing import Dict
 from typing import Tuple
 
 from celery import shared_task
-from celery.exceptions import Reject
 
 # Setup logger
 logger = logging.getLogger(__name__)
@@ -31,12 +30,12 @@ def _is_class_method(func: Any) -> bool:
 def taskqueue_class(cls):
     """Decorator to automatically capture init arguments for taskqueue."""
     original_init = cls.__init__
-    
+
     def wrapped_init(self, *args, **kwargs):
         self._taskqueue_init_args = list(args)
         self._taskqueue_init_kwargs = dict(kwargs)
         original_init(self, *args, **kwargs)
-    
+
     cls.__init__ = wrapped_init
     return cls
 
@@ -82,9 +81,9 @@ def _build_dynamic_task_call(func: Any, *args: Any, **func_kwargs: Any) -> Tuple
         module_path = klass.__module__
         class_name = klass.__name__
         method_name = func.__name__
-        
+
         init_args, init_kwargs = _extract_init_args_from_instance(instance)
-        
+
         task_name = "taskqueue.cmanager.dynamic_class_method_executor"
         task_args = []
         task_kwargs: Dict[str, Any] = {
@@ -238,7 +237,6 @@ class CManager:
 cm = CManager()
 
 
-# Dynamic task executors - handle function and class method execution
 @shared_task(bind=True, max_retries=K_MAX_RETRY_COUNT)
 def dynamic_function_executor(self, module_path=None, function_name=None, args=None, kwargs=None, retry=None):
     job_id = self.request.id
@@ -262,7 +260,9 @@ def dynamic_function_executor(self, module_path=None, function_name=None, args=N
             max_retries = retry['max_retries']
 
         if current_retries >= max_retries:
-            raise Reject(str(e), requeue=False)
+            logger.error(
+                f"[TaskQueue] Max retries ({max_retries}) reached for function: {function_name}, marking task as FAILED, job_id: {job_id}")
+            raise
 
         countdown = K_DEFAULT_RETRY_COUNTDOWN
         if isinstance(retry, dict) and 'countdown' in retry:
@@ -298,7 +298,9 @@ def dynamic_class_method_executor(self, module_path=None, class_name=None, metho
             max_retries = retry['max_retries']
 
         if current_retries >= max_retries:
-            raise Reject(str(e), requeue=False)
+            logger.error(
+                f"[TaskQueue] Max retries ({max_retries}) reached for method: {method_name}, marking task as FAILED, job_id: {job_id}")
+            raise
 
         countdown = K_DEFAULT_RETRY_COUNTDOWN
         if isinstance(retry, dict) and 'countdown' in retry: