django-restit 4.1.70__tar.gz → 4.1.72__tar.gz

{django_restit-4.1.70 → django_restit-4.1.72}/PKG-INFO

@@ -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 → django_restit-4.1.72}/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)

{django_restit-4.1.70 → django_restit-4.1.72}/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)

{django_restit-4.1.70 → django_restit-4.1.72}/pyproject.toml

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

{django_restit-4.1.70 → django_restit-4.1.72}/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"

{django_restit-4.1.70 → django_restit-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

{django_restit-4.1.70 → django_restit-4.1.72}/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

{django_restit-4.1.70 → django_restit-4.1.72}/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)

django_restit-4.1.72/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),
+        ),
+    ]

{django_restit-4.1.70 → django_restit-4.1.72}/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
 

{django_restit-4.1.70 → django_restit-4.1.72}/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)