accrete 0.0.156__tar.gz → 0.0.157__tar.gz

{accrete-0.0.156 → accrete-0.0.157}/PKG-INFO

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

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/log/helper.py

@@ -1,8 +1,11 @@
+import json
+
 from django.db import models
 from django.db.models.query import RawQuerySet
-from django.forms import model_to_dict
 
 from .models import Log, LogConfig
+from accrete.fields import TranslatedCharField, TranslatedTextField
+from accrete.utils.models import model_to_dict
 
 TYPES_FK = ['AutoField', 'BigAutoField', 'ForeignKey']
 TYPES_INT = ['IntegerField', 'PositiveSmallIntegerField']
@@ -13,6 +16,7 @@ TYPES_BOOL = ['BooleanField']
 TYPES_DATETIME = ['DateTimeField']
 TYPES_DATE = ['DateField']
 TYPES_TIME = ['TimeField']
+TYPES_JSON = ['JSONField']
 
 
 def internal_type_to_log_type(field: models.Field):
@@ -33,6 +37,8 @@ def internal_type_to_log_type(field: models.Field):
         return 'date'
     if internal_type in TYPES_DATETIME:
         return 'datetime'
+    if internal_type in TYPES_JSON:
+        return 'json'
 
 
 def log_state_to_dict(logs: RawQuerySet) -> tuple[dict, dict]:
@@ -71,9 +77,12 @@ def get_instance_state(instance: models.Model):
         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)):
+        if isinstance(v, (list, tuple)):
             continue
         if f not in fields_to_log:
             continue
+        if isinstance(v, dict) and isinstance(instance._meta.get_field(f), (TranslatedCharField, TranslatedTextField)):
+            cleaned_state.update({f: json.dumps(v)})
+            continue
         cleaned_state.update({f: v})
     return cleaned_state

accrete-0.0.157/accrete/contrib/log/migrations/0007_alter_log_new_value_type_alter_log_old_value_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.7 on 2025-10-06 18:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('log', '0006_remove_log_accrete_log_model_cf888c_idx_and_more'),
+    ]
+
+    operations = [
+        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'), ('json', 'JSON')], 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'), ('json', 'JSON')], max_length=100, verbose_name='Old Value Type'),
+        ),
+    ]

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/log/models.py

@@ -63,7 +63,8 @@ class Log(models.Model):
             ('bool', 'Boolean'),
             ('str', 'String'),
             ('date', 'Date'),
-            ('datetime', 'Date Time')
+            ('datetime', 'Date Time'),
+            ('json', 'JSON')
         ],
         max_length=100,
     )
@@ -78,7 +79,8 @@ class Log(models.Model):
             ('bool', 'Boolean'),
             ('str', 'String'),
             ('date', 'Date'),
-            ('datetime', 'Date Time')
+            ('datetime', 'Date Time'),
+            ('json', 'JSON')
         ],
         max_length=100
     )

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/sequence/queries.py

@@ -5,7 +5,7 @@ from accrete.tenant import get_tenant
 from .models import Sequence
 
 
