django-restit 4.1.38__py3-none-any.whl → 4.1.40__py3-none-any.whl

account/models/group.py

@@ -136,7 +136,7 @@ class Group(models.Model, RestModel, MetaDataModel):
             return self.restGet(request)
         return restPermissionDenied(request)
 
-    def onRestCanSave(self, request):
+    def onRestCanSave(self, request=None, data=None, extended=None):
         if request.member is None:
             raise PermissionDeniedException("permission denied for save")
         if request.member.hasPermission(["manage_groups", "create_groups"]):

{django_restit-4.1.38.dist-info → django_restit-4.1.40.dist-info}/METADATA

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

{django_restit-4.1.38.dist-info → django_restit-4.1.40.dist-info}/RECORD

@@ -17,7 +17,7 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=OxQbDkVcZogwgNj3bQWljOxAkkt15KgBYVrsumzek8Q,341
 account/models/device.py,sha256=UQVkwAX3zicSYRScPRn7StgBEm3NYM5K2X69IgCh4HQ,3756
 account/models/feeds.py,sha256=4n4Mv8HjcXpUmMPWafHlsGbVQ1fDKdtblL1hp30sDrg,1437
-account/models/group.py,sha256=Il3tcfqCueW9jsFDp7ziewCDx6EJqvrRwjR5ohepSRA,18212
+account/models/group.py,sha256=a0H6DdexDE4E5vvxpB9HbUdUzKso22PtVGqJ2Bk2n5I,18243
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=0AM6fZtLtgsdmIr-e_36t-PQkTZYnHZyj08dSj5pn94,47645
 account/models/membership.py,sha256=l7suW6kRCfa3KqdbqjOIO2jVhxjkPbEENdJIlj2WomY,7378
@@ -141,7 +141,7 @@ medialib/fixtures/medialib_test_fixture.json,sha256=7M7zvGI2S5G3ENV8OQ3Ks4149lEi
 medialib/forms.py,sha256=nrE6QTPNPiIeX7Nx4l9DEmAQeQXqFyCg1C3JEDBYJfE,5442
 medialib/migrations/0001_initial.py,sha256=H3JliH5aw7tiHef8MhrJr_9rGetqgA7UjTF-eKziRSM,20518
 medialib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-medialib/models.py,sha256=DnUpe-WyOHCU3vEfXlm_sodflUEgAterLTdLHo1RNe8,52121
+medialib/models.py,sha256=QApiv3zFfqMSLbjVqwpvRYT4HKbXj7EZGFkNDG_P_hQ,52152
 medialib/ocr.py,sha256=zlP7-NBiXhW7jR9pljmEPl5xzLVZpLN5QLAELQgU0Fk,1189
 medialib/pdf.py,sha256=l28WwM0JKbT9boV-b_9TFh9jhvGcrquR8GqC8wfEaLk,1275
 medialib/qrcode.py,sha256=vHyA5egXOX70EFiUDgr1njI9zcF6bXQJ_hKAQrppRow,545
@@ -343,7 +343,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=u1JmMJ5f6pBs8gdWElvXjCeVD9gkJ32PMVB28GZBm84,121
+rest/__init__.py,sha256=qEmZBxIJWeZCVLWbDDx_XIDFv831Xv6nqEGRAnU33JA,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
@@ -358,7 +358,7 @@ rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
 rest/extra/json_metadata.py,sha256=p_ffzmANmOFix_oC3voR6_NNTjcn7-T7aXcH-I4_Npg,1078
 rest/fields.py,sha256=_v1TJVc6vyWlqmwFRJ6mtuR5Fo-lS0KcUhPWIrzKZUo,9719
 rest/forms.py,sha256=66Wm5cdy8tKib_mGicjq_yd-gNVMFWRECnrDksnNnwU,6316
-rest/helpers.py,sha256=oJ5jNW_JlG6_CD7jgBIF19aNh4Xi-avoQ38qr9Zl51E,26387
+rest/helpers.py,sha256=-Gn-_eGVH0tMNBFJoDKR2lSA6FovFq_1SBDMt2zFm_0,26705
 rest/joke.py,sha256=0PpKaX2iN7jlS62kgjfmmqkFBYLPURz15aQ8R7OJkJ8,260
 rest/jwtoken.py,sha256=1ruZGPTXnodb85ywPd8ZmRiRYCskopA8EhcbX7Adixc,2298
 rest/log.py,sha256=hd1_4HBOS395sfXJIL6BTw9yekm1SLgBwYx_PdfIhKA,20930
