django-restit 4.1.70__py3-none-any.whl → 4.1.72__py3-none-any.whl

{django_restit-4.1.70.dist-info → django_restit-4.1.72.dist-info}/METADATA

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

{django_restit-4.1.70.dist-info → django_restit-4.1.72.dist-info}/RECORD

@@ -114,7 +114,7 @@ location/migrations/0002_geoip_subnet_alter_geoip_ip.py,sha256=n-oJrEnIqN9VnMhiZ
 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/ip.py,sha256=HZGYG-lchEtU0Stdvb7dXrnOiIqqi_EcCxO3eSIhxUk,3560
+location/models/ip.py,sha256=ramy2mr4pLq_OzwcvLMfVPNEIa0YlAYtJ5l1af7do_8,3619
 location/models/legacy.py,sha256=8ROsUSZrjGQkUyXeJvoxPdKAWaKfUH-AL9TIeJb7krg,1994
 location/models/location.py,sha256=01dJPJecbp5orExsIGWOsBC_KkwFRIW0rGDIwyx1r0w,2316
 location/models/track.py,sha256=OdhRL1KVXlPcZkp4S6QpKc7Ctoth8VjwHs_dlZ8XHI4,1474
@@ -132,7 +132,7 @@ location/providers/timezones/__init__.py,sha256=enslc1cVTju3GKrvpLoAxSHUKkLeREhe
 location/providers/timezones/google.py,sha256=HyATVCGJ3wHwfc47jQRLnwa8nPeBlmpHOGTxetfg7FU,619
 location/providers/zillow.py,sha256=nCV_q_9ULRkgxi4HTZHioP6nWDDmApvSf1DcwNLcOxk,1935
 location/rpc/__init__.py,sha256=74T2Y3Zw7ZOl_h67Gdb-tfkyKJAJFSDFHjv04FRKsjQ,123
-location/rpc/ip.py,sha256=DtFiRNGm9wnNz8Bed2hxANFMcQhfd6BH6v7c89IVx5c,875
+location/rpc/ip.py,sha256=TbRRgh4_hykT_Z0PDQrMnCdp_x0nK0Zm_WnvzXuweF4,1305
 location/rpc/location.py,sha256=D5R54nnmmp8NaHQRkP_TF921Ej6j9nmTUNzX1K5WVPc,779
 location/rpc/track.py,sha256=jSS9_eiKayM_8iW_4Ldojg9a2_trjfXhnLe_a261x5E,3735
 medialib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -350,14 +350,14 @@ 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=BYWlN8oGM865Ufx-c18Jzkieb3YQ4Yx7fiEnNw4ANOw,121
+rest/__init__.py,sha256=yKUhy4QLzfRVHXFOkJ5gTp1ZH-VLHdi4d6I5qBr-PWI,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
 rest/crypto/aes.py,sha256=f7UgiTGCfgjCc7dL94vnxkPhq_5NzooI-kw0B8_nA58,3605
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
-rest/datem.py,sha256=Pfzq1VByvV7zR3nJ7A41pUlkgf5cTnK70CReErsQ-U0,9328
+rest/datem.py,sha256=boG5a1PeK1q51Pf7vHhLZHItbQOlzTc9bC4bdbhiOFE,9330
 rest/decorators.py,sha256=3RB1ZkJ0dxZhdUyYr8v9QQ4xk_zXB7fn97Y68ZeeMqo,15177
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=Jy7Hld3d0Ooc-nJ995N5SDx0EXQLWKac7g6VLJpVJf0,501
@@ -395,10 +395,10 @@ rest/serializers/collection.py,sha256=86AaICz8JylFUzhqouRpp_7v0cNzWcZpsW9yWZQ3w6
 rest/serializers/csv.py,sha256=CVD0erB2Ebl7mqgrMAZ2FxZSZpyVDCoSS4FHiEjuvDM,3252
 rest/serializers/excel.py,sha256=KtxqZZU5Huzo31tyVVWbshMudeSAImKLO71ufQQt0-c,1077
 rest/serializers/json.py,sha256=R1has2PZQuXacA6WwfdrBnMG4rSM6CrnXQOhGoAU6Dk,1736