-def get_nextval(name, create_if_none=True):
+def get_nextval(name: str, create_if_none:bool = True) -> int:
     tenant = get_tenant()
     with transaction.atomic():
         seq = Sequence.objects.filter(

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/ui/__init__.py

@@ -16,5 +16,6 @@ from .response import (
     message_response,
     add_trigger,
     update,
-    WindowResponseConfig
+    WindowResponseConfig,
+    redirect_response
 )

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/ui/response.py

@@ -465,3 +465,10 @@ def update(request, ui_responses: list[Response], trigger: list[ClientTrigger] =
     for t in trigger or []:
         add_trigger(response, t.trigger, t.header)
     return response
+
+
+def redirect_response(url: str, reload: bool = True):
+    res = HttpResponse()
+    header = 'HX-Redirect' if reload else 'HX-Location'
+    res[header] = url
+    return res

accrete-0.0.157/accrete/contrib/ui/templates/django/forms/widgets/radio.html

@@ -0,0 +1,5 @@
+{% with id=widget.attrs.id %}<div{% if id %} id="{{ id }}"{% endif %}{% if widget.attrs.class %} class="{{ widget.attrs.class }}"{% endif %}>{% for group, options, index in widget.optgroups %}{% if group %}
+    <div><label class="has-text-weight-medium">{{ group }}</label>{% endif %}<div style="display: flex; flex-direction: row; flex-wrap: wrap">{% for option in options %}<div class="mr-2" style="white-space: nowrap">
+    {% include option.template_name with widget=option %}</div>{% endfor %}</div>{% if group %}
+    </div>{% endif %}{% endfor %}
+</div>{% endwith %}

accrete-0.0.157/accrete/contrib/ui/templates/ui/form_error.html

@@ -0,0 +1,13 @@
+{% load i18n %}
+
+{% if form.non_field_errors or form.save_error %}
+    <div class="message is-danger" style="word-wrap: break-word;">
+        <div class="message-body">
+            {{ form.non_field_errors }}
+            {% if form.save_error %}
+                <p>{{ form.save_error }}</p>
+                {% if form.save_error_id %}<span>{% translate 'Error ID' %}: {{ form.save_error_id }}</span>{% endif %}
+            {% endif %}
+        </div>
+    </div>
+{% endif %}

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/ui/templates/ui/layout.html

@@ -146,7 +146,7 @@
                 <div id="message" class="" style="position: fixed; top: calc(var(--bulma-navbar-height) + 5px); left: 50%; transform: translateX(-50%); z-index: 999">
                     {% for message in messages %}
                         <div class="mb-2" style="min-width: 330px; max-width: 330px" x-data="{ show: false }" x-show="show" x-cloak="" x-init="show = true; setTimeout(() => show = false, 4000)" x-transition.duration.200ms>
-                        <article class="message {{ message|message_class }}" style="box-shadow: 2px 2px 5px">
+                        <article class="message {{ message|message_class }}">
                             <div class="message-body">
                                 {{ message }}
                                 <button class="delete" x-on:click="show = false;" style="position: absolute; top: 5px; right: 5px"></button>

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/ui/templates/ui/message.html

@@ -4,7 +4,7 @@
     {% for message in messages %}
         <div hx-swap-oob="{% if append %}beforeend:#message{% else %}innerHTML:#message{% endif %}">
             <div class="mb-2" style="min-width: 340px; max-width: 340px" x-data="{ show: false }" x-show="show" x-cloak="" x-init="show = true; {% if not persistent %}setTimeout(() => show = false, 4000){% endif %}" x-transition.duration.200ms>
-                <article class="message {{ message|message_class }}" style="box-shadow: 2px 2px 5px">
+                <article class="message {{ message|message_class }}">
                     <div class="message-body">
                         {{ message }}
                         <button class="delete" x-on:click="show = false;" style="position: absolute; top: 5px; right: 5px"></button>

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/ui/templates/ui/templatetags/field.html

@@ -1,28 +1,9 @@
 {% load ui %}
 {% load partials %}
 
-{#{% partialdef form_field %}#}
-{#    <label class="label mt-2 mb-5">#}
-{#        {{ field.label }}#}
-{#        {{ field }}#}
-{#        <span class="has-text-danger is-size-6">{{ field.errors }}</span>#}
-{#        <span class="helptext is-size-7">{{ field.help_text }}</span>#}
-{#        <span class="helptext is-size-7">{% if label %}{{ label }}{% else %}{{ field.help_text|default_if_falsy:field.label }}{% endif %}</span>#}
-{#    </label>#}
-{#{% endpartialdef %}#}
-
-{#{% partialdef form_field %}#}
-{#    <label class="label mt-2 mb-5" style="border: 1px solid; border-radius: var(--bulma-radius);">#}
-{#        <span style="justify-content: left" class="is-fullwidth button is-static helptext is-size-7 {% if field.field.required %}has-text-weight-bold{% endif %}">{% if label %}{{ label }}{% else %}{{ field.help_text|default_if_falsy:field.label }}{% endif %}</span>#}
-{#        {{ field }}#}
-{#        <span class="has-text-danger is-size-6">{{ field.errors }}Testmessage</span>#}
-{##}
-{#    </label>#}
-{#{% endpartialdef %}#}
-
 {% partialdef form_field %}
     <div class="mb-5">
-        <label class="label mb-0 {% if field.field.required %}has-text-weight-medium{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
+        <label class="label mb-0 {% if field.field.required %}has-text-weight-bold{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
         <div class="field has-addons mb-0">
             {% if icon %}
                 <p class="control">
@@ -36,6 +17,24 @@
     </div>
 {% endpartialdef %}
 
+{% partialdef form_checkbox %}
+    <div class="mb-5">
+        <div class="level" style="display: flex; flex-direction: row; justify-content: start">
+        <div class="field has-addons mb-0">
+            {% if icon %}
+                <p class="control">
+                    <button tabindex="-1" type="button" class="button is-static"><span class="icon"><i class="{{ icon }}"></i></span></button>
+                </p>
+            {% endif %}
+            <div class="control is-expanded">{{ field }}</div>
+        </div>
+            <label class="label mb-0 {% if field.field.required %}has-text-weight-bold{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
+        </div>
+        <span class="has-text-danger is-size-6">{{ field.errors }}</span>
+        <span class="helptext is-size-7">{{ field.help_text|default_if_falsy:'' }}</span>
+    </div>
+{% endpartialdef %}
+
 {% partialdef textarea %}
     <label class="label mt-2 mb-5">
         <span class="{% if field.field.required %}has-text-weight-normal{% endif %}">{{ field.label }}</span>
@@ -45,12 +44,6 @@
 {% endpartialdef %}
 
 {% partialdef model_field %}
-{#    <label class="label mt-2 mb-5">#}
-{#        <span class="field has-addons mb-0">#}
-{#            <span class="control input has-text-weight-bold">{{ value|default_if_none:'' }}</span>#}
-{#        </span>#}
-{#        <span class="helptext">{{ label }}</span>#}
-{#    </label>#}
     <div class="mb-5">
         <label class="label mb-0 {% if field.field.required %}has-text-weight-bold{% endif %}" for="{{ field.id_for_label }}">{{ label }}</label>
         <div class="field has-addons mb-0">

accrete-0.0.157/accrete/contrib/ui/templates/ui/templatetags/tenant_quick_switch.html

@@ -0,0 +1,14 @@
+<div class="navbar-item is-unselectable has-text-weight-bold" style="{% if switch_url %}cursor: pointer;{% endif %}" x-on:click="showQuickSwitch = !showQuickSwitch;">
+    {{ tenant.name }}
+</div>
+{% if tenants and switch_url %}
+<article class="box p-1" style="position: fixed; top: var(--bulma-navbar-height); left: 0; min-width: 150px; border-top-left-radius: 0; border-top-right-radius: 0;"
+         x-show="showQuickSwitch" x-cloak="" x-on:click.outside="showQuickSwitch = false"
+>
+    <ul class="hoverable mr-1">
+        {% for t in tenants %}
+            <li class="navbar-item" style="cursor: pointer; border-radius: var(--bulma-radius);"><a href="{{ switch_url }}?tenant_id={{ t.pk }}" hx-boost="false" style="width: 100%; display: inline-block">{{ t.name }}</a></li>
+        {% endfor %}
+    </ul>
+</article>
+{% endif %}

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/ui/templatetags/ui.py

@@ -163,13 +163,19 @@ def x_ref_save(param: str):
 
 
 @register.filter(name='wrap_form_field')
-def wrap_form_fields(field, icon=None):
+def wrap_form_field(field, icon=None):
     if isinstance(field.field.widget, widgets.Textarea):
         html = render_to_string(
             'ui/templatetags/field.html#textarea',
             {'field': field, 'icon': None}
         )
         return mark_safe(html)
+    if isinstance(field.field.widget, widgets.CheckboxInput):
+        html = render_to_string(
+            'ui/templatetags/field.html#form_checkbox',
+            {'field': field, 'icon': None}
+        )
+        return mark_safe(html)
     html = render_to_string(
         'ui/templatetags/field.html#form_field',
         {'field': field, 'icon': icon}

accrete-0.0.157/accrete/contrib/user/migrations/0011_alter_user_theme.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-08 18:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0010_alter_user_theme'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='theme',
+            field=models.CharField(choices=[(None, [('preset', 'Preset'), ('light', 'Light'), ('dark', 'Dark'), ('custom', 'Custom')])], default='preset', max_length=50, verbose_name='Theme'),
+        ),
+    ]

{accrete-0.0.156 → accrete-0.0.157}/accrete/contrib/user/models.py

@@ -181,10 +181,12 @@ class User(AbstractBaseUser, PermissionsMixin):
         verbose_name=_('Theme'),
         max_length=50,
         choices=[
-            ('preset', _('Preset')),
-            ('light', _('Light')),
-            ('dark', _('Dark')),
-            ('custom', _('Custom'))
+            (None, (
+                ('preset', _('Preset')),
+                ('light', _('Light')),
+                ('dark', _('Dark')),
+                ('custom', _('Custom'))
+            ))
         ],
         default='preset'
     )

{accrete-0.0.156 → accrete-0.0.157}/accrete/utils/models.py

@@ -1,6 +1,9 @@
 import json
 from django.db import connection
 from django.db.models import Model, Field
+from django.forms import model_to_dict as mtd
+
+from accrete.fields import TranslatedCharField, TranslatedTextField
 
 
 def get_related_model(model: type[Model], rel_path: str) -> tuple[Model, list[str]]:
@@ -43,3 +46,19 @@ def translated_db_value(instance: Model, field: str) -> dict:
         row = row and row[0]
         db_value = row and json.loads(row) or dict()
     return db_value
+
+
+def model_to_dict(instance, fields=None, exclude=None, translated=True):
+    """
+    Extends django.forms.model_to_dict with the option to get the
+    translation dict instead of the translated string for the active language
+    """
+    data = mtd(instance, fields=fields, exclude=exclude)
+    if translated:
+        return data
+    updates = {}
+    for f, v in data.items():
+        if isinstance(instance._meta.get_field(f), (TranslatedCharField, TranslatedTextField)):
+            updates.update({f: translated_db_value(instance, f)})
+    data.update(updates)
+    return data

{accrete-0.0.156 → accrete-0.0.157}/pyproject.toml

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

accrete-0.0.156/accrete/contrib/ui/templates/ui/form_error.html

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

accrete-0.0.156/accrete/contrib/ui/templates/ui/templatetags/tenant_quick_switch.html

@@ -1,14 +0,0 @@
-<div class="navbar-item is-unselectable has-text-weight-bold" style="{% if switch_url %}cursor: pointer;{% endif %}" x-on:click="showQuickSwitch = !showQuickSwitch;">
-    {{ tenant.name }}
-</div>
-{% if tenants and switch_url %}
-<article class="p-1 has-text-weight-bold" style="background-color: var(--bulma-body-background-color); position: fixed; top: var(--bulma-navbar-height); left: 0; box-shadow: 2px 2px 5px; border-bottom-right-radius: var(--bulma-radius); min-width: 150px;"
-         x-show="showQuickSwitch" x-cloak="" x-on:click.outside="showQuickSwitch = false"
->
-    <ul class="hoverable mr-1">
-        {% for t in tenants %}
-            <li class="title is-6 mb-1 p-2" style="cursor: pointer; border-radius: var(--bulma-radius);"><a href="{{ switch_url }}?tenant_id={{ t.pk }}" hx-boost="false" style="width: 100%; display: inline-block">{{ t.name }}</a></li>
-        {% endfor %}
-    </ul>
-</article>
-{% endif %}