accrete 0.0.111__py3-none-any.whl → 0.0.112__py3-none-any.whl

accrete/contrib/sequence/migrations/0003_alter_sequence_tenant.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.1 on 2025-01-07 20:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0002_initial'),
+        ('sequence', '0002_alter_sequence_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sequence',
+            name='tenant',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accrete.tenant', verbose_name='Tenant'),
+        ),
+    ]

accrete/models.py

@@ -3,12 +3,10 @@ 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
 from accrete.managers import TenantManager
-from accrete.tenant import unscoped
 
 
-class TenantModel(models.Model, AnnotationModelMixin):
+class TenantModel(models.Model):
 
     class Meta:
         abstract = True

{accrete-0.0.111.dist-info → accrete-0.0.112.dist-info}/METADATA

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

{accrete-0.0.111.dist-info → accrete-0.0.112.dist-info}/RECORD

@@ -1,12 +1,11 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
-accrete/annotation.py,sha256=GCpTTX3fJH9w2vOOOydKcAALdEd1gRNjh_Ws9LkJ4aA,1355
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=H2hPQemslRLvTVV0Wl1TfUmTc5wU3Z98nQTMiLMliqo,1288
 accrete/managers.py,sha256=3wylSG4XBL9s2hrIWJ8FHIL75PbuYgPZg5Svacwj2-Y,1454
 accrete/middleware.py,sha256=YN73WloNkN01oel9Dcj3xyhurcWoB6zMV0NT3hY8DGw,2264
-accrete/models.py,sha256=TTsXoZEIiyUgRuAiqK2eNIM-nlCHxy8aEGgNwpMN8Ps,5563
+accrete/models.py,sha256=6vymvqZ-ygaIZ5r-P1F57twy17VxdRQbzr8PMLwsWxs,5453
 accrete/storage.py,sha256=Jp3oE_uPMqgarjS_G49KDFrR2eSe4XuIJK9oAF_QBxk,1288
 accrete/tenant.py,sha256=-__rFtYrc5SbxFX2-Dvw6Wc1XzSAD6DeIBRuOVQlbWQ,1908
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
@@ -23,6 +22,7 @@ accrete/contrib/sequence/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6
 accrete/contrib/sequence/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
 accrete/contrib/sequence/migrations/0001_initial.py,sha256=iAR_hhGN2wDAk40IS9PwEsm7iYqfgasoKRrTLFEpOY8,1352
 accrete/contrib/sequence/migrations/0002_alter_sequence_name.py,sha256=70tpxJ0_edWpzj69PxV73m3CwI7Hy5x1YK8m6_2niP4,398
+accrete/contrib/sequence/migrations/0003_alter_sequence_tenant.py,sha256=W0RJKpTK1DKKpipktRJASr9aG-24Xuzr7GxYYGkwoJk,535
 accrete/contrib/sequence/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/system_mail/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/system_mail/admin.py,sha256=9hXwwfZn446juyRoBOygLWm12X6N9waRC-1LHBLrgZk,227
@@ -363,7 +363,7 @@ accrete/utils/forms.py,sha256=IvxbXNpSd4a-JBgsTJhs2GHe-DCRWX-xnVPRcoiCzbI,3104
 accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=2xTacvcpmDK_Bp4rAK7JdVLf8HU009LYNJ6eSpMgYZI,1014
 accrete/utils/views.py,sha256=AutijWetWGgjdO1PNc4gxCblT-i1fAfldNDFRbO9Sac,5012
-accrete-0.0.111.dist-info/METADATA,sha256=GpJ4Mdmyt-4vvX2mrBDwSexyLZvq7Ej2t3L8xH_1ddk,4953
-accrete-0.0.111.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-accrete-0.0.111.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.111.dist-info/RECORD,,
+accrete-0.0.112.dist-info/METADATA,sha256=KdP41pM_6cq8Jx0oEy3TCHNTVwEhKSVI2pIivZr89Nk,4953
+accrete-0.0.112.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.112.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.112.dist-info/RECORD,,

accrete/annotation.py

@@ -1,46 +0,0 @@
-from django.db.models import Field, Subquery, OuterRef
-from django.db.models.expressions import Func
-from django.db.models.aggregates import Aggregate
-
-
-class Annotation:
-
-    def __init__(
-            self,
-            verbose_name: str,
-            field: type[Field],
-            function: type[Func] | type[Aggregate],
-            help_text: str = '',
-            **kwargs
-    ):
-        self.verbose_name = verbose_name or self
-        self.field = field
-        self.function = function
-        self.help_text = help_text
-        self.__dict__.update(kwargs)
-
-
-class AnnotationModelMixin:
-
-    @classmethod
-    def get_annotations(cls) -> list[dict]:
-        return list({'name': a, 'annotation': getattr(cls, a)} for a in filter(
-            lambda a:
-            not a.startswith('__')
-            and isinstance(getattr(cls, a), Annotation),
-            cls.__dict__
-        ))
-
-
-class AnnotationManagerMixin:
-
-    def get_annotations(self, queryset):
-        if not hasattr(self.model, 'get_annotations'):
-            return {}
-        return {
-            annotation['name']: Subquery(
-                queryset.annotate(**{
-                    annotation['name']: annotation['annotation'].function
-                }).filter(pk=OuterRef('pk')).values(annotation['name'])[:1])
-            for annotation in self.model.get_annotations()
-        }