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

accrete/contrib/log/admin.py

@@ -0,0 +1,43 @@
+import django.apps
+from django.contrib import admin
+from django import forms
+from . import models
+
+installed_models = django.apps.apps.get_models(
+    include_auto_created=True, include_swapped=True
+)
+model_choices = [(
+    f'{m._meta.app_label}.{m._meta.model_name}',
+    f'{m._meta.app_label}.{m._meta.verbose_name}'
+) for m in installed_models]
+
+
+class LogConfigForm(forms.ModelForm):
+
+    model = forms.ChoiceField(choices=model_choices)
+
+
+class LogConfigFieldInLine(admin.TabularInline):
+
+    model = models.LogConfigField
+
+
+class LogConfigAdmin(admin.ModelAdmin):
+
+    model = models.LogConfig
+    list_display = ('model', 'ignore_errors')
+    search_fields = ('pk', 'model')
+    list_filter = ['ignore_errors']
+    form = LogConfigForm
+    inlines = [LogConfigFieldInLine]
+
+    def formfield_for_choice_field(self, db_field, request, **kwargs):
+        if db_field.name == "model":
+            kwargs["choices"] = [
+                ("accepted", "Accepted"),
+                ("denied", "Denied"),
+            ]
+        return super().formfield_for_choice_field(db_field, request, **kwargs)
+
+
+admin.site.register(models.LogConfig, LogConfigAdmin)

accrete/contrib/log/apps.py

@@ -0,0 +1,13 @@
+from django.apps import AppConfig
+from django.db.models.signals import post_save
+
+
+class LogConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'accrete.contrib.log'
+
+    def ready(self):
+        from . import signals
+        post_save.connect(
+            signals.create_log, weak=False, dispatch_uid="accrete.contrib.log"
+        )

accrete/contrib/log/helper.py

@@ -0,0 +1,79 @@
+from django.db import models
+from django.db.models.query import RawQuerySet
+from django.forms import model_to_dict
+
+from .models import Log, LogConfig
+
+TYPES_FK = ['AutoField', 'BigAutoField', 'ForeignKey']
+TYPES_INT = ['IntegerField', 'PositiveSmallIntegerField']
+TYPES_DECIMAL = ['DecimalField']
+TYPES_FLOAT = ['FloatField']
+TYPES_STR = ['CharField', 'TextField']
+TYPES_BOOL = ['BooleanField']
+TYPES_DATETIME = ['DateTimeField']
+TYPES_DATE = ['DateField']
+TYPES_TIME = ['TimeField']
+
+
+def internal_type_to_log_type(field: models.Field):
+    internal_type = field.get_internal_type()
+    if internal_type in TYPES_FK:
+        return 'fk'
+    if internal_type in TYPES_INT:
+        return 'int'
+    if internal_type in TYPES_FLOAT:
+        return 'float'
+    if internal_type in TYPES_DECIMAL:
+        return 'decimal'
+    if internal_type in TYPES_BOOL:
+        return 'bool'
+    if internal_type in TYPES_STR:
+        return 'str'
+    if internal_type in TYPES_DATE:
+        return 'date'
+    if internal_type in TYPES_DATETIME:
+        return 'datetime'
+
+
+def log_state_to_dict(logs: RawQuerySet) -> tuple[dict, dict]:
+    state = dict()
+    info = dict()
+    if not logs:
+        return state, info
+    for log in logs:
+        state.update({log.field: log.cast_value()})
+        info.update({log.field: {'new_value_type': log.new_value_type}})
+    return state, info
+
+
+def log_value_to_instance_value(log: Log):
+    if log.new_value_type == 'bool':
+        return bool(log.new_value == 'True')
+
+    if log.new_value == '':
+        return None
+    if log.new_value_type in ['fk', 'int']:
+        return int(log.new_value)
+
+
+def get_instance_state(instance: models.Model):
+    state = model_to_dict(instance)
+    cleaned_state = dict()
+    log_config = LogConfig.objects.filter(
+        model=f'{instance._meta.app_label}.{instance._meta.model_name}'
+    ).prefetch_related('fields').first()
+    if not log_config:
+        return cleaned_state
+    all_fields = list(map(lambda x: x.name, instance._meta.get_fields()))
+    if log_config.exclude_fields:
+        fields_to_log = list(f for f in all_fields if f not in log_config.fields.all().values_list('field_name', flat=True))
+    else:
+        fields_to_log = log_config.fields.all().values_list('field_name', flat=True)
+
+    for f, v in state.items():
+        if isinstance(v, (list, tuple, dict)):
+            continue
+        if f not in fields_to_log:
+            continue
+        cleaned_state.update({f: v})
+    return cleaned_state

