django-restit 4.2.46__py3-none-any.whl → 4.2.47__py3-none-any.whl

account/models/session.py

@@ -27,6 +27,12 @@ class AuthSession(models.Model, RestModel):
                 "graphs": {
                     "location": "default"
                 }
+            },
+            "location": {
+                "graphs": {
+                    "location": "default",
+                    "member": "basic"
+                }
             }
         }
     # the signature of session

{django_restit-4.2.46.dist-info → django_restit-4.2.47.dist-info}/METADATA

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

{django_restit-4.2.46.dist-info → django_restit-4.2.47.dist-info}/RECORD

@@ -29,7 +29,7 @@ account/models/member.py,sha256=XwT4evwN6_THL2bKb_TjtQg7NWNwQqtotMHLScplv1s,5018
 account/models/membership.py,sha256=K2fd0TJYhfv58HPyjQVlahlOPz3Q6ZwrxVkguG-2Ej8,7806
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
-account/models/session.py,sha256=iN9x9hi0LyB_2giT__YuqwbClQ7Ae8Gb4bhGph_qD6Q,3561
+account/models/session.py,sha256=o3t98e8itXEtkknBHdBH_PSq9kuw1A858_wl6ZleXMM,3729
 account/models/settings.py,sha256=gOyRWBVd3BQpjfj_hJPtqX3H46ztyRAFxBrPbv11lQg,2137
 account/oauth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/oauth/google.py,sha256=q5M6Qhpfp9QslKRVYFZBvtG6kgXV6vYMrR5fp6Xdb9I,2078
@@ -103,7 +103,7 @@ incident/migrations/0013_rulecheck_is_required.py,sha256=cL7tOj5XGPpKd2f5BojIKfN
 incident/migrations/0014_event_group_alter_rulecheck_index.py,sha256=v3gm5k0LVoas27qUDOt7el7YtK4yjFVLeEpuFUCoXaQ,724
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
-incident/models/event.py,sha256=CYyJHcTCRSkZuOynVNVBO6P9466OamMVV63jWEbDBZ8,7264
+incident/models/event.py,sha256=qa6BIlellU7uUQcA2c4Botd2x7JLL8b7IjSfxyi5iHk,7306
 incident/models/incident.py,sha256=0M7QN32BwlHYRvnUWPqI4IIThSpActGDdbmbPjNcJ9A,18415
 incident/models/ossec.py,sha256=p1ptr-8lnaj1EP_VmPR58b2LmaYBGaYYKAMqhWK5yZM,2227
 incident/models/rules.py,sha256=uT5GhW6Flso287lJGphAlWwL20NRnHDAZoGrWBBQfeE,6260
@@ -363,7 +363,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=XeNEczGva6f-NCiOEuPB5xX3SPad8Q_MV-nviN1P2d0,121
+rest/__init__.py,sha256=KPZYlX8yNoUvOBRew6LnBQO59yY6TNSoJO9DSSVFH10,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
@@ -485,7 +485,7 @@ wiki/rpc/wiki.py,sha256=iWehZasU8J1E5sPPqz9QoQr3MpGxqu3rd7CH4wFrm2w,1333
 wiki/tq.py,sha256=wvuBZ3OMV_D2o4kpJhVLIOwpEUfwlglqLJQvpncAwtk,313
 ws4redis/README.md,sha256=QvwdsauPKxx4qQqnJ991xeU8DgFQCj3CeQt-nCE4s-w,3624
 ws4redis/__init__.py,sha256=teNfv83A_ke1CBt9BB7NsnWCcFBhnUFPsPESjF554_k,46
-ws4redis/client.py,sha256=0PXDFHb7P7BRjvT0_3Al9ZOfsljMzng93HsSl90nzro,5225
+ws4redis/client.py,sha256=ZI8m6c8cG-Ysn80OokZQxg2ihHHWbp0Ea7C7jmFk1UQ,6506
 ws4redis/connection.py,sha256=QGjzalYrx1y4o6sb6P1akL-Y2fjf2qil0JCo-ona5F8,13431
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
 ws4redis/redis.py,sha256=IfT4p3bUtlqso9rryNliH9Ebzlx8-Q2VJcs1kFioeGA,6093
@@ -496,7 +496,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.2.46.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.46.dist-info/METADATA,sha256=lCBmmksn0kY3P_GgX1stSJMT0zykk8qDWbK9ipwYks4,7594
-django_restit-4.2.46.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.46.dist-info/RECORD,,
+django_restit-4.2.47.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.47.dist-info/METADATA,sha256=L-HD17mdjnfiJOiNb865oC4nGAAQsYmAXETtIrCZnL4,7594
+django_restit-4.2.47.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.47.dist-info/RECORD,,

incident/models/event.py

@@ -136,6 +136,8 @@ class Event(JSONMetaData, rm.RestModel):
             self.lookupIP(request.ip)
 
     def on_rest_saved(self, request, is_new=False):
+        if not is_new:
+            return
         if INCIDENT_EVENT_METRICS:
             if self.hostname:
                 metrics.metric(f"incident_evt_{self.hostname}", category="incident_events", min_granularity="hourly")

rest/__init__.py

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

ws4redis/client.py

@@ -131,6 +131,55 @@ def hincrby(name, field, inc=1):
     return c.hincrby(name, field, inc)
 
 
+def lpush(name, value, unique=False):
+    c = getRedisClient()
+    if isinstance(value, list):
+        for v in value:
+            if unique and value.encode() in c.lrange(name, 0, -1):
+                return 0
+            c.lpush(name, v)
+        return len(value)
+    if unique and value.encode() in c.lrange(name, 0, -1):
+        return 0
+    return c.lpush(name, value)
+
+
+def rpush(name, value, unique=False):
+    c = getRedisClient()
+    if isinstance(value, list):
+        for v in value:
+            if unique and value.encode() in c.lrange(name, 0, -1):
+                return 0
+            c.rpush(name, v)
+        return len(value)
+    if unique and value.encode() in c.lrange(name, 0, -1):
+        return 0
+    return c.rpush(name, value)
+
+
+def lpop(name, timeout=None):
+    c = getRedisClient()
+    if timeout is None:
+        return c.lpop(name)
+    r = c.blpop(name, timeout=timeout)
+    if isinstance(r, tuple):
+        return r[1].decode()
+
+
+def rpop(name, timeout=None):
+    c = getRedisClient()
+    if timeout is None:
+        return c.rpop(name)
+    r = c.brpop(name, timeout=timeout)
+    if isinstance(r, tuple):
+        return r[1].decode()
+
+
+def lrange(name, start, end):
+    c = getRedisClient()
+    return [v.decode() for v in c.lrange(name, start, end)]
+
+
 def sendToUser(user, name, message=None, priority=0, model=None, model_pk=None, custom=None):
     return sendMessageToUsers([user], buildEventMessage(name, message, priority, model, model_pk, custom))