django-restit 4.2.29__py3-none-any.whl → 4.2.31__py3-none-any.whl

{django_restit-4.2.29.dist-info → django_restit-4.2.31.dist-info}/METADATA

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

{django_restit-4.2.29.dist-info → django_restit-4.2.31.dist-info}/RECORD

@@ -114,7 +114,7 @@ incident/rpc.py,sha256=-voKgyKlyL5sosXtalWT1yytCtjzcjX7yX81yboaB8k,7680
 incident/templates/email/incident_change.html,sha256=O_5ocWTsnqmmOuQhAtXEiE4rWecnZnJjoKU4MwV6ILo,14178
 incident/templates/email/incident_new.html,sha256=IPX3CqIrvdrZSn13_jlR6sEb0If8ftvUrUpkzC5G2Gc,15173
 incident/templates/email/incident_plain.html,sha256=fx4zsoldG1AQEBA6IYx5BJp_MAMizgjjx9EmuR5m4SQ,14727
-incident/tq.py,sha256=sAArYa_xid_HD2dgS1grer5l_jmoAgV0eA17yJaFmns,5079
+incident/tq.py,sha256=6GGGVKzcbslDBz0oDyBSKdFCLYWKYiVkUeOEiHOOfcM,5049
 location/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
@@ -359,7 +359,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=SxPZeJ8SfzXhG57OGTTQp7d2Te0l-riKdSuXvcLSNc0,121
+rest/__init__.py,sha256=iqS1TYxzy3PsvhaN98G9-46-zcIVaX0fdZCRWBLjhI0,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
@@ -480,10 +480,10 @@ 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=-WIfAW34zxEkJtoDgFSUK1Uu_wv1Gt9Vs2IFG_S3U1o,5208
+ws4redis/client.py,sha256=0PXDFHb7P7BRjvT0_3Al9ZOfsljMzng93HsSl90nzro,5225
 ws4redis/connection.py,sha256=QGjzalYrx1y4o6sb6P1akL-Y2fjf2qil0JCo-ona5F8,13431
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
-ws4redis/redis.py,sha256=AmkiKc-KIytjAqNYIj6BBveJZfvmM7HA-anMGe_nlrU,5561
+ws4redis/redis.py,sha256=IfT4p3bUtlqso9rryNliH9Ebzlx8-Q2VJcs1kFioeGA,6093
 ws4redis/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws4redis/servers/base.py,sha256=3nYZF5jSsQxNLbnLtKLFJ82xJs_Mc7N1H2kEOx8wT6o,3747
 ws4redis/servers/django.py,sha256=iNzWtGN4vZ-2ltClayCnPD-OPvB_ZGySnKD2EyXl6l8,4329
@@ -491,7 +491,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.29.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.29.dist-info/METADATA,sha256=XcvsK0sdSM_cvCbc4lmO_KhN2RHXSj7dCpJZlzWZUtA,7594
-django_restit-4.2.29.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.29.dist-info/RECORD,,
+django_restit-4.2.31.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.31.dist-info/METADATA,sha256=UYUdYMTNLK1RQ-hXzGcxaN9IFPS3miDGix62wl8YeYU,7594
+django_restit-4.2.31.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.31.dist-info/RECORD,,

incident/tq.py

@@ -136,9 +136,8 @@ def run_auto_close(task):
     # lets check any incidents that haven't reached action threshold and older then bundle time
     qset = ia.Incident.objects.filter(state=ia.INCIDENT_STATE_PENDING)
     for inc in qset:
-        if inc.bundle_expired and not inc.action_triggered:
+        if inc.bundle_expired:
             inc.state = ia.INCIDENT_STATE_IGNORE
             inc.save()
             inc.logHistory("history", "auto ignore", notify=False)
 
-

rest/__init__.py

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

ws4redis/client.py

@@ -188,8 +188,8 @@ def subscribe(channel):
     return pubsub
 
 
-def waitForMessage(pubsub, msg_filter):
-    timeout_at = time.time() + 55
+def waitForMessage(pubsub, msg_filter, timeout=55):
+    timeout_at = time.time() + timeout
     while time.time() < timeout_at:
         message = pubsub.get_message()
         if message is not None:

ws4redis/redis.py

@@ -1,6 +1,7 @@
 from redis import ConnectionPool, StrictRedis
 
 from ws4redis import settings
+import time
 
 from rest import UberDict
 from rest.log import getLogger
@@ -25,7 +26,7 @@ class RedisMessage(bytes):
             if len(value) >= 2 and value[0] == b'message':
                 return value[2]
         elif isinstance(value, dict):
-            if not isinstance(value, UberDict):
+            if not hasattr(value, "toJSON"):
                 value = UberDict(value)
             return bytes(value.toJSON(as_string=True), 'utf-8')
         elif isinstance(value, bytes):
@@ -84,7 +85,7 @@ class RedisStore():
             key = F'{prefix}:{channel}:{pk}:{facility}'
         return key
 
-    def subscribe(self, channel, facility, pk=None, prefix=settings.WS4REDIS_PREFIX):
+    def subscribe(self, channel, facility="events", pk=None, prefix=settings.WS4REDIS_PREFIX):
         if self.pubsub is None:
             self.pubsub = self.connection.pubsub()
         key = self.channelToKey(channel, facility, pk, prefix)
@@ -128,6 +129,15 @@ class RedisStore():
                 if count == 0:
                     self.connection.srem(F"{name}:online", pk)
 
+    def waitForMessage(self, muid=None, timeout=55):
+        timeout_at = time.time() + timeout
+        while time.time() < timeout_at:
+            message = self.pubsub.get_message()
+            if message is not None and message.get("type") == "message":
+                return UberDict.fromJSON(message.get("data"))
+            time.sleep(1.0)
+        return None
+
     def get_file_descriptor(self):
         """
         Returns the file descriptor used for passing to the select call when listening
@@ -147,3 +157,9 @@ class RedisStore():
             self.pubsub.unsubscribe()
             self.pubsub.reset()
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.release()
+        return False