accrete/contrib/log/migrations/0001_initial.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.1.1 on 2025-01-08 20:04
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('accrete', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Log',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('model', models.CharField(help_text='Combination of app label and model name seperated by a dot', max_length=255, verbose_name='Model')),
+                ('field', models.CharField(max_length=255, verbose_name='Field')),
+                ('object_id', models.BigIntegerField(verbose_name='Object ID')),
+                ('log_date', models.DateTimeField(auto_now_add=True, verbose_name='Date')),
+                ('old_value_type', models.CharField(choices=[('fk', 'Foreign Key'), ('int', 'Integer'), ('float', 'Float'), ('decimal', 'Decimal'), ('bool', 'Boolean'), ('str', 'String')], max_length=100, verbose_name='Old Value Type')),
+                ('new_value_type', models.CharField(choices=[('fk', 'Foreign Key'), ('int', 'Integer'), ('float', 'Float'), ('decimal', 'Decimal'), ('bool', 'Boolean'), ('str', 'String')], max_length=100, verbose_name='New Value Type')),
+                ('old_value', models.TextField(blank=True, null=True, verbose_name='Old Value')),
+                ('new_value', models.TextField(blank=True, null=True, verbose_name='New Value')),
+                ('tenant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accrete.tenant', verbose_name='Tenant')),
+            ],
+            options={
+                'verbose_name': 'Log',
+                'verbose_name_plural': 'Logs',
+                'db_table': 'accrete_log',
+                'indexes': [models.Index(fields=['model', 'object_id'], name='accrete_log_model_cf888c_idx')],
+                'constraints': [models.UniqueConstraint(fields=('model', 'field', 'object_id', 'log_date'), name='unique_group_fields')],
+            },
+        ),
+    ]

accrete/contrib/log/migrations/0002_log_user_alter_log_new_value_type_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.1 on 2025-01-10 07:56
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('log', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='log',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='logs', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='new_value_type',
+            field=models.CharField(choices=[('fk', 'Foreign Key'), ('int', 'Integer'), ('float', 'Float'), ('decimal', 'Decimal'), ('bool', 'Boolean'), ('str', 'String'), ('date', 'Date'), ('datetime', 'Date Time')], max_length=100, verbose_name='New Value Type'),
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='old_value_type',
+            field=models.CharField(choices=[('fk', 'Foreign Key'), ('int', 'Integer'), ('float', 'Float'), ('decimal', 'Decimal'), ('bool', 'Boolean'), ('str', 'String'), ('date', 'Date'), ('datetime', 'Date Time')], max_length=100, verbose_name='Old Value Type'),
+        ),
+    ]

accrete/contrib/log/migrations/0003_alter_log_tenant.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.1 on 2025-01-10 08:02
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0003_remove_member_name'),
+        ('log', '0002_log_user_alter_log_new_value_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='log',
+            name='tenant',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='accrete.tenant', verbose_name='Tenant'),
+        ),
+    ]

accrete/contrib/log/migrations/0004_logconfig_logconfigfield.py

