django-restit 4.1.73__tar.gz → 4.1.75__tar.gz

{django_restit-4.1.73 → django_restit-4.1.75}/PKG-INFO

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

{django_restit-4.1.73 → django_restit-4.1.75}/account/models/member.py

@@ -82,9 +82,13 @@ class Member(User, RestModel, MetaDataModel):
             "first_name", "last_name",
             "last_activity#datetime", "date_joined#datetime",
             "is_staff",
+            ("ip", "auth_sessions__ip"),
             ("notify_via", "properties|notify_via"),
             ("phone", "phone_number"),
             ("perms", "properties|permissions.")]
+        QUERY_FIELDS_SPECIAL = {
+            "ip": "auth_sessions__ip",
+        }
         UNIQUE_LOOKUP = ["username", "email"]
         METADATA_FIELD_PROPERTIES = settings.USER_METADATA_PROPERTIES
         GRAPHS = {

{django_restit-4.1.73 → django_restit-4.1.75}/auditlog/models.py

@@ -251,6 +251,8 @@ class PersistentLog(models.Model, RestModel):
         # deepcopy vs copy?
         sobj = copy.copy(obj)
         for key in sobj:
+            if key is None:
+                continue
             lkey = key.lower()
             if lkey in LOG_FILTERS:
                 funcn = LOG_FILTERS.get(lkey)

{django_restit-4.1.73 → django_restit-4.1.75}/incident/models/incident.py

@@ -164,11 +164,16 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         # sms:NOTIFY_SETTING
         self.action_sent = datetime.now()
         self.save()
-        action, perm = self.rule.action.split(":")
-        members = Member.GetWithNotification(perm)
-        msg = f"{settings.SITE_LABEL}\nNew Incident: {self.description}"
-        for m in members:
-            m.sendSMS(msg)  
+        try:
+            action, perm = self.rule.action.split(":")
+            members = Member.GetWithNotification(perm)
+            # count = self.getProperty("event_count", default=1, field_type=int)
+            url = F"{settings.INCIDENT_PORTAL_URL}"
+            msg = f"Incident #{self.pk}\n{self.description}\n<a href='{url}?incident={self.pk}'>view</a>"
+            for m in members:
+                m.sendSMS(msg)
+        except Exception:
+            rh.log_exception("triggerSMS")
 
     def notifyWith(self, perm):
         # logger.info("notifyWith", perm)

{django_restit-4.1.73 → django_restit-4.1.75}/pyproject.toml

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

{django_restit-4.1.73 → django_restit-4.1.75}/rest/__init__.py

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

{django_restit-4.1.73 → django_restit-4.1.75}/telephony/models.py

@@ -157,7 +157,12 @@ class SMS(models.Model, RestModel):
                 msg.reason = "number valid: {} number kind: {} cannot receive sms".format(to_info.is_valid, to_info.kind)
                 msg.save()
                 return msg
-        resp = phone_util.sendSMS(endpoint, srcpoint, message)
+        if transport == "sms":
+            resp = phone_util.sendSMS(endpoint, srcpoint, message)
+        elif transport == "whatsapp":
+            resp = phone_util.sendWhatsApp(endpoint, srcpoint, message)
+        else:
+            raise Exception(f"unknown transport: {transport}")
         msg = SMS(endpoint=endpoint, message=message, srcpoint=srcpoint, transport=transport, by=by, to=to, group=group)
         msg.sid = resp.sid
         msg.status = resp.status

{django_restit-4.1.73 → django_restit-4.1.75}/telephony/phone_util.py

@@ -38,6 +38,15 @@ def sendSMS(to_num, from_num, msg, country="US"):
     return tmsg
 
 
+def sendWhatsApp(to_num, from_num, msg, country="US"):
+    to_num = normalize(to_num, country)
+    to_num = f"whatsapp:{to_num}"
+    from_num = normalize(from_num, country)
+    from_num = f"whatsapp:{from_num}"
+    tmsg = client.messages.create(body=msg, to=to_num, from_=from_num)
+    return tmsg
+
+
 def find(text, country="US"):
     # finds any phone numbers in the text blob
     numbers = []