accrete 0.0.142__tar.gz → 0.0.143__tar.gz

{accrete-0.0.142 → accrete-0.0.143}/PKG-INFO

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

{accrete-0.0.142 → accrete-0.0.143}/accrete/contrib/ui/__init__.py

@@ -13,5 +13,6 @@ from . context import (
 from .utils import (
     modal_response,
     detail_response,
+    search_select_response,
     add_trigger
 )

{accrete-0.0.142 → accrete-0.0.143}/accrete/contrib/ui/templates/ui/form_error.html

@@ -5,7 +5,7 @@
         {{ form.non_field_errors }}
         {% if form.save_error %}
             <p>{{ form.save_error }}</p>
-            <span>{% translate 'Error ID' %}: {{ form.save_error_id }}</span>
+            {% if form.save_error_id %}<span>{% translate 'Error ID' %}: {{ form.save_error_id }}</span>{% endif %}
         {% endif %}
     </div>
 {% endif %}

{accrete-0.0.142 → accrete-0.0.143}/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>
-                <div class="notification has-text-centered {{ message|message_class }}">
+                <div class="notification has-text-centered {{ message|message_class }}" style="box-shadow: 2px 2px 5px">
                     {% if persistent %}<button class="delete" x-on:click="show = false;"></button>{% endif %}
                     {{ message }}
                 </div>

{accrete-0.0.142 → accrete-0.0.143}/accrete/contrib/ui/utils.py

@@ -3,6 +3,7 @@ import json
 
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
+from django.template.loader import render_to_string
 
 from . import OobContext
 from .context import BaseContext, ModalContext
@@ -30,26 +31,29 @@ def modal_response(
 
 def detail_response(
     request: HttpRequest,
-    header_template: str,
-    content_template: str,
-    context: BaseContext | dict,
+    header_template: str = None,
+    content_template: str = None,
+    context: BaseContext | dict = None,
     extra_content: str | None = None
 ) -> HttpResponse:
     if isinstance(context, BaseContext):
         context = context.dict()
-    content = render_templates([
-        ('ui/message.html', context),
-        ('ui/oob.html', OobContext(
+    templates = [
+        ('ui/message.html', context)
+    ]
+    if header_template:
+        templates.append(('ui/oob.html', OobContext(
             template=header_template,
             swap='innerHTML:#content-right-header',
             extra=context
-        ).dict()),
-        ('ui/oob.html', OobContext(
+        ).dict()))
+    if content_template:
+        templates.append(('ui/oob.html', OobContext(
             template=content_template,
             swap='innerHTML:#content-right',
             extra=context
-        ).dict())
-    ], request=request)
+        ).dict()))
+    content = render_templates(templates, request=request)
     if extra_content:
         content += extra_content
     res = HttpResponse(content=content)
@@ -57,8 +61,15 @@ def detail_response(
     return res
 
 
+def search_select_response(queryset) -> HttpResponse:
+    return HttpResponse(render_to_string(
+        'ui/widgets/model_search_select_options.html',
+        {'options': queryset}
+    ))
+
+
 def add_trigger(
-    response: [HttpResponse],
+    response: HttpResponse,
     trigger: dict | str,
     header: str = 'HX-Trigger'
 ) -> HttpResponse:

{accrete-0.0.142 → accrete-0.0.143}/accrete/utils/forms.py

@@ -1,79 +1,91 @@
 import re
 import logging
 from uuid import uuid4
-from typing import Type
+from typing import Type, Any
+from dataclasses import dataclass, field
 from django.db import transaction
 from django.forms import BaseFormSet, Form, ModelForm
 
 _logger = logging.getLogger(__name__)
 
 
-def save_form(form: [Form|ModelForm], commit=True, reraise=False) -> [Form | ModelForm]:
+@dataclass
+class FormResult:
+
+    form: Form | ModelForm
+    is_saved: bool = False
+    save_error: str | None = None
+    save_error_id: str | None = None
+    res: Any = None  # return value of form.save()
+    inline_formsets: list = field(default_factory=list)
+
+    def __getattr__(self, item):
+        return getattr(self.form, item)
+
+    def __getitem__(self, item):
+        return self.form.__getitem__(item)
+
+
+def save_form(form: Form | ModelForm, commit=True, reraise=False) -> FormResult:
     if not hasattr(form, 'save'):
         raise AttributeError('Form must have method "save" implemented.')
-    form.is_saved = False
-    form.save_error = None
-    form.save_error_id = None
-    form.res = None
+    result = FormResult(form=form)
     try:
         if form.is_valid():
             with transaction.atomic():
-                form.res = form.save(commit=commit)
-            form.is_saved = True
+                result.res = form.save(commit=commit)
+            result.is_saved = True
     except Exception as e:
-        form.save_error = repr(e)
+        result.save_error = repr(e)
         error_id = str(uuid4())[:8]
         _logger.exception(f'{error_id}: {e}')
-        form.save_error_id = error_id
+        result.save_error_id = error_id
         if reraise:
             raise e
-    return form
+    return result
 
 
-def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool = False) -> [Form | ModelForm]:
+def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool = False) -> FormResult:
 
     def handle_error(error):
-        form.save_error = repr(error)
+        result.save_error = repr(error)
         error_id = str(uuid4())[:8]
         _logger.exception(f'{error_id}: {error}')
-        form.save_error_id = error_id
+        result.save_error_id = error_id
 
     if not hasattr(form, 'save'):
         raise AttributeError('Form must have method "save" implemented.')
 
-    form.is_saved = False
-    form.save_error = None
-    form.save_error_id = None
-    form.res = None
-    form.inline_forms = inline_formsets
+    result = FormResult(form=form)
+    result.inline_forms = inline_formsets
 
     try:
         form.is_valid()
         inlines_valid = all([
-            inline_formset.is_valid() for inline_formset in inline_formsets
+            inline_formset.is_valid() for inline_formset in result.inline_formsets
         ])
     except Exception as e:
         handle_error(e)
         if reraise:
             raise e
-        return form
+        return result
 
     if not form.is_valid() or not inlines_valid:
-        return form
+        return result
 
     try:
         with transaction.atomic():
-            form.res = form.save(commit=commit)
-            for inline_formset in inline_formsets:
+            result.res = form.save(commit=commit)
+            for inline_formset in result.inline_formsets:
                 inline_formset.save(commit=commit)
     except Exception as e:
         handle_error(e)
         if reraise:
             raise e
-        return form
+        return result
 
-    form.is_saved = True
-    return form
+    result.is_saved = True
+    return result
 
 
 def inline_vals_from_post(post: dict, prefix: str) -> list[dict]:

{accrete-0.0.142 → accrete-0.0.143}/pyproject.toml

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