django-restit 4.2.43__py3-none-any.whl → 4.2.45__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.43.dist-info → django_restit-4.2.45.dist-info}/METADATA

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

{django_restit-4.2.43.dist-info → django_restit-4.2.45.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
@@ -120,9 +120,10 @@ location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
 location/migrations/0001_initial.py,sha256=E0Kekah0vfp7VGKGYRHFEIFjFRTkd8QnFGSHNFllVv0,7000
 location/migrations/0002_geoip_subnet_alter_geoip_ip.py,sha256=n-oJrEnIqN9VnMhiZsr34LF-EXBluPm1lz1zusaMkx8,576
+location/migrations/0003_address_postalcode_suffix.py,sha256=DT8voJeMiSQyUhH-69NHK9YywaChAvIJn1ztL7fCI30,443
 location/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/models/__init__.py,sha256=rZhldkoKmoJQXjBAK1IIQn7K_OOJvFtIGOGVl_szqbE,230
-location/models/address.py,sha256=GFMyGg9md0y6Szj6bue7sx7ucVjhOgpwJAaz6lYtQEs,2028
+location/models/address.py,sha256=oTPQiLdg2QkfPorlm16re1OoR6TJf4Of2Ew1slun2r8,2596
 location/models/ip.py,sha256=ZaBFdW1tL1Q3bnS5gIY9SseiQ5xeeP_oyP1hp3czFeA,5984
 location/models/legacy.py,sha256=8ROsUSZrjGQkUyXeJvoxPdKAWaKfUH-AL9TIeJb7krg,1994
 location/models/location.py,sha256=01dJPJecbp5orExsIGWOsBC_KkwFRIW0rGDIwyx1r0w,2316
@@ -134,7 +135,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 +360,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=B3KELuugMakWUSxd3cQeoght2GcWz66TWhLh0vh0fD0,121
+rest/__init__.py,sha256=1X-W3BH6L-ujXvvzyMW1tIIeqHcQOhgRzb6isSAl9mY,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,7 +441,7 @@ 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=ruu7ZqN_0J9QjMNR55fHKkzqGycGNRnASgjTFed9drA,21323
+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
@@ -450,7 +451,7 @@ taskqueue/transports/http.py,sha256=kRBjHiwTmk5b4TMdZWt1EKKcjfSlX8DFmtmJaRGZQFw,
 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 +493,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.43.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.43.dist-info/METADATA,sha256=C9XmEDdqejYKLugPLZOfLEeLWQ9cyTDQ47xi4YSAXao,7594
-django_restit-4.2.43.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.43.dist-info/RECORD,,
+django_restit-4.2.45.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.45.dist-info/METADATA,sha256=sjprDnHaz3wHRJMOMfpI0y3UMinbPipZ0aB8mboJGdI,7594
+django_restit-4.2.45.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.45.dist-info/RECORD,,

location/migrations/0003_address_postalcode_suffix.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2024-02-20 21:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0002_geoip_subnet_alter_geoip_ip'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='address',
+            name='postalcode_suffix',
+            field=models.CharField(blank=True, default=None, max_length=32, null=True),
+        ),
+    ]

location/models/address.py

@@ -27,6 +27,7 @@ class Address(models.Model, rm.RestModel):
     county = models.CharField(max_length=127, blank=True, null=True, default=None)
     country = models.CharField(max_length=16, blank=True, null=True, default=None)
     postalcode = models.CharField(max_length=32, blank=True, null=True, default=None)
+    postalcode_suffix = models.CharField(max_length=32, blank=True, null=True, default=None)
     lat = models.FloatField(default=0.0, blank=True)
     lng = models.FloatField(default=0.0, blank=True)
 
@@ -35,14 +36,27 @@ class Address(models.Model, rm.RestModel):
             return geolocate.getTimeZone(self.lat, self.lng)
         return None
 
+    def lookup(self):
+        res = geolocate.search("{}, {}, {}".format(self.line1, self.city, self.state))
+        if isinstance(res, list) and len(res):
+            return res[0]
+        return None
+
     def refresh(self):
         try:
-            res = geolocate.search("{}, {}, {}".format(self.line1, self.city, self.state))
-            self.county = res.county
-            self.country = res.short_country
-            self.lat = res.latitude
-            self.lng = res.longitude
-            super(Address, self).save()
+            addr = self.lookup()
+            if addr:
+                if addr.county:
+                    self.county = addr.county
+                self.country = addr.country
+                if addr.lat:
+                    self.lat = addr.lat
+                    self.lng = addr.lng
+                if not self.postalcode and addr.postal_code:
+                    self.postalcode = addr.postal_code
+                if addr.postal_code_suffix:
+                    self.postalcode_suffix = addr.postal_code_suffix
+                super(Address, self).save()
         except Exception:
             rh.log_exception("address.refresh")
 

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.43"
+__version__ = "4.2.45"

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

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