django-restit 4.1.34__tar.gz → 4.1.40__tar.gz

{django_restit-4.1.34 → django_restit-4.1.40}/PKG-INFO

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

{django_restit-4.1.34 → django_restit-4.1.40}/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.34 → django_restit-4.1.40}/account/models/member.py

@@ -505,22 +505,34 @@ class Member(User, RestModel, MetaDataModel):
         return True
 
     def sendEmail(self, subject, body, attachments=[], do_async=True, template=None, context=None):
+        default_domain = self.getProperty("default_domain", settings.EMAIL_DEFAULT_DOMAIN)
+        from_email = rh.getFromEmailForHost(default_domain)
         NotificationRecord = RestModel.getModel("account", "NotificationRecord")
         NotificationRecord.notify(
             [self], subject=subject, message=body,
             template=template, context=context,
+            from_email=from_email,
             email_only=True, attachments=attachments)
 
     def sendInvite(self, subject, group=None, url=None, msg=None, **kwargs):
+        if url is None:
+            url = settings.DEFAULT_LOGIN_URL
         if url[:4] != "http":
             url = f"https://{url}"
+        from_domain = rh.parseHostName(url, True)
+        from_email = rh.getFromEmailForHost(from_domain)
+        self.member.setProperty("default_domain", from_domain)
+        self.member.setProperty("default_from_email", from_email)
         context = rh.getContext(
             self.getActiveRequest(),
             member=self,
             group=group,
             url=url,
             msg=msg, **kwargs)
-        rest_mail.send(self.email, subject, template=settings.get("EMAIL_TEMPLATE_INVITE", "email/invite.html"), context=context)
+        rest_mail.send(
+            self.email, subject, from_email=from_email,
+            template=settings.get("EMAIL_TEMPLATE_INVITE", "email/invite.html"),
+            context=context)
 
     def getActiveSessions(self):
         return SessionLog.objects.filter(user__id=self.pk, is_closed=False)

{django_restit-4.1.34 → django_restit-4.1.40}/account/models/membership.py

@@ -81,10 +81,17 @@ class Membership(models.Model, RestModel, MetaDataModel):
         if value == "resend_invite":
             self.sendInvite(self.getActiveRequest())
 
-    def sendInvite(self, request=None, url=None, subject=None):
+    def sendInvite(self, request=None, url=None, subject=None, site_logo=None, company_name=None):
         if request:
+            powered_by = request.DATA.get("powered_by", True)
             subject = request.DATA.get("invite_subject")
             url = request.DATA.get("invite_url")
+            site_logo = request.DATA.get("site_logo", settings.SITE_LOGO)
+            company_name = request.DATA.get("company_name", settings.COMPANY_NAME)
+        else:
+            powered_by = True
+            site_logo = settings.SITE_LOGO
+            company_name = settings.COMPANY_NAME
         if url is None:
             raise RestValidationError("requires url", -1)
         if "?" not in url:
@@ -99,7 +106,13 @@ class Membership(models.Model, RestModel, MetaDataModel):
             self.member.generateAuthCode(expires=expires)
             auth_token = objict(username=self.member.username, auth_token=self.member.auth_code)
             url = "{}&auth_code={}".format(url, auth_token.toBase64())
-        self.member.sendInvite(subject, self.group, url=url, msg=request.DATA.get("invite_msg", None), btn_label=btn_label)
+        self.member.sendInvite(
+            subject, self.group, url=url, 
+            msg=request.DATA.get("invite_msg", None), 
+            POWERED_BY=powered_by,
+            SITE_LOGO=site_logo,
+            COMPANY_NAME=company_name,
+            btn_label=btn_label)
 
     def set_state(self, value):
         if self.state != value:

{django_restit-4.1.34 → django_restit-4.1.40}/account/templates/email/plain/invite.html

@@ -186,7 +186,7 @@
                   <tr>
                     <td align="center" style="font-size:0px;padding:8px 0;word-break:break-word;">
                       <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:30px;font-weight:300;line-height:30px;text-align:center;color:#000000;">
-                      {{settings.COMPANY_NAME}}</div>
+                      {{COMPANY_NAME}}</div>
 
                     </td>
                   </tr>