@@ -375,7 +375,7 @@ 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=1L5vXL1psmz3lp8dEDwAOzRb4x0uUwaSwmNbyYfmfR0,64288
+rest/models/base.py,sha256=qDZR2-YelYnOz-3h-ssWGVDFvQ4ZYgbeU2SPRCsFDs4,65047
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=GZTrDXms3jumo7dFq2zpY3x4EzGZWwryn5Jfsr6Wg2Y,11894
 rest/net.py,sha256=LTF4ip-ur8C2G7NETVOg7ioACegBGo4sDJA18PfF5kQ,1691
@@ -385,10 +385,10 @@ rest/rpc.py,sha256=8n6LdtUyLqpwvdH1dtVT1e2ODYxOj1CEYs8mm_-vqwA,3612
 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
+rest/serializers/csv.py,sha256=CVD0erB2Ebl7mqgrMAZ2FxZSZpyVDCoSS4FHiEjuvDM,3252
 rest/serializers/excel.py,sha256=KtxqZZU5Huzo31tyVVWbshMudeSAImKLO71ufQQt0-c,1077
 rest/serializers/json.py,sha256=R1has2PZQuXacA6WwfdrBnMG4rSM6CrnXQOhGoAU6Dk,1736
-rest/serializers/legacy.py,sha256=AhwXFZQQ2XedV5ztQiHPbDRkd4vDX1iTejZrHH-r5Gs,61795
+rest/serializers/legacy.py,sha256=LgU8Sr7yFoiOso1Tb-LkJ-vphGcbEc4BKuSCCuD62R8,61800
 rest/serializers/model.py,sha256=kbwtREE--n7YKUfTzErfYhHsgiuqnLdS52z1owrXaQI,7532
 rest/serializers/profiler.py,sha256=OxOimhEyvCAuzUBC9Q1dz2xaakjAqmSnekMATsjduXM,997
 rest/serializers/response.py,sha256=8PtxZznl8E_OQbCA1epIHcMxSJJYf9VOW_syXh19nz4,6509
@@ -474,7 +474,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.1.38.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.38.dist-info/METADATA,sha256=_DKFhVqRNHv4P29SNgPVaLhs87VnMIGj7pc3y9y7nFg,7573
-django_restit-4.1.38.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.38.dist-info/RECORD,,
+django_restit-4.1.40.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.40.dist-info/METADATA,sha256=Sm4DNuvkHqUeY2ZqBYmql_qo9BrmwWxp6Usuj02yjAU,7573
+django_restit-4.1.40.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.40.dist-info/RECORD,,

medialib/models.py

@@ -409,7 +409,7 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
         super(MediaItem, self).__init__(*args, **kwargs)
         self.old_state = self.state
 
-    def onRestCanSave(self, request):
+    def onRestCanSave(self, request=None, data=None, extended=None):
         # must throw an exception if cannot save
         return True
 

rest/__init__.py

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

rest/helpers.py

@@ -124,6 +124,17 @@ def log_error(*args):
     getLoggerByRequest(request).error(*extra, *args)
 
 
+def log_stack(*args):
+    request = getActiveRequest()
+    import inspect
+    extra = []
+    for frame in inspect.stack():
+        file, line, func = frame[1:4]
+        extra.append(f"{file}, line {line} in function {func}")
+    ERROR_LOGGER.error(*extra, *args)
+    getLoggerByRequest(request).error(*extra, *args)
+
+
 def setLogModel(self, component, pk):
     # this method allows for updating the component to associate a log with
     if not pk or (self._log_pk == pk):

rest/models/base.py

@@ -418,7 +418,7 @@ class RestModel(object):
                             obj = new_obj
                     if using is None:
                         using = self.restGetModelDB()
-                    obj.saveFromDict(None, value, using=using)
+                    obj.checkPermsAndSave(None, value, using=using)
                     # rh.log_print("{} vs {}".format(self._state.db, obj._state.db))
                     # rh.log_print("saving FK to {} ({}.{}) - {}".format(fieldname, using, obj.pk, type(obj)), value)
                     setattr(self, fieldname, obj)
