better retry support

Author: Alexey Tsitkin

auto_tasks/base_service.py

@@ -6,9 +6,11 @@ class BaseAutoTaskService:
 
     @abstractmethod
     def register_task(self, method, queue_name=None, max_retries=None):
+        # type: (Any, str, int) -> None
         pass
 
 
 class NoopTaskService(BaseAutoTaskService):
     def register_task(self, method, queue_name=None, max_retries=None):
+        # type: (Any, str, int) -> None
         pass

auto_tasks/exceptions.py

@@ -1,8 +1,11 @@
 class RetryableTaskException(Exception):
-    def __init__(self, inner):
-        # type: (Exception) -> None
+    def __init__(self, inner, delay=None, count_retries=None):
+        # type: (Exception, int, bool) -> None
         self._inner = inner
 
+        self.delay = delay
+        self.count_retries = count_retries
+
     def __repr__(self):
         # type: () -> str
         return repr(self._inner)

auto_tasks/service.py

@@ -27,22 +27,33 @@ def _auto_task_wrapper(module_name, class_name, func_name, *args, **kwargs):
         getattr(instance, func_name)(*args, **kwargs)  # invoke method on instance
     except RetryableTaskException as exc:
         try:
-            _auto_task_wrapper.retry()
+            retry_kwargs = {}
+            if 'execute_inline' in kwargs:
+                retry_kwargs['execute_inline'] = kwargs['execute_inline']
+
+            if exc.delay is not None:
+                retry_kwargs['delay'] = exc.delay
+
+            if exc.count_retries is not None:
+                retry_kwargs['count_retries'] = exc.count_retries
+
+            _auto_task_wrapper.retry(**retry_kwargs)
         except MaxRetriesReachedException:
             logger.error('Reached max retries in auto task {}.{}.{} with error: {}'.format(module_name, class_name, func_name, repr(exc)))
 
 
 class AutoTaskService(BaseAutoTaskService):
     def register_task(self, method, queue_name=None, max_retries=None):
+        # type: (Any, str, int) -> None
         instance = method.im_self
         class_ = instance.__class__
         func_name = method.func_name
 
         def _auto_task_wrapper_invoker(*args, **kwargs):
-            if queue_name:
+            if queue_name is not None:
                 kwargs['queue_name'] = queue_name
 
-            if max_retries:
+            if max_retries is not None:
                 kwargs['max_retries'] = max_retries
 
             _auto_task_wrapper.delay(

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-eb-sqs',
-    version='1.30',
+    version='1.31',
     package_dir={'eb_sqs': 'eb_sqs'},
     include_package_data=True,
     packages=find_packages(),