accrete 0.0.104__py3-none-any.whl → 0.0.105__py3-none-any.whl

accrete/managers.py

@@ -1,15 +1,15 @@
 from django.db import models
 from accrete.tenant import get_tenant
-from accrete.annotation import AnnotationManagerMixin
 
 
-class TenantManager(models.Manager, AnnotationManagerMixin):
+class TenantManager(models.Manager):
 
     def get_queryset(self):
         queryset = super().get_queryset()
-        if tenant := get_tenant():
+        tenant = get_tenant()
+        if tenant:
             queryset = queryset.filter(tenant=tenant)
-        return queryset.annotate(**self.get_annotations(queryset))
+        return queryset
 
     def bulk_create(
             self,

accrete/middleware.py

@@ -1,92 +1,69 @@
+import logging
+
 from django.utils.deprecation import MiddlewareMixin
-from django.conf import settings
-from django.http.response import HttpResponseRedirect, HttpResponsePermanentRedirect
-from accrete.tenant import set_tenant, set_member
+from accrete.tenant import set_tenant, set_member, get_tenant
+
+from .models import Tenant, Member
 
-from .models import Tenant
+_logger = logging.getLogger(__name__)
 
 
 class TenantMiddleware(MiddlewareMixin):
     @staticmethod
     def get_tenant_id_from_request(request):
-        if tenant := request.META.get('X-TENANT_ID'):
-            tenant_id = tenant
-        elif tenant_id := request.GET.get('tenant_id'):
-            tenant_id = tenant_id
-        elif tenant := request.COOKIES.get('tenant_id'):
-            tenant_id = tenant
-        else:
-            tenant_id = None
-
+        tenant_id = (
+            request.GET.get('tenant_id')
+            or request.META.get('HTTP_X_TENANT_ID')
+        )
         try:
             tenant_id = int(tenant_id)
-        except (ValueError, TypeError):
+            assert tenant_id > 0
+        except (ValueError, TypeError, AssertionError):
             tenant_id = None
-
         return tenant_id
 
     def process_request(self, request):
         request.tenant = None
         request.member = None
+        set_member(False)
         if request.path.startswith('/admin'):
+            return
+        if not request.user.is_authenticated:
             set_member(None)
             return
+        tenant_id = self.get_tenant_id_from_request(request)
+        tenant = Tenant.objects.none()
+        memberships = Member.objects.filter(
+            user=request.user, is_active=True, tenant__is_active=True
+        ).prefetch_related('tenant', 'user').order_by('pk')
+        if tenant_id:
+            tenant = Tenant.objects.get(pk=tenant_id)
+            memberships = memberships.filter(tenant=tenant)
+        if memberships.count() == 1:
+            request.member = memberships.first()
+            request.tenant = request.member.tenant
+            set_member(request.member)
+            self.update_post_data(request)
+            return
+        if memberships.count() > 1:
+            set_member(None)
+            return
+        if request.user.is_staff and tenant:
+            set_member(None)
+            set_tenant(tenant)
+            request.tenant = tenant
+            return
+        set_member(None)
+        return
 
-        if request.user.is_authenticated:
-            memberships = request.user.memberships.filter(
-                is_active=True,
-                tenant__is_active=True
-            )
-
-            if request.user.is_staff:
-                tenant_id = self.get_tenant_id_from_request(request)
-                if not tenant_id:
-                    tenant_id = memberships and memberships.first().tenant.pk
-                request.tenant = tenant_id and Tenant.objects.filter(pk=tenant_id).first()
-                request.member = request.tenant.members.filter(user=request.user).first()
-
-            elif memberships and len(memberships) == 1:
-                request.member = memberships.first()
-                request.tenant = request.member.tenant
-            elif memberships and len(memberships) > 1:
-                tenant_id = self.get_tenant_id_from_request(request)
-                if not tenant_id:
-                    tenant_id = memberships.first().tenant.pk
-                request.member = memberships.filter(tenant_id=tenant_id).first()
-                request.tenant = request.member.tenant
-
-        set_member(request.member)
-        if request.user.is_staff:
-            set_tenant(request.tenant)
-
+    @staticmethod
+    def update_post_data(request):
         if request.POST and not request.POST.get('tenant') and request.tenant:
             request.POST = request.POST.copy()
             request.POST['tenant'] = request.tenant.pk
 
     @staticmethod
     def process_response(request, response):
-        if request.tenant:
-            response['X-TENANT_ID'] = request.tenant.id
-            response.set_cookie(
-                'tenant_id',
-                request.tenant.pk,
-                samesite=settings.SESSION_COOKIE_SAMESITE,
-                max_age=31536000
-            )
-        return response
-
-
-class HtmxRedirectMiddleware(MiddlewareMixin):
-
-    @staticmethod
-    def process_response(request, response):
-        is_htmx = request.headers.get('HX-Request', 'false') == 'true'
-        if not is_htmx:
-            return response
-        is_redirect = isinstance(response, HttpResponseRedirect)
-        is_permanent_redirect = isinstance(response, HttpResponsePermanentRedirect)
-        if is_redirect or is_permanent_redirect:
-            response.status_code = 200
-            header = 'HX-Location' if is_redirect else 'HX-Redirect'
-            response[header] = response['Location']
+        tenant = get_tenant()
+        response['X-TENANT-ID'] = tenant and tenant.id or 0
         return response

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)
 
@@ -39,7 +44,7 @@ class Unscoped:
                 '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)
@@ -52,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.104.dist-info → accrete-0.0.105.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.104
+Version: 0.0.105
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek
@@ -22,6 +22,7 @@ License: Copyright (c) 2023 Benedikt Jilek
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
+License-File: LICENSE
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Intended Audience :: Developers