@@ -468,7 +468,7 @@ class RestModel(object):
     def saveFromRequest(self, request, **kwargs):
         if "files" not in kwargs:
             kwargs["files"] = request.FILES
-        return self.saveFromDict(request, request.DATA, **kwargs)
+        return self.checkPermsAndSave(request, request.DATA, **kwargs)
 
     def hasFieldChanged(self, fieldname):
         if not hasattr(self, "_changed__"):
@@ -489,17 +489,20 @@ class RestModel(object):
         else:
             self._changed__[fieldname] = old_value
 
-    def saveFromDict(self, request, data, files=None, **kwargs):
+    def checkPermsAndSave(self, request, data, files=None, **kwargs):
         can_save = getattr(self.RestMeta, "CAN_SAVE", True)
         if not can_save:
-            return self.restStatus(request, False, error="saving not allowed via rest for this model.")
-        save_media_files = getattr(self.RestMeta, "SAVE_MEDIA_FILES", False) or getattr(self.RestMeta, "SAVE_MEDIA_FILES_BY_NAME", False)
+            raise re.PermissionDeniedException("saving not allowed via rest for this model.")
         # check check for save permissions
         if request is None:
             request = RestModel.getActiveRequest()
             if request is None:
                 request = objict(member=None, FILES=[], DATA=objict(), is_authenticated=False, is_local=True)
-        self.onRestCanSave(request)
+        self.onRestCanSave(request, data, kwargs)
+        return self.saveFromDict(request, data, files=None, **kwargs)
+
+    def saveFromDict(self, request, data, files=None, **kwargs):
+        save_media_files = getattr(self.RestMeta, "SAVE_MEDIA_FILES", False) or getattr(self.RestMeta, "SAVE_MEDIA_FILES_BY_NAME", False)
         is_new = self.id is None
         has_fields = hasattr(self.RestMeta, "SAVE_FIELDS") and len(self.RestMeta.SAVE_FIELDS)
         has_no_fields = hasattr(self.RestMeta, "NO_SAVE_FIELDS") and len(self.RestMeta.NO_SAVE_FIELDS)
@@ -516,9 +519,10 @@ class RestModel(object):
                 else:
                     m_field = field
                     req_field = field
-                req_value = getattr(request, req_field, None)
-                if request and req_value:
-                    data[m_field] = req_value
+                if request is not None:
+                    req_value = getattr(request, req_field, None)
+                    if req_value is not None:
+                        data[m_field] = req_value
             # rh.log_print(data)
         self._changed__ = objict()
         if hasattr(self.RestMeta, "POST_SAVE_FIELDS"):
@@ -561,7 +565,7 @@ class RestModel(object):
         if len(deferred):
             self.save(using=using)
 
-        if len(rfiles) and save_media_files:
+        if rfiles is not None and len(rfiles) and save_media_files:
             self.restSaveMediaFiles(rfiles)
 
         # these setters are responsible for saving themselves
@@ -575,7 +579,7 @@ class RestModel(object):
         return self
 
     def restSaveFiles(self, request, files=None):
-        if files is None:
+        if files is None and request is not None:
             files = request.FILES
         if not files:
             return files
@@ -728,10 +732,10 @@ class RestModel(object):
         self.on_rest_pre_get(request)
         return self.restGet(request)
 
-    def onRestCanSave(self, request=None):
-        self.onRestCheckSavePerms(request)
+    def onRestCanSave(self, request=None, data=None, extended=None):
+        self.onRestCheckSavePerms(request, data, extended)
 
-    def onRestCheckSavePerms(self, request=None):
+    def onRestCheckSavePerms(self, request=None, data=None, extended=None):
         if request is None:
             request = self.getActiveRequest()
             if request is None:
@@ -748,7 +752,15 @@ class RestModel(object):
             group_field = getattr(self.RestMeta, "GROUP_FIELD", "group")
             # rh.log_error(F"group field={group_field}")
             if self.id is None:
-                group = request.DATA.get(group_field)
+                group = None
+                if extended is not None:
+                    group = extended.get(group_field, None)
+                if group is None:
+                    if data is not None:
+                        group = data.get(group_field, None)
+                if group is None:
+                    if request is not None:
+                        group = request.DATA.get(group_field, None)
             elif "__" in group_field and hasattr(self, "group"):
                 group = self.group
             elif "__" in group_field:
