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

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

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

{django_restit-4.1.71 → 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.71 → 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.71 → django_restit-4.1.72}/pyproject.toml

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

{django_restit-4.1.71 → 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.71"
+__version__ = "4.1.72"

{django_restit-4.1.71 → django_restit-4.1.72}/telephony/rpc.py

@@ -22,6 +22,24 @@ def handle_sms_list(request, pk=None):
     return SMS.on_rest_request(request, pk)
 
 
+@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
@@ -67,13 +85,6 @@ def receiveSMS(request):
     return HttpResponse(resp.to_xml(), content_type='text/xml')
 
 
-@rd.url(r'^info$')
-@rd.url(r'^info/(?P<pk>\d+)$')
-@rd.login_required
-def handle_info(request, pk=None):
-    return PhonenumberInfo.on_rest_request(request, pk)
-
-
 @rd.url(r'^lookup$')
 @rd.login_required
 def handle_lookup(request, pk=None):
@@ -92,6 +103,7 @@ def handle_twilio_status(request, pk=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)