accrete 0.0.111__tar.gz → 0.0.112__tar.gz

{accrete-0.0.111 → accrete-0.0.112}/PKG-INFO

@@ -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.112/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-0.0.111 → accrete-0.0.112}/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 → accrete-0.0.112}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.111'
+version = '0.0.112'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]

accrete-0.0.111/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()
-        }