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

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

@@ -138,9 +138,9 @@ class CloudCredentialsMetaData(rm.MetaDataBase):
 
 
 def getCloudMessanger(name):
-    creds = CloudCredentials.objects.filter(uuid=name).last()
-    if creds is not None:
-        return creds
+    # 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

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

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

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

@@ -21,9 +21,10 @@ 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=9wq41JuP5hvDkGauZCDHF7hbRWsIAHwe1kP3uEQ0QI8,5220
+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
@@ -106,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
@@ -367,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=bERP1K_f9PlA9V_pCBU1-PcbHQxiWC19_283DRHe10o,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
@@ -500,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.63.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.63.dist-info/METADATA,sha256=152iRXbYrfis4DIYRd86mMH6UeHPVTtKD8H2B0RgMD0,7594
-django_restit-4.2.63.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.63.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.63"
+__version__ = "4.2.64"