accrete 0.0.99__py3-none-any.whl → 0.0.109__py3-none-any.whl

accrete/models.py

@@ -14,6 +14,7 @@ class TenantModel(models.Model, AnnotationModelMixin):
         abstract = True
 
     tenant = models.ForeignKey(
+        verbose_name=_('Tenant'),
         to='accrete.Tenant',
         on_delete=models.CASCADE
     )
@@ -34,7 +35,8 @@ class TenantModel(models.Model, AnnotationModelMixin):
         if self.pk and not self.tenant and not tenant:
             raise ValueError(
                 'Tenant not provided! '
-                'Use accrete.tenant.set_tenant() or set the tenant explicitly on the instance.'
+                'Use accrete.tenant.set_tenant() '
+                'or set the tenant explicitly on the instance.'
             )
         if tenant:
             self.tenant = tenant
@@ -45,6 +47,10 @@ class TenantModel(models.Model, AnnotationModelMixin):
             update_fields=update_fields
         )
 
+    @staticmethod
+    def exclude_from_filter():
+        return ['tenant']
+
 
 class Tenant(models.Model):
 

accrete/storage.py

@@ -25,7 +25,10 @@ class TenantFileSystemStorage(FileSystemStorage):
     def base_url(self):
         if self._base_url is not None and not self._base_url.endswith("/"):
             self._base_url += "/"
-        res = self._value_or_setting(self._base_url, f'{settings.MEDIA_URL.strip("/")}/{get_tenant().id}')
+        res = self._value_or_setting(
+            self._base_url,
+            f'{settings.MEDIA_URL.strip("/")}/{get_tenant().id}'
+        )
         return res
 
     def url(self, name):

accrete/tenant.py

@@ -2,7 +2,7 @@ import contextvars
 import logging
 import time
 from django.apps import apps
-from django.db.models import Q
+from django.db.models import Q, QuerySet
 
 _logger = logging.getLogger(__name__)
 
@@ -19,7 +19,12 @@ def get_tenant():
 
 
 def set_member(member):
-    tenant = member.tenant if member is not None else None
+    if member is False:
+        tenant = False
+    elif member is None:
+        tenant = None
+    else:
+        tenant = member.tenant
     member_contextvar.set(member)
     tenant_contextvar.set(tenant)
 
@@ -36,9 +41,10 @@ class Unscoped:
     def __enter__(self):
         if self.tenant is None:
             _logger.warning(
-                'Entering unscoped context manager with tenant already set to None!'
+                'Entering unscoped context manager with tenant already set to None!',
+                stack_info=True
             )
-        set_tenant(None)
+        set_tenant(False)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         set_tenant(self.tenant)
@@ -51,7 +57,7 @@ def unscoped():
 def per_tenant(include: Q = None, exclude: Q = None):
     def decorator(f):
         def wrapper(*args, **kwargs):
-            tenants = apps.get_model('accrete', 'Tenant').objects.all()
+            tenants: QuerySet = apps.get_model('accrete', 'Tenant').objects.all()
             if include is not None:
                 tenants = tenants.filter(include)
             if exclude is not None:

accrete/utils/__init__.py