@@ -0,0 +1,47 @@
+# Generated by Django 5.1.1 on 2025-01-10 15:20
+
+import django.db.models.deletion
+import django.db.models.functions.text
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('log', '0003_alter_log_tenant'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LogConfig',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('model', models.CharField(help_text='Combination of app label and model name seperated by a dot', max_length=255, verbose_name='Model')),
+                ('ignore_errors', models.BooleanField(default=False, help_text='IF true, exceptions during log creation will be ignored', verbose_name='Ignore Errors')),
+            ],
+            options={
+                'verbose_name': 'Log Configuration',
+                'verbose_name_plural': 'Log Configs',
+                'db_table': 'accrete_log_config',
+                'ordering': [django.db.models.functions.text.Lower('model')],
+                'indexes': [models.Index(fields=['model'], name='accrete_log_model_a89071_idx')],
+                'constraints': [models.UniqueConstraint(fields=('model',), name='unique_model')],
+            },
+        ),
+        migrations.CreateModel(
+            name='LogConfigField',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('field_name', models.CharField(help_text='Name of the field to log', max_length=255, verbose_name='Field Name')),
+                ('log_config', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='log.logconfig', verbose_name='Log Configuration')),
+            ],
+            options={
+                'verbose_name': 'Log Configuration Field',
+                'verbose_name_plural': 'Log Configuration Fields',
+                'db_table': 'accrete_log_config_field',
+                'ordering': [django.db.models.functions.text.Lower('field_name')],
+                'indexes': [models.Index(fields=['log_config'], name='accrete_log_log_con_22f45e_idx')],
+                'constraints': [models.UniqueConstraint(fields=('log_config', 'field_name'), name='unique_config_field_name')],
+            },
+        ),
+    ]

accrete/contrib/log/migrations/0005_logconfig_exclude_fields_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.1.1 on 2025-01-12 09:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('log', '0004_logconfig_logconfigfield'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='logconfig',
+            name='exclude_fields',
+            field=models.BooleanField(default=False, help_text='If set, Log Configuration Fields will be excluded from logging. Otherwise only configured fields will be logged.', verbose_name='Exclude Fields'),
+        ),
+        migrations.AlterField(
+            model_name='logconfig',
+            name='ignore_errors',
+            field=models.BooleanField(default=False, help_text='If set, exceptions during log creation will be ignored', verbose_name='Ignore Errors'),
+        ),
+        migrations.AlterField(
+            model_name='logconfigfield',
+            name='log_config',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fields', to='log.logconfig', verbose_name='Log Configuration'),
+        ),
+    ]

accrete/contrib/log/models.py