-rest/serializers/legacy.py,sha256=LgU8Sr7yFoiOso1Tb-LkJ-vphGcbEc4BKuSCCuD62R8,61800
+rest/serializers/legacy.py,sha256=JMv1eWhUJveBGO0E80PrsxvROGDl9EYAlx407tmVt7g,61872
 rest/serializers/model.py,sha256=08HJeqpmytjxvyiJFfsSRRG0uH-iK2mXCw6w0oMfWrI,8598
 rest/serializers/profiler.py,sha256=OxOimhEyvCAuzUBC9Q1dz2xaakjAqmSnekMATsjduXM,997
-rest/serializers/response.py,sha256=W_N-t0GHoRvxFweqYyyTfIF19bVypj-Q-p_xFdxZhHQ,6766
+rest/serializers/response.py,sha256=9zIgIYj_Y47X001_Ujwul4-xE2wMGw3hZ4B_g62NSBI,6840
 rest/serializers/util.py,sha256=-In89fpuVTd6_Ul8nwEUt3DjVKdpeoEyAxudlyB8K6Y,2734
 rest/settings_helper.py,sha256=_Vn9nmL5_GPss9zIsXzacbTQkn99NbO42CqvOZC3ge4,1532
 rest/ssl_check.py,sha256=kH4Pk4upUEwKTAnBLR0DIKezNJHjkW3g2TdQAObEgW4,1419
@@ -445,10 +445,11 @@ telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/migrations/0001_initial.py,sha256=YRiNtpeqj-4uvq19sfI64Q-KRnQ_T53kNzyt-CZUl14,3030
+telephony/migrations/0002_alter_sms_sid.py,sha256=QAnMG-UZ5emssZwdJ8XwfaRh3872zUUR55maDMD4RkE,424
 telephony/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-telephony/models.py,sha256=Sigr87Sz7TgXp3hsb67YBEjVzV6QV16UytDzu6F8-DE,7753
+telephony/models.py,sha256=C6TTG24FADIWCJJunScvzYyp6t4fYEMuxdUYaN0KfLU,7894
 telephony/phone_util.py,sha256=aJ4hXjDCauwrSaI_qWa5HVCgD2CCdWx6TA_ikJ6kC7w,2126
-telephony/rpc.py,sha256=dHpTFjyy6lv7AS_MyYurJu0XIRBES-A3A-beqnPhKHQ,2659
+telephony/rpc.py,sha256=GVPWH5XSPNar-ICu5oq-yF6FBmJbju3XJr6gSXA6ZVU,3535
 wiki/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 wiki/migrations/0001_initial.py,sha256=9jvUyjrbJrbDilRnwzQUPhPV8Xi_olEPBk_N0nycvM0,3606
 wiki/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -481,7 +482,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.1.70.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.70.dist-info/METADATA,sha256=6za46qp_8SDCN52LyLQw6bpuiUJwYiS9hv50f8FZHOY,7573
-django_restit-4.1.70.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.70.dist-info/RECORD,,
+django_restit-4.1.72.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.72.dist-info/METADATA,sha256=ldiAuTSzPz2ky_RTBIK7XqA8oDCa45x_RsvEmIvQtqQ,7573
+django_restit-4.1.72.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.72.dist-info/RECORD,,

location/models/ip.py

@@ -8,6 +8,9 @@ GEOIP_LOOKUP_BY_SUBNET = settings.get("GEOIP_LOOKUP_BY_SUBNET", True)
 
 
 class GeoIP(models.Model, rm.RestModel):
+    class RestMeta:
+        SEARCH_FIELDS = ["ip", "isp"]
+
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
     hostname = models.CharField(max_length=255, blank=True, null=True, default=None)

location/rpc/ip.py

@@ -25,8 +25,21 @@ def on_ip_lookup(request):
     return gip.restGet(request, graph)
 
 
-@rd.url(r'^geo/ip$')
-@rd.url(r'^geo/ip/(?P<pk>\d+)$')
+@rd.urlGET('geo/ip')
+@rd.urlGET('geo/ip/<int:pk>')
 @rd.login_required
 def rest_on_geoip(request, pk=None):
     return location.GeoIP.on_rest_request(request, pk)
+
+
+@rd.urlPOST('geo/ip')
+@rd.login_required
+@rd.requires_params(["ip"])
+def rest_on_geoip_lookup(request, pk=None):
+    ip = request.DATA.get("ip", request.ip)
+    gip = location.GeoIP.get(
+        ip,
+        force_refresh=request.DATA.get("refresh", 0, field_type=bool),
+        stale_after=request.DATA.get("stale_after", 90, field_type=int))
+    graph = request.DATA.get("graph", "default")
+    return gip.restGet(request, graph)

