django-restit 4.2.62__py3-none-any.whl → 4.2.64__py3-none-any.whl

account/fcm/google.py

@@ -0,0 +1,53 @@
+import json
+import requests
+import time
+from jwt import JWT, jwk_from_dict
+from datetime import datetime, timedelta
+
+
+def oauthLogin(service_account_info):
+    # Token endpoint
+    token_uri = service_account_info["token_uri"]
+
+    # The current time and expiration time for the assertion
+    issued_at_time = datetime.utcnow()
+    expiration_time = issued_at_time + timedelta(minutes=60)
+
+    # JWT Header
+    jwt_header = {
+        "alg": "RS256",
+        "typ": "JWT",
+        "kid": service_account_info["private_key_id"]
+    }
+
+    # JWT Payload
+    jwt_payload = {
+        "iss": service_account_info["client_email"],
+        "sub": service_account_info["client_email"],
+        "aud": token_uri,
+        "iat": int(issued_at_time.timestamp()),
+        "exp": int(expiration_time.timestamp()),
+        "scope": "https://www.googleapis.com/auth/firebase.messaging"
+    }
+
+    # Create a JWT
+    jwt_instance = JWT()
+    private_key = jwk_from_dict({"k": service_account_info["private_key"], "kty": "RSA"})
+    assertion = jwt_instance.encode(jwt_header, jwt_payload, private_key)
+
+    # Exchange the JWT for an access token
+    response = requests.post(token_uri, data={
+        "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
+        "assertion": assertion
+    })
+
+    response_data = response.json()
+
+    access_token = response_data.get("access_token")
+    expires_in = response_data.get("expires_in")  # Seconds until the token expires
+
+    # You can now use this access_token to authenticate requests to Google APIs.
+    # Remember to refresh the token using a similar process once it's close to expiration.
+
+    print("Access Token:", access_token)
+    print("Expires In:", expires_in)

account/fcm/v1.py

@@ -0,0 +1,47 @@
+from google.oauth2 import service_account
+import google.auth.transport.requests
+import requests
+from rest import settings
+from rest import log
+
+
+FCM_ENDPOINT = 'https://fcm.googleapis.com/v1/projects/{}/messages:send'
+
+logger = log.getLogger("fcm", filename="fcm.log")
+
+
+def getCredentials(data):
+    # Load the credentials from the dictionary
+    credentials = service_account.Credentials.from_service_account_info(
+        data,
+        scopes=["https://www.googleapis.com/auth/firebase.messaging"])
+    # Use the credentials to authenticate a Requests session
+    auth_req = google.auth.transport.requests.Request()
+    credentials.refresh(auth_req)
+    return credentials
+
+
+def sendToDevice(device, data):
+    return sendData(device.cm_token, data)
+
+
+def sendNotification(to_token, title, body):
+    return postMessage(dict(token=to_token, notification=dict(title=title, body=body)))
+
+
+def sendData(to_token, data, priority="high"):
+    return postMessage(dict(token=to_token, data=data, content_available=True, priority=priority))
+
+
+def postMessage(credentials, payload):
+    logger.info("sending FCM", payload)
+    headers = {
+        'Authorization': 'Bearer ' + credentials.token,
+        'Content-Type': 'application/json; UTF-8',
+    }
+    body = dict(message=payload)
+    resp = requests.post(FCM_ENDPOINT.format(credentials.project_id), headers=headers, json=body)
+    logger.info("response", resp.text)
+    return resp
+
+

account/migrations/0020_cloudcredentials_cloudcredentialsmetadata.py

