django-restit 4.2.158__py3-none-any.whl → 4.2.161__py3-none-any.whl

{django_restit-4.2.158.dist-info → django_restit-4.2.161.dist-info}/METADATA

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

{django_restit-4.2.158.dist-info → django_restit-4.2.161.dist-info}/RECORD

@@ -126,7 +126,7 @@ incident/templates/email/incident_change.html,sha256=tQYphypwLukkVdwH0TB2Szz2VEJ
 incident/templates/email/incident_msg.html,sha256=MZdKhTddUF2MpiH8Z3RTQEmW_ko1n3ajeZ11KLtiLlU,13780
 incident/templates/email/incident_new.html,sha256=W6nwFQROnyDfMlXub8s02ws4hGnJp16pfgp9xTm_aEc,15185
 incident/templates/email/incident_plain.html,sha256=AyTv_3ITUwHoAO7Tv_xCODzWQXTV61EdtlphFum0BnM,14739
-incident/tq.py,sha256=BO8OjH5UzLB97vOatMmsuMDeQ1ZYhXWENoomoVJ9QlY,5235
+incident/tq.py,sha256=bWcPhwQGMfsTt1Kb80U6uvMnCuqUZMFMEPVQneUPsNM,5228
 location/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
@@ -355,7 +355,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=ytr4b4S7xlmNjW5C644OgFV_ITu-XTl-B-KgdmjsYdQ,13871
+metrics/models.py,sha256=-bIEvhamfZZKweMEswBcBoZDOQhPqJHbCKyUuH6WjFc,14052
 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
@@ -378,7 +378,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=SU4Po24LGBYYq7oi8hG5xIytEBZ6kYngMv2k66cvPi0,122
+rest/__init__.py,sha256=ZZl-QgQmlrNh4Joe-BilCYkrd4rBnztS0KqzxKAYu3s,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
@@ -411,7 +411,7 @@ 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=RnL6-8N7tghGDcOtWIRwlTWrllgwW6EMoeyi8I-bm4I,71856
+rest/models/base.py,sha256=eOvVDwHgKDdBJAnaK2xavGfkjkfpk5Oqy1KfKRjtu6o,72072
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -470,7 +470,7 @@ taskqueue/transports/http.py,sha256=AzliUnw_LuyO2zZZOoUAJGFcTV-Gxt1iE3hCVnIiyGQ,
 taskqueue/transports/s3.py,sha256=fMosL893u1iQdo6Y1djwb7KEoNo6TTsDPJl13OJdJP8,1913
 taskqueue/transports/sftp.py,sha256=jT1_krjTHA7DCAukD85aGYRCg9m0cEH9EWzOC-wJGdk,1891
 taskqueue/transports/sms.py,sha256=H1-LIGEMfbUNqJD9amRcsvKUSwtz9yBj1QNfB7EHjHE,142
-taskqueue/worker.py,sha256=1YBeTOziUBtgjtgjiwf5ULFrJAfizqxvHxgWomhgtWs,15655
+taskqueue/worker.py,sha256=U_WGw3pJx9-I8loCQyfj3kyWScXOVb45g-6U9uyCH-c,15700
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -514,7 +514,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.158.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.158.dist-info/METADATA,sha256=EK_-ce-t1VPSg93xJBxPOUxxFK2Sh0yEBi6QxTKRdEY,7663
-django_restit-4.2.158.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.158.dist-info/RECORD,,
+django_restit-4.2.161.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.161.dist-info/METADATA,sha256=RlhvubtGorzBm7GK3EeMvv9SdwFB3oTHnl_jz1cNsM4,7663
+django_restit-4.2.161.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.161.dist-info/RECORD,,

incident/tq.py

@@ -127,7 +127,7 @@ def run_cleanup(task):
     if count:
         task.log(f"deleted {count} old Events")
     
-    count = ia.Incident.objects.filter(created__lte=stale).filter(state=ia.INCIDENT_STATE_IGNORE).delete()[0]
+    count = ia.Incident.objects.filter(created__lte=stale, state=ia.INCIDENT_STATE_IGNORE).delete()[0]
     if count:
         task.log(f"deleted {count} old Incidents")
 

metrics/models.py

@@ -13,7 +13,7 @@ from .eod import EODMetrics
 # THIS IS IN DAYS
 METRICS_EXPIRE_HOURLY = settings.get("METRICS_EXPIRE_HOURLY", 90)
 METRICS_EXPIRE_DAILY = settings.get("METRICS_EXPIRE_DAILY", 360)
-
+METRICS_EXPIRE_WEEKLY = settings.get("METRICS_EXPIRE_WEEKLY", 360)
 
 def metric(
     slug, keys, data, min_granularity="hourly",
@@ -38,6 +38,8 @@ def metric(
             expires = datetime.now() + timedelta(days=METRICS_EXPIRE_HOURLY)
         elif granularity == "daily":
             expires = datetime.now() + timedelta(days=METRICS_EXPIRE_DAILY)
+        elif granularity == "weekly":
+            expires = datetime.now() + timedelta(days=METRICS_EXPIRE_WEEKLY)
         m, created = Metrics.objects.get_or_create(
             uuid=key, 
             defaults=dict(

rest/__init__.py

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

rest/models/base.py

@@ -1657,6 +1657,10 @@ class RestModel(object):
                         q[f"properties__int_value__{meta_op}"] = value
                     else:
                         q[f"properties__value__{meta_op}"] = value
+                elif value in [1, "1"]:
+                    q[f"properties__int_value"] = value
+                elif value in [0, "0"]:
+                    q[f"properties__int_value"] = value
                 else:
                     q["properties__value"] = value
                 continue
@@ -1699,6 +1703,7 @@ class RestModel(object):
                 value = rh.toInteger(value)
             q[key] = value
         if bool(q):
+            rh.debug(q)
             exq = {key[:-4]: q[key] for key in q if key.endswith("__ne")}
             q = {key: q[key] for key in q if not key.endswith("__ne")}
             if bool(exq):

taskqueue/worker.py

@@ -227,6 +227,7 @@ class WorkManager(object):
         elif action == "get_stats":
             data = nobjict(action="stats", hostname=settings.HOSTNAME)
             data.uptime = time.time() - self.started_at
+            data.workers = self.worker_count
             data.subscribed = self.subscribe_to
             data.running = self._running_count
             data.pending = self._pending_count