p1-taskqueue 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

{p1_taskqueue-0.1.5.dist-info → p1_taskqueue-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.5
+Version: 0.1.7
 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.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+taskqueue/__init__.py,sha256=nNHXIyysNLom9f8of-d__pWJ-YF53Mbrbsb1frPzPPI,298
+taskqueue/celery_app.py,sha256=dUT-7XzsSQbr8vKrLv7f_6iYxTCUEJZHEt9fL-KIQ5U,3302
+taskqueue/cmanager.py,sha256=raQwdccYTpWRiW8UGU5OcUEN0jZr9TTlIEnhZGtamiI,12274
+taskqueue/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+taskqueue/libs/helper_test.py,sha256=_yfPhm_7CzbN30j7E_Ld5KwXRlGHhTNrRTOBZQySEIU,3656
+p1_taskqueue-0.1.7.dist-info/METADATA,sha256=y3FYv9zHOECh2FzdJRBKofYPGvlr1a1A0wUk4B98TyU,1508
+p1_taskqueue-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+p1_taskqueue-0.1.7.dist-info/top_level.txt,sha256=hA3SM1ik2K8iPqtlt_-_nJ4TAePwHPN3vsOc4EiynqU,10
+p1_taskqueue-0.1.7.dist-info/RECORD,,

taskqueue/__init__.py

@@ -7,6 +7,7 @@ __author__ = "Chalvin"
 __email__ = "engineering@dekoruma.com"
 
 from .cmanager import cm
+from .cmanager import taskqueue_class
 from .celery_app import celery_app
 
-__all__ = ["cm", "celery_app"]
+__all__ = ["cm", "celery_app", "taskqueue_class"]

taskqueue/cmanager.py

@@ -28,6 +28,26 @@ 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
+
+
+def _extract_init_args_from_instance(instance: Any) -> Tuple[list, dict]:
+    """Extract init arguments from instance."""
+    init_args = getattr(instance, '_taskqueue_init_args', [])
+    init_kwargs = getattr(instance, '_taskqueue_init_kwargs', {})
+    return init_args, init_kwargs
+
+
 def _split_function_and_queue_kwargs(kwargs: Dict[str, Any]) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     # To prevent confusion whether a kwargs is for function or queue kwargs(i.e celery options and on_commit),
     # ignore confusing kwargs while give warning
@@ -62,10 +82,20 @@ 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 = [module_path, class_name,
-                     method_name, list(args), dict(func_kwargs)]
-        task_kwargs: Dict[str, Any] = {}
+        task_args = []
+        task_kwargs: Dict[str, Any] = {
+            "module_path": module_path,
+            "class_name": class_name,
+            "method_name": method_name,
+            "args": list(args),
+            "kwargs": dict(func_kwargs),
+            "init_args": init_args,
+            "init_kwargs": init_kwargs,
+        }
         return task_name, task_args, task_kwargs
 
     module_path = getattr(func, "__module__", None)
@@ -75,8 +105,13 @@ def _build_dynamic_task_call(func: Any, *args: Any, **func_kwargs: Any) -> Tuple
             "Unsupported callable type for Celery enqueue. Provide a module-level function or a class method.")
 
     task_name = "taskqueue.cmanager.dynamic_function_executor"
-    task_args = [module_path, function_name, list(args), dict(func_kwargs)]
-    task_kwargs = {}
+    task_args = []
+    task_kwargs = {
+        "module_path": module_path,
+        "function_name": function_name,
+        "args": list(args),
+        "kwargs": dict(func_kwargs),
+    }
     return task_name, task_args, task_kwargs
 
 
@@ -160,17 +195,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 +230,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()
@@ -203,7 +240,7 @@ 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):
+def dynamic_function_executor(self, module_path=None, function_name=None, args=None, kwargs=None, retry=None):
     job_id = self.request.id
     try:
         module = importlib.import_module(module_path)
@@ -235,12 +272,14 @@ 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):
+def dynamic_class_method_executor(self, module_path=None, class_name=None, method_name=None, args=None, kwargs=None, init_args=None, init_kwargs=None, retry=None):
     job_id = self.request.id
     try:
         module = importlib.import_module(module_path)
         class_obj = getattr(module, class_name)
-        instance = class_obj()
+        init_args = init_args or []
+        init_kwargs = init_kwargs or {}
+        instance = class_obj(*init_args, **init_kwargs)
         method = getattr(instance, method_name)
         args = args or []
         kwargs = kwargs or {}

p1_taskqueue-0.1.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-taskqueue/__init__.py,sha256=gVDUAurwUijthE9_36FmhAQTBf7veGgjnew-amrTrmg,241
-taskqueue/celery_app.py,sha256=dUT-7XzsSQbr8vKrLv7f_6iYxTCUEJZHEt9fL-KIQ5U,3302
-taskqueue/cmanager.py,sha256=jFrunboXWpRP4yFASr62HfezUxJQ2b_V4046q-87L2k,10965
-taskqueue/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/libs/helper_test.py,sha256=_yfPhm_7CzbN30j7E_Ld5KwXRlGHhTNrRTOBZQySEIU,3656
-p1_taskqueue-0.1.5.dist-info/METADATA,sha256=yLSKcc1vB-J51skVqKQGbJ6FPDgrJGDo3bpZ4a9xnX4,1508
-p1_taskqueue-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-p1_taskqueue-0.1.5.dist-info/top_level.txt,sha256=hA3SM1ik2K8iPqtlt_-_nJ4TAePwHPN3vsOc4EiynqU,10
-p1_taskqueue-0.1.5.dist-info/RECORD,,