@@ -0,0 +1,229 @@
+from decimal import Decimal
+from datetime import date, datetime
+
+from django.conf import settings
+from django.db.models.functions import Lower
+from django.utils.translation import gettext_lazy as _
+from django.db import models
+
+
+class Log(models.Model):
+
+    class Meta:
+        verbose_name = _('Log')
+        verbose_name_plural = _('Logs')
+        db_table = 'accrete_log'
+        indexes = [
+            models.Index(fields=['model', 'object_id'])
+        ]
+        constraints = [
+            models.UniqueConstraint(
+                name='unique_group_fields',
+                fields=('model', 'field', 'object_id', 'log_date')
+            )
+        ]
+
+    tenant = models.ForeignKey(
+        verbose_name=_('Tenant'),
+        to='accrete.Tenant',
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True
+    )
+
+    model = models.CharField(
+        verbose_name=_('Model'),
+        max_length=255,
+        help_text='Combination of app label and model name seperated by a dot'
+    )
+
+    field = models.CharField(
+        verbose_name=_('Field'),
+        max_length=255
+    )
+
+    object_id = models.BigIntegerField(
+        verbose_name='Object ID'
+    )
+
+    log_date = models.DateTimeField(
+        verbose_name=_('Date'),
+        auto_now_add=True
+    )
+
+    old_value_type = models.CharField(
+        verbose_name=_('Old Value Type'),
+        choices=[
+            ('fk', 'Foreign Key'),
+            ('int', 'Integer'),
+            ('float', 'Float'),
+            ('decimal', 'Decimal'),
+            ('bool', 'Boolean'),
+            ('str', 'String'),
+            ('date', 'Date'),
+            ('datetime', 'Date Time')
+        ],
+        max_length=100,
+    )
+
+    new_value_type = models.CharField(
+        verbose_name=_('New Value Type'),
+        choices=[
+            ('fk', 'Foreign Key'),
+            ('int', 'Integer'),
+            ('float', 'Float'),
+            ('decimal', 'Decimal'),
+            ('bool', 'Boolean'),
+            ('str', 'String'),
+            ('date', 'Date'),
+            ('datetime', 'Date Time')
+        ],
+        max_length=100
+    )
+
+    old_value = models.TextField(
+        verbose_name=_('Old Value'),
+        null=True,
+        blank=True
+    )
+
+    new_value = models.TextField(
+        verbose_name=_('New Value'),
+        null=True,
+        blank=True
+    )
+
+    user = models.ForeignKey(
+        to=settings.AUTH_USER_MODEL,
+        related_name='logs',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True
+    )
+
+    def __str__(self):
+        return f'{self.model}.{self.field},{self.object_id}'
+
+    def cast_value(self):
+        if self.new_value is None:
+            return None
+        if self.new_value_type == 'fk':
+            return self.cast_fk()
+        if self.new_value_type == 'int':
+            return self.cast_int()
+        if self.new_value_type == 'float':
+            return self.cast_float()
+        if self.new_value_type == 'decimal':
+            return self.cast_decimal()
+        if self.new_value_type == 'bool':
+            return self.cast_bool()
+        if self.new_value_type == 'str':
+            return self.cast_str()
+        if self.new_value_type == 'date':
+            return self.cast_date()
+        if self.new_value_type == 'datetime':
+            return self.cast_date_time()
+
+    def cast_fk(self):
+        return self.cast_int()
+
+    def cast_int(self):
+        if self.new_value == '':
+            return None
+        return int(self.new_value)
+
+    def cast_float(self):
+        if self.new_value == '':
+            return 0.0
+        return float(self.new_value)
+
+    def cast_decimal(self):
+        if self.new_value == '':
+            return Decimal(0)
+        return Decimal(self.new_value)
+
+    def cast_bool(self):
+        return self.new_value == 'True'
+
+    def cast_str(self):
+        return self.new_value
+
+    def cast_date(self):
+        if self.new_value == '':
+            return None
+        return date.fromisoformat(str(self.new_value))
+
+    def cast_date_time(self):
+        if self.new_value == '':
+            return None
+        return datetime.fromisoformat(self.new_value)
+
+
+class LogConfig(models.Model):
+
+    class Meta:
+        verbose_name = _('Log Configuration')
+        verbose_name_plural = _('Log Configs')
+        db_table = 'accrete_log_config'
+        ordering = [Lower('model')]
+        indexes = [
+            models.Index(fields=['model'])
+        ]
+        constraints = [
+            models.UniqueConstraint(
+                name='unique_model',
+                fields=('model',)
+            )
+        ]
+
+    model = models.CharField(
+        verbose_name=_('Model'),
+        max_length=255,
+        help_text=_('Combination of app label and model name seperated by a dot')
+    )
+
+    ignore_errors = models.BooleanField(
+        verbose_name=_('Ignore Errors'),
+        default=False,
+        help_text=_('If set, exceptions during log creation will be ignored')
+    )
+
+    exclude_fields = models.BooleanField(
+        verbose_name=_('Exclude Fields'),
+        default=False,
+        help_text=_(
+            'If set, Log Configuration Fields will be excluded from logging. '
+            'Otherwise only configured fields will be logged.'
+        )
+    )
+
+
+class LogConfigField(models.Model):
+
+    class Meta:
+        verbose_name = _('Log Configuration Field')
+        verbose_name_plural = _('Log Configuration Fields')
+        db_table = 'accrete_log_config_field'
+        ordering = [Lower('field_name')]
+        indexes = [
+            models.Index(fields=['log_config'])
+        ]
+        constraints = [
+            models.UniqueConstraint(
+                name='unique_config_field_name',
+                fields=('log_config', 'field_name')
+            )
+        ]
+
+    log_config = models.ForeignKey(
+        verbose_name=_('Log Configuration'),
+        to='log.LogConfig',
+        related_name='fields',
+        on_delete=models.CASCADE
+    )
+
+    field_name = models.CharField(
+        verbose_name=_('Field Name'),
+        max_length=255,
+        help_text=_('Name of the field to log')
+    )

