django-restit 4.2.136__py3-none-any.whl → 4.2.138__py3-none-any.whl

{django_restit-4.2.136.dist-info → django_restit-4.2.138.dist-info}/METADATA

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

{django_restit-4.2.136.dist-info → django_restit-4.2.138.dist-info}/RECORD

@@ -366,25 +366,25 @@ pushit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pushit/admin.py,sha256=69HdDZU_Iz8Fm72M8r8FUztsZvW37zdGwVmj8VTqr0c,451
 pushit/migrations/0001_initial.py,sha256=kYF1ksOlKf9ElrlagGhpNf5GbKEq6SORWGreMH9A7as,4555
 pushit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pushit/models.py,sha256=dbUJgD9W1y_2H5NxMUQhjsucvLkruErRMXkUSbza3ck,5066
+pushit/models.py,sha256=fkJdNqj8dC2Y8mbri4keOEVfrZZeq3-IUrvJdxY7ve0,4615
 pushit/rpc/__init__.py,sha256=13ibfbWNdjoNxzCzF8QxasSzFgs8IZJPc05XhErOBCw,88
 pushit/rpc/githooks.py,sha256=hjL1x0qN_YB4QZfwrOAVg-biEFRreKp8LK4FaLUBHyw,1756
 pushit/rpc/legacy.py,sha256=9xsZH1S70htIb0bwKENfhTe-uHvyqSTiPiwYTlLWS3E,5028
-pushit/rpc/products.py,sha256=JFNN0VYsZQ9VJ5RZ3vD0m2hhsXEIB5Koz66inlMzx6Y,378
+pushit/rpc/products.py,sha256=n9IAbKbmURrXMQcQji9cP5Wpp8kAqsjwzK9XvKAxu6E,738
 pushit/static/js/models_pushit.js,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pushit/tq.py,sha256=uD0g1Jj1n5IAlbnNOa_YORfQHEXMW30eYpei35lH3so,424
 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=P7AsJG2-fQOZPMovCvkbEW57dyHqLdU0F4_ptZlHISg,122
+rest/__init__.py,sha256=JUtEuNqc7n7slOQOEm9TZVqe9zNOKgxUmepHVFPIeJc,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
 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=hX6bTbl5mQSg0x2hDK5P1TynkZFUfVTDwYkTuFObgbw,12626
+rest/datem.py,sha256=qbkgDpTVbxpnS4hRm_GnyRo9Gk7nRJbH-tJqxm172mo,13152
 rest/decorators.py,sha256=AuB4agpog587CUsF8HkAZiHDfs_pueb2rdxXZD7dUUE,15327
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=uKwG9OkLme36etabqK54DMjMQc1fgEoUIAUxXa7WFQw,612
@@ -410,7 +410,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=asj1ehoq_LLcm99PbyICGG9I_GQikxilrc52tTs2YBY,71301
+rest/models/base.py,sha256=soIYiW71wZdUPmYf-JPPcnHx79CrA9B-hGNFt_WlRCI,71609
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -459,7 +459,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=RsBC2YcG058D_LVq5fCgiqIaFqi5yDh9LAwI6Pe2V3A,23719
+taskqueue/models.py,sha256=Q4kAo-1pELdBpS5IkSLiDLJ5-hu4Qa0GG0ERoW0XLg4,23855
 taskqueue/periodic.py,sha256=hpXnunJL_cuVQLAKpjTbABbsQ4fvdsV9_gyyK-_53Sk,3844
 taskqueue/rpc.py,sha256=Lf5VUoqCRkfWUAIvx_s508mjAtDPwpiWyxg0ryqWbQA,5793
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
@@ -503,17 +503,17 @@ 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/connection.py,sha256=QGjzalYrx1y4o6sb6P1akL-Y2fjf2qil0JCo-ona5F8,13431
+ws4redis/connection.py,sha256=rlzdmgyjmuqETxjNf3uZU3tfoBeQQTzD4ZFru_u3JAs,13738
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
 ws4redis/redis.py,sha256=IfT4p3bUtlqso9rryNliH9Ebzlx8-Q2VJcs1kFioeGA,6093
 ws4redis/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws4redis/servers/base.py,sha256=3nYZF5jSsQxNLbnLtKLFJ82xJs_Mc7N1H2kEOx8wT6o,3747
-ws4redis/servers/django.py,sha256=EF8sHw4--hes7nbswT8M0R6PobtjEvPOb_M_tDrEoR0,5898
+ws4redis/servers/django.py,sha256=cKOE4U0cE8I3_rDaLgv-KuDb376RASdOzUn7MlDA4As,5900
 ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,1723
-ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
+ws4redis/settings.py,sha256=KKq00EwoGnz1yLwCZr5Dfoq2izivmAdsNEEM4EhZwN4,1610
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.136.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.136.dist-info/METADATA,sha256=0XTqwV9RSBBDL7jfrwHLJoRI-Rr122bpMowDHQbuLCA,7663
-django_restit-4.2.136.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.136.dist-info/RECORD,,
+django_restit-4.2.138.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.138.dist-info/METADATA,sha256=f8SLDPTRNX35L0cWaSmKyOK6ccRD2-Ex2itkf00QD20,7663
+django_restit-4.2.138.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.138.dist-info/RECORD,,

pushit/models.py

@@ -12,6 +12,7 @@ from rest.middleware import get_request
 from rest import RemoteEvents
 from rest.models import RestModel, MetaDataModel, MetaDataBase
 
+
 class Product(models.Model, RestModel, MetaDataModel):
     class RestMeta:
         GRAPHS = {
@@ -27,7 +28,6 @@ class Product(models.Model, RestModel, MetaDataModel):
                     "current":"default",
                     "beta":"default",
                 },
-                "recurse_into":[("getReleases", "versions")],
                 "exclude":["library"]
             }
         }
@@ -73,6 +73,7 @@ class Product(models.Model, RestModel, MetaDataModel):
 class ProductMetaData(MetaDataBase):
     parent = models.ForeignKey(Product, related_name="properties", on_delete=models.CASCADE)
 
