django-restit 4.1.14__py3-none-any.whl → 4.1.16__py3-none-any.whl

{django_restit-4.1.14.dist-info → django_restit-4.1.16.dist-info}/METADATA

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

{django_restit-4.1.14.dist-info → django_restit-4.1.16.dist-info}/RECORD

@@ -86,7 +86,7 @@ incident/migrations/0007_event_metadata.py,sha256=syxcM4gIcBwSjcpdU69CXq5dGS1Gu8
 incident/migrations/0008_incident_action_sent_incident_hostname_and_more.py,sha256=N2D47E9k4PxOo-9C72gqYkb6K0GqVIO4PkvdnWlrSuA,903
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=adTSOSVrYJgHD4hZNJJjFj_M1QZbpwhZZQiIzanUKA8,167
-incident/models/event.py,sha256=ksFC4RMdTDe8Y4DsS11H9tOspE3RsnLR16QLLlDh3k8,5068
+incident/models/event.py,sha256=p1N9_gG-1OLBZ9BN93PRauHSB13nWH2H9gU-X2YthCo,5070
 incident/models/incident.py,sha256=BNK9gEXz_GrhiKdhC985GCbc7MgbXA31UxvmYqLYkU0,10022
 incident/models/ossec.py,sha256=pWMqcuTRxPFTEF-OZQSMn7YpNEE9mfsI4GMhWWjJs5I,2187
 incident/models/rules.py,sha256=67fbtEDfznxCYb-B89417lgYesN12PzmY25WBF_65a8,5300
@@ -342,7 +342,7 @@ 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=NfWKfyRNR3f4sSELu5NFjOp8GFZdFrs4w0oHHKdr0es,121
+rest/__init__.py,sha256=55bVWCfeW183Yg3vCEJi2Kc0S6HRRfKn19IMdIH9a2M,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -374,13 +374,13 @@ rest/middleware/request.py,sha256=OlWE4_8nJ1krzuiNn2heecPxqtbTEhFzGYp3_7bnEEA,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=X_i06TnZLW1srV0vkjjLhZ7fl1G56PswXxRpVzdFasw,1874
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=X2GAK29li3p3oaFUuoYrdNnEc05doTX-N1iU1HYCELc,62288
+rest/models/base.py,sha256=nVLZPUnTlPtsHTc-2g9-Yw7iLDLMEUelo7hqbF-Uohg,62375
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=GZTrDXms3jumo7dFq2zpY3x4EzGZWwryn5Jfsr6Wg2Y,11894
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=htoLVg6tvVozrjAqzgLR8hONblyH4DWph47xOwcUIv8,15472
 rest/rpc.py,sha256=KMih2Z4Z0Pqgwmcy_14nKqMCKJ9lGDJ6-vwMA2NSlyQ,3713
-rest/search.py,sha256=i7rnZZhlnuAT0isyVcMHEqGjbiz7EIArgjzzg7xwK-s,7645
+rest/search.py,sha256=UPnUldROiq65KmnEn-FIsgnpxk0wcXVu7I2NGfB7A-Q,7645
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=7vDmuz6alautQVr9VsVCFQdQdJcZR9tkrOEs2b_mKQw,2015
 rest/serializers/csv.py,sha256=nae_SIIpDH7HReErjNacVxEujzTvJqQxHd29BY-RXh0,2975
@@ -401,7 +401,7 @@ rest/templates/email/error.html,sha256=JDtB0egYLHDZS6KCNFslgB4ZiaidfPdjkTXaHiyVb
 rest/templates/email/error.subject,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/templates/rest_docs.html,sha256=lr5p3ic0uCRli9KEvoULTa5a3_54wNE5yL16kN1uau8,7148
 rest/templates/rest_html.html,sha256=wGZV3j_tB9rzzJlsMxidUQ5ex_uRPyU_s8GCmHLXiqk,10880
-rest/ua.py,sha256=iKoLdDFzwrmo_QfKxQoM88wPgvJabIIZPhxvIDfo5J0,185122
+rest/ua.py,sha256=0wwOtJPWCiCxUKzWKyMApRbSaiuAxCCk0Pe3OwzYBhE,185398
 rest/uberdict.py,sha256=ivDpzfchQqX8dM2_TtuyMW7NNO-j7zDmxkdKixQxvU4,17064
 rest/url_docs.py,sha256=O8O_CQso3fB-7o-huidIT1BRGv5R6lDW-yKHnsGyAPk,11881
 rest/urls.py,sha256=U3eD9kI19wp-NkkXCiAjdQe560fslskQngStRcGDS0I,1787
