p1-taskqueue 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

{p1_taskqueue-0.1.4.dist-info → p1_taskqueue-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.4
+Version: 0.1.6
 Summary: A Task Queue Wrapper for Dekoruma Backend
 Author-email: Chalvin <engineering@dekoruma.com>
 Project-URL: Homepage, https://github.com/Dekoruma/p1-taskqueue

{p1_taskqueue-0.1.4.dist-info → p1_taskqueue-0.1.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
 taskqueue/__init__.py,sha256=gVDUAurwUijthE9_36FmhAQTBf7veGgjnew-amrTrmg,241
 taskqueue/celery_app.py,sha256=dUT-7XzsSQbr8vKrLv7f_6iYxTCUEJZHEt9fL-KIQ5U,3302
-taskqueue/cmanager.py,sha256=Xh89VbBYclb-RcmaisqEJfezkT-isyWkQ3KHdSpf_aM,9821
+taskqueue/cmanager.py,sha256=pBxHi3FT2zuiM3iaMII6KPLYR7DOJmShQH4bzi1xkAU,11076
 taskqueue/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/libs/helper_test.py,sha256=_yfPhm_7CzbN30j7E_Ld5KwXRlGHhTNrRTOBZQySEIU,3656
-p1_taskqueue-0.1.4.dist-info/METADATA,sha256=uapQZwJie_JNIfgfJM2zLTXpDIsOVZHAB7ffZj9rvjY,1508
-p1_taskqueue-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-p1_taskqueue-0.1.4.dist-info/top_level.txt,sha256=hA3SM1ik2K8iPqtlt_-_nJ4TAePwHPN3vsOc4EiynqU,10
-p1_taskqueue-0.1.4.dist-info/RECORD,,
+p1_taskqueue-0.1.6.dist-info/METADATA,sha256=B29pPPy3lL9ubU1TBuXbW_HUFPewzBDAPfB5zSTmKss,1508
+p1_taskqueue-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+p1_taskqueue-0.1.6.dist-info/top_level.txt,sha256=hA3SM1ik2K8iPqtlt_-_nJ4TAePwHPN3vsOc4EiynqU,10
+p1_taskqueue-0.1.6.dist-info/RECORD,,

taskqueue/cmanager.py

@@ -160,17 +160,18 @@ class CManager:
             task_name, task_args, task_kwargs = _build_dynamic_task_call(
                 func, *func_args, **func_kwargs)
 
-            self._send_task(task_name, task_args, task_kwargs, queue_kwargs)
+            task_id = self._send_task(task_name, task_args,
+                                      task_kwargs, queue_kwargs)
 
-            logger.info('[_enqueue_op_base %s] Submit Celery Task SUCCESS, task_name: %s args: %s, kwargs: %s' % (
-                enqueue_op_type, task_name, task_args, task_kwargs))
+            logger.info('[_enqueue_op_base %s] Submit Celery Task SUCCESS, task_name: %s args: %s, kwargs: %s, task_id: %s' % (
+                enqueue_op_type, task_name, task_args, task_kwargs, task_id))
 
         except Exception as e:
             logger.exception('[_enqueue_op_base %s] Submit Celery Task FAILED, error: %s, args: %s, kwargs: %s' % (
                 enqueue_op_type, str(e), args, kwargs))
             raise e
 
-    def _send_task(self, task_name: str, task_args: list, task_kwargs: dict, queue_kwargs: Dict[str, Any]) -> None:
+    def _send_task(self, task_name: str, task_args: list, task_kwargs: dict, queue_kwargs: Dict[str, Any]) -> str:
         celery_app = self._get_celery_app()
 
         queue_name = queue_kwargs.pop("channel", None)
@@ -194,8 +195,9 @@ class CManager:
         else:
             task_kwargs_with_retry["retry"] = retry_policy
 
-        celery_app.send_task(task_name, args=task_args,
-                             kwargs=task_kwargs_with_retry, **send_opts)
+        task = celery_app.send_task(task_name, args=task_args,
+                                    kwargs=task_kwargs_with_retry, **send_opts)
+        return str(task.id)
 
 
 cm = CManager()
@@ -204,14 +206,21 @@ 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, function_name, args=None, kwargs=None, retry=None):
+    job_id = self.request.id
     try:
         module = importlib.import_module(module_path)
         function = getattr(module, function_name)
         args = args or []
         kwargs = kwargs or {}
+        logger.info(
+            f"[TaskQueue] Executing dynamic function: {function_name} with args: {args} and kwargs: {kwargs}, job_id: {job_id}")
         function(*args, **kwargs)
+        logger.info(
+            f"[TaskQueue] Dynamic function execution completed successfully, function_name: {function_name}, args: {args}, kwargs: {kwargs}, job_id: {job_id}")
         return None
     except Exception as e:
+        logger.exception(
+            f"[TaskQueue] Error executing dynamic function: {function_name} with args: {args} and kwargs: {kwargs}, error_class: {e.__class__.__name__}, error: {e}, job_id: {job_id}")
         current_retries = getattr(self.request, 'retries', 0) or 0
         max_retries = self.max_retries or K_MAX_RETRY_COUNT
         if isinstance(retry, dict) and 'max_retries' in retry:
@@ -229,6 +238,7 @@ def dynamic_function_executor(self, module_path, function_name, args=None, kwarg
 
 @shared_task(bind=True, max_retries=K_MAX_RETRY_COUNT)
 def dynamic_class_method_executor(self, module_path, class_name, method_name, args=None, kwargs=None, retry=None):
+    job_id = self.request.id
     try:
         module = importlib.import_module(module_path)
         class_obj = getattr(module, class_name)
@@ -236,9 +246,15 @@ def dynamic_class_method_executor(self, module_path, class_name, method_name, ar
         method = getattr(instance, method_name)
         args = args or []
         kwargs = kwargs or {}
+        logger.info(
+            f"[TaskQueue] Executing dynamic class method: {method_name} with args: {args} and kwargs: {kwargs}, job_id: {job_id}")
         method(*args, **kwargs)
+        logger.info(
+            f"[TaskQueue] Dynamic class method execution completed successfully, method_name: {method_name}, args: {args}, kwargs: {kwargs}, job_id: {job_id}")
         return None
     except Exception as e:
+        logger.exception(
+            f"[TaskQueue] Error executing dynamic class method: {method_name} with args: {args} and kwargs: {kwargs}, error_class: {e.__class__.__name__}, error: {e}, job_id: {job_id}")
         current_retries = getattr(self.request, 'retries', 0) or 0
         max_retries = self.max_retries or K_MAX_RETRY_COUNT
         if isinstance(retry, dict) and 'max_retries' in retry: