django-restit 4.2.118__tar.gz → 4.2.120__tar.gz

{django_restit-4.2.118 → django_restit-4.2.120}/PKG-INFO

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

{django_restit-4.2.118 → django_restit-4.2.120}/inbox/models/message.py

@@ -1,5 +1,9 @@
 from django.db import models
 from rest import models as rm
+import time
+
+POSIX_BODY_BREAK = "\n\n\n"
+WIN_BODY_BREAK = "\r\n\r\n\r\n"
 
 
 class Mailbox(models.Model, rm.RestModel, rm.MetaDataModel):
@@ -51,9 +55,31 @@ class Message(models.Model, rm.RestModel):
     body = models.TextField(null=True, default=None)
     html = models.TextField(null=True, default=None)
 
+    def getIdFromSubject(self, prefix="#"):
+        pk = self.subject[self.subject.find(prefix)+len(prefix):]
+        if ' ' in pk:
+            pk = pk[:pk.find(' ')]
+        return pk
+
+    def getLatestBody(self):
+        body = self.body
+        if POSIX_BODY_BREAK in body:
+            body = body[:body.find(POSIX_BODY_BREAK)]
+        elif WIN_BODY_BREAK in body:
+            body = body[:body.find(WIN_BODY_BREAK)]
+        return body
+        
     def __str__(self):
         return f"message: to:{self.to_email} from:{self.from_email} subject: {self.subject}"
 
+    @staticmethod
+    def GetMessage(pk, delay=2.0):
+        msg = Message.objects.filter(pk=pk).last()
+        if msg is None:
+            time.sleep(delay)
+            msg = Message.objects.filter(pk=pk).last()
+        return msg
+
 
 class Attachment(models.Model, rm.RestModel):
     class RestMeta:

{django_restit-4.2.118 → django_restit-4.2.120}/incident/models/incident.py

@@ -53,7 +53,16 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
                     "rule": "basic",
                     "assigned_to": "basic"
                 },
-            }
+            },
+            "detailed": {
+                "extra": ["metadata", ("get_state_display", "state_display")],
+                "graphs": {
+                    "group": "basic",
+                    "rule": "basic",
+                    "assigned_to": "basic",
+                    "generic__component": "basic"
+                },
+            },
         }
 
     created = models.DateTimeField(auto_now_add=True)
@@ -228,7 +237,13 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             return
         self.action_sent = datetime.now()
         self.save()
-        Task.Publish(fields[1], fields[2], channel=fields[3])
+        channel = "tq_app_handler"
+        if len(fields) > 3:
+            channel = fields[3]
+
+        Task.Publish(
+            fields[1], fields[2], channel=channel,
+            data=dict(pk=self.pk))
 
     def triggerEmail(self):
         if self.lastSentAge() < 300:

{django_restit-4.2.118 → django_restit-4.2.120}/metrics/models.py

@@ -46,14 +46,15 @@ def metric(
         m.updateMetrics(keys, data, created)
 
 
-def gauge(slug, keys, data, granularity="daily", group=None, date=None, timezone=None, slug_append=None, max_granularity=None):
+def gauge(slug, keys, data, granularity="daily", group=None, date=None, 
+          timezone=None, slug_append=None, max_granularity=None):
     # guage does not accumulate but just stores the data like a cache
     # if calledf on the same time period it will just update the current numbers
-    uuid_key = generate_uuid(slug, group, slug_append)
-    granularities = utils.granularities(granularity, granularity)
-    date = normalize_date(date, timezone, group)
     if max_granularity is None:
         max_granularity = granularity
+    uuid_key = generate_uuid(slug, group, slug_append)
+    granularities = utils.granularities(granularity, max_granularity)
+    date = normalize_date(date, timezone, group)
     uuids = utils.build_keys(
         uuid_key, date,
         min_granularity=granularity,
@@ -85,7 +86,8 @@ def normalize_date(date=None, timezone=None, group=None):
         date = date_util.convertToLocalTime(settings.METRICS_TIMEZONE, date)
     return date
 
-def get_qset(slug, granularity, start=None, end=None, group=-1, starts_with=False, ends_with=None):
+def get_qset(slug, granularity, start=None, end=None,
+             group=-1, starts_with=False, ends_with=None):
     if start is None:
         start = utils.datetime.utcnow()
     if group is not None and group != -1:

{django_restit-4.2.118 → django_restit-4.2.120}/pyproject.toml

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

{django_restit-4.2.118 → django_restit-4.2.120}/rest/__init__.py

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