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

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

@@ -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.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,7 +350,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=cgJ85yBetTOJGyIg6bbItIkke57c8MfIj9JtbyVyMd0,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
@@ -449,7 +449,7 @@ telephony/migrations/0002_alter_sms_sid.py,sha256=QAnMG-UZ5emssZwdJ8XwfaRh3872zU
 telephony/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/models.py,sha256=C6TTG24FADIWCJJunScvzYyp6t4fYEMuxdUYaN0KfLU,7894
 telephony/phone_util.py,sha256=aJ4hXjDCauwrSaI_qWa5HVCgD2CCdWx6TA_ikJ6kC7w,2126
-telephony/rpc.py,sha256=ni3IaY1o_isTtVQm0gYH2iIP0IbBynaewj4UfkjJK-0,3121
+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
@@ -482,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.71.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.71.dist-info/METADATA,sha256=qUXlqbkRFFIN4HCd07RBEX5UYtWvKvppLP4eFPn5jHY,7573
-django_restit-4.1.71.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.71.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.71"
+__version__ = "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)