django-restit 4.2.45__py3-none-any.whl → 4.2.47__py3-none-any.whl

account/migrations/0019_group_location.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.4 on 2024-02-23 20:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0004_remove_address_modified_by_address_group_and_more'),
+        ('account', '0018_userpasskey'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='location',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='location.address'),
+        ),
+    ]

account/models/group.py

@@ -38,6 +38,10 @@ class Group(models.Model, RestModel, MetaDataModel):
     # this is the new model for groups having multiple parents
     children = models.ManyToManyField("self", related_name="parents", symmetrical=False)
 
+    location = models.ForeignKey(
+        "location.Address", default=None, null=True, blank=True,
+        related_name="+", on_delete=models.SET_NULL)
+
     class RestMeta:
         SEARCH_FIELDS = [
             "name"
@@ -76,7 +80,8 @@ class Group(models.Model, RestModel, MetaDataModel):
             "default": {
                 "graphs": {
                     "self": "basic",
-                    "parent": "basic"
+                    "parent": "basic",
+                    "location": "basic"
                 },
                 "fields": ["metadata"],
             },
@@ -84,9 +89,17 @@ class Group(models.Model, RestModel, MetaDataModel):
                 "graphs": {
                     "self": "basic",
                     "parent": "basic",
-                    "children": "basic"
+                    "children": "basic",
+                    "location": "basic"
                 },
-                "fields": ["metadata"],
+                "extra": ["metadata"],
+            },
+            "location": {
+                "fields": ["name", "kind", "id"],
+                "extra": ["location"],
+                "graphs": {
+                    "location": "basic"
+                }
             },
             "abstract": {
                 "fields": [
@@ -157,7 +170,7 @@ class Group(models.Model, RestModel, MetaDataModel):
                 raise PermissionDeniedException("invalid parent")
             qset = qset.filter(parent=parent)
         elif child_of:
-            parent = parent = request.member.getGroup(child_of)
+            parent = request.member.getGroup(child_of)
             if parent:
                 request.group = None
                 return parent.getAllChildren(grand_children=True)

account/models/session.py

@@ -27,6 +27,12 @@ class AuthSession(models.Model, RestModel):
                 "graphs": {
                     "location": "default"
                 }
+            },
+            "location": {
+                "graphs": {
+                    "location": "default",
+                    "member": "basic"
+                }
             }
         }
     # the signature of session

{django_restit-4.2.45.dist-info → django_restit-4.2.47.dist-info}/METADATA

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

{django_restit-4.2.45.dist-info → django_restit-4.2.47.dist-info}/RECORD

@@ -18,17 +18,18 @@ account/migrations/0015_memberdevice_buid.py,sha256=O3M3mS_O1zn4gQahC3ebRu8tMySo
 account/migrations/0016_authsession_buid.py,sha256=wZdiH_87Ik3jAXYUgtafeAo9IbJq35xDVOlQ_UiTC8k,424
 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/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
 account/models/device.py,sha256=XipNpByreGubB5-d4ZBOoIV5Xw14b2Btcgn6fXz8HAc,4105
 account/models/feeds.py,sha256=FXqcZ1Qy4oYOLzai7-GL4WNd7iKPb5Y3ZqvKQunq1Yk,1861
-account/models/group.py,sha256=d9uYtLub7iABrQmsYg_L88xG3W7f7VRWvOpebD3XgQY,20684
+account/models/group.py,sha256=l56gQxR1PQNae3TdtL5ytxdSCPP9miYZ2pBMLqA0d5E,21125
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=XwT4evwN6_THL2bKb_TjtQg7NWNwQqtotMHLScplv1s,50188
 account/models/membership.py,sha256=K2fd0TJYhfv58HPyjQVlahlOPz3Q6ZwrxVkguG-2Ej8,7806
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
-account/models/session.py,sha256=iN9x9hi0LyB_2giT__YuqwbClQ7Ae8Gb4bhGph_qD6Q,3561
+account/models/session.py,sha256=o3t98e8itXEtkknBHdBH_PSq9kuw1A858_wl6ZleXMM,3729
 account/models/settings.py,sha256=gOyRWBVd3BQpjfj_hJPtqX3H46ztyRAFxBrPbv11lQg,2137
 account/oauth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/oauth/google.py,sha256=q5M6Qhpfp9QslKRVYFZBvtG6kgXV6vYMrR5fp6Xdb9I,2078