accrete/contrib/log/queries.py

@@ -0,0 +1,34 @@
+from .models import Log
+from accrete.tenant import get_tenant
+
+
+def current_log_state(model: str, object_id: int):
+    tenant = get_tenant()
+    tenant_id = tenant and tenant.id or None
+    logs = Log.objects.raw("""
+        SELECT
+            log_value.id,
+            log_value.model,
+            log_value.field,
+            log_value.object_id,
+            log_value.log_date,
+            log_value.old_value_type,
+            log_value.new_value_type,
+            log_value.old_value,
+            log_value.new_value
+        FROM (
+            SELECT model, field, object_id, MAX(log_date) AS log_date
+            FROM accrete_log
+            WHERE
+                model = %s AND
+                object_id = %s AND
+                tenant_id = %s
+            GROUP BY model, field, object_id
+        ) log_result
+        JOIN accrete_log log_value ON
+            log_value.model = log_result.model AND
+            log_value.field = log_result.field AND
+            log_value.object_id = log_result.object_id AND
+            log_result.log_date = log_value.log_date;
+    """, [model, object_id, tenant_id])
+    return logs

accrete/contrib/log/signals.py

@@ -0,0 +1,62 @@
+import logging
+
+from django.db import models
+
+from accrete.tenant import get_member, get_tenant
+from accrete.utils.log import log_time
+from .models import Log, LogConfig
+from . import helper, queries
+
+_logger = logging.getLogger(__name__)
+
+
+@log_time
+def create_log(sender, **kwargs):
+
+    def _create_log():
+        member = get_member()
+        user = member and member.user or None
+        object_id = instance.id
+        log_rows = queries.current_log_state(model, object_id)
+        log_state, log_info = helper.log_state_to_dict(log_rows)
+        instance_state = helper.get_instance_state(instance)
+        diff = dict(log_state.items() ^ instance_state.items())
+        logs_to_create = []
+        for field, value in instance_state.items():
+            if field not in diff.keys():
+                continue
+            value_type = helper.internal_type_to_log_type(instance._meta.get_field(field))
+            if value_type is None:
+                continue
+            if value is None:
+                new_value = None
+            else:
+                new_value = str(value)
+            log = Log(
+                model=model,
+                field=field,
+                object_id=instance.id,
+                old_value_type=log_info.get(field, {}).get('new_value_type', ''),
+                old_value=log_state.get(field),
+                new_value_type=helper.internal_type_to_log_type(instance._meta.get_field(field)),
+                new_value=new_value,
+                user=user,
+                tenant=get_tenant()
+            )
+            logs_to_create.append(log)
+        Log.objects.bulk_create(logs_to_create)
+
+    instance: models.Model = kwargs.get('instance')
+    model = f'{instance._meta.app_label}.{instance._meta.model_name}'
+    log_config = LogConfig.objects.filter(model=model).first()
+    if not log_config:
+        return
+
+    try:
+        _create_log()
+    except Exception as e:
+        _logger.exception(e)
+        if log_config.ignore_errors:
+            pass
+        else:
+            raise e

accrete/contrib/log/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

accrete/contrib/log/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

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/contrib/ui/templates/ui/form_error.html

