django-restit 4.1.73__py3-none-any.whl → 4.1.75__py3-none-any.whl

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 = {

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.dist-info → django_restit-4.1.75.dist-info}/METADATA

@@ -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.dist-info → django_restit-4.1.75.dist-info}/RECORD

@@ -22,7 +22,7 @@ account/models/device.py,sha256=XipNpByreGubB5-d4ZBOoIV5Xw14b2Btcgn6fXz8HAc,4105
 account/models/feeds.py,sha256=4n4Mv8HjcXpUmMPWafHlsGbVQ1fDKdtblL1hp30sDrg,1437
 account/models/group.py,sha256=X_ij8moxmtH9qwH3w2EL8siuy-prsyxQVv1JIhBp3hI,19399
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=_UYwU8HY5zQ9BgoBLsREe1fBlYn4KsL2FdsWAYY-y4Q,48354
+account/models/member.py,sha256=kyPnmRRG-LF9q9bOfmaGkuPHnePu8bR7wKfhlqy6Xoo,48477
 account/models/membership.py,sha256=l7suW6kRCfa3KqdbqjOIO2jVhxjkPbEENdJIlj2WomY,7378
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/session.py,sha256=swhxcx_lWzOpGCmfifXoACgWYqmKmS7eZsD9s9jSToc,3509
@@ -54,7 +54,7 @@ auditlog/decorators.py,sha256=ZoIv0fhZjxtMEV15NcKijW4xPF5UEScPna60zB3TxZo,6553
 auditlog/middleware.py,sha256=GtfFR90uLltiLsAx8t4xeid5QssqcusbrKjgBl08kuw,1329
 auditlog/migrations/0001_initial.py,sha256=X171gKQZIaTO9FGNG1yKTjGSZS0ZjZj5gvimF9-_kks,3309
 auditlog/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditlog/models.py,sha256=ykVVmL2TSimhV2n18f0iU-QvOz12JSuYPUVKz9rAgRE,16241
+auditlog/models.py,sha256=6CyWMRNvqCYoyiXE9_qk41EJFjutwo6nfoP9KKYWiYw,16294
 auditlog/periodic.py,sha256=AUhDeVsZtC47BJ-lklvYEegHoxAzj1RpIvRFSsM7g5E,363
 auditlog/rpc.py,sha256=w01zcOiqmqM0953Muq9I4OY7o0CyKmwDEQTV4LfsASs,3591
 auditlog/tq.py,sha256=OgzJVspWI6FL92GEhDPtabYoP_Hd3zGNh0E297abz3Y,2415
@@ -94,7 +94,7 @@ incident/migrations/0011_ticket.py,sha256=Ml5E_Qi4Z0MD89fetoOFOL3rPlVQdjaaDCcFBf
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
 incident/models/event.py,sha256=AXFV92OtnVi3opSZcRX1o3qZ8uBvqGFL549AXH2gjY8,6792
-incident/models/incident.py,sha256=iUIqhlFbb6hPfY-45ntj-9u797lnTV55gqzJzUfp7fc,14147
+incident/models/incident.py,sha256=qBwXC4lhQ8YZ7EatDjOced93cXq1jJqYgElgmKfl9nw,14409
 incident/models/ossec.py,sha256=pWMqcuTRxPFTEF-OZQSMn7YpNEE9mfsI4GMhWWjJs5I,2187
 incident/models/rules.py,sha256=Ua-hC78_D6YikJjP3DXfA8ghi6zu__Qud8H1bk7MRG0,5342
 incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
@@ -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=1o6NrqSxTa8UlH7xp-JWkqRdafGdexl-T7JrFkr2Ryc,121
+rest/__init__.py,sha256=EBklYrW3BC8Q1_xwHhntKj0NjkG0lEqi8Nw56aKm-K0,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
@@ -447,8 +447,8 @@ 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=C6TTG24FADIWCJJunScvzYyp6t4fYEMuxdUYaN0KfLU,7894
-telephony/phone_util.py,sha256=aJ4hXjDCauwrSaI_qWa5HVCgD2CCdWx6TA_ikJ6kC7w,2126
+telephony/models.py,sha256=S6k7rbG1GxO9nhffOOzbM-jgpm1PJEfO20mdj6IIpDI,8116
+telephony/phone_util.py,sha256=15IWkTSqkjDWT9edPAYogAxHc1OdjOziPSxsJ8vfpfE,2426
 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
@@ -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.73.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.73.dist-info/METADATA,sha256=2D9z5w_2iS-RDzfmY-RST7iGaVVX_VQthLMXVfQbv6A,7573
-django_restit-4.1.73.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.73.dist-info/RECORD,,
+django_restit-4.1.75.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.75.dist-info/METADATA,sha256=hjRHe-VVVIQu1Sqhc6pz00FdyeLdszibBJ-5coivs7I,7573
+django_restit-4.1.75.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.75.dist-info/RECORD,,

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)

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"

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

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 = []