+
 class Release(models.Model, RestModel, MetaDataModel):
     class RestMeta:
         GRAPHS = {
@@ -84,11 +85,9 @@ class Release(models.Model, RestModel, MetaDataModel):
 
         POST_SAVE_FIELDS = ["media"]
 
-
     created = models.DateTimeField(auto_now_add=True, editable=False)
     modified = models.DateTimeField(auto_now=True)
     owner = models.ForeignKey(Member, related_name="+", on_delete=models.CASCADE)
-
     product = models.ForeignKey(Product, related_name="releases", on_delete=models.CASCADE)
 
     notes = models.TextField(blank=True, null=True, default=None)
@@ -97,6 +96,14 @@ class Release(models.Model, RestModel, MetaDataModel):
 
     media = models.ForeignKey(MediaItem, on_delete=models.PROTECT, blank=True, null=True, default=None)
 
+    def set_product(self, value):
+        if isinstance(value, str):
+            self.product = Product.objects.filter(oid=value).last()
+        elif isinstance(value, int):
+            self.product = Product.objects.filter(pk=value).last()
+        else:
+            self.product = value
+
     def makeCurrent(self):
         self.product.current = self
         self.product.save()
@@ -110,36 +117,14 @@ class Release(models.Model, RestModel, MetaDataModel):
             return self.media.url()
         return None
 
-    def set_media(self, value, commit=False):
-        if value is None:
-            return
-
-        if value.startswith("http"):
-            media = MediaItem.CreateFromURL(value, self.owner, library=self.product.getLibrary(), kind=None)
-            self.media = media
-            if commit:
-                self.save()
-            return media
-
-        request = get_request()
-        name = request.DATA.get("media_name", "test.txt")
-        kind = MediaItem.guessMediaKind(value)
-        media = MediaItem(library=self.product.getLibrary(), name=name, owner=self.product.owner, kind=kind, base64_data=value)
-        media.save()
-        self.media = media
-
-    # upload__ called for files
-    def upload__media(self, value, name):
-        if value is None:
-            return
-
-        kind = MediaItem.guessMediaKind(value)
-        media = MediaItem(library=self.product.getLibrary(), name=name, owner=self.product.owner, kind=kind, newfile=value)
-        media.save()
-        self.media = media
-
-    def __unicode__(self):
-        return "{0} - {1}".format(self.product.name, self.version_str)
-
-
-
+    def on_rest_pre_save(self, request, **kwargs):
+        self.owner = self.product.owner
+        if self.version_num == 1:
+            lr = Release.objects.filter(product=self.product).last()
+            if lr is not None:
+                self.version_num = lr.version_num + 1
+
+    def on_rest_saved(self, request, is_new=False):
+        if is_new:
+            self.product.current = self
+            self.product.save()

pushit/rpc/products.py

@@ -4,8 +4,16 @@ from pushit.models import Product, Release
 
 
 @rd.url('product')
-@rd.url('product/<int:pk>')
+@rd.url('product/<str:pk>')
 def rest_on_product(request, pk=None):
+    if pk is not None:
+        if isinstance(pk, str) and not pk.isdigit():
+            obj = Product.objects.filter(oid=pk).last()
+            if obj is not None:
+                if request.method == "GET":
+                    return obj.on_rest_get(request)
+                elif request.method == "POST":
+                    return obj.on_rest_post(request)
     return Product.on_rest_request(request, pk)
 
 

rest/__init__.py

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

rest/datem.py

@@ -394,3 +394,18 @@ def convert_to_epoch_range(start, end=None):
         raise ValueError("Start parameter must be an int, datetime object, or a string representing a timedelta.")
 
     return start_epoch, end_epoch
+
+
+def updateTimeFromString(dt, time_string):
+    # Check if the time_string is in "hour" format (e.g., "13") or 
+    # "hour:minute" format (e.g., "1:32")
+    if ':' in time_string:
+        # Parse hour and minute
+        hour, minute = map(int, time_string.split(':'))
+    else:
+        # Only hour is provided
+        hour = int(time_string)
+        minute = 0
+    # Update the datetime object with the new hour and minute
+    updated_dt = dt.replace(hour=hour, minute=minute, second=0, microsecond=0)
+    return updated_dt

rest/models/base.py

@@ -1021,6 +1021,12 @@ class RestModel(object):
                 if dr_offset > 0:
                     dr_start = dr_start + timedelta(minutes=dr_offset)
                     dr_end = dr_end + timedelta(minutes=dr_offset)
+            tr_start = request.DATA.get("tr_start")
+            if tr_start is not None:
+                tr_start = rh.updateTimeFromString(dr_start, tr_start)
+            tr_end = request.DATA.get("tr_end")
+            if tr_end is not None:
+                tr_end = rh.updateTimeFromString(dr_end, tr_end)
             dr_field = request.DATA.get("dr_field", getattr(cls.RestMeta, "DATE_RANGE_FIELD", "created"))
             q = dict()
             q["{}__gte".format(dr_field)] = dr_start

taskqueue/models.py

@@ -212,8 +212,12 @@ class Task(models.Model, RestModel):
             else:
                 bof = TQ_RETRY_BACKOFF_FACTOR
                 delay = TQ_RETRY_DELAY
-            attempts = self.attempts - 1
-            from_now_secs = delay * (bof ** attempts)
+            attempts = self.attempts - 2
+            if attempts == -1:
+                # retry first attempt right away
+                from_now_secs = 1
+            else:
+                from_now_secs = delay * (bof ** attempts)
         if from_now_secs is not None:
             # this will not run the task again until after this time has been hit
             self.scheduled_for = datetime.now() + timedelta(seconds=from_now_secs)

ws4redis/connection.py

@@ -14,6 +14,7 @@ logger = getLogger("async", filename="async.log")
 MODEL_CACHE = dict()  # caching of app.Model for faster access
 
 ALLOW_ANY_FACILITY = not private_settings.WS4REDIS_FACILITIES
+DISCONNECT_AFTER_NO_CREDS = 30
 
 
 def getRemoteIP(request):
@@ -37,10 +38,15 @@ class WebsocketConnection():
         self.redis = RedisStore(server._redis_connection)
         self.websocket = server.upgrade_websocket(environ, start_response)
         self.last_beat = time.time()
+        self.conneted_time = time.time()
         self.last_msg = None
         self._heart_beat = util.toString(private_settings.WS4REDIS_HEARTBEAT)
         self.debug = private_settings.WS4REDIS_LOG_DEBUG
 
+    @property
+    def elapsed_time(self):
+        return time.time() - self.conneted_time
+
     def refreshFDs(self):
         if len(self.listening_fds) == 1:
             sub_sd = self.redis.get_file_descriptor()
@@ -160,6 +166,7 @@ class WebsocketConnection():
             return True
         Model = self.getAppModel(ch_model)
         if not hasattr(Model, "canPublishTo"):
+            logger.warning("canPublishTo", "no canPublishTo")
             return False
         return Model.canPublishTo(self.credentials, msg)
 
@@ -201,7 +208,7 @@ class WebsocketConnection():
 
     def on_channel_msg(self, msg):
         if not self.canPublishTo(msg):
-            logger.warning("on_channel_msg permission denied", msg)
+            logger.warning("on_channel_msg permission denied", msg, private_settings.WS4REDIS_CHANNELS)
             self.sendToWS(msg.channel, dict(error="cannot publish to channel"))
             return None
         ch_model = private_settings.WS4REDIS_CHANNELS.get(msg.channel, None)
@@ -310,18 +317,17 @@ class WebsocketConnection():
         self.listening_fds = [websocket_fd]
         if callable(private_settings.URL_AUTHENTICATOR):
             private_settings.URL_AUTHENTICATOR(self)
-        no_cred_count = 0
-        
+
         while self.websocket and not self.websocket.closed:
             ready = self.server.select(self.listening_fds, [], [], 4.0)[0]
             if not ready:
                 self.websocket.flush()
             if not self.credentials:
-                no_cred_count += 1
-                if no_cred_count > 10:
+                if self.elapsed_time > 8 and self.elapsed_time < 30:
                     logger.error(f"{self.ip} has sent no credentials", self.ua)
-                    no_cred_count = 0
                     self.sendToWS("member", dict(error="no credentials received"))
+                elif private_settings.WS4REDIS_NOAUTH_CLOSE and self.elapsed_time > 30:
+                    self.release()
                     
             for fd in ready:
                 if fd == websocket_fd:

ws4redis/servers/django.py

@@ -166,7 +166,7 @@ _websocket_url = getattr(settings, 'WEBSOCKET_URL')
 
 def application(environ, start_response):
     if _websocket_url and environ.get('PATH_INFO').startswith(_websocket_url):
-        logger.info("environ", environ)
+        # logger.info("environ", environ)
         return _websocket_app(environ, start_response)
     return _django_app(environ, start_response)
 

ws4redis/settings.py

@@ -42,3 +42,4 @@ WS4REDIS_AUTHENTICATORS = getattr(settings, "WS4REDIS_AUTHENTICATORS", {})
 URL_AUTHENTICATOR = getattr(settings, "URL_AUTHENTICATOR", None)
 
 WS4REDIS_LOG_DEBUG = getattr(settings, 'WS4REDIS_LOG_DEBUG', False)
+WS4REDIS_NOAUTH_CLOSE = getattr(settings, 'WS4REDIS_NOAUTH_CLOSE', False)