@@ -0,0 +1,11 @@
+{% load i18n %}
+
+{% if form.non_field_errors or form.save_error %}
+    <div class="notification is-danger is-light">
+        {{ form.non_field_errors }}
+        {% if form.save_error %}
+            <p>{{ form.save_error }}</p>
+            <span>{% translate 'Error ID' %}: {{ form.save_error_id }}</span>
+        {% endif %}
+    </div>
+{% endif %}

accrete/managers.py

@@ -40,3 +40,10 @@ class TenantManager(models.Manager):
             update_conflicts=update_conflicts, update_fields=update_fields,
             unique_fields=unique_fields
         )
+
+
+class MemberManager(TenantManager):
+
+    def get_queryset(self):
+        queryset = super().get_queryset().select_related('tenant', 'user')
+        return queryset

accrete/migrations/0003_remove_member_name.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.1 on 2025-01-10 07:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='member',
+            name='name',
+        ),
+    ]

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
+from accrete.managers import TenantManager, MemberManager
 
 
-class TenantModel(models.Model, AnnotationModelMixin):
+class TenantModel(models.Model):
 
     class Meta:
         abstract = True
@@ -88,8 +86,6 @@ class Member(models.Model):
         ordering = ['tenant', 'user']
         db_table = 'accrete_member'
 
-    username_validator = UnicodeUsernameValidator()
-
     user = models.ForeignKey(
         to=settings.AUTH_USER_MODEL,
         related_name='memberships',
@@ -102,18 +98,6 @@ class Member(models.Model):
         on_delete=models.CASCADE
     )
 
-    name = models.CharField(
-        verbose_name=_('Name'),
-        max_length=150,
-        help_text=_(
-            '150 characters or fewer.'
-            'Letters, digits and @/./+/-/_ only.'
-        ),
-        blank=True,
-        null=True,
-        validators=[username_validator],
-    )
-
     is_active = models.BooleanField(
         verbose_name=_('Active'),
         default=True
@@ -125,10 +109,10 @@ class Member(models.Model):
         through_fields=('member', 'access_group')
     )
 
-    objects = TenantManager()
+    objects = MemberManager()
 
     def __str__(self):
-        return f'{self.name or self.user}'
+        return f'{self.user}'
 
 
 class AccessGroup(models.Model):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.111
+Version: 0.0.113
 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.113.dist-info}/RECORD

@@ -1,18 +1,32 @@
 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/managers.py,sha256=DevRVm7cStvlfz6TriitSINr40POCi4HNaHX48VkrMA,1620
 accrete/middleware.py,sha256=YN73WloNkN01oel9Dcj3xyhurcWoB6zMV0NT3hY8DGw,2264
-accrete/models.py,sha256=TTsXoZEIiyUgRuAiqK2eNIM-nlCHxy8aEGgNwpMN8Ps,5563
+accrete/models.py,sha256=k6BLNeQY4H_-WiODLpMoNJp_g3Dm4sTfeNj5n68oJ88,5109
 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
 accrete/urls.py,sha256=goDFR-yhOlLLy7AMi9pmh2aBkxdtZtwXNg6mwI2zPhU,227
 accrete/views.py,sha256=dwgXLkIjqjG16vlG4C6QeS191HoDnT7bZtkLahJB6wQ,2582
 accrete/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+accrete/contrib/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+accrete/contrib/log/admin.py,sha256=a3VCS2_YmahBShewMS9yn1QOln-3rmCJqMsa6VnNqdU,1151