@@ -6,6 +6,8 @@ from .forms import (
     extend_formset
 )
 from .views import (
+    page_from_querystring,
+    get_page,
     filter_from_querystring,
     cast_param,
     method_not_allowed,

accrete/utils/models.py

@@ -1,4 +1,4 @@
-from django.db.models import Model
+from django.db.models import Model, Field
 
 
 def get_related_model(model: type[Model], rel_path: str) -> tuple[Model, list[str]]:
@@ -16,4 +16,12 @@ def get_related_model(model: type[Model], rel_path: str) -> tuple[Model, list[st
                     related_model = next_model
             except AttributeError:
                 break
+    names.append(str(related_model._meta.verbose_name))
     return related_model, names
+
+
+def get_related_field(model: type[Model], field_path: str) -> Field:
+    parts = field_path.split('__')
+    rel_path = '__'.join(parts[:-1])
+    rel_model, _ = get_related_model(model, rel_path)
+    return rel_model._meta.get_field(parts[-1])

accrete/utils/views.py

@@ -2,11 +2,12 @@ import logging
 import json
 import operator
 from typing import Callable
+
+from django.core import paginator
 from django.db.models import Model, Q, QuerySet
 from django.template.loader import render_to_string, TemplateDoesNotExist
 from django.http import HttpResponseNotAllowed
 from accrete.utils.models import get_related_model
-from accrete.annotation import Annotation
 
 _logger = logging.getLogger(__name__)
 
@@ -18,13 +19,40 @@ QUERYSTRING_KEY_MAP = {
 }
 
 
+def page_from_querystring(
+    model: type[Model], query_dict: dict, key_map: dict = None,
+    select_related: list = None, prefetch_related: list = None
+) -> paginator.Page:
+
+    key_map = key_map or QUERYSTRING_KEY_MAP
+    queryset = filter_from_querystring(
+        model, query_dict, key_map
+    ).select_related(
+        *select_related or []
+    ).prefetch_related(
+        *prefetch_related or []
+    )
+    return get_page(
+        queryset,
+        cast_param(query_dict, key_map.get('paginate_by'), int, 40),
+        cast_param(query_dict, key_map.get('page'), int, 1)
+    )
+
+
+def get_page(queryset: QuerySet, paginate_by: int, page_number: int) -> paginator.Page:
+    pages = paginator.Paginator(queryset, per_page=paginate_by)
+    return pages.page(
+        page_number <= pages.num_pages and page_number or pages.num_pages
+    )
+
+
 def filter_from_querystring(
-        model: type[Model], get_params: dict, key_map: dict = None
+        model: type[Model], query_dict: dict, key_map: dict = None
 ) -> QuerySet:
 
     key_map = key_map or QUERYSTRING_KEY_MAP
-    querystring = get_params.get(key_map['querystring'], '[]')
-    order = get_params.get(key_map['order']) or model._meta.ordering
+    querystring = query_dict.get(key_map['querystring'], '[]')
+    order = query_dict.get(key_map['order']) or model._meta.ordering
 
     return model.objects.filter(
         parse_querystring(model, querystring)
@@ -34,7 +62,7 @@ def filter_from_querystring(
 def parse_querystring(model: type[Model], query_string: str) -> Q:
     """
     param: query_string: JSON serializable string
-    [{term: value}, '&', [{term: value}, '|', {~term: value}]]
+    [{"term": value}, "&", [{t"erm": value}, "|", {"~term": value}]]
     Q(term=value) & (Q(term=value) | ~Q(term=value))
     """
 
@@ -51,19 +79,7 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
 
         rel_path = '__'.join(parts[:-2])
         related_model, x = get_related_model(model, rel_path)
-        attr = getattr(related_model, parts[-2])
-        if not isinstance(attr, Annotation):
-            expression = Q(**{term: value})
-            return ~expression if invert else expression
-
-        objects = related_model.objects.filter(Q(**{
-            '__'.join(parts[-2:]): value
-        }))
-        expression = Q(**{
-            f'{rel_path}{"__" if rel_path else ""}id__in':
-                objects.values_list('id', flat=True)
-        })
-
+        expression = Q(**{term: value})
         return ~expression if invert else expression
 
     def parse_query_block(sub_item) -> Q:
@@ -85,7 +101,6 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
                         f'Operator must be one of &, |, ^'
                     )
                 op = ops[item]
-
             else:
                 raise ValueError(
                     f'Unsupported item in querystring: {item}.'
@@ -120,6 +135,7 @@ def method_not_allowed(method: str, allowed: list[str]) -> HttpResponseNotAllowe
 def render_templates(
     templates: list[str | tuple[str, dict]],
     context: dict = None,
+    request=None,
     log_not_found: bool = False
 ) -> str:
     context = {} if context is None else context
@@ -131,7 +147,7 @@ def render_templates(
             template_name = template
             template_context = context
         try:
-            content += render_to_string(template_name, template_context)
+            content += render_to_string(template_name, template_context, request)
         except TemplateDoesNotExist as e:
             if log_not_found:
                 _logger.warning(repr(e))

accrete/views.py

@@ -4,9 +4,9 @@ from django.http import HttpResponse, HttpResponseNotFound
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import login_required
 from django.core.exceptions import ImproperlyConfigured
-from django.shortcuts import redirect
+from django.shortcuts import redirect, get_object_or_404
 from django.conf import settings
-from accrete.tenant import get_tenant
+from accrete.models import Tenant, Member
 from . import config
 
 
@@ -80,6 +80,8 @@ def tenant_required(
             tenant = request.tenant
             if not tenant:
                 return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
+            if kwargs.get('tenant'):
+                kwargs.pop('tenant')
             return f(request, *args, **kwargs)
         return _wrapped_view
     return decorator
@@ -87,9 +89,11 @@ def tenant_required(
 
 @tenant_required()
 def get_tenant_file(request, tenant_id, filepath):
-    tenant = get_tenant()
-    if tenant.id != tenant_id:
-        return HttpResponseNotFound()
+    tenant = get_object_or_404(Tenant, pk=tenant_id)
+    if not request.user.is_staff:
+        member = Member.objects.filter(user=request.user, tenant=tenant)
+        if not member.exists():
+            return HttpResponseNotFound()
     filepath = f'{settings.MEDIA_ROOT}/{tenant_id}/{filepath}'
     if not os.path.exists(filepath):
         return HttpResponseNotFound()

{accrete-0.0.99.dist-info → accrete-0.0.109.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.99
+Version: 0.0.109
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek