accrete 0.0.39__py3-none-any.whl → 0.0.40__py3-none-any.whl

accrete/annotation.py

@@ -1,4 +1,4 @@
-from django.db.models import Field, QuerySet
+from django.db.models import Field
 from django.db.models.expressions import Func
 from django.db.models.aggregates import Aggregate
 
@@ -34,12 +34,10 @@ class AnnotationModelMixin:
 
 class AnnotationManagerMixin:
 
-    def add_annotations(self, queryset: QuerySet):
-        model = self.model
-        if not hasattr(model, 'get_annotations'):
-            return queryset
-        return queryset.annotate(**{
+    def get_annotations(self):
+        if not hasattr(self.model, 'get_annotations'):
+            return {}
+        return {
             annotation['name']: annotation['annotation'].function
-            for annotation in model.get_annotations()
-        })
-
+            for annotation in self.model.get_annotations()
+        }

accrete/contrib/user/views.py

@@ -1,15 +1,12 @@
-from django.utils import timezone
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import views, update_session_auth_hash
 from django.contrib.auth.decorators import login_required
-from django.contrib.sessions.models import Session
 from django.contrib import messages
-from django.db.models import Q
 from django.shortcuts import redirect, render, reverse, resolve_url
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
-from accrete.forms import save_form
+from accrete.utils import save_form
 from accrete.contrib import ui
 from .forms import UserForm, ChangePasswordForm, ChangeEmailForm
 

accrete/forms.py

@@ -290,22 +290,3 @@ class TenantModelForm(One2ManyModelForm):
             self.save_o2m()
 
         return self.instance
-
-
-def save_form(form, reraise=False):
-    form.is_saved = False
-    form.save_error = None
-    form.save_error_id = None
-    try:
-        if form.is_valid():
-            with transaction.atomic():
-                form.save()
-            form.is_saved = True
-    except Exception as e:
-        form.save_error = repr(e)
-        error_id = str(uuid4())[:8]
-        _logger.exception(f'{error_id}: {e}')
-        form.save_error_id = error_id
-        if reraise:
-            raise e
-    return form

accrete/managers.py

@@ -0,0 +1,35 @@
+from django.db import models
+from accrete.tenant import get_tenant
+from accrete.annotation import AnnotationManagerMixin
+
+
+class TenantManager(models.Manager, AnnotationManagerMixin):
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        tenant = get_tenant()
+        if tenant:
+            queryset = queryset.filter(tenant=tenant)
+        return queryset.annotate(**self.get_annotations())
+
+    def bulk_create(
+            self,
+            objs,
+            batch_size=None,
+            ignore_conflicts=False,
+            update_conflicts=False,
+            update_fields=None,
+            unique_fields=None,
+    ):
+        tenant = get_tenant()
+        if tenant is None and not all(obj.tenant_id for obj in objs):
+            raise ValueError(
+                'Tenant must be set for all objects when calling bulk_create'
+            )
+        for obj in objs:
+            obj.tenant_id = tenant.pk
+        return super().bulk_create(
+            objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
+            update_conflicts=update_conflicts, update_fields=update_fields,
+            unique_fields=unique_fields
+        )

accrete/models.py

@@ -3,39 +3,8 @@ from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from accrete.tenant import get_tenant
-from accrete.annotation import AnnotationModelMixin, AnnotationManagerMixin
-
-
-class TenantManager(models.Manager, AnnotationManagerMixin):
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        tenant = get_tenant()
-        if tenant:
-            queryset = queryset.filter(tenant=tenant)
-        return self.add_annotations(queryset)
-
-    def bulk_create(
-            self,
-            objs,
-            batch_size=None,
-            ignore_conflicts=False,
-            update_conflicts=False,
-            update_fields=None,
-            unique_fields=None,
-    ):
-        tenant = get_tenant()
-        if tenant is None and not all(obj.tenant_id for obj in objs):
-            raise ValueError(
-                'Tenant must be set for all objects when calling bulk_create'
-            )
-        for obj in objs:
-            obj.tenant_id = tenant.pk
-        return super().bulk_create(
-            objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
-            update_conflicts=update_conflicts, update_fields=update_fields,
-            unique_fields=unique_fields
-        )
+from accrete.annotation import AnnotationModelMixin
+from accrete.managers import TenantManager
 
 
 class TenantModel(models.Model, AnnotationModelMixin):

accrete/utils/__init__.py

@@ -0,0 +1,4 @@
+from . import dates
+from .forms import save_form
+from .http import filter_from_querystring
+from .models import get_related_model

accrete/utils/forms.py

@@ -0,0 +1,24 @@
+import logging
+from uuid import uuid4
+from django.db import transaction
+
+_logger = logging.getLogger(__name__)
+
+
+def save_form(form, reraise=False):
+    form.is_saved = False
+    form.save_error = None
+    form.save_error_id = None
+    try:
+        if form.is_valid():
+            with transaction.atomic():
+                form.save()
+            form.is_saved = True
+    except Exception as e:
+        form.save_error = repr(e)
+        error_id = str(uuid4())[:8]
+        _logger.exception(f'{error_id}: {e}')
+        form.save_error_id = error_id
+        if reraise:
+            raise e
+    return form

accrete/{querystring.py → utils/http.py}

@@ -7,14 +7,24 @@ from accrete.annotation import Annotation
 
 _logger = logging.getLogger(__name__)
 
+Querystring_KEY_MAP = {
+    'querystring': 'q',
+    'order': 'order',
+    'paginate_by': 'paginate_by',
+    'page': 'page'
+}
+
 
 def filter_from_querystring(
-        model: type[Model], query_string: str, order: list[str] = None
+        model: type[Model], get_params: dict, key_map: dict = None
 ) -> QuerySet:
 
