django-restit 4.2.149__tar.gz → 4.2.152__tar.gz

{django_restit-4.2.149 → django_restit-4.2.152}/PKG-INFO

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

{django_restit-4.2.149 → django_restit-4.2.152}/inbox/utils/parsing.py

@@ -131,7 +131,9 @@ def toFileObject(attachment):
     return obj
 
 
-def parseAddresses(input_string):
+def parseAddresses(input_string, force_name=False):
+    if input_string is None:
+        return []
     # Define a regex pattern to capture email addresses
     email_pattern = r'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}'
     # Find all matches of the pattern in the input string
@@ -141,11 +143,16 @@ def parseAddresses(input_string):
     for addr in emails:
         # Extract name if it exists
         name_match = re.search(r'([a-zA-Z\s]+)?\s*<{}>'.format(re.escape(addr)), input_string)
+        addr = addr.strip().lower()
+        full_email = addr
         if name_match and name_match.group(1):
             name = name_match.group(1).strip()
+            full_email = f"{name} <{addr}>"
+        elif force_name:
+            name = addr.split('@')[1]
         else:
             name = None
-        parsed_emails.append(objict(name=name, email=addr))
+        parsed_emails.append(objict(name=name, email=addr, full_email=full_email))
     return parsed_emails
 
 

{django_restit-4.2.149 → django_restit-4.2.152}/metrics/models.py

@@ -192,10 +192,8 @@ def get_metrics(slug, granularity, start, end=None, group=None, samples=None):
         start = utils.start_by_granularity(granularity, start, samples=samples)
     # set the correct end for this granularity
     end = utils.date_for_granulatiry(end, granularity)
-
     qset = Metrics.objects.filter(
         slug=slug, granularity=granularity, start__gte=start, start__lte=end, group=group)
-    raw_metrics = dict()
     # now we want to get the keys from the most recent object (latest keys if changed)
     keys = None
     obj = qset.last()
@@ -203,27 +201,29 @@ def get_metrics(slug, granularity, start, end=None, group=None, samples=None):
         return objict(periods=[], data={})
     values = obj.getMetrics()
     keys = values.keys()
-
-    for obj in qset:
+    period_values = []
+    for obj in qset.order_by("uuid"):
         values = obj.getMetrics()
-        raw_metrics[utils.slug_to_label(obj.uuid)] = values
-
+        pvals = objict(uuid=obj.uuid, period=utils.slug_to_label(obj.uuid), values=values)
+        period_values.append(pvals)
     periods = get_chart_periods(slug, granularity, start, end)
-
+    # now we assume that our raw metrics are sorted correctly
     data = dict()
     if keys is None:
         return objict(periods=periods, data=data)
     for k in keys:
         data[k] = []
-
+    # this logic is not perfect
+    # it will find the first match first the last match
     for period in periods:
-        if period not in raw_metrics:
+        result = next((d for d in period_values if d.get("period") == period), None)
+        if result is None:
             for k in keys:
                 data[k].append(0)
-        else:
-            values = raw_metrics[period]
-            for k in keys:
-                data[k].append(values.get(k, 0))
+            continue
+        for k in keys: 
+            data[k].append(result["values"].get(k, 0))
+        period_values.remove(result)
     return objict(periods=periods, data=data)
 
 

{django_restit-4.2.149 → django_restit-4.2.152}/metrics/utils.py

@@ -202,6 +202,7 @@ def slug_to_label(slug):
         return f"{lbl[-5:]}".replace("-", ":")
     return lbl
 
+
 def date_for_granulatiry(date, granularity):
     if granularity == "minutes":
         return date.replace(second=0, microsecond=0)

{django_restit-4.2.149 → django_restit-4.2.152}/pyproject.toml

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

{django_restit-4.2.149 → django_restit-4.2.152}/rest/__init__.py

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

{django_restit-4.2.149 → django_restit-4.2.152}/ws4redis/connection.py

@@ -60,13 +60,14 @@ class WebsocketConnection():
         # check our other auth mechanisms
         auther = self.getAuthenticator(msg.kind)
         if auther is None or not hasattr(auther, "authWS4RedisConnection"):
-            logger.error("invalid auth", msg)
+            logger.error(f"{self.ip} invalid auth", msg)
             self.sendToWS(msg.channel, dict(error="invalid auth kind", code=500))
             return
 
+        # logger.info(f"{self.ip} authenticating")
         self.credentials = auther.authWS4RedisConnection(msg)
         if self.credentials is None or self.credentials.pk is None:
-            logger.error("invalid credentials for", msg, self.credentials)
+            logger.error(f"{self.ip} invalid credentials for", msg, self.credentials)
             self.sendToWS(msg.channel, dict(error="invalid credentials", code=401))
             return
         self.on_authenticated()
@@ -182,20 +183,24 @@ class WebsocketConnection():
         dmsg = UberDict.fromJSON(raw_data, ignore_errors=True)
         if dmsg.action:
             # this is a special message that we want to handle directly
-            if dmsg.action == "auth":
-                self.on_auth(dmsg)
-            elif dmsg.action == "subscribe":
-                self.on_subscribe(dmsg)
-            elif dmsg.action == "unsubscribe":
-                self.on_unsubscribe(dmsg)
-            elif dmsg.action == "resubscribe":
-                self.on_resubscribe(dmsg)
-            elif dmsg.action == "publish":
-                self.on_publish(dmsg)
-            elif dmsg.action == "save":
-                self.on_save(dmsg)
-            elif dmsg.channel:
-                self.on_channel_msg(dmsg)
+            try:
+                if dmsg.action == "auth":
+                    self.on_auth(dmsg)
+                elif dmsg.action == "subscribe":
+                    self.on_subscribe(dmsg)
+                elif dmsg.action == "unsubscribe":
+                    self.on_unsubscribe(dmsg)
+                elif dmsg.action == "resubscribe":
+                    self.on_resubscribe(dmsg)
+                elif dmsg.action == "publish":
+                    self.on_publish(dmsg)
+                elif dmsg.action == "save":
+                    self.on_save(dmsg)
+                elif dmsg.channel:
+                    self.on_channel_msg(dmsg)
+            except Exception as err:
+                self.sendToWS(dmsg.get("channel", "system"), dict(error=str(err)))
+                logger.exception(self.ip)
 
     def on_save(self, msg):
         if self.credentials and self.credentials.instance:
@@ -287,7 +292,7 @@ class WebsocketConnection():
                 self.on_ws_msg(self.last_msg)
         except Exception:
             # logger.exception()
-            logger.error("unable to recv on ws... flushing")
+            logger.error(f"{self.ip}: unable to recv on ws... flushing")
             self.websocket.flush()
 
     def checkHeartbeat(self):