django-restit 4.2.146__tar.gz → 4.2.149__tar.gz

{django_restit-4.2.146 → django_restit-4.2.149}/PKG-INFO

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

{django_restit-4.2.146 → django_restit-4.2.149}/incident/models/incident.py

@@ -177,6 +177,8 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         return (count % aa) == 0
 
     def triggerAction(self, force=False):
+        if self.state == INCIDENT_STATE_IGNORE:
+            return
         if self.rule is None:
             if self.action_sent is None:
                 self.triggerAsyncNotify()
@@ -496,6 +498,8 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         info = abuse.lookup(ip, 0)
         if "errors" not in info:
             self.setProperty("abuse_info", info)
+            if info.get("abuseConfidenceScore", 0) >= 45:
+                self.state = INCIDENT_STATE_IGNORE
 
     @classmethod
     def getBundled(cls, rule, event):

{django_restit-4.2.146 → django_restit-4.2.149}/medialib/caching.py

@@ -1,3 +1,4 @@
+import io
 from rest import settings
 from medialib.stores import s3
 from django.http import HttpResponse, StreamingHttpResponse
@@ -45,7 +46,18 @@ def getCachedItem(cache_guid, content_type="application/json"):
 def cacheResponse(response, cache_guid, content_type="application/json"):
     url = f"s3://{settings.AWS_S3_BUCKET}/caching/{cache_guid}"
     item = s3.S3Item(url, content_type)
-    item.upload(response.content)
+    if isinstance(response, StreamingHttpResponse):
+        # Access the streaming content and convert it to a file-like object
+        content = io.BytesIO()
+        for chunk in response.streaming_content:
+            content.write(chunk)
+        # Reset the file pointer to the beginning before uploading
+        content.seek(0)
+        item.upload(content)
+        content.seek(0)
+        response.streaming_content = iter(lambda: content.read(8192), b'')
+    else:
+        item.upload(response.content)
     return item
 
 

{django_restit-4.2.146 → django_restit-4.2.149}/pyproject.toml

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

{django_restit-4.2.146 → django_restit-4.2.149}/rest/__init__.py

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

{django_restit-4.2.146 → django_restit-4.2.149}/rest/models/base.py

@@ -1028,6 +1028,7 @@ class RestModel(object):
         if tr_start is not None:
             dr_start = rh.updateTimeFromString(dr_start, tr_start)
         if tr_end is not None:
+            dr_end = request.DATA.get("dr_end", field_type=datetime)
             dr_end = rh.updateTimeFromString(dr_end, tr_end)
 
         if dr_tz is not None:

{django_restit-4.2.146 → django_restit-4.2.149}/rest/rpc.py

@@ -81,7 +81,7 @@ def on_get_system_info(request):
     out = hostinfo.getHostInfo(
         include_versions=request.DATA.get("versions") and SOFTWARE_VERSIONS,
         include_blocked=request.DATA.get("blocked"))
-    out["redist_pool"] = redis.getPoolStatus()
+    out["redis_pool"] = redis.getPoolStatus()
     return views.restGet(request, out)