@@ -764,11 +776,11 @@ class RestModel(object):
             if not status:
                 if self.id is None and code == 402:
                     code = 435
-                rh.log_error(F"onRestCheckSavePerms: {self.id} {request.member} {group} permission denied: status={status}, error={error}, code={code}", perms)
+                    rh.log_error(F"onRestCheckSavePerms: {self.__class__.__name__} {request.member} {group} permission denied: status={status}, error={error}, code={code}", perms)
                 raise re.PermissionDeniedException(error, code)
 
     def on_rest_post(self, request):
-        self.saveFromRequest(request)
+        self.checkPermsAndSave(request, request.DATA)
         status_only = request.DATA.get("status_only", False, field_type=bool)
         if status_only:
             return self.restStatus(request, True)
@@ -784,11 +796,12 @@ class RestModel(object):
     def on_rest_saved(self, request, is_new=False):
         pass
 
-    def on_rest_delete(self, request):
+    def on_rest_delete(self, request, force=False):
         can_delete = getattr(self.RestMeta, "CAN_DELETE", False)
         if not can_delete:
             return self.restStatus(request, False, error="deletion not allowed via rest for this model.")
-        self.onRestCanSave(request)
+        if not force:
+            self.onRestCanSave(request)
         self.on_rest_deleted(request)
         self.delete()
         RestModel._setupGraphHelpers()
@@ -1121,7 +1134,7 @@ class RestModel(object):
                 try:
                     obj = cls.ro_objects().filter(**item).last()
                     if not obj:
-                        obj.saveFromDict(request, item)
+                        obj.checkPermsAndSave(request, item)
                     items.append(obj)
                 except Exception:
                     pass

rest/serializers/csv.py

@@ -5,38 +5,42 @@ import csv
 
 
 def flattenObject(obj, field_names):
-    NOT_FOUND = "-!@#$%^&*()-"
-
     row = []
     for f in field_names:
-        d = getattr(obj, f, NOT_FOUND)
-        if d != NOT_FOUND:
-            if callable(d):
-                d = d()
-        elif "." in f:
-            f1, f2 = f.split('.')
-            d1 = getattr(obj, f1, None)
-            if d1:
-                if not hasattr(d1, f2):
-                    if hasattr(d1, "first"):
-                        d1 = d1.first()
-                d = getattr(d1, f2, "")
+        d = ""
+        if "__" in f:
+            f = f.replace("__", ".")
+        if "." in f:
+            # we could use obj.getFieldValue
+            keys = f.split('.')
+            f1 = keys[0]
+            f2 = keys[1]
+            if f1 == "metadata" and hasattr(obj, "getProperty"): 
+                if len(keys) > 2:
+                    d = obj.getProperty(f2, category=keys[2])
+                else:
+                    d = obj.getProperty(f2)
+            elif hasattr(obj, "getFieldValue"):
+                d = obj.getFieldValue(f, "t/a")
                 if callable(d):
                     d = d()
             else:
-                d = ""
-        elif "__" in f:
-            f1, f2 = f.split('__')
-            d1 = getattr(obj, f1, None)
-            if d1:
-                if not hasattr(d1, f2):
-                    if hasattr(d1, "first"):
-                        d1 = d1.first()
-                d = getattr(d1, f2, "")
-            else:
-                d = ""
+                d1 = getattr(obj, f1, None)
+                if d1 is not None:
+                    if not hasattr(d1, f2):
+                        if hasattr(d1, "first"):
+                            d1 = d1.first()
+                    d = getattr(d1, f2, "")
+                    if callable(d):
+                        d = d()                
         else:
+            d = getattr(obj, f, "n/a")
+            if callable(d):
+                d = d()
+        if d is None:
             d = "n/a"
+        elif hasattr(d, "pk"):
+            d = d.pk
         row.append(str(d))
     return row
 

rest/serializers/legacy.py

@@ -226,6 +226,7 @@ class RawQuery(object):
             sql += " OFFSET %d" % self.offset
 
         return sql + ";"
+    
     def run(self):
         return self.model.objects.raw(self.sql())