@@ -421,7 +421,7 @@ 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=d2m4yERMCVy6nk4gfEljM1lMG2ukH7MfqdUIvlaeh2U,18959
-taskqueue/periodic.py,sha256=vaL4F9gCuOUT5boI6vQwnsaH0hcXQ-jyGmGTD7EhYGM,3189
+taskqueue/periodic.py,sha256=bi6-36nemjgKocIu3LxQNkTfmzVQeHVaCUa48-sW7pQ,3236
 taskqueue/rpc.py,sha256=Wu6aEh8h7I7Xoaje3ufL7qMo8DUkxb9tgXeXUr4kNtc,5326
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
 taskqueue/transports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -452,7 +452,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=lF-6nzv7SWjmFgmontpZKdSBhp8q4FhvFOcEYZGR8pc,1411
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.1.14.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.14.dist-info/METADATA,sha256=oRla45d9kNzCOcD8hwjnJCtZWKGfKt_QwHyBmUTV1sg,7532
-django_restit-4.1.14.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.14.dist-info/RECORD,,
+django_restit-4.1.16.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.16.dist-info/METADATA,sha256=RN25T2gjqCvwXJaZ-4CyUraCPNvLLx3evLCpXk-gbSg,7532
+django_restit-4.1.16.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.16.dist-info/RECORD,,

incident/models/event.py

@@ -14,7 +14,7 @@ from .rules import Rule
 
 INCIDENT_METRICS = settings.get("INCIDENT_METRICS", False)
 INCIDENT_EVENT_METRICS = settings.get("INCIDENT_EVENT_METRICS", False)
-EVENT_TO_INCIDENT_LEVEL = settings.get("EVENT_TO_INCIDENT_LEVEL", 3)
+EVENT_TO_INCIDENT_LEVEL = settings.get("EVENT_TO_INCIDENT_LEVEL", 4)
 
 
 logger = log.getLogger("incident", filename="incident.log")
@@ -117,7 +117,7 @@ class Event(JSONMetaData, rm.RestModel):
         elif self.level >= EVENT_TO_INCIDENT_LEVEL:
             # we ignore levels 4 and higher if they did not create a rule
             self.save()
-            logger.info(f"ignore event {self.pk} {self.description}")
+            # logger.info(f"ignore event {self.pk} {self.description}")
             return
 
         # always create an incident 

rest/__init__.py

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

rest/models/base.py

@@ -511,9 +511,9 @@ class RestModel(object):
             self.restSaveField(key, value, has_fields, has_no_fields, using=using)
 
         rfiles = self.restSaveFiles(request, files)
-
-        self.on_rest_pre_save(request)
-        self.save(using=using)
+        if getattr(self.RestMeta, "ALWAYS_SAVE", True) or len(self._changed__):
+            self.on_rest_pre_save(request)
+            self.save(using=using)
         for key, value in list(deferred.items()):
             self.restSaveField(key, value, has_fields, has_no_fields, using=using)
 

rest/search.py

@@ -202,7 +202,7 @@ def get_query(query_string, search_fields, value_fields=[], default_filter="icon
         if query is None:
             query = or_query
         else:
-            query = query & or_query
+            query = query | or_query
     terms = [x for x in terms if x not in remove_terms]
     return query
 

rest/ua.py

@@ -469,8 +469,13 @@ def GetFilters(
     return filters
 
 
-
 USER_AGENT_PARSERS = [
+    UserAgentParser(
+        '^(Indica.+?)/(\\d+)\\.(\\d+)\\.(\\d+)\s\((.+?)\)\s(.+?)/(.+?)$',
+        None,
+        None,
+        None,
+    ),
     UserAgentParser(
         '(GeoEvent Server) (\\d+)(?:\\.(\\d+)(?:\\.(\\d+)|)|)',
         None,
@@ -2419,6 +2424,13 @@ DEVICE_PARSERS = [
         'Spider',
         'Smartphone',
     ),
+    DeviceParser(
+        '^Indica.+?/.+?\s\((.+?)\)\s(.+?)/(.+?)$',
+        None,
+        "iPad",
+        "$2",
+        "$3"
+    ),
     DeviceParser(
         '(?:DoCoMo|\\bMOT\\b|\\bLG\\b|Nokia|Samsung|SonyEricsson).*(?:(?:Bot|Yeti)-Mobile|bots?/\\d|(?:bot|crawler)\\.html|(?:jump|google|Wukong)bot|ichiro/mobile|/spider|YahooSeeker)',
         'i',

taskqueue/periodic.py

@@ -64,6 +64,10 @@ def run_retry(force=False, verbose=False, now=None):
         else:
             retry.failed("stale")
 
+    checkBackLog()
+
+
+def checkBackLog():
     # check if we have back log
     qset = Task.objects.filter(state=TASK_STATE_SCHEDULED)
     backlog_count = qset.count()
@@ -73,8 +77,8 @@ def run_retry(force=False, verbose=False, now=None):
         for key, value in helpers.countOccurences(qset, "channel").items():
             details += "{} = {}\n".format(key, value)
         incident.event_now(
-            "rest_errors", f"Task Queue Backlog of {backlog_count}",
-            details=details, level=3)
+            "taskqueue_errors", f"Task Queue Backlog of {backlog_count}",
+            details=details, level=3) 
 
 
 @periodic(minute=45, hour=10)