django-restit 4.2.42__py3-none-any.whl → 4.2.44__py3-none-any.whl

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.42.dist-info → django_restit-4.2.44.dist-info}/METADATA

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

{django_restit-4.2.42.dist-info → django_restit-4.2.44.dist-info}/RECORD

@@ -38,7 +38,7 @@ account/periodic.py,sha256=-u0n-7QTJgDOkasGhBAPwHAwjpqWGA-MZLEFkVTqCGU,874
 account/rpc/__init__.py,sha256=SGF0M_-H0dKh3b1apSX29BotNWAvITYccGQVC0MIjL8,336
 account/rpc/auth.py,sha256=eywdJSjsi_Ds2pM4wnltPJUfjIQqf6r6e99eKS7q3BA,15593
 account/rpc/device.py,sha256=fbbZFp3cUdhVXvD7gVFOqFWj4hKS3bjZKD_aF5fQxd8,2852
-account/rpc/group.py,sha256=JFOTgAbxtpmNmJIMb9Gqesd4y_31Sv9G6atkRoNylqs,3802
+account/rpc/group.py,sha256=eW5p0TbJC7b77Xf7CTqLm-Qq_r1FPbGmSuVWrQR37uA,3823
 account/rpc/member.py,sha256=PU-Uz5KUI_BZFy-F-taDqAfnt_AwONYXSzUvfm7eyTw,1264
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
 account/rpc/oauth.py,sha256=ISLVsR5HvKALANokaOFRvF4FTRxWtXPvVnZAYANKxpo,2864
@@ -134,7 +134,7 @@ location/providers/iplookup/extremeip.py,sha256=QNRGhwXXsOuJL2M-xiI2pFN_6LP2HkqS
 location/providers/iplookup/geoplugin.py,sha256=RK_6McxHYlVVMVdJ2rCafw-kqMfzMm3g_tJjBwcKXYg,2121
 location/providers/iplookup/ipapi.py,sha256=cyVs_n4GYvmLsPn8jDOcfevPzWkwBs22PSzoYRzVhDo,1797
 location/providers/iplookup/ipinfo.py,sha256=G3mrBQOAOzWkQBXf8uF98-xVPSA4HGAkYl4PlwmeKVU,1265
-location/providers/iplookup/restit.py,sha256=XgD3agvsfO_gL7As-UCava1gg3cShhvPKzUBSrGyQHw,937
+location/providers/iplookup/restit.py,sha256=UJlQ_-X85YhyO4Yqt7ys8-MFY_zQcAKHecaIOxL844U,937
 location/providers/location/__init__.py,sha256=ki4sfPrgHMMr50GCKGZb2NDK0Unl8xkgcWJT7fsWgwA,42
 location/providers/location/google.py,sha256=RXZoYXUcTerE3-7z2BciEuDJJB-f-0_F6jWLnEK5v8w,2860
 location/providers/timezones/__init__.py,sha256=enslc1cVTju3GKrvpLoAxSHUKkLeREhed-eHkvHWdoM,46
@@ -359,7 +359,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=2-UnT-DpX_VCvJoBb0q2uUn-JATRDQg-pEwLwkz3eM4,121
+rest/__init__.py,sha256=D1F9OsFxtJr7AuWmena-TkvTjJPlbM2SRa6S8jjJtkk,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -440,17 +440,17 @@ taskqueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/models.py,sha256=xt3WQD0QcMK4W6C4YMMD9Ok7H2fz2GWEaonpsPq6Akg,19306
+taskqueue/models.py,sha256=tCFAKSr8JybUJV4gijg3wUCwQMJiHUsRBgHH2CWonfY,22119
 taskqueue/periodic.py,sha256=2i0271khrCow3hDmlNEcoAZnesBVl40jd7MIim2Cxs4,3543
 taskqueue/rpc.py,sha256=If5E9D9AR2RqW4lHRaDuD9L9b9ZfL_PaBQ6iX91ehvU,5736
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
 taskqueue/transports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/transports/email.py,sha256=H4GaomiyCck5R_AOcsrMawCl-_Bp_Zg-uWto9t1Xcoo,623
