django-restit 4.2.29__tar.gz → 4.2.31__tar.gz

{django_restit-4.2.29 → django_restit-4.2.31}/PKG-INFO

@@ -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 → django_restit-4.2.31}/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)
 
-

{django_restit-4.2.29 → django_restit-4.2.31}/pyproject.toml

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

{django_restit-4.2.29 → django_restit-4.2.31}/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"

{django_restit-4.2.29 → django_restit-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:

{django_restit-4.2.29 → django_restit-4.2.31}/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