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

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

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

{django_restit-4.2.151.dist-info → django_restit-4.2.153.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=ORYgg_QRKQqv3M3vok1MPK7eIMmmwqUwxk_Fa-cb3bM,5550
+inbox/utils/parsing.py,sha256=y_71dwz8bm3JvF35ol8698XJ36sBF8fQWUrn0sYd2Fs,5597
 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
@@ -242,7 +242,7 @@ medialib/static/lib/tinymce/plugins/medialib/editor_plugin.js,sha256=We_6msWhBiy
 medialib/static/lib/tinymce/plugins/medialib/editor_plugin_src.js,sha256=We_6msWhBiyj0MCwU2mA-Obz_JzKSN743wEgelBLtek,1163
 medialib/static/lib/tinymce/plugins/medialib/js/dialog.js,sha256=PSGxVxHpY9m5D_ZijapOx_-Xl4a_E3l5Z0py6kDXvfE,5708
 medialib/static/lib/tinymce/plugins/medialib/medialib.html,sha256=7zoWtyXkUgt645D5Xol7KIb7Z2oErapBaVmClJL-958,3502
-medialib/stores/__init__.py,sha256=HvPbBTov-lekG0szyXylrKzEVNL5egIuqW4U42IMLZw,5876
+medialib/stores/__init__.py,sha256=sVo0IHoxgMj19qllzT2zsrt0R22NvWLJKN0kzwahvpI,5875
 medialib/stores/apiclient/__init__.py,sha256=iGdQFKwzm0VxArl8X183-_ZBhIsETZlbXxhBAUz3MfI,601
 medialib/stores/apiclient/channel.py,sha256=gsv_9XG0sDO4_rIiIJ06FA_30ZivMaqMwfibqGKFLWQ,9852
 medialib/stores/apiclient/discovery.py,sha256=IQdIU7utMR9Zt0C9MkEjFE_Pla6zoFy9dkRAiI8VdJI,35929
@@ -356,14 +356,14 @@ metrics/migrations/0003_metrics_expires.py,sha256=_g4oRv4NHW-4iCQx2s1SiF38LLyFf8
 metrics/migrations/0004_eodmetrics.py,sha256=Ky6ZVMZqa0F_SUp_QFWY7ZKBgVhy9CS4wZcsEhrkSgc,3271
 metrics/migrations/0005_alter_metrics_v1_alter_metrics_v10_alter_metrics_v11_and_more.py,sha256=pmwJfpPJ1RUX_CqM66l6vvV-nrAUPo_GIan0Pc9mQHs,2358
 metrics/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metrics/models.py,sha256=SF3fCAK43GIDh1_wkkoSc5cv1zKBDo4gv0mP5lFxPwc,13564
+metrics/models.py,sha256=ytr4b4S7xlmNjW5C644OgFV_ITu-XTl-B-KgdmjsYdQ,13871
 metrics/periodic.py,sha256=IayBLLat40D8FB-A3bYBW9lxm9-IzcugQunojThQ_OU,661
 metrics/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metrics/providers/aws.py,sha256=dIBGFE1Fvszy6rmVrn_Fm1zUDv345q4dBsg9Iit-XCc,8358
 metrics/rpc.py,sha256=gnyRFBW2KBA-TAiqVcwkoVviX4bPbZ2WZELlR9uEUlM,22213
 metrics/settings.py,sha256=wwHA9Z7BAHNeu3tFVn8Fh5j46KR-eGx0E8r5dzCFlAU,132
 metrics/tq.py,sha256=WHBRYSinmTuxF9l-_-lx0yfzEYkb0ffVMt_uvCj9bYo,825
-metrics/utils.py,sha256=PSydxeI983udULUTcbeWG-_ulPSOac6Q_t_8k_Vjn1I,12606
+metrics/utils.py,sha256=QZ9Gcv_vsh3yS5laXGMJQgGxmanwC1LfVhfAkAZl2yk,12607
 pushit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pushit/admin.py,sha256=69HdDZU_Iz8Fm72M8r8FUztsZvW37zdGwVmj8VTqr0c,451
 pushit/migrations/0001_initial.py,sha256=kYF1ksOlKf9ElrlagGhpNf5GbKEq6SORWGreMH9A7as,4555
@@ -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=NlPBDSPooXfNg535Lz8YBFDbF0KQOjtEHtUd8dGdGOA,122
+rest/__init__.py,sha256=8aFIz-8RHV4xBWuoJXgDNggbkdl1BC7eSkON9J2HXVY,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
@@ -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.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,,
+django_restit-4.2.153.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.153.dist-info/METADATA,sha256=VojJKBZUJNrnd64vmXxVW51-UNOstFLOcaMDflyUgbg,7663
+django_restit-4.2.153.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.153.dist-info/RECORD,,

inbox/utils/parsing.py

@@ -132,6 +132,8 @@ def toFileObject(attachment):
 
 
 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

medialib/stores/__init__.py

@@ -53,7 +53,7 @@ def view_url(url, expires=600, is_secure=False, request=None):
             mpath = url[len(k):]
             try:
                 ext = mpath.rsplit('.', 1)[1]
-            except ValueError:
+            except Exception:
                 ext = None
             srcip = getattr(request, 'META', {}).get('REMOTE_ADDR', None)
             try:

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)
 
 

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)

rest/__init__.py

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