-taskqueue/transports/http.py,sha256=MIwB7e3duAv-xrBdncDkxqa4OKsKVwjdBscnrDUv4So,664
+taskqueue/transports/http.py,sha256=kRBjHiwTmk5b4TMdZWt1EKKcjfSlX8DFmtmJaRGZQFw,681
 taskqueue/transports/s3.py,sha256=fMosL893u1iQdo6Y1djwb7KEoNo6TTsDPJl13OJdJP8,1913
 taskqueue/transports/sftp.py,sha256=jT1_krjTHA7DCAukD85aGYRCg9m0cEH9EWzOC-wJGdk,1891
 taskqueue/transports/sms.py,sha256=H1-LIGEMfbUNqJD9amRcsvKUSwtz9yBj1QNfB7EHjHE,142
-taskqueue/worker.py,sha256=Gry6ysDh34m4uB8mQsmyEyxl56p1hwlSUD5T1H2jl_w,15692
+taskqueue/worker.py,sha256=u7H-FLkz7vpBoDaab9hpw4RduvG1ZTdtlw3PSHRBmUw,15737
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -492,7 +492,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.42.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.42.dist-info/METADATA,sha256=33_hH1hxg3ZRJMY3EW2ePRnCcIuf4irKfwJu1SQHX1A,7594
-django_restit-4.2.42.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.42.dist-info/RECORD,,
+django_restit-4.2.44.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.44.dist-info/METADATA,sha256=ZgC_TvH6w7_xLrj9Anw73cJI9jNaC_dJ8AfuybTH6mw,7594
+django_restit-4.2.44.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.44.dist-info/RECORD,,

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

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.42"
+__version__ = "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()
@@ -158,6 +168,20 @@ class Task(models.Model, RestModel):
 
     def log(self, text, kind="info"):
         TaskLog.Log(self, text, kind=kind)
+        if self.data and ((self.data.log_component and self.data.log_pk) or self.data.log_tid):
+            PLOG = self.getModel("auditlog", "PersistentLog")
+            level = 0
+            if kind == "exception":
+                level = 21
+            elif kind == "error":
+                level = 17
+            PLOG.log(message=text, action=f"taskqueue_{kind}", 
+                     level=level,
+                     method=self.fname, path=self.model,
+                     tid=self.data.log_tid,
+                     component=self.data.log_component,
+                     pkey=self.data.log_pk,
+                     group=self.data.group_id)
 
     def log_exception(self, text, kind="exception"):
         self.log(str(text), kind=kind)
@@ -173,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
@@ -200,24 +234,30 @@ class Task(models.Model, RestModel):
         self.notifyError()
         self.save()
 
-    def notifyError(self, kind="Failure"):
-        subject = "TaskQueue - {}".format(kind)
-        handler = "unknown bg_handler"
-        if self.data:
-            handler = self.data.get("bg_handler")
-        msg = "{}:{}<br>\n{}".format(self.model, handler, self.reason)
-        # sms_msg = "{}\n{}".format(subject, msg)
-        # Member.notifyWithPermission("taskqueue_alerts", subject, msg, sms_msg=sms_msg)
+    def notifyError(self):
+        handler = f"{self.model}{self.fname}"
+        subject = f"TaskQueue - {handler}"
+
+        msg = f"{handler}<br>\n{self.reason}"
         metadata = {
             "server": settings.get("HOSTNAME", "unknown"),
             "task": self.pk,
             "reason": self.reason,
-            "kind": kind,
             "app": self.model,
             "fname": self.fname,
             "channel": self.channel,
+            "attempts": self.attempts,
             "handler": handler
         }