+accrete/contrib/log/apps.py,sha256=O0Cje3MmpxPToJVgO195lBg0tRCy9Ou87-ntcdGBKM0,369
+accrete/contrib/log/helper.py,sha256=Zzmwxz7vP0jdW2LCw8gDpPNBkqlELaCydz-nxGh7F5Y,2493
+accrete/contrib/log/models.py,sha256=PUGtm2mmZIhWf7Idpu9hZ-1mJtKU2p975e7eoCZ2cHE,6082
+accrete/contrib/log/queries.py,sha256=JMI_q6dQ0JjyORtfRPOW92of45TFxqPiwIhHEEar34o,1126
+accrete/contrib/log/signals.py,sha256=Gsb7B9nRhLgQQ8qxtbCEnvgHkFK9v7JfYJfAupFQ21I,2036
+accrete/contrib/log/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
+accrete/contrib/log/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
+accrete/contrib/log/migrations/0001_initial.py,sha256=wkGMfaYc09dOuJXY0JengDBTkS98rMutUzmEAb6eK3E,2130
+accrete/contrib/log/migrations/0002_log_user_alter_log_new_value_type_and_more.py,sha256=E3IUq4P62sapYzbKbUuufdCbN4O4kRphpcyVfUpJwrc,1346
+accrete/contrib/log/migrations/0003_alter_log_tenant.py,sha256=yp3WizRdAPvPctMiCmKcsqVix3a0LaIRmuAB6LJ6Gb0,582
+accrete/contrib/log/migrations/0004_logconfig_logconfigfield.py,sha256=iXD3kDj8GAD5Dce9xVozl0n8KCQaK4LsQkLHR3BDZ28,2367
+accrete/contrib/log/migrations/0005_logconfig_exclude_fields_and_more.py,sha256=eN0AG2vR80-9NvMBfijjM04qPfRGxO7B8VFabrEZ_ZQ,1127
+accrete/contrib/log/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/sequence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/sequence/admin.py,sha256=mTjab5cVklRUIQcSrsUo-_JgtXEsSdcFj_gfWhlStS4,273
 accrete/contrib/sequence/apps.py,sha256=2SalOz9piCrbOPudCh0grN1eojN9kEC4-jcNzBmfqEk,164
@@ -23,6 +37,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
@@ -303,6 +318,7 @@ accrete/contrib/ui/templates/django/forms/widgets/select.html,sha256=uSfDpOQox2m
 accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoDLVtTOOiWNprrsPriNr712yFxaHyDIo,47
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
 accrete/contrib/ui/templates/ui/content_right.html,sha256=XUF1tYpSKfO9FleYtJ2QmWPmwdLYxLHXdBLRa-BrFUs,221
+accrete/contrib/ui/templates/ui/form_error.html,sha256=uA8FLdZyeU0vXJHlGK3rcBqcmXb63MLPV32uQyUTak4,348
 accrete/contrib/ui/templates/ui/layout.html,sha256=PVqvIPYdWPX8IuAes1db0SWlw05xu0SNp8vmV9n1Sms,12889
 accrete/contrib/ui/templates/ui/list.html,sha256=NY8DmHGl3n5O1u-_B9a_mlAck19ZmpYthzecADuc3BM,2250
 accrete/contrib/ui/templates/ui/list_update.html,sha256=mLQTCgkKfVI5jrgei-Upc1u87iXL0Q63uLzXHPwMyeo,110
@@ -356,6 +372,7 @@ accrete/contrib/user_registration/templates/user_registration/registration.html,
 accrete/contrib/user_registration/templates/user_registration/mail_templates/confirmation_mail.html,sha256=5UkpGUrDAazrr_gKguOnOykr77a2FLgD2gnvUxzHfyg,192
 accrete/migrations/0001_initial.py,sha256=azThbc8otEhxJwo8BIgOt5eC30mxXhKJLBAazZFe3BA,4166
 accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEKnygZE,1628
+accrete/migrations/0003_remove_member_name.py,sha256=bnZrzOIXcqsoGfbqgohTN5OHm2IldnLlBz1HNJDeqKc,315
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/__init__.py,sha256=saw9zi2XItJOPbv4fjTXOpl7StNtC803jHhapFcGx08,312
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
@@ -363,7 +380,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.113.dist-info/METADATA,sha256=kvqYem5bYx1j0oWAFyHESNnmukLdsBxfiu-kc-PDB-k,4953
+accrete-0.0.113.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.113.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.113.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()
-        }