django-restit 4.2.114__py3-none-any.whl → 4.2.116__py3-none-any.whl

{django_restit-4.2.114.dist-info → django_restit-4.2.116.dist-info}/METADATA

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

{django_restit-4.2.114.dist-info → django_restit-4.2.116.dist-info}/RECORD

@@ -333,7 +333,7 @@ medialib/youtube/upload.py,sha256=MTuPxm1ZC-y5pXAGtLNtp1hBSNZgCKYt1ewP5hwMQHI,28
 medialib/youtube/uritemplate/__init__.py,sha256=ONWR_KRz9au0O-XUUTrO_UN7GHTmZCTKyvflUQb8wxM,4996
 metrics/README.md,sha256=YwbCA2y6xJBlaO6yEtl1zWpqrQ4ZzkQSuQT-h6btET8,2307
 metrics/__init__.py,sha256=70sdDZGOwGIEFWgDkHWPMVODFelo206jp1g-BFV2u_4,90
-metrics/client.py,sha256=WXyyl4C4CUZECJHWrY154uTPMEoJTZoYocVK582i4co,25322
+metrics/client.py,sha256=vc49J0KLLJlryhb77I-ejShDnWGF8NqSU6mhdPv8V2s,25570
 metrics/eod.py,sha256=gnq-tNE7xfm2ah52e2TUyERgUQNwkFuT2rtDv8XOUVQ,9182
 metrics/examples/eod_example.py,sha256=gYtansjsKILVxe8XJD12XPaxmBJ-B6dOXGZG2JTGWA8,1664
 metrics/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -374,7 +374,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=I4M0vBLQ0dMaa7ccf6GrMzSczgRpGJKMpuC_hGglXKw,122
+rest/__init__.py,sha256=zq-aA_H3gyebhcB7jqx-Fz7xYfU8p-8olZwDkM19dMU,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
@@ -382,7 +382,7 @@ rest/crypto/aes.py,sha256=NOVRBRSHCV-om68YpGySWWG-4kako3iEVjq8hxZWPUU,4372
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
 rest/datem.py,sha256=JHMvWG8A-n4g915wrZiCtfuhgcLMgNYMXuzXIEtgaPg,12335
-rest/decorators.py,sha256=ig0LATc3-2mhEJPAWHRbIRM-ZOFyjm6e_F9RhpRWidE,15082
+rest/decorators.py,sha256=AuB4agpog587CUsF8HkAZiHDfs_pueb2rdxXZD7dUUE,15327
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=uKwG9OkLme36etabqK54DMjMQc1fgEoUIAUxXa7WFQw,612
 rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
@@ -456,7 +456,7 @@ taskqueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/models.py,sha256=VQ8Slk6Cm3H7ZDCfFP_b83VL2mpSdOOGTxALTZxQdqo,23726
+taskqueue/models.py,sha256=RsBC2YcG058D_LVq5fCgiqIaFqi5yDh9LAwI6Pe2V3A,23719
 taskqueue/periodic.py,sha256=hpXnunJL_cuVQLAKpjTbABbsQ4fvdsV9_gyyK-_53Sk,3844
 taskqueue/rpc.py,sha256=Lf5VUoqCRkfWUAIvx_s508mjAtDPwpiWyxg0ryqWbQA,5793
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
@@ -509,7 +509,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.114.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.114.dist-info/METADATA,sha256=XRTxk70XLcfM04aM6GvDnMGuuQ5FoDyrYoVybJVrLNI,7663
-django_restit-4.2.114.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.114.dist-info/RECORD,,
+django_restit-4.2.116.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.116.dist-info/METADATA,sha256=BToaxG5x14y7PloG6uUtuWk9iPDlNIqPS9_CjfUhCvA,7663
+django_restit-4.2.116.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.116.dist-info/RECORD,,

metrics/client.py

@@ -607,6 +607,10 @@ class R(object):
             data[slug].append(v)
 
         # Now, reorganize data for our end result.
+        if len(slugs) == 0:
+            periods = self.build_periods("junk", since, granularity=granularity, samples=samples)
+            values = [0 for p in periods]
+            return dict(periods=periods, data=[dict(slug="na", values=values)])
         periods = self.build_periods(slugs[0], since, granularity=granularity, samples=samples)
         metrics = {'periods': periods, 'data': []}
         for slug, values in data.items():

rest/__init__.py

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

rest/decorators.py

@@ -25,6 +25,7 @@ import traceback
 REST_METRICS = settings.get("REST_METRICS", False)
 REST_METRICS_BY_ENDPOINT = settings.get("REST_METRICS_BY_ENDPOINT", False)
 REST_METRICS_IGNORE = settings.get("REST_METRICS_IGNORE", [])
+REST_METRICS_GRANULARITY = settings.get("REST_METRICS_GRANULARITY", "daily")
 REST_MODULE_NAME = settings.get("REST_MODULE_NAME", "rpc")
 
 
@@ -55,17 +56,17 @@ def postpone(function):
 def rest_error_catcher(func, request, *args, **kwargs):
     try:
         if REST_METRICS:
-            metrics.metric("rest_calls")
+            metrics.metric("rest_calls", min_granularity=REST_METRICS_GRANULARITY)
             if REST_METRICS_BY_ENDPOINT:
                 slug_path = request.path.replace("/", "__")
-                metrics.metric(f"rest_call_{slug_path}", category="rest_calls")
+                metrics.metric(f"rest_call_{slug_path}", category="rest_calls", min_granularity=REST_METRICS_GRANULARITY)
         return func(request, *args, **kwargs)
     except PermissionDeniedException as err:
         return rv.restPermissionDenied(request, err.reason, err.code)
     except RestError as err:
         rh.log_exception("REST ERROR", request.path, err.reason)
         if settings.get("REST_ERROR_METRICS", True):
-            metrics.metric("rest_errors")
+            metrics.metric("rest_errors", min_granularity=REST_METRICS_GRANULARITY)
         if settings.get("REST_ERROR_EVENTS", True):
             incident.exception_event(
                 request, f"{err.code}: {err.reason}", level=7,
@@ -75,7 +76,7 @@ def rest_error_catcher(func, request, *args, **kwargs):
     except Exception as err:
         rh.log_exception("REST EXCEPTION", request.path)
         if settings.get("REST_ERROR_METRICS", True):
-            metrics.metric("rest_errors")
+            metrics.metric("rest_errors", min_granularity=REST_METRICS_GRANULARITY)
         try:
             body = request.body.decode('utf-8')
         except Exception:

taskqueue/models.py

@@ -286,7 +286,7 @@ class Task(models.Model, RestModel):
             import incident
             incident.event_now(
                 category, description=subject, details=msg, 
-                level=3, metadata=metadata)
+                level=3, **metadata)
         except Exception as err:
             self.log(str(err), kind="error")