@@ -209,7 +209,7 @@
                   </tr>
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:20px;font-weight:300;line-height:30px;text-align:left;color:#000000;">You have been invited to join "<a href="{{url}}" style="color: #2e58ff; text-decoration: none; font-weight: 400;">{{group.name}}</a>" on the {{settings.COMPANY_NAME}} portal.</div>
+                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:20px;font-weight:300;line-height:30px;text-align:left;color:#000000;">You have been invited to join "<a href="{{url}}" style="color: #2e58ff; text-decoration: none; font-weight: 400;">{{group.name}}</a>" on the {{COMPANY_NAME}} portal.</div>
                     </td>
                   </tr>
                   {% if msg %}
@@ -284,6 +284,7 @@
           <![endif]-->
               <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  {% if POWERED_BY %}
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                       <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:14px;font-weight:300;line-height:20px;text-align:center;color:#000000;">
@@ -291,6 +292,7 @@
                       </div>
                     </td>
                   </tr>
+                  {% endif %}
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                       <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:14px;font-weight:300;line-height:20px;text-align:center;color:#000000;">

{django_restit-4.1.34 → django_restit-4.1.40}/account/templates/email/simple/invite.html

@@ -186,7 +186,7 @@
                   <tr>
                     <td align="center" style="font-size:0px;padding:8px 0;word-break:break-word;">
                       <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:30px;font-weight:300;line-height:30px;text-align:center;color:#000000;">
-                      {{settings.COMPANY_NAME}}</div>
+                      {{COMPANY_NAME}}</div>
 
                     </td>
                   </tr>
@@ -209,7 +209,7 @@
                   </tr>
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:20px;font-weight:300;line-height:30px;text-align:left;color:#000000;">You have been invited to join "<a href="{{url}}" style="color: #2e58ff; text-decoration: none; font-weight: 400;">{{group.name}}</a>" on the {{settings.COMPANY_NAME}} portal.</div>
+                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:20px;font-weight:300;line-height:30px;text-align:left;color:#000000;">You have been invited to join "<a href="{{url}}" style="color: #2e58ff; text-decoration: none; font-weight: 400;">{{group.name}}</a>" on the {{COMPANY_NAME}} portal.</div>
                     </td>
                   </tr>
                   {% if msg %}
@@ -360,4 +360,5 @@
   </div>
 </body>
 
-</html>
+</html>
+

{django_restit-4.1.34 → django_restit-4.1.40}/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
 

{django_restit-4.1.34 → django_restit-4.1.40}/metrics/models.py

@@ -271,9 +271,18 @@ def generate_uuid(slug, group, slug_append=None):
 
 class Metrics(models.Model, rm.RestModel):
     class RestMeta:
+        QUERY_FIELDS = ["group__kind", "all_fields"]
         GRAPHS = {
-            "default": {
-                "recurse_into": ["generic__component"]
+            "detailed": {
+                "fields": [
+                    "id", "created", "start",
+                    "granularity", "uuid",
+                    "slug"
+                ],
+                "extra": [("getMetrics", "metrics")],
+                "graphs": {
+                    "group": "basic"
+                }
             }
         }
 

{django_restit-4.1.34 → django_restit-4.1.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.1.34"
+version = "4.1.40"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.1.34 → django_restit-4.1.40}/rest/__init__.py

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

{django_restit-4.1.34 → django_restit-4.1.40}/rest/helpers.py

@@ -15,6 +15,9 @@ from .datem import *
 from .log import getLogger
 import getpass
 
+from urllib.parse import urlparse
+
+
 try:
     from fuzzywuzzy import fuzz
 except:
@@ -121,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):
@@ -261,6 +275,30 @@ def getRemoteIP(request):
         ip = request.META.get('REMOTE_ADDR')
     return ip
 
+
+def parseHostName(url, root=False):
+    if url.startswith("http"):
+        parsed_url = urlparse(url)
+        hname = parsed_url.netloc
+    else:
+        hname = url
+    if root and hname.count('.') > 1:
+        return hname[hname.find(".")+1:]
+    return hname
+
+
+def getFromEmailForHost(host):
+    email_domain = settings.EMAIL_DEFAULT_DOMAIN
+    from_label = settings.EMAIL_FROM_LABEL
+    if settings.EMAIL_SETTINGS:
+        hostname = parseHostName(host, True)
+        info = settings.EMAIL_SETTINGS.get(hostname, None)
+        if info is not None:
+            email_domain = info.get("email_domain", email_domain)
+            from_label = info.get("from_label", from_label)
+    return f"{from_label} <noreply@{email_domain}>"
+
+
 def getUserAgent(request):
   # Some mobile browsers put the User-Agent in a HTTP-X header
   return request.META.get('HTTP_X_OPERAMINI_PHONE_UA') or \
