django-restit 4.1.31__tar.gz → 4.1.33__tar.gz

{django_restit-4.1.31 → django_restit-4.1.33}/PKG-INFO

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

django_restit-4.1.33/incident/migrations/0009_incident_reporter_ip.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-08-22 19:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0008_incident_action_sent_incident_hostname_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='incident',
+            name='reporter_ip',
+            field=models.CharField(blank=True, db_index=True, default=None, max_length=16, null=True),
+        ),
+    ]

{django_restit-4.1.31 → django_restit-4.1.33}/incident/models/event.py

@@ -135,7 +135,10 @@ class Event(JSONMetaData, rm.RestModel):
 
         # always create an incident 
         if incident is None:
-            incident = Incident(rule=hit_rule, priority=priority, component=self.category, hostname=self.hostname)
+            incident = Incident(
+                rule=hit_rule, priority=priority,
+                reporter_ip=self.reporter_ip,
+                component=self.category, hostname=self.hostname)
             if hit_rule is not None:
                 incident.group = hit_rule.group
             # TODO possibly make this smarter?

{django_restit-4.1.31 → django_restit-4.1.33}/incident/models/incident.py

@@ -50,6 +50,7 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
     description = models.CharField(max_length=200)
     component = models.CharField(max_length=200, null=True, default=None, db_index=True)
     hostname = models.CharField(max_length=200, null=True, default=None, db_index=True)
+    reporter_ip = models.CharField(max_length=16, blank=True, null=True, default=None, db_index=True)
 
     group = models.ForeignKey("account.Group", on_delete=models.SET_NULL, null=True, default=None)
     assigned_to = models.ForeignKey("account.Member", on_delete=models.SET_NULL, null=True, default=None)
@@ -210,6 +211,11 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         elif rule.bundle_by == 3:
             q.hostname = event.hostname
             q.component = event.category
+        elif rule.bundle_by == 4:
+            q.reporter_ip = event.reporter_ip
+        elif rule.bundle_by == 5:
+            q.reporter_ip = event.reporter_ip
+            q.component = event.category
         return Incident.objects.filter(**q).last()
 
     @classmethod

{django_restit-4.1.31 → django_restit-4.1.33}/pyproject.toml

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

{django_restit-4.1.31 → django_restit-4.1.33}/rest/__init__.py

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

{django_restit-4.1.31 → django_restit-4.1.33}/taskqueue/models.py

@@ -256,7 +256,7 @@ class Task(models.Model, RestModel):
         tdata = nobjict()
         tdata.url = url
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_web_request", fname=fname, data=tdata)
+        task = cls(channel="tq_hook", model="tq_web_request", fname=fname, data=tdata)
         if stale_after_seconds:
             task.stale_after = datetime.now() + timedelta(seconds=stale_after_seconds)
         task.save()
@@ -270,7 +270,7 @@ class Task(models.Model, RestModel):
         tdata.filename = filename
         tdata.subject = subject
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_email_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_email_request", data=tdata)
         task.save()
         task.publish()
         return task
@@ -280,7 +280,7 @@ class Task(models.Model, RestModel):
         tdata = nobjict()
         tdata.phone = phone
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_sms_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_sms_request", data=tdata)
         task.save()
         task.publish()
         return task
@@ -295,7 +295,7 @@ class Task(models.Model, RestModel):
         tdata.username = username
         tdata.password = password
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_sftp_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_sftp_request", data=tdata)
         task.save()
         task.publish()
         return task
@@ -310,7 +310,7 @@ class Task(models.Model, RestModel):
         tdata.aws = aws
         tdata.secret = secret
         tdata.when = str(when)
-        task = cls(channel="tq_hook",model="tq_s3_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_s3_request", data=tdata)
         task.save()
         task.publish()
         return task

{django_restit-4.1.31 → django_restit-4.1.33}/taskqueue/transports/http.py

@@ -1,7 +1,8 @@
 import requests
 import time
 REQ_TIMEOUT = 15.0
-from rest.uberdict import UberDict
+from objict import objict
+
 
 def POST(task, attempts=3, timeout=REQ_TIMEOUT, headers=None):
     while attempts:
@@ -43,13 +44,14 @@ def httpGET(url, params=None, session=None, timeout=REQ_TIMEOUT):
         res = requests.get(url, headers=headers, params=params, timeout=timeout)
     return res
 
+
 def httpPOST(url, data, post_json=False, session=None, timeout=REQ_TIMEOUT, headers=None):
     if not headers or type(headers) is not dict:
         headers = {'Accept': 'application/json'}
     if 'Accept' not in headers:
         headers['Accept'] = 'application/json'
     if post_json:
-        data = UberDict(data).toJSON()
+        data = objict.fromdict(data).toJSON()
         headers['Content-type'] = 'application/json'
     if post_json:
         if session:

{django_restit-4.1.31 → django_restit-4.1.33}/taskqueue/worker.py

@@ -194,7 +194,7 @@ class WorkManager(object):
                 self.logger.warning("ignore job {}:{}".format(task.id, task.channel))
 
     def _on_webrequest(self, task):
-        self.logger.debug("starting webrequest to: {}".format(task.data.url))
+        # self.logger.debug("starting web request to: {}".format(task.data.url))
         # we need to copy the data and remove the url
         if task.fname.upper() == "GET":
             resp = http.GET(task)
@@ -207,7 +207,6 @@ class WorkManager(object):
             task.retry_later(from_now_secs=(task.attempts-1) * 120)
 
     def _on_hookrequest(self, task):
-        self.logger.debug("starting webrequest to: {}".format(task.data.url))
         # we need to copy the data and remove the url
         if task.model == "tq_email_request":
             resp = email.SEND(task)