django-restit 4.2.43__tar.gz → 4.2.44__tar.gz

{django_restit-4.2.43 → django_restit-4.2.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.43
+Version: 4.2.44
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.43 → django_restit-4.2.44}/account/rpc/group.py

@@ -83,7 +83,7 @@ def rest_on_membership(request, pk=None):
 @rd.login_required
 def rest_on_users_membership(request, group_id=None):
     ms = request.member.getMembershipFor(group_id, include_parents=True)
-    if ms is None:
+    if ms is None or not ms.is_enabled:
         return rv.restStatus(request, False, error="not found", error_code=404)
     return ms.restGet(request)
 

{django_restit-4.2.43 → django_restit-4.2.44}/location/providers/iplookup/restit.py

@@ -26,7 +26,7 @@ def getLocation(ip):
     if GEOIP_RESTIT_HOST is None:
         return None
     params = {"ip": ip}
-    url = f"https://{GEOIP_RESTIT_HOST}/rpc/location/ip/lookup"
+    url = f"https://{GEOIP_RESTIT_HOST}/api/location/ip/lookup"
     res = requests.get(url, params=params)
     if res.status_code != 200:
         return None

{django_restit-4.2.43 → django_restit-4.2.44}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.43"
+version = "4.2.44"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.43 → django_restit-4.2.44}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.43"
+__version__ = "4.2.44"

{django_restit-4.2.43 → django_restit-4.2.44}/taskqueue/models.py

@@ -31,6 +31,10 @@ TASK_STATES = [
     (TASK_STATE_CANCELED, 'canceled')
 ]
 
+TQ_RETRY_BACKOFF_FACTOR = settings.get("TQ_RETRY_BACKOFF_FACTOR", 2)
+TQ_RETRY_ATTEMPTS = settings.get("TQ_RETRY_ATTEMPTS", 5)
+TQ_RETRY_DELAY = settings.get("TQ_RETRY_DELAY", 60)
+
 def getAppHandler(app_name, fname):
     try:
         # module = __import__(app_name + '.tq', globals(), locals(), ['*'], 0)
@@ -143,6 +147,12 @@ class Task(models.Model, RestModel):
             return self.runtime
         return (datetime.now() - self.started_at).total_seconds()
 
+    @property
+    def max_attempts(self):
+        if self.data:
+            return self.data.get("retry_max_attempts", TQ_RETRY_ATTEMPTS)
+        return TQ_RETRY_ATTEMPTS
+
     def set_action(self, value):
         if value == "retry_now":
             self.retry_now()
@@ -187,7 +197,17 @@ class Task(models.Model, RestModel):
     def retry_later(self, reason=None, from_now_secs=None):
         if reason:
             self.reason = reason
-        if from_now_secs:
+        if from_now_secs == -1:
+            # allow backoff retry
+            if self.data:
+                bof = self.data.get("retry_bof", TQ_RETRY_BACKOFF_FACTOR)
+                delay = self.data.get("retry_delay", TQ_RETRY_DELAY)
+            else:
+                bof = TQ_RETRY_BACKOFF_FACTOR
+                delay = TQ_RETRY_DELAY
+            attempts = self.attempts - 1
+            from_now_secs = delay * (bof ** attempts)
+        if from_now_secs is not None:
             # this will not run the task again until after this time has been hit
             self.scheduled_for = datetime.now() + timedelta(seconds=from_now_secs)
         self.state = TASK_STATE_RETRY

{django_restit-4.2.43 → django_restit-4.2.44}/taskqueue/worker.py

@@ -178,7 +178,7 @@ class WorkManager(object):
             pass
 
     def processBacklog(self):
-        tasks = Task.objects.filter(state__in=[0,1,2])
+        tasks = Task.objects.filter(state__in=[0, 1, 2])
         for task in tasks:
             if task.channel in self.subscribe_to:
                 if task.cancel_requested:
@@ -196,8 +196,9 @@ class WorkManager(object):
     def _on_webrequest(self, task):
         if http.REQUEST(task):
             task.completed()
-        elif task.attempts < 5:
-            task.retry_later(from_now_secs=task.attempts * task.attempts * 60)
+        elif task.attempts < task.max_attempts:
+            # -1 will auto calculate retry with back off
+            task.retry_later(from_now_secs=-1)
         else:
             task.failed("max attempts")
 
@@ -212,8 +213,8 @@ class WorkManager(object):
             resp = s3.UPLOAD(task)
         if resp:
             task.completed()
-        elif task.state == 1:
-            task.retry_later(from_now_secs=task.attempts * 60)
+        elif task.attempts < task.max_attempts:
+            task.retry_later(from_now_secs=-1)
         else:
             task.failed()