django-restit 4.2.117__py3-none-any.whl → 4.2.119__py3-none-any.whl

{django_restit-4.2.117.dist-info → django_restit-4.2.119.dist-info}/METADATA

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

{django_restit-4.2.117.dist-info → django_restit-4.2.119.dist-info}/RECORD

@@ -351,7 +351,7 @@ 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=lD9nVzfwdav70ENulqJ8rE8Ui8EWlzdVp05rg8bAlMA,13444
+metrics/models.py,sha256=SF3fCAK43GIDh1_wkkoSc5cv1zKBDo4gv0mP5lFxPwc,13564
 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
@@ -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=eEcQu-xBJYFfnIKJ2D20u1uTGYqA98jafXZ8kYWSowY,122
+rest/__init__.py,sha256=T69hPGVuXYLkkZwzO8U8g_fb7Vw1XimtawbmkqkYBio,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
@@ -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.117.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.117.dist-info/METADATA,sha256=JwiKaeVRnqgf3Vmbq6pENaofQTVTldb95V4T0dRh6_c,7663
-django_restit-4.2.117.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.117.dist-info/RECORD,,
+django_restit-4.2.119.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.119.dist-info/METADATA,sha256=bfo5mQTv9HTNskCFG0XkAhrkfzGHplgxitT1tKK9Ul4,7663
+django_restit-4.2.119.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.119.dist-info/RECORD,,

metrics/models.py

@@ -46,17 +46,19 @@ def metric(
         m.updateMetrics(keys, data, created)
 
 
-def gauge(slug, keys, data, granularity="daily", group=None, date=None, timezone=None, slug_append=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
+    if max_granularity is None:
+        max_granularity = granularity
     uuid_key = generate_uuid(slug, group, slug_append)
-    granularities = utils.granularities(granularity, granularity)
+    granularities = utils.granularities(granularity, max_granularity)
     date = normalize_date(date, timezone, group)
-    
     uuids = utils.build_keys(
         uuid_key, date,
         min_granularity=granularity,
-        max_granularity=granularity)
+        max_granularity=max_granularity)
 
     for gran, key in zip(granularities, uuids):
         # DO not change slug to uuid_key so we can filter by group using group field
@@ -72,6 +74,7 @@ def gauge(slug, keys, data, granularity="daily", group=None, date=None, timezone
                 group=group, start=utils.date_for_granulatiry(date, gran)))
         m.setMetrics(keys, data, created)
 
+
 def normalize_date(date=None, timezone=None, group=None):
     if date is None:
         date = utils.datetime.utcnow()
@@ -83,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:

rest/__init__.py

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