@@ -0,0 +1,47 @@
+# Generated by Django 4.1.4 on 2024-04-15 13:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+import rest.fields
+import rest.models.base
+import rest.models.metadata
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0019_group_location'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CloudCredentials',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('name', models.CharField(blank=True, default=None, max_length=128, null=True)),
+                ('uuid', models.CharField(blank=True, db_index=True, default=None, max_length=64, null=True)),
+                ('state', models.IntegerField(db_index=True, default=1)),
+                ('credentials', rest.fields.JSONField(default=None, null=True)),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloud_credentials', to='account.group')),
+            ],
+            bases=(models.Model, rest.models.base.RestModel, rest.models.metadata.MetaDataModel),
+        ),
+        migrations.CreateModel(
+            name='CloudCredentialsMetaData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('category', models.CharField(blank=True, db_index=True, default=None, max_length=32, null=True)),
+                ('key', models.CharField(db_index=True, max_length=80)),
+                ('value_format', models.CharField(max_length=16)),
+                ('value', models.TextField()),
+                ('int_value', models.IntegerField(blank=True, default=None, null=True)),
+                ('float_value', models.IntegerField(blank=True, default=None, null=True)),
+                ('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='properties', to='account.cloudcredentials')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

account/models/device.py

@@ -1,6 +1,7 @@
 
 from django.db import models
 from rest import models as rm
+from rest import fields as rf
 from rest import settings
 from objict import objict
 from datetime import datetime
@@ -110,7 +111,36 @@ class MemberDeviceMetaData(rm.MetaDataBase):
     parent = models.ForeignKey(MemberDevice, related_name="properties", on_delete=models.CASCADE)
 
 
+class CloudCredentials(models.Model, rm.RestModel, rm.MetaDataModel):
+    """
+    MemberDevice Model tracks personal devices associated with a user.
+    This can include mobile and desktop devices.
+    """
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+    group = models.ForeignKey("account.Group", related_name="cloud_credentials", on_delete=models.CASCADE)
+
+    name = models.CharField(max_length=128, blank=True, null=True, default=None)
+    uuid = models.CharField(db_index=True, max_length=64, blank=True, null=True, default=None)
+    state = models.IntegerField(db_index=True, default=1)
+
+    credentials = rf.JSONField()
+
+    def sendToDevice(self, device, message):
+        pass
+
+    def sendNotification(self, token, title, body):
+        pass
+
+
+class CloudCredentialsMetaData(rm.MetaDataBase):
+    parent = models.ForeignKey(CloudCredentials, related_name="properties", on_delete=models.CASCADE)
+
+
 def getCloudMessanger(name):
+    # creds = CloudCredentials.objects.filter(uuid=name).last()
+    # if creds is not None:
+    #     return creds
     if name not in CM_BACKENDS:
         if name == "fcm":
             from account import fcm

account/models/feeds.py

@@ -39,9 +39,9 @@ class GroupFeed(FeedBase, rm.RestModel):
         VIEW_PERMS = ["manage_groups", "manage_group", "view_all_groups"]
         GRAPHS = {
             "default": {
-                "recurse_into": ["generic__component"],
                 "graphs": {
-                    "member": "basic"
+                    "member": "basic",
+                    "generic__component": "basic"
                 }
             }
         }

auditlog/cloudwatch.py

@@ -0,0 +1,93 @@
+import boto3
+import datetime
+import time
+import json
+from objict import objict
+from rest import settings
+from concurrent.futures import ThreadPoolExecutor
+
+
+LOG_CACHE = objict()
+
+
+def getClient():
+    if LOG_CACHE.client is None:
+        key = settings.AWS_KEY
+        secret = settings.AWS_SECRET
+        region = settings.AWS_REGION
+        LOG_CACHE.client = boto3.client("logs", aws_access_key_id=key, aws_secret_access_key=secret, region_name=region)
+    return LOG_CACHE.client
+
+
+def log(data, log_group, log_stream):
+    if LOG_CACHE.pool is None:
+        LOG_CACHE.pool = ThreadPoolExecutor(max_workers=1)
+    LOG_CACHE.pool.submit(logToCloudWatch, data, log_group, log_stream)
+    return True
+
+
+def logToCloudWatch(data, log_group, log_stream):
+    message = data
+    if isinstance(message, dict):
+        message = json.dumps(message)
+    return logBatchToCloudWatch([
+            dict(
+                timestamp=int(datetime.datetime.utcnow().timestamp() * 1000),
+                message=message)
+        ], log_group, log_stream)
+
+
+def logBatchToCloudWatch(batch, log_group, log_stream):
+    return getClient().put_log_events(
+        logGroupName=log_group,
+        logStreamName=log_stream,
+        logEvents=batch
+    )
+
+
+def getLogGroups():
+    response = getClient().describe_log_groups()
+    return response.get('logGroups', [])
+
+
+def createLogStream(log_group, log_stream):
+    try:
+        getClient().create_log_stream(logGroupName=log_group, logStreamName=log_stream)
+    except Exception:
+        pass  # Log stream already exists, no need to create it
+
+
+def getInsights(log_group, start_time, end_time, query_string):
+    """
+    Executes a CloudWatch Logs Insights query and returns the results.
+
+    :param log_group: The name of the log group to query.
+    :param start_time: The start time of the query (epoch time in seconds).
+    :param end_time: The end time of the query (epoch time in seconds).
+    :param query_string: The query string to use.
+    :param region_name: AWS region name.
+    :return: The query results.
+    """
+    # Create a CloudWatch Logs client
+    client = getClient()
+    
+    # Start the query
+    start_query_response = client.start_query(
+        logGroupName=log_group,
+        startTime=start_time,
+        endTime=end_time,
+        queryString=query_string,
+    )
+    
+    query_id = start_query_response['queryId']
+    
+    # Wait for the query to complete
+    response = None
+    while response is None or response['status'] == 'Running':
+        time.sleep(1)  # Sleep to rate limit the polling
+        response = client.get_query_results(queryId=query_id)
+    
+    if response['status'] == 'Complete':
+        return response['results']
+    else:
+        raise Exception(f"Query did not complete successfully. Status: {response['status']}")

auditlog/models.py

@@ -8,6 +8,7 @@ import copy
 from rest.models import RestModel
 from rest import helpers
 from rest.log import getLogger
+from auditlog import cloudwatch
 
 import traceback
 
@@ -281,7 +282,9 @@ class PersistentLog(models.Model, RestModel):
 
     @staticmethod
     def log(message, level=0, request=None, component=None,
-            pkey=None, action=None, group=None, path=None, method=None, tid=None, no_truncate=False):
+            pkey=None, action=None, group=None, path=None,
+            method=None, tid=None, no_truncate=False,
+            aws_log_group=None, aws_log_stream=None):
         plog = PersistentLog.createLogFromRequest(
             request, component=component, tid=tid, pkey=pkey, action=action, group=group,
             path=path, method=method, level=level)
@@ -290,6 +293,8 @@ class PersistentLog(models.Model, RestModel):
 
         try:
             plog.save()
+            if aws_log_group and aws_log_stream:
+                cloudwatch.log(plog.toDict(), aws_log_group, aws_log_stream)
         except Exception:
             helpers.log_exception(plog.message)
 

{django_restit-4.2.62.dist-info → django_restit-4.2.64.dist-info}/METADATA

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

{django_restit-4.2.62.dist-info → django_restit-4.2.64.dist-info}/RECORD

@@ -1,6 +1,8 @@
 account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/admin.py,sha256=8MQ1gAgjpPUC_SGCVMwd7I8fqLetqcutLiasjssEPRY,1839
 account/fcm/__init__.py,sha256=gSTChf99a5T20oKuf4Lh9UR-f3V5qI20AZxIhlPlnVs,980
+account/fcm/google.py,sha256=T-TZZgrT90YY9sEtKC6rNGpwfBmVTCuFpB31vRDguu0,1710
+account/fcm/v1.py,sha256=PGpSmAnq40cMao4SwDU2tv6m5PpteDWLbzvldjalRJ8,1434
 account/migrations/0001_initial.py,sha256=PhYNDTiwjyUplErBmYc34ecynLIEJL2JuC02o8GCXes,15894
 account/migrations/0003_member_phone_number.py,sha256=auAJCfxsK-y3Veo0vwZfrIZxvwHYBjg5CpYRgCWghCQ,738
 account/migrations/0004_group_modified_alter_group_created.py,sha256=20iNFlUGtRCWUsxEqTJFRQKQ73z4REhfo-hGam8IHXY,551
@@ -19,10 +21,11 @@ account/migrations/0016_authsession_buid.py,sha256=wZdiH_87Ik3jAXYUgtafeAo9IbJq3
 account/migrations/0017_rename_requires_topt_member_requires_totp.py,sha256=GksGiF7OQDV2RihyC2OTBzSmDwzCzenThkNs6FKni4M,375
 account/migrations/0018_userpasskey.py,sha256=SdXYo4TkIeP5wLNfCza3Jq5-gKuUufzTHGBw0hFQOMY,1475
 account/migrations/0019_group_location.py,sha256=EfMB_w4qWUGDqQeNc453PFZwpjpTeoA6xr6Qgo_YAOM,601
+account/migrations/0020_cloudcredentials_cloudcredentialsmetadata.py,sha256=mHwxkyDfA4ueQOt34w5ndJB4XwNTDLv79CkKgzhlz-c,2250
 account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
-account/models/device.py,sha256=EzkEPjpJxxt7OGDfEkRXIpoutdfSSPBGquVdKF6nJD0,4114
-account/models/feeds.py,sha256=JYBfAmvSnbFaFV90Di2Hu07-SLAhyBMw0pCOvJ_eXqs,2016
+account/models/device.py,sha256=MVWZEYrX_4zJaqmJS_feFplfVXYyqBJ-0_Fm3B1SVg8,5226
+account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
 account/models/group.py,sha256=4fk-RavG1wNVzfuXMaD2XDiX2DhK1hgL0-OA54Uym18,21576
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=CxxhNnFCQPEw7MGc5147J8eandYqUj6HhhQ_YRyFQX4,50397
@@ -57,11 +60,12 @@ account/templates/email/simple/reset_code.html,sha256=Dln4C8jC-PI1ToS-k2VpRUjXya
 auditlog/README,sha256=q4DXhdz5CuMyuxYISHXzhlHnIkRJlojwOMchLzW2qOI,520
 auditlog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auditlog/admin.py,sha256=-q7fstdFjNeDFfbwdrxVqy0WGKxMpBwrsM7AyG1p80g,1006
+auditlog/cloudwatch.py,sha256=R-B_ByVM3We26YnDoFYIQeWV31CUyS63QTojRAkfWa8,2805
 auditlog/decorators.py,sha256=ZoIv0fhZjxtMEV15NcKijW4xPF5UEScPna60zB3TxZo,6553
 auditlog/middleware.py,sha256=Q4bXg8rnm8y2fMnAsN6ha3Fz6TW8jIzLnvpu4H9SpWE,1537
 auditlog/migrations/0001_initial.py,sha256=X171gKQZIaTO9FGNG1yKTjGSZS0ZjZj5gvimF9-_kks,3309
 auditlog/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditlog/models.py,sha256=6CyWMRNvqCYoyiXE9_qk41EJFjutwo6nfoP9KKYWiYw,16294
+auditlog/models.py,sha256=skDAiuzR4chC-WNIaH2nm_VVcbnDD6ZtUxBwhk7UY8U,16517
 auditlog/periodic.py,sha256=AUhDeVsZtC47BJ-lklvYEegHoxAzj1RpIvRFSsM7g5E,363
 auditlog/rpc.py,sha256=lhme-ScqwVSKfHo3RlzMVm_C-Yx4xOxPogBEv7b3w1M,1720
 auditlog/tq.py,sha256=OgzJVspWI6FL92GEhDPtabYoP_Hd3zGNh0E297abz3Y,2415
@@ -103,7 +107,7 @@ incident/migrations/0013_rulecheck_is_required.py,sha256=cL7tOj5XGPpKd2f5BojIKfN
 incident/migrations/0014_event_group_alter_rulecheck_index.py,sha256=v3gm5k0LVoas27qUDOt7el7YtK4yjFVLeEpuFUCoXaQ,724
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
-incident/models/event.py,sha256=qa6BIlellU7uUQcA2c4Botd2x7JLL8b7IjSfxyi5iHk,7306
+incident/models/event.py,sha256=WRNzvjo0jypdnQNBksOOyi-_0kVT4qWUrDZf0Aw_MPM,7355
 incident/models/incident.py,sha256=Jx0RnOo70BzPX4BLMVF8jB5UOYwFPKPlxWznkTeMzOU,19332
 incident/models/ossec.py,sha256=p1ptr-8lnaj1EP_VmPR58b2LmaYBGaYYKAMqhWK5yZM,2227
 incident/models/rules.py,sha256=uT5GhW6Flso287lJGphAlWwL20NRnHDAZoGrWBBQfeE,6260
@@ -364,7 +368,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=nqUQGTs1aNMT8VVPk-Lu2qFRYD6XdwBeqh9cbJmiwxY,121
+rest/__init__.py,sha256=p0-hoQXw9I4GjJGpnAZji3gbFzmQxNAIsg1J5OP5Bm8,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
@@ -445,17 +449,17 @@ 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=tCFAKSr8JybUJV4gijg3wUCwQMJiHUsRBgHH2CWonfY,22119
+taskqueue/models.py,sha256=N3_9jWHPGzs6UxlAzpjst6qPhvIs1RELTy1cMXMeXsA,22407
 taskqueue/periodic.py,sha256=2i0271khrCow3hDmlNEcoAZnesBVl40jd7MIim2Cxs4,3543
 taskqueue/rpc.py,sha256=If5E9D9AR2RqW4lHRaDuD9L9b9ZfL_PaBQ6iX91ehvU,5736
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
 taskqueue/transports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/transports/email.py,sha256=H4GaomiyCck5R_AOcsrMawCl-_Bp_Zg-uWto9t1Xcoo,623
-taskqueue/transports/http.py,sha256=kRBjHiwTmk5b4TMdZWt1EKKcjfSlX8DFmtmJaRGZQFw,681
+taskqueue/transports/http.py,sha256=AzliUnw_LuyO2zZZOoUAJGFcTV-Gxt1iE3hCVnIiyGQ,839
 taskqueue/transports/s3.py,sha256=fMosL893u1iQdo6Y1djwb7KEoNo6TTsDPJl13OJdJP8,1913
 taskqueue/transports/sftp.py,sha256=jT1_krjTHA7DCAukD85aGYRCg9m0cEH9EWzOC-wJGdk,1891
 taskqueue/transports/sms.py,sha256=H1-LIGEMfbUNqJD9amRcsvKUSwtz9yBj1QNfB7EHjHE,142
-taskqueue/worker.py,sha256=u7H-FLkz7vpBoDaab9hpw4RduvG1ZTdtlw3PSHRBmUw,15737
+taskqueue/worker.py,sha256=wzp44fk6LX94MdrXLp_IJmWgutLCBKqoobk433OiLqw,15822
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -497,7 +501,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.62.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.62.dist-info/METADATA,sha256=XPJeA3gzUze_WPJT54LMV1INVHI_ru-82Nrsu82Wc30,7594
-django_restit-4.2.62.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.62.dist-info/RECORD,,
+django_restit-4.2.64.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.64.dist-info/METADATA,sha256=L_HZYV8PSsU8TdNKCTl2M7ZJ2U_JJEM9ImYZ99X6Ams,7594
+django_restit-4.2.64.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.64.dist-info/RECORD,,

incident/models/event.py

@@ -121,6 +121,8 @@ class Event(JSONMetaData, rm.RestModel):
 
     def set_description(self, value):
         # trun desc to 84
+        if value is None:
+            value = ""
         if len(value) > 84:
             value = value[:80] + "..."
         self.description = value

rest/__init__.py

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

taskqueue/models.py

@@ -226,23 +226,25 @@ class Task(models.Model, RestModel):
         self.state = TASK_STATE_COMPLETED
         self.save()
 
-    def failed(self, reason=None):
+    def failed(self, reason=None, category="taskqueue_errors"):
         if reason and len(reason) > 250:
             reason = reason[:250]
         self.reason = reason
         self.state = TASK_STATE_FAILED
-        self.notifyError()
+        self.notifyError(category=category, reason=reason)
         self.save()
 
-    def notifyError(self):
-        handler = f"{self.model}{self.fname}"
+    def notifyError(self, category="taskqueue_errors", reason=None):
+        handler = f"{self.model}.{self.fname}"
         subject = f"TaskQueue - {handler}"
+        if reason is None:
+            reason = self.reason
 
-        msg = f"{handler}<br>\n{self.reason}"
+        msg = f"{handler}<br>\n{reason}"
         metadata = {
             "server": settings.get("HOSTNAME", "unknown"),
             "task": self.pk,
-            "reason": self.reason,
+            "reason": reason,
             "app": self.model,
             "fname": self.fname,
             "channel": self.channel,
@@ -253,6 +255,9 @@ class Task(models.Model, RestModel):
         if self.data:
             if self.data.url:
                 metadata["url"] = self.data.url
+                from urllib.parse import urlparse
+                purl = urlparse(self.data.url)
+                metadata["host"] = purl.netloc
                 msg = f"{msg}<br>\n{self.data.url}"
             if self.data.log_component:
                 metadata["component"] = self.data.log_component
@@ -261,7 +266,7 @@ class Task(models.Model, RestModel):
         try:
             import incident
             incident.event_now(
-                "taskqueue_errors", description=subject, details=msg, 
+                category, description=subject, details=msg, 
                 level=3, metadata=metadata)
         except Exception as err:
             self.log(str(err), kind="error")

taskqueue/transports/http.py

@@ -15,9 +15,13 @@ def REQUEST(task):
                            data=task.data.data, raw_response=True,
                            verify=False, timeout=REQ_TIMEOUT)
         task.log(resp.text, kind="response")
-        return resp.status_code == 200
+        if resp.status_code == 200:
+            return True
+        task.reason = f"invalid response of {resp.status_code}"
     except requests.Timeout:
+        task.reason = "request timed out"
         task.log("request timed out", kind="error")
     except Exception as err:
+        task.reason = str(err)
         task.log_exception(err)
     return False

taskqueue/worker.py

@@ -198,6 +198,8 @@ class WorkManager(object):
             task.completed()
         elif task.attempts < task.max_attempts:
             # -1 will auto calculate retry with back off
+            # lets report the issue
+            task.notifyError(reason=task.reason)
             task.retry_later(from_now_secs=-1)
         else:
             task.failed("max attempts")