+
+        if self.data:
+            if self.data.url:
+                metadata["url"] = self.data.url
+                msg = f"{msg}<br>\n{self.data.url}"
+            if self.data.log_component:
+                metadata["component"] = self.data.log_component
+            if self.data.log_pk:
+                metadata["component_id"] = self.data.log_pk
         try:
             import incident
             incident.event_now(
@@ -254,10 +294,16 @@ class Task(models.Model, RestModel):
         return getattr(model, self.fname, None)
 
     @classmethod
-    def WebRequest(cls, url, data, fname="POST", stale_after_seconds=0):
+    def WebRequest(cls, url, data, fname="POST", stale_after_seconds=0,
+                   log_component=None, log_pk=None, log_tid=None):
         tdata = nobjict()
         tdata.url = url
         tdata.data = data
+        if log_component is not None:
+            tdata.log_component = log_component
+            tdata.log_pk = log_pk
+        if log_tid is not None:
+            tdata.log_tid = log_tid
         task = cls(channel="tq_hook", model="tq_web_request", fname=fname, data=tdata)
         if stale_after_seconds:
             task.stale_after = datetime.now() + timedelta(seconds=stale_after_seconds)
@@ -266,29 +312,41 @@ class Task(models.Model, RestModel):
         return task
 
     @classmethod
-    def EmailRequest(cls, address, data, filename=None, subject=None):
+    def EmailRequest(cls, address, data, filename=None, subject=None,
+                     log_component=None, log_pk=None, log_tid=None):
         tdata = nobjict()
         tdata.address = address
         tdata.filename = filename
         tdata.subject = subject
         tdata.data = data
+        if log_component is not None:
+            tdata.log_component = log_component
+            tdata.log_pk = log_pk
+        if log_tid is not None:
+            tdata.log_tid = log_tid
         task = cls(channel="tq_hook", model="tq_email_request", data=tdata)
         task.save()
         task.publish()
         return task
 
     @classmethod
-    def SMSRequest(cls, phone, data):
+    def SMSRequest(cls, phone, data, log_component=None, log_pk=None, log_tid=None):
         tdata = nobjict()
         tdata.phone = phone
         tdata.data = data
+        if log_component is not None:
+            tdata.log_component = log_component
+            tdata.log_pk = log_pk
+        if log_tid is not None:
+            tdata.log_tid = log_tid
         task = cls(channel="tq_hook", model="tq_sms_request", data=tdata)
         task.save()
         task.publish()
         return task
 
     @classmethod
-    def SFTPRequest(cls, host, data, filename, username, password):
+    def SFTPRequest(cls, host, data, filename, username, password,
+                    log_component=None, log_pk=None, log_tid=None):
         tdata = nobjict()
         tdata.host = host
         tdata.filename = filename
@@ -297,13 +355,19 @@ class Task(models.Model, RestModel):
         tdata.username = username
         tdata.password = password
         tdata.data = data
+        if log_component is not None:
+            tdata.log_component = log_component
+            tdata.log_pk = log_pk
+        if log_tid is not None:
+            tdata.log_tid = log_tid
         task = cls(channel="tq_hook", model="tq_sftp_request", data=tdata)
         task.save()
         task.publish()
         return task
     
     @classmethod
-    def S3Request(cls, bucket, data, folder, aws, secret, filename, when):
+    def S3Request(cls, bucket, data, folder, aws, secret, filename, when,
+                  log_component=None, log_pk=None, log_tid=None):
         tdata = nobjict()
         tdata.bucket = bucket
         tdata.filename = filename
@@ -312,6 +376,11 @@ class Task(models.Model, RestModel):
         tdata.aws = aws
         tdata.secret = secret
         tdata.when = str(when)
+        if log_component is not None:
+            tdata.log_component = log_component
+            tdata.log_pk = log_pk
+        if log_tid is not None:
+            tdata.log_tid = log_tid
         task = cls(channel="tq_hook", model="tq_s3_request", data=tdata)
         task.save()
         task.publish()

taskqueue/transports/http.py

@@ -14,7 +14,7 @@ def REQUEST(task):
         resp = net.REQUEST(method, url, params=params,
                            data=task.data.data, raw_response=True,
                            verify=False, timeout=REQ_TIMEOUT)
-        task.log(resp.text)
+        task.log(resp.text, kind="response")
         return resp.status_code == 200
     except requests.Timeout:
         task.log("request timed out", kind="error")

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()