django-restit 4.2.139__py3-none-any.whl → 4.2.141__py3-none-any.whl

{django_restit-4.2.139.dist-info → django_restit-4.2.141.dist-info}/METADATA

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

{django_restit-4.2.139.dist-info → django_restit-4.2.141.dist-info}/RECORD

@@ -377,7 +377,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=W9iMjMLUXgCp5VQe62P3Mky_Gv21udyvJXdIErjW-lU,122
+rest/__init__.py,sha256=YC4So4Ejobln4uHaypwHTf7FfQPfOQA2E7VzAEIVpK0,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
@@ -410,13 +410,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=tIdtYxT2RWkfesxxWBxwMaiMbsD7gr6bBF6qmC4PqFQ,71711
+rest/models/base.py,sha256=NTw7IHJu4wpJ3CwIDbYZnoDe8mbJ5B6quocAmyzzJ2c,71787
 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=xun-HuaEqm1Lwg-9Xm4Y2JwOf8wTdpoagHuIUNlqTlI,2891
+rest/rpc.py,sha256=fcOI84p8sK9MJBDRgjBwtPtylOTOZNUUhFmFtSSndB8,2919
 rest/search.py,sha256=QVjk2b5tZLgf1zM2MHvJTyRjwUbY5ZD7HXSTmSPXtvU,8362
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=V9O4qxw26VX9dSYdbsN0-RNnXEi347Ln8eFLZ003LhA,4646
@@ -469,7 +469,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=wzp44fk6LX94MdrXLp_IJmWgutLCBKqoobk433OiLqw,15822
+taskqueue/worker.py,sha256=MFHj8P_Fdh_2BBKVDf0stF8TNgdQlEl6lg_f8lhRCIQ,16204
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -502,10 +502,10 @@ wiki/rpc/wiki.py,sha256=RQY1gtqxdNhp13n3SkZL9WZ6RatrtCIh7QOYta6-UUU,1327
 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=kElPtVMVObLUXAfu32v_PHd0HyygrW-ukk37_Tuo7ZM,7062
+ws4redis/client.py,sha256=HTntgqlMzZU9MhBz3fn3fXDpzfaTDZx_9tIb5SU91hY,7077
 ws4redis/connection.py,sha256=rlzdmgyjmuqETxjNf3uZU3tfoBeQQTzD4ZFru_u3JAs,13738
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
-ws4redis/redis.py,sha256=IfT4p3bUtlqso9rryNliH9Ebzlx8-Q2VJcs1kFioeGA,6093
+ws4redis/redis.py,sha256=fTNKrXPelowZrgji1XaijUoeQepV1ab1_Y3_tHsysww,6511
 ws4redis/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws4redis/servers/base.py,sha256=3nYZF5jSsQxNLbnLtKLFJ82xJs_Mc7N1H2kEOx8wT6o,3747
 ws4redis/servers/django.py,sha256=cKOE4U0cE8I3_rDaLgv-KuDb376RASdOzUn7MlDA4As,5900
@@ -513,7 +513,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.139.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.139.dist-info/METADATA,sha256=-RSYtViuxP0HG4yjHKLLDRQX_An5kFw3bu9Tix_Xs_U,7663
-django_restit-4.2.139.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.139.dist-info/RECORD,,
+django_restit-4.2.141.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.141.dist-info/METADATA,sha256=Y15h9tAP-SaF2niw_d4c0qKCW_aCAcHDJca7xzY4ivk,7663
+django_restit-4.2.141.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.141.dist-info/RECORD,,

rest/__init__.py

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

rest/models/base.py

@@ -1004,6 +1004,7 @@ class RestModel(object):
     def on_rest_date_filter(cls, request, qset=None):
         dr_start = request.DATA.get("dr_start", field_type=datetime)
         dr_end = request.DATA.get("dr_end", field_type=datetime)
+        dr_end_str = request.DATA.get("dr_end")
         tr_start = request.DATA.get("tr_start")
         tr_end = request.DATA.get("tr_end")
         dr_offset = request.DATA.get("dr_offset", 0, field_type=int)
@@ -1021,7 +1022,7 @@ class RestModel(object):
             dr_end = datetime.now() + timedelta(hours=5)
         elif dr_end == dr_start and not tr_end:
             dr_end = dr_start + timedelta(days=1)
-        elif not tr_end:
+        elif "-" in dr_end_str or "/" in dr_end_str:
             dr_end = dr_end + timedelta(days=1)
 
         if tr_start is not None:

rest/rpc.py

@@ -58,7 +58,7 @@ def on_get_status(request):
         flag = redis.ping()
     except Exception:
         flag = False
-    status = dict(redis=flag, database={})
+    status = dict(redis=flag, database={}, pool=redis.getPoolStatus())
     for alias in settings.DATABASES.keys():
         db_conn = connections[alias]
         try:

taskqueue/worker.py

@@ -5,18 +5,29 @@ from concurrent import futures
 
 from redis import ConnectionPool, StrictRedis
 from ws4redis import settings as ws4redis_settings
+from objict import nobjict, objict
 
 redis_connection_pool = ConnectionPool(**ws4redis_settings.WS4REDIS_CONNECTION)
 
+
 def getRedisClient():
     return StrictRedis(connection_pool=redis_connection_pool)
 
+
+def getPoolStatus():
+    status = objict()
+    status.max_size = redis_connection_pool.max_connections
+    status.size = redis_connection_pool._created_connections
+    status.in_use = len(redis_connection_pool._in_use_connections)
+    status.available = len(redis_connection_pool._available_connections)
+    return status
+
+
 from .models import redis, Task, TASK_STATE_STARTED
 from .transports import email, http, sftp, sms, s3
 from rest import helpers
 from rest.log import getLogger
 from rest import settings
-from objict import nobjict
 from datetime import datetime, timedelta
 import time
 
@@ -238,6 +249,7 @@ class WorkManager(object):
             data.running = self._running_count
             data.pending = self._pending_count
             data.scheduled = len(self._scheduled_tasks.keys())
+            data.pool = dict(**getPoolStatus())
             redis.publish(event.data.response_channel, data)
 
     def on_task_started(self, task):

ws4redis/client.py

@@ -2,7 +2,7 @@ import time
 
 from rest import UberDict
 
-from ws4redis.redis import RedisMessage, RedisStore, getRedisClient
+from ws4redis.redis import RedisMessage, RedisStore, getRedisClient, getPoolStatus
 
 
 def buildEventMessage(name=None, message=None, priority=0, model=None, model_pk=None, custom=None):

ws4redis/redis.py

@@ -17,6 +17,18 @@ def getRedisClient():
     return StrictRedis(connection_pool=REDIS_CON_POOL)
 
 
+# Function to check the number of connections in use and available
+def getPoolStatus():
+    status = UberDict()
+    if REDIS_CON_POOL is None:
+        return status
+    status.max_size = REDIS_CON_POOL.max_connections
+    status.size = REDIS_CON_POOL._created_connections
+    status.in_use = len(REDIS_CON_POOL._in_use_connections)
+    status.available = len(REDIS_CON_POOL._available_connections)
+    return status
+
+
 class RedisMessage(bytes):
     def __new__(cls, value):
         if isinstance(value, str):