-    order = order or model._meta.ordering
+    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
+
     return model.objects.filter(
-        parse_querystring(model, query_string)
+        parse_querystring(model, querystring)
     ).order_by(*order).distinct()
 
 
@@ -86,4 +96,4 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
 
     ops = {'&': operator.and_, '|': operator.or_, '^': operator.xor}
     query = parse_query_block(query_data)
-    return query
+    return query

{accrete-0.0.39.dist-info → accrete-0.0.40.dist-info}/METADATA

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

{accrete-0.0.39.dist-info → accrete-0.0.40.dist-info}/RECORD

@@ -1,14 +1,12 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
-accrete/annotation.py,sha256=MpzKdVDBn2tTLoUTWd9taY3h2dedvQMf3XP7dEtXLrI,1235
+accrete/annotation.py,sha256=P85kNgf_ka3U8i5cwaiKaAiSm21U-xY9PKmXMZR2ulU,1160
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
-accrete/forms.py,sha256=nPDgSZao-vuVFRam2Py18yiet3Bar-A-qkWjwbeUDlg,11235
-accrete/managers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+accrete/forms.py,sha256=2LobDn8EjHIaqBcgE4_Xk-nbfN6CPQasey-l22cQcT0,10740
+accrete/managers.py,sha256=EvWURMnGadnH3d-wXwv0-sLJKD6uGY03tSCiRSGsKbo,1170
 accrete/middleware.py,sha256=RWeHHcYCfpVO4EnG5HMS52F1y5OKRzNCuidMeq6b0zY,3176
-accrete/models.py,sha256=ruPKqNeKYzqSpYRhpQ12S82iJDYxy0EjSEtNSKWeRz4,6126
-accrete/queries.py,sha256=bchiqLzE1DmR9kvQ6Yyog6cNlYK_lxpztQMOx6Hy_0c,410
-accrete/querystring.py,sha256=RVKWHIM3Sdvr0ZTG240UOBqDEERq7FwkZpoRts-27v8,2993
+accrete/models.py,sha256=akv8BAT6Q3kxvSujgysg36nxWTizl_D9wAd14DzYhFM,5109
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/views.py,sha256=9-sgCFe_CyG-wllAcIOLujyueiq66C-zg0U7Uf5Y2wU,2954
@@ -161,7 +159,7 @@ accrete/contrib/user/middleware.py,sha256=qblcujwJsthopagyT-hPFq4HsMyGt-VvqZw5TQ
 accrete/contrib/user/models.py,sha256=SFEXG9G-XY7Nuss7DT51abDv8BWLHKYJocOhQDI_1Lw,3926
 accrete/contrib/user/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/user/urls.py,sha256=ktQJ3vZxDlKNUfzOxReeDLOduSdoW5z5Sz0LVFpxZGU,460
-accrete/contrib/user/views.py,sha256=82-RPqabxE6o7cglnfZmCUxNNRii4pmVFGiTThE4Zp0,3727
+accrete/contrib/user/views.py,sha256=oNY6HrZpUyCn0NmCRcA93JDwO64dA910F8INkvTo4Hk,3611
 accrete/contrib/user/locale/de/LC_MESSAGES/django.mo,sha256=p3rgUg6WltAVIMkQsjvjBqTsd_usLhSr1GH4Cyltc2c,433
 accrete/contrib/user/locale/de/LC_MESSAGES/django.po,sha256=f_Nxpo3HTm2L3f3zoHLfeWsZ-4IQp_EEVSku6TCZSvw,1870
 accrete/contrib/user/migrations/0001_initial.py,sha256=JWfM9PcMDfkJUdCjLWuWieGs6643qP0KdbCyr5uAZoY,2950
@@ -188,10 +186,12 @@ accrete/contrib/user_registration/templates/user_registration/mail_templates/con
 accrete/migrations/0001_initial.py,sha256=azThbc8otEhxJwo8BIgOt5eC30mxXhKJLBAazZFe3BA,4166
 accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEKnygZE,1628
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+accrete/utils/__init__.py,sha256=BGXx2NwF4Sc6uaenKNvPZEmHuHVY1u97PPECrd1seA8,129
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
+accrete/utils/forms.py,sha256=FHR9IP76dkULCtX4H68xbQG5uvkBQZnDEXSlHyz34iU,606
+accrete/utils/http.py,sha256=dR4p-Q8xoTlrjfx0sN--vkY4ZGtYUsqqquAfPNxsXx8,3249
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.39.dist-info/METADATA,sha256=_irD4sQ7BFCpr2vtpIJCNszpZGTSzVIoKMmtKLVpBKE,4892
-accrete-0.0.39.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-accrete-0.0.39.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.39.dist-info/RECORD,,
+accrete-0.0.40.dist-info/METADATA,sha256=51Qq-N3iNatoNK4Ot5au42pWHRyxydqijYO5kqk-PUE,4892
+accrete-0.0.40.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+accrete-0.0.40.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.40.dist-info/RECORD,,

accrete/queries.py

@@ -1,18 +0,0 @@
-import logging
-from accrete import models
-from accrete.tenant import get_tenant
-
-_logger = logging.getLogger(__name__)
-
-
-def is_member(tenant, user):
-    return tenant.members.filter(user=user, is_active=True).exists()
-
-
-def members_for_current_tenant():
-    tenant = get_tenant()
-    return tenant and tenant.members or models.Member.objects.none()
-
-
-def all_tenants():
-    return models.Tenant.objects.all()