@@ -102,7 +103,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=CYyJHcTCRSkZuOynVNVBO6P9466OamMVV63jWEbDBZ8,7264
+incident/models/event.py,sha256=qa6BIlellU7uUQcA2c4Botd2x7JLL8b7IjSfxyi5iHk,7306
 incident/models/incident.py,sha256=0M7QN32BwlHYRvnUWPqI4IIThSpActGDdbmbPjNcJ9A,18415
 incident/models/ossec.py,sha256=p1ptr-8lnaj1EP_VmPR58b2LmaYBGaYYKAMqhWK5yZM,2227
 incident/models/rules.py,sha256=uT5GhW6Flso287lJGphAlWwL20NRnHDAZoGrWBBQfeE,6260
@@ -121,9 +122,10 @@ location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
 location/migrations/0001_initial.py,sha256=E0Kekah0vfp7VGKGYRHFEIFjFRTkd8QnFGSHNFllVv0,7000
 location/migrations/0002_geoip_subnet_alter_geoip_ip.py,sha256=n-oJrEnIqN9VnMhiZsr34LF-EXBluPm1lz1zusaMkx8,576
 location/migrations/0003_address_postalcode_suffix.py,sha256=DT8voJeMiSQyUhH-69NHK9YywaChAvIJn1ztL7fCI30,443
+location/migrations/0004_remove_address_modified_by_address_group_and_more.py,sha256=Xq0q8oVoElVYbPC779empO4GIQKuRWOyBCUmWg9Wzo4,1270
 location/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/models/__init__.py,sha256=rZhldkoKmoJQXjBAK1IIQn7K_OOJvFtIGOGVl_szqbE,230
-location/models/address.py,sha256=oTPQiLdg2QkfPorlm16re1OoR6TJf4Of2Ew1slun2r8,2596
+location/models/address.py,sha256=5059tQZI4XDZJPywQPN0zXIJ8FTUQnONwBkc7DFgwng,3045
 location/models/ip.py,sha256=ZaBFdW1tL1Q3bnS5gIY9SseiQ5xeeP_oyP1hp3czFeA,5984
 location/models/legacy.py,sha256=8ROsUSZrjGQkUyXeJvoxPdKAWaKfUH-AL9TIeJb7krg,1994
 location/models/location.py,sha256=01dJPJecbp5orExsIGWOsBC_KkwFRIW0rGDIwyx1r0w,2316
@@ -141,7 +143,8 @@ location/providers/location/google.py,sha256=RXZoYXUcTerE3-7z2BciEuDJJB-f-0_F6jW
 location/providers/timezones/__init__.py,sha256=enslc1cVTju3GKrvpLoAxSHUKkLeREhed-eHkvHWdoM,46
 location/providers/timezones/google.py,sha256=HyATVCGJ3wHwfc47jQRLnwa8nPeBlmpHOGTxetfg7FU,619
 location/providers/zillow.py,sha256=nCV_q_9ULRkgxi4HTZHioP6nWDDmApvSf1DcwNLcOxk,1935
-location/rpc/__init__.py,sha256=74T2Y3Zw7ZOl_h67Gdb-tfkyKJAJFSDFHjv04FRKsjQ,123
+location/rpc/__init__.py,sha256=MDs0Qntwff3d128BhjHEFcGTWSomshHQ1VToqMT0YVA,166
+location/rpc/address.py,sha256=ivkdG5Oc8YnJowEQ8dmiOnZr5OOaIuiw9fuwbrC7gUQ,219
 location/rpc/ip.py,sha256=TbRRgh4_hykT_Z0PDQrMnCdp_x0nK0Zm_WnvzXuweF4,1305
 location/rpc/location.py,sha256=D5R54nnmmp8NaHQRkP_TF921Ej6j9nmTUNzX1K5WVPc,779
 location/rpc/track.py,sha256=jSS9_eiKayM_8iW_4Ldojg9a2_trjfXhnLe_a261x5E,3735
@@ -360,7 +363,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=1X-W3BH6L-ujXvvzyMW1tIIeqHcQOhgRzb6isSAl9mY,121
+rest/__init__.py,sha256=KPZYlX8yNoUvOBRew6LnBQO59yY6TNSoJO9DSSVFH10,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
@@ -392,7 +395,7 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=vYs3dlI10VYbYiKMhqZ9XJXTHllrS9eQNzpPRyPBBHg,67303
+rest/models/base.py,sha256=S6lLCPPEUQRVHn_4S2TwAVSQisdlKz3kqKI4dRKWUBY,67650
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=ui0962oaWbYGIbkNs7oaUGKyaca9epsW2H-ywgyH7rg,12631
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -482,7 +485,7 @@ wiki/rpc/wiki.py,sha256=iWehZasU8J1E5sPPqz9QoQr3MpGxqu3rd7CH4wFrm2w,1333
 wiki/tq.py,sha256=wvuBZ3OMV_D2o4kpJhVLIOwpEUfwlglqLJQvpncAwtk,313
 ws4redis/README.md,sha256=QvwdsauPKxx4qQqnJ991xeU8DgFQCj3CeQt-nCE4s-w,3624
 ws4redis/__init__.py,sha256=teNfv83A_ke1CBt9BB7NsnWCcFBhnUFPsPESjF554_k,46
-ws4redis/client.py,sha256=0PXDFHb7P7BRjvT0_3Al9ZOfsljMzng93HsSl90nzro,5225
+ws4redis/client.py,sha256=ZI8m6c8cG-Ysn80OokZQxg2ihHHWbp0Ea7C7jmFk1UQ,6506
 ws4redis/connection.py,sha256=QGjzalYrx1y4o6sb6P1akL-Y2fjf2qil0JCo-ona5F8,13431
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
 ws4redis/redis.py,sha256=IfT4p3bUtlqso9rryNliH9Ebzlx8-Q2VJcs1kFioeGA,6093
@@ -493,7 +496,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.45.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.45.dist-info/METADATA,sha256=sjprDnHaz3wHRJMOMfpI0y3UMinbPipZ0aB8mboJGdI,7594
-django_restit-4.2.45.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.45.dist-info/RECORD,,
+django_restit-4.2.47.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.47.dist-info/METADATA,sha256=L-HD17mdjnfiJOiNb865oC4nGAAQsYmAXETtIrCZnL4,7594
+django_restit-4.2.47.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.47.dist-info/RECORD,,

incident/models/event.py

@@ -136,6 +136,8 @@ class Event(JSONMetaData, rm.RestModel):
             self.lookupIP(request.ip)
 
     def on_rest_saved(self, request, is_new=False):
+        if not is_new:
+            return
         if INCIDENT_EVENT_METRICS:
             if self.hostname:
                 metrics.metric(f"incident_evt_{self.hostname}", category="incident_events", min_granularity="hourly")

