django-restit 4.2.147__py3-none-any.whl → 4.2.151__py3-none-any.whl

{django_restit-4.2.147.dist-info → django_restit-4.2.151.dist-info}/METADATA

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

{django_restit-4.2.147.dist-info → django_restit-4.2.151.dist-info}/RECORD

@@ -91,7 +91,7 @@ inbox/models/message.py,sha256=acPm2z0QsucoFFmfzPekehElZm8EMzkcGChX_BpzGLU,3758
 inbox/models/template.py,sha256=i5vf0vsM1U0251UmVsF61MDCV_c7xt-zdCdx1SiKOG0,1013
 inbox/rpc.py,sha256=7JXvpXlEGKG7by_NkANPGYLCzagyCnTIGM4rme_htpk,1534
 inbox/utils/__init__.py,sha256=P_UR2rGK3L0tZNlTN-mf99tpeYM-tLkA18iDKXSSLDM,89
-inbox/utils/parsing.py,sha256=cU5qHaVNkje21b3ApeCixYQEuCsQl0gM8FeLz9DPgs0,5340
+inbox/utils/parsing.py,sha256=ORYgg_QRKQqv3M3vok1MPK7eIMmmwqUwxk_Fa-cb3bM,5550
 inbox/utils/render.py,sha256=CU_F2qUBQE7mjb9Q6Dn9ro5CS_O_zEY-wDMHEClKkIA,4331
 inbox/utils/sending.py,sha256=BKelTZnbkdSLGpjOY6IRTrzj-Hnw2pPZ7RYQGwe-tqk,2179
 incident/README.md,sha256=4vbZTJj7uUmq8rogYngxqNYjFTlBOujfWUGheLoFKMc,1114
@@ -163,7 +163,7 @@ location/rpc/location.py,sha256=D5R54nnmmp8NaHQRkP_TF921Ej6j9nmTUNzX1K5WVPc,779
 location/rpc/track.py,sha256=jSS9_eiKayM_8iW_4Ldojg9a2_trjfXhnLe_a261x5E,3735
 medialib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 medialib/admin.py,sha256=befSpVP7TpyWGsh47E1CiFMUSwNYT7bxMgzgyDK07yI,2261
-medialib/caching.py,sha256=K5dE8fpsC2mpFB5WLJQKx9OtjuhvYeTtQM5vBA5IBEE,2292
+medialib/caching.py,sha256=Hhkj8OsR6sLJ1RSWtQKsIHru2yYQpk-UBYK5IUWD-Jk,2776
 medialib/cvutil/__init__.py,sha256=ADxS2MfnLqzd7NI2QgWeQSNcgJCNBP2Wgy3hBZV9w4s,27
 medialib/cvutil/contours.py,sha256=B6_PGOIg_ORX9i3K8PE35H_c2H0LejLSRE1sQMxPaIc,4269
 medialib/cvutil/images.py,sha256=9qQDd1rE3HJZ0MBn2v39snBXatI9fLqYPQXgdCuaQs0,12649
@@ -379,7 +379,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=DXC3jf0JO99XmF87usjMaANr6EwqvH5vRYN3btnK7bg,122
+rest/__init__.py,sha256=NlPBDSPooXfNg535Lz8YBFDbF0KQOjtEHtUd8dGdGOA,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -412,13 +412,13 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=NTw7IHJu4wpJ3CwIDbYZnoDe8mbJ5B6quocAmyzzJ2c,71787
+rest/models/base.py,sha256=RnL6-8N7tghGDcOtWIRwlTWrllgwW6EMoeyi8I-bm4I,71856
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=N56056vV3zWkAP-QrYsCu7SdpPzE5kLuPoxGIuZAKt0,16127
-rest/rpc.py,sha256=CNQ2RtAPOYxZtpZxjh0sVzBmIGBYMP7n3CDEDwMENF0,2966
+rest/rpc.py,sha256=WXZe5CLdYMeSXRH6wuzl-_riPPRnmtFNVJB9dfY1GSo,2965
 rest/search.py,sha256=QVjk2b5tZLgf1zM2MHvJTyRjwUbY5ZD7HXSTmSPXtvU,8362
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=V9O4qxw26VX9dSYdbsN0-RNnXEi347Ln8eFLZ003LhA,4646
@@ -505,7 +505,7 @@ 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=HTntgqlMzZU9MhBz3fn3fXDpzfaTDZx_9tIb5SU91hY,7077
-ws4redis/connection.py,sha256=HeRrQUxNYMJ-2SSSYB2XBHScKRbQRMCuQueDSUDJXXQ,13740
+ws4redis/connection.py,sha256=SM0KOaTjNeRt3W28mBsSPi3dgegXlhWhLIpGYULgl1Q,14060
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
 ws4redis/redis.py,sha256=jHfwpUG0Nru_zSyD-xwJhX67gASqVtTFiAc3RwgTcJs,6542
 ws4redis/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -515,7 +515,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=KKq00EwoGnz1yLwCZr5Dfoq2izivmAdsNEEM4EhZwN4,1610
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.147.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.147.dist-info/METADATA,sha256=UVN5VubPWs-OWuDvx_HWVNDvVXXCg7PaG0uumf-GTuo,7663
-django_restit-4.2.147.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.147.dist-info/RECORD,,
+django_restit-4.2.151.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.151.dist-info/METADATA,sha256=0mVYsiUDKwkB_0VkL_-c_AYqtKqycTiUyl7-UWGsV4Y,7663
+django_restit-4.2.151.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.151.dist-info/RECORD,,

inbox/utils/parsing.py

@@ -131,7 +131,7 @@ def toFileObject(attachment):
     return obj
 
 
-def parseAddresses(input_string):
+def parseAddresses(input_string, force_name=False):
     # 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 +141,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
 
 

medialib/caching.py

@@ -1,3 +1,4 @@
+import io
 from rest import settings
 from medialib.stores import s3
 from django.http import HttpResponse, StreamingHttpResponse
@@ -45,7 +46,18 @@ def getCachedItem(cache_guid, content_type="application/json"):
 def cacheResponse(response, cache_guid, content_type="application/json"):
     url = f"s3://{settings.AWS_S3_BUCKET}/caching/{cache_guid}"
     item = s3.S3Item(url, content_type)
-    item.upload(response.content)
+    if isinstance(response, StreamingHttpResponse):
+        # Access the streaming content and convert it to a file-like object
+        content = io.BytesIO()
+        for chunk in response.streaming_content:
+            content.write(chunk)
+        # Reset the file pointer to the beginning before uploading
+        content.seek(0)
+        item.upload(content)
+        content.seek(0)
+        response.streaming_content = iter(lambda: content.read(8192), b'')
+    else:
+        item.upload(response.content)
     return item
 
 

rest/__init__.py

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

rest/models/base.py

@@ -1028,6 +1028,7 @@ class RestModel(object):
         if tr_start is not None:
             dr_start = rh.updateTimeFromString(dr_start, tr_start)
         if tr_end is not None:
+            dr_end = request.DATA.get("dr_end", field_type=datetime)
             dr_end = rh.updateTimeFromString(dr_end, tr_end)
 
         if dr_tz is not None:

rest/rpc.py

@@ -81,7 +81,7 @@ def on_get_system_info(request):
     out = hostinfo.getHostInfo(
         include_versions=request.DATA.get("versions") and SOFTWARE_VERSIONS,
         include_blocked=request.DATA.get("blocked"))
-    out["redist_pool"] = redis.getPoolStatus()
+    out["redis_pool"] = redis.getPoolStatus()
     return views.restGet(request, out)
 
 

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):