django-restit 4.2.139__tar.gz → 4.2.141__tar.gz

{django_restit-4.2.139 → django_restit-4.2.141}/PKG-INFO

@@ -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 → django_restit-4.2.141}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.139"
+version = "4.2.141"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.139 → django_restit-4.2.141}/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"

{django_restit-4.2.139 → django_restit-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:

{django_restit-4.2.139 → django_restit-4.2.141}/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:

{django_restit-4.2.139 → django_restit-4.2.141}/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):

{django_restit-4.2.139 → django_restit-4.2.141}/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):

{django_restit-4.2.139 → django_restit-4.2.141}/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):