django-restit 4.2.137__tar.gz → 4.2.138__tar.gz

{django_restit-4.2.137 → django_restit-4.2.138}/PKG-INFO

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

{django_restit-4.2.137 → django_restit-4.2.138}/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()

django_restit-4.2.138/pushit/rpc/products.py

@@ -0,0 +1,23 @@
+from rest import decorators as rd
+from rest import views as rv
+from pushit.models import Product, Release
+
+
+@rd.url('product')
+@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)
+
+
+@rd.url('release')
+@rd.url('release/<int:pk>')
+def rest_on_release(request, pk=None):
+    return Release.on_rest_request(request, pk)

{django_restit-4.2.137 → django_restit-4.2.138}/pyproject.toml

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

{django_restit-4.2.137 → django_restit-4.2.138}/rest/__init__.py

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

{django_restit-4.2.137 → django_restit-4.2.138}/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)

{django_restit-4.2.137 → django_restit-4.2.138}/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:

{django_restit-4.2.137 → django_restit-4.2.138}/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)
 

{django_restit-4.2.137 → django_restit-4.2.138}/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)

django_restit-4.2.137/pushit/rpc/products.py

@@ -1,15 +0,0 @@
-from rest import decorators as rd
-from rest import views as rv
-from pushit.models import Product, Release
-
-
-@rd.url('product')
-@rd.url('product/<int:pk>')
-def rest_on_product(request, pk=None):
-    return Product.on_rest_request(request, pk)
-
-
-@rd.url('release')
-@rd.url('release/<int:pk>')
-def rest_on_release(request, pk=None):
-    return Release.on_rest_request(request, pk)