rest/__init__.py

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

rest/datem.py

@@ -290,7 +290,7 @@ def getDateRange(start, end=None, kind=None, zone=None, hour=0, eod=None, end_eo
             start = end - timedelta(days=int(kind))
     
     if end is None:
-        end = start + timedelta(days=1)
+        end = start + timedelta(hours=24)
 
     if zone and zone.lower() == "utc":
         zone = None

rest/serializers/legacy.py

@@ -1549,6 +1549,9 @@ def restOK(request):
 def restError(request, error, error_code=None):
     return restStatus(request, False, error=error, error_code=error_code)
 
+def restSuccessNoContent(request):
+    return HttpResponse(status=204)
+
 def restStatus(request, status, data={}, accept_list=None, **kwargs):
     """
     request: HttpRequest object

rest/serializers/response.py

@@ -13,6 +13,7 @@ from . import csv
 from . import excel
 # from . import profiler
 
+
 def restStatus(request, status, data={}, **kwargs):
     if isinstance(data, str):
         if status:
@@ -25,6 +26,10 @@ def restStatus(request, status, data={}, **kwargs):
     return restResult(request, data)
 
 
+def restSuccessNoContent(request):
+    return HttpResponse(status=204)
+
+
 # @profiler.timeit
 def restGet(request, obj, fields=None, extra=[], exclude=[], recurse_into=[], **kwargs):
     data = ms.to_dict(obj, fields, extra, exclude, recurse_into)

telephony/migrations/0002_alter_sms_sid.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-11-27 22:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('telephony', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sms',
+            name='sid',
+            field=models.CharField(blank=True, db_index=True, default=None, max_length=125, null=True),
+        ),
+    ]

telephony/models.py

@@ -41,15 +41,28 @@ class SMS(models.Model, RestModel):
             }
         }
 
-    sid = models.CharField(max_length=125, blank=True, null=True, default=None)
+    sid = models.CharField(
+        max_length=125, blank=True, null=True,
+        default=None, db_index=True)
     created = models.DateTimeField(auto_now_add=True, editable=False)
-    group = models.ForeignKey(Group, related_name="telephony_sms", blank=True, null=True, default=None, on_delete=models.CASCADE)
-    by = models.ForeignKey(Member, related_name="telephony_sms_out", blank=True, null=True, default=None, on_delete=models.CASCADE)
-    to = models.ForeignKey(Member, related_name="telephony_sms_in", blank=True, null=True, default=None, on_delete=models.CASCADE)
+    group = models.ForeignKey(
+        Group, related_name="telephony_sms",
+        blank=True, null=True, default=None,
+        on_delete=models.CASCADE)
+    by = models.ForeignKey(
+        Member, related_name="telephony_sms_out",
+        blank=True, null=True, default=None,
+        on_delete=models.CASCADE)
+    to = models.ForeignKey(
+        Member, related_name="telephony_sms_in",
+        blank=True, null=True, default=None,
+        on_delete=models.CASCADE)
     # the mechanism , sms, push, etc
     transport = models.CharField(max_length=125, blank=True, null=True, default=None)
     # this can be email, phone, etc
-    endpoint = models.CharField(max_length=200, blank=True, null=True, default=None, db_index=True)
+    endpoint = models.CharField(
+        max_length=200, blank=True,
+        null=True, default=None, db_index=True)
     # this can be email, phone, etc
     srcpoint = models.CharField(max_length=200, blank=True, null=True, default=None)
 
@@ -92,12 +105,13 @@ class SMS(models.Model, RestModel):
             "ToZip": "92656"
         }
         """
-        msg = SMS(endpoint=request.DATA.get("To"),
+        msg = SMS(
+            endpoint=request.DATA.get("To"),
             message=request.DATA.get("Body"),
             srcpoint=request.DATA.get("From"),
             transport="sms", is_inbound=True)
         msg.sid = request.DATA.get("MessageSid")
-        msg.status = request.DATA.get("SmsStatus")
+        msg.status = request.DATA.get("MessageStatus")
         msg.save()
         return None
 

telephony/rpc.py

@@ -3,10 +3,10 @@ from django.conf import settings
 from django.http import HttpResponse
 
 from telephony.models import SMS, PhonenumberInfo
-
+from account import models as am
 from rest import helpers
-from rest.views import *
-from rest.decorators import *
+from rest import views as rv
+from rest import decorators as rd
 import importlib
 
 try:
@@ -15,41 +15,59 @@ except ImportError:
     pass
 
 
-@url(r'^sms/msg$')
-@url(r'^sms/msg/(?P<pk>\d+)$')
-@perm_required("view_logs")
+@rd.url('sms/msg')
+@rd.url('sms/msg/<int:pk>')
+@rd.perm_required("view_logs")
 def handle_sms_list(request, pk=None):
     return SMS.on_rest_request(request, pk)
 
 
-@urlPOST(r'^sms$')
-@urlPOST(r'^sms/$')
-@login_required
+@rd.urlGET('info')
+@rd.urlGET('info/<int:pk>')
+@rd.perm_required("view_logs")
+def handle_number_info(request, pk=None):
+    return PhonenumberInfo.on_rest_request(request, pk)
+
+
+@rd.urlPOST('info')
+@rd.login_required
+@rd.requires_params(["phone_number"])
+def handle_number_lookup(request, pk=None):
+    number = request.DATA.get("phone_number")
+    info = PhonenumberInfo.lookup(number)
+    if info.pk is None:
+        return rv.restStatus(request, False, error="Invalid number")
+    return info.restGet(request)
+
+
+@rd.urlPOST(r'^sms$')
+@rd.urlPOST(r'^sms/$')
+@rd.login_required
 def sendSMS(request):
     me = request.member
     group = request.group
     # for now you can only send msgs to a member
     if "to" in request.DATA:
         to = request.DATA.getlist("to")
-        members = Member.objects.filter(pk__in=to)
+        members = am.Member.objects.filter(pk__in=to)
         message = request.DATA.get("message")
-        return restGet(request, SMS.broadcast(members, message, by=me, group=group, transport="sms"))
+        return rv.restGet(request, SMS.broadcast(members, message, by=me, group=group, transport="sms"))
 
     if "message" not in request.DATA:
-        return restStatus(request, False, error="permission denied")
+        return rv.restStatus(request, False, error="permission denied")
 
-    member = Member.getFromRequest(request)
+    member = am.Member.getFromRequest(request)
     if not member:
-        return restStatus(request, False, error="requires valid member")
+        return rv.restStatus(request, False, error="requires valid member")
     phone = member.getProperty("phone")
     if not phone:
-        return restStatus(request, False, error="member has no phone number")
+        return rv.restStatus(request, False, error="member has no phone number")
     message = request.DATA.get("message")
     # send(endpoint, message, by=None, group=None, to=None, transport="sms", srcpoint=None):
-    return restGet(request, SMS.send(phone, message, me, group, member))
+    return rv.restGet(request, SMS.send(phone, message, me, group, member))
 
 
-@urlPOST(r'^sms/incoming$')
+@rd.urlPOST(r'^sms/incoming$')
 def receiveSMS(request):
     helpers.log_print(request.DATA.asDict())
     SMS.log_incoming(request)
@@ -67,22 +85,25 @@ def receiveSMS(request):
     return HttpResponse(resp.to_xml(), content_type='text/xml')
 
 
-@url(r'^info$')
-@url(r'^info/(?P<pk>\d+)$')
-@login_required
-def handle_info(request, pk=None):
-    return PhonenumberInfo.on_rest_request(request, pk)
-
-
-@url(r'^lookup$')
-@login_required
+@rd.url(r'^lookup$')
+@rd.login_required
 def handle_lookup(request, pk=None):
     number = request.DATA.get(["number", "phone"])
     if number is None:
-        return restPermissionDenied(request)
+        return rv.restPermissionDenied(request)
     info = PhonenumberInfo.lookup(number)
     return info.restGet(request)
 
 
-
+@rd.urlPOST('sms/twilio/status')
+def handle_twilio_status(request, pk=None):
+    sid = request.DATA.get("MessageSid", None)
+    msd = None
+    if sid is not None:
+        msg = SMS.objects.filter(sid=sid).last()
+        if msg is not None:
+            msg.status = request.DATA.get("MessageStatus", None)
+            msg.reason = request.DATA.get("ErrorCode", None)
+            msg.save()
+    return rv.restSuccessNoContent(request)