location/migrations/0004_remove_address_modified_by_address_group_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.1.4 on 2024-02-23 19:15
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('account', '0018_userpasskey'),
+        ('location', '0003_address_postalcode_suffix'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='address',
+            name='modified_by',
+        ),
+        migrations.AddField(
+            model_name='address',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to='account.group'),
+        ),
+        migrations.AddField(
+            model_name='address',
+            name='label',
+            field=models.CharField(blank=True, db_index=True, default=None, max_length=250, null=True),
+        ),
+        migrations.AddField(
+            model_name='address',
+            name='member',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

location/models/address.py

@@ -6,6 +6,11 @@ from .. import geolocate
 
 class Address(models.Model, rm.RestModel):
     class RestMeta:
+        VIEW_PERMS = [
+            "view_all_groups",
+            "manage_groups",
+            "manage_group",
+            "manage_settings"]
         GRAPHS = {
             "abstract": {
                 "fields":[
@@ -18,7 +23,15 @@ class Address(models.Model, rm.RestModel):
                 ]
             }
         }
-    modified_by = models.ForeignKey("account.User", null=True, blank=True, default=None, on_delete=models.CASCADE)
+    label = models.CharField(
+        max_length=250, null=True, blank=True,
+        default=None, db_index=True)
+    member = models.ForeignKey(
+        "account.User", null=True, blank=True,
+        default=None, on_delete=models.SET_NULL, related_name="addresses")
+    group = models.ForeignKey(
+        "account.Group", null=True, blank=True,
+        default=None, on_delete=models.SET_NULL, related_name="addresses")
     modified = models.DateTimeField(auto_now=True)
     line1 = models.CharField(max_length=255, blank=True, null=True, default=None)
     line2 = models.CharField(max_length=255, blank=True, null=True, default=None)

location/rpc/__init__.py

@@ -1,3 +1,4 @@
 from .ip import *  # noqa: F401, F403
 from .track import *  # noqa: F401, F403
 from .location import *  # noqa: F401, F403
+from .address import *  # noqa: F401, F403

location/rpc/address.py

@@ -0,0 +1,8 @@
+from rest import decorators as rd
+from location import models as location
+
+
+@rd.url('address')
+@rd.url('address/<int:pk>')
+def rest_on_address(request, pk=None):
+    return location.Address.on_rest_request(request, pk)

rest/__init__.py

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

rest/models/base.py

@@ -321,6 +321,16 @@ class RestModel(object):
     def getModel(app_name, model_name):
         return apps.get_model(app_name, model_name)
 
+    @staticmethod
+    def getModelInstance(app_name, model_name, **kwargs):
+        Model = apps.get_model(app_name, model_name)
+        return Model.objects.filter(**kwargs).last()
+
+    @staticmethod
+    def createModelInstance(app_name, model_name, **kwargs):
+        Model = apps.get_model(app_name, model_name)
+        return Model(**kwargs)
+
     def restGetGenericModel(self, field):
         # called by the rest module to magically parse
         # a component that is marked genericr elation in a graph

ws4redis/client.py

@@ -131,6 +131,55 @@ def hincrby(name, field, inc=1):
     return c.hincrby(name, field, inc)
 
 
+def lpush(name, value, unique=False):
+    c = getRedisClient()
+    if isinstance(value, list):
+        for v in value:
+            if unique and value.encode() in c.lrange(name, 0, -1):
+                return 0
+            c.lpush(name, v)
+        return len(value)
+    if unique and value.encode() in c.lrange(name, 0, -1):
+        return 0
+    return c.lpush(name, value)
+
+
+def rpush(name, value, unique=False):
+    c = getRedisClient()
+    if isinstance(value, list):
+        for v in value:
+            if unique and value.encode() in c.lrange(name, 0, -1):
+                return 0
+            c.rpush(name, v)
+        return len(value)
+    if unique and value.encode() in c.lrange(name, 0, -1):
+        return 0
+    return c.rpush(name, value)
+
+
+def lpop(name, timeout=None):
+    c = getRedisClient()
+    if timeout is None:
+        return c.lpop(name)
+    r = c.blpop(name, timeout=timeout)
+    if isinstance(r, tuple):
+        return r[1].decode()
+
+
+def rpop(name, timeout=None):
+    c = getRedisClient()
+    if timeout is None:
+        return c.rpop(name)
+    r = c.brpop(name, timeout=timeout)
+    if isinstance(r, tuple):
+        return r[1].decode()
+
+
+def lrange(name, start, end):
+    c = getRedisClient()
+    return [v.decode() for v in c.lrange(name, start, end)]
+
+
 def sendToUser(user, name, message=None, priority=0, model=None, model_pk=None, custom=None):
     return sendMessageToUsers([user], buildEventMessage(name, message, priority, model, model_pk, custom))