@@ -443,7 +481,7 @@ def getContext(request, *args, **kwargs):
         c["protocol"] = getProtocol(request)
         c["request"] = request
 
-    for k, v in list(kwargs.items()):
+    for k, v in kwargs.items():
         c[k] = v
     return c
 

{django_restit-4.1.34 → django_restit-4.1.40}/rest/mail.py

@@ -50,7 +50,7 @@ def send(to, subject, body=None, attachments=[],
         html = renderBody(html, template, context)
 
     msg = createMultiPartMessage(
-        settings.DEFAULT_FROM_EMAIL, to, subject,
+        from_email, to, subject,
         text=text, html=html, attachments=attachments,
         replyto=replyto)
 

{django_restit-4.1.34 → django_restit-4.1.40}/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:
@@ -739,7 +743,7 @@ class RestModel(object):
         if getattr(request, "is_local", False):
             return True
         perms = getattr(self.RestMeta, "SAVE_PERMS", getattr(self.RestMeta, "VIEW_PERMS", None))
-        if self.pk is None:
+        if self.id is None:
             perms = getattr(self.RestMeta, "CREATE_PERMS", perms)
         if perms:
             if "owner" in perms and self.checkIsOwner(request.member):
@@ -747,8 +751,16 @@ class RestModel(object):
             # we need to check if this user has permission
             group_field = getattr(self.RestMeta, "GROUP_FIELD", "group")
             # rh.log_error(F"group field={group_field}")
-            if self.pk is None:
-                group = request.DATA.get(group_field)
+            if self.id is None:
+                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:
@@ -762,13 +774,13 @@ class RestModel(object):
                 group = getattr(self, group_field, None)
             status, error, code = rh.requestHasPerms(request, perms, group)
             if not status:
-                if self.pk is None and code == 402:
+                if self.id is None and code == 402:
                     code = 435
-                rh.log_error(F"onRestCheckSavePerms: {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
@@ -1189,17 +1202,17 @@ class RestModel(object):
         # check if model id is in post
         request.rest_class = cls
         cls._boundRest()
-        if not pk and getattr(cls.RestMeta, "PK_FROM_FILTER", False):
+        if pk is None and getattr(cls.RestMeta, "PK_FROM_FILTER", False):
             pk_fields = []
             key = cls.get_class_name().lower()
-            key_p = "{0}_id".format(key)
+            key_p = f"{key}_id"
             pk_fields.append(key_p)
             # check if the cls has a field with the class name, (causes conflict)
             if not cls.get_field_type(key):
                 pk_fields.append(key)
             pk = request.DATA.get(pk_fields, None, field_type=int)
         # generic rest request handler
-        if pk:
+        if pk is not None:
             using = getattr(cls.RestMeta, "RO_DATABASE", None)
             if using is None:
                 using = getattr(cls.RestMeta, "DATABASE", None)
@@ -1207,7 +1220,7 @@ class RestModel(object):
                 obj = cls.objects.using(using).filter(pk=pk).last()
             else:
                 obj = cls.objects.filter(pk=pk).last()
-            if not obj:
+            if obj is None:
                 return GRAPH_HELPERS.views.restNotFound(request)
             if request.method == "GET":
                 return obj.on_rest_get(request)
@@ -1423,7 +1436,18 @@ class RestModel(object):
         """
         This will look at the query request and allow for basic filtering.
 
-        QUERY_FIELDS can be used to restrict what fields can be queried
+        QUERY_FIELDS_SPECIAL can be used to allow mappings of certain queries:
+            ?group=iso
+            {
+                "group": "group__kind"
+            }
+
+        QUERY_FIELDS can be used to restrict what fields can be queried 
+        and add special fields:
+
+        ?group__kind=iso
+        # this will allow "group__kind" but also support all other fields
+        ["group__kind", "all_fields"]
 
         <field_name>=value
         or
@@ -1523,7 +1547,7 @@ class RestModel(object):
                 value = rh.parseDateTime(value)
             q[key] = value
         if bool(q):
-            # rh.debug("queryFromRequest", q, request.default_rest_filters)
+            # rh.debug("queryFromRequest", q, "default_filters:", request.default_rest_filters)
             qset = qset.filter(**q)
         return qset
 

{django_restit-4.1.34 → django_restit-4.1.40}/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
 

{django_restit-4.1.34 → django_restit-4.1.40}/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())