accrete 0.0.27__tar.gz → 0.0.29__tar.gz

{accrete-0.0.27 → accrete-0.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accrete
-Version: 0.0.27
+Version: 0.0.29
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek
@@ -35,6 +35,7 @@ Requires-Dist: django>=4.2
 Provides-Extra: contrib
 Requires-Dist: celery>=5.3.4; extra == 'contrib'
 Requires-Dist: django-celery-beat; extra == 'contrib'
+Requires-Dist: sqlalchemy; extra == 'contrib'
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'
 Requires-Dist: pytest>=7.0; extra == 'dev'

accrete-0.0.29/accrete/contrib/sequence/migrations/0002_alter_sequence_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.9 on 2024-01-27 07:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sequence', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sequence',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='Name'),
+        ),
+    ]

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/sequence/models.py

@@ -21,7 +21,7 @@ class Sequence(TenantModel):
 
     name = models.CharField(
         verbose_name=_('Name'),
-        max_length=50,
+        max_length=255,
     )
 
     nextval = models.PositiveBigIntegerField(

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/sequence/queries.py

@@ -9,11 +9,11 @@ def get_nextval(name, create_if_none=True):
     tenant = get_tenant()
     with transaction.atomic():
         seq = Sequence.objects.filter(
-            tenant=tenant.id, name=name
+            tenant=tenant, name=name
         ).select_for_update().first()
 
         if seq is None and not create_if_none:
-            raise AttributeError(f'No sequence for {name} found!')
+            raise ValueError(f'Sequence "{name}" does not exist.')
         elif seq is None:
             seq = Sequence(name=name, tenant=tenant)
             seq.save()

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/system_mail/tasks.py

@@ -1,15 +1,22 @@
 import logging
-from celery import shared_task
-
+from celery import shared_task, current_app
+from celery.schedules import crontab
 from django.core import mail
 from django.db import transaction
 from django.utils.html import strip_tags
-
 from .models import SystemMail
 
 _logger = logging.getLogger(__name__)
 
 
+@current_app.on_after_finalize.connect
+def setup_periodic_tasks(sender, **kwargs):
+    sender.add_periodic_task(
+        crontab(hour='*', minute='*/5'),
+        run_mail_queue.s()
+    )
+
+
 @shared_task()
 def run_mail_queue():
     with transaction.atomic():

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/__init__.py

@@ -6,9 +6,10 @@ from .context import (
 )
 from .components import (
     ClientAction,
+    ActionMethod,
     BreadCrumb,
     TableField,
     TableFieldAlignment,
     TableFieldType
 )
-from .querystring import load_querystring, build_url_params
+from .querystring import load_querystring, build_querystring

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/components.py

@@ -1,5 +1,17 @@
 from dataclasses import dataclass, field
 from enum import Enum
+from django.db.models import Model, QuerySet, Q
+
+DEFAULT_PAGINATE_BY = 40
+
+
+class ActionMethod(Enum):
+
+    HREF = 'href'
+    GET = 'hx-get'
+    POST = 'hx-post'
+    PUT = 'hx-put'
+    DELETE = 'hx-delete'
 
 
 class TableFieldAlignment(Enum):
@@ -37,6 +49,7 @@ class BreadCrumb:
 
     name: str
     url: str
+    add_url_params: bool = True
 
 
 @dataclass
@@ -44,8 +57,24 @@ class ClientAction:
 
     name: str
     url: str = ''
+    method: ActionMethod = ActionMethod.HREF
     query_params: str = ''
     attrs: list[tuple[str, str]] = field(default_factory=list)
     submit: bool = False
     form_id: str = 'form'
     class_list: list[str] = field(default_factory=list)
+    add_url_params: bool = True
+
+    def attrs_str(self):
+        return ' '.join(['='.join(attr) for attr in self.attrs])
+
+
+@dataclass
+class List:
+
+    queryset: QuerySet
+    title: str = None
+    paginate_by: int = DEFAULT_PAGINATE_BY
+    breadcrumbs: list[BreadCrumb] = field(default_factory=list)
+    actions: list[ClientAction] = field(default_factory=list)
+    fields: list[TableField] = field(default_factory=list)

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/context.py

@@ -7,7 +7,7 @@ from django.core.paginator import Paginator
 from django.forms import Form, ModelForm
 from accrete.querystring import parse_querystring
 
-from .querystring import load_querystring, build_url_params
+from .querystring import load_querystring, build_querystring
 from .components import ClientAction, BreadCrumb, TableField
 from .filter import Filter
 
@@ -43,16 +43,16 @@ class ListContext:
 
         order = self.order_by or self.model._meta.ordering
 
-        pks = self.model.objects.filter(
-            parse_querystring(self.model, self.get_params.get('q', '[]'))
-        ).distinct().values_list('pk', flat=True)
+        # pks = self.model.objects.filter(
+        #     parse_querystring(self.model, self.get_params.get('q', '[]'))
+        # ).distinct().values_list('pk', flat=True)
 
         queryset = self.model.objects.select_related(
             *self.select_related
         ).prefetch_related(
             *self.prefetch_related
         ).filter(
-            Q(pk__in=pks)
+            parse_querystring(self.model, self.get_params.get('q', '[]'))
         ).annotate(
             **self.get_annotations()
         ).order_by(
@@ -110,7 +110,7 @@ class ListContext:
             'default_filter_term': self.default_filter_term,
             'breadcrumbs': self.breadcrumbs,
             'querystring': load_querystring(self.get_params),
-            'url_params': build_url_params(self.get_params),
+            'url_params': build_querystring(self.get_params),
             'actions': self.actions,
             'fields': self.fields
         }
@@ -209,7 +209,7 @@ class DetailContext:
             'paginate_by': paginate_by,
             'detail_pagination': False,
             'breadcrumbs': self.breadcrumbs,
-            'url_params': build_url_params(self.get_params, ['page']),
+            'url_params': build_querystring(self.get_params, ['page']),
             'actions': self.actions
         }
         if self.paginate_by > 0:
@@ -230,6 +230,7 @@ class FormContext:
     add_default_actions: bool = True
     discard_url: str = None
     actions: list[ClientAction] = field(default_factory=list)
+    breadcrumbs: list[BreadCrumb] = field(default_factory=list)
 
     def get_default_form_actions(self):
         actions = [
@@ -268,17 +269,18 @@ class FormContext:
             return self.title
         try:
             int(self.model.pk)
-            return f'Edit {self.model}'
+            return _('Edit')
         except TypeError:
-            return f'Add {self.model._meta.verbose_name}'
+            return _('Add')
 
     def dict(self):
         ctx = {
             'title': self.get_title(),
             'form': self.form,
             'form_id': self.form_id,
-            'url_params': build_url_params(self.get_params, ['page']),
-            'actions': []
+            'url_params': build_querystring(self.get_params, ['page']),
+            'actions': [],
+            'breadcrumbs': self.breadcrumbs,
         }
         if self.add_default_actions:
             ctx.update({'actions': self.get_default_form_actions()})

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/filter.py

@@ -115,6 +115,28 @@ class Filter:
             ]
         }
 
+    def get_choice_int_query_term(self, label, param, choices):
+        choices = [(choice[0], str(choice[1])) for choice in choices]
+        return {
+            'label': str(label),
+            'param': param,
+            'params': [
+                {
+                    'label': str(self.LABEL_EXACT),
+                    'data_type': 'selection',
+                    'choices': choices,
+                    'param': 'exact'
+                },
+                {
+                    'label': str(self.LABEL_EXACT_NOT),
+                    'data_type': 'selection',
+                    'choices': choices,
+                    'invert': True,
+                    'param': 'exact'
+                }
+            ]
+        }
+
     def get_int_query_term(self, label, param):
         return {
             'label': str(label),
@@ -258,6 +280,8 @@ class Filter:
                 label, param, self.cast_decimal_places_to_step(field.decimal_places or 0)
             )
         elif internal_type in self.query_int_fields:
+            if field.choices:
+                return self.get_choice_int_query_term(label, param, field.choices)
             return self.get_int_query_term(label, param)
         elif internal_type in self.query_boolean_fields:
             return self.get_boolean_query_term(label, param)

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/querystring.py

@@ -5,7 +5,7 @@ def load_querystring(get_params: dict) -> list:
     return json.loads(get_params.get('q', '[]'))
 
 
-def build_url_params(get_params: dict, extra_params: list[str] = None) -> str:
+def build_querystring(get_params: dict, extra_params: list[str] = None) -> str:
     querystring = f'?q={get_params.get("q", "[]")}'
     if paginate_by := get_params.get('paginate_by', False):
         querystring += f'&paginate_by={paginate_by}'

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/static/js/filter.js

@@ -229,6 +229,9 @@ function appendAfterTag(queryTagContainer) {
 function resetInput() {
     const input = document.getElementById('query-input');
     const queryParam = getParamElement(input.getAttribute('data-default-term'))
+    if (!queryParam) {
+        return
+    }
     const queryLabel = getCompleteQueryText(queryParam);
     const queryNotificationLabel = document.getElementById('query-label');
     queryNotificationLabel.innerText = queryLabel;

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/templates/ui/layout.html

@@ -93,12 +93,14 @@
                             {% if action.submit %}
                                 <input class="button is-fullwidth {{ action.class_list|join:' ' }}"
                                        type="submit" form={{ action.form_id }} value="{{ action.name }}"
-                                       {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                                       {{ action.attrs_str }}
                                 >
                             {% else %}
                                 <a class="button is-fullwidth {{ action.class_list|join:' ' }}"
-                                   href="{{ action.url }}{{ url_params|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
-                                   {% for attr, val in action.attrs %}{{ attr }}="{{ val }}"{% endfor %}
+                                    {% if action.url %}
+                                        {{ action.method.value }}="{{ action.url }}{% if action.add_url_params %}{{ url_params|default_if_none:'?' }}{% endif %}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
+                                    {% endif %}
+                                   {{ action.attrs_str }}
                                 >{{ action.name }}
                                 </a>
                             {% endif %}

{accrete-0.0.27 → accrete-0.0.29}/accrete/contrib/ui/templates/ui/partials/header.html

@@ -7,7 +7,7 @@
                 <nav id="breadcrumbs" class="breadcrumb" aria-label="breadcrumbs" style="white-space: unset; word-break: break-word">
                     <ul>
                         {% for crumb in breadcrumbs %}
-                            <li><a class="is-underlined" hx-get="{{ crumb.url|default_if_none:'#' }}{{ url_params }}"
+                            <li><a class="is-underlined" hx-get="{{ crumb.url|default_if_none:'#' }}{% if crumb.add_url_params %}{{ url_params }}{% endif %}"
                                    hx-target="body" hx-push-url="true" aria-current="page"
                             >{{ crumb.name }}</a></li>
                         {% endfor %}
@@ -35,12 +35,14 @@
                 {% if action.submit %}
                     <input class="button mr-2 {{ action.class_list|join:' ' }}"
                            type="submit" form={{ action.form_id }} value="{{ action.name }}"
-                           {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                           {{ action.attrs_str }}
                     >
                 {% else %}
                     <a class="button mr-2 {{ action.class_list|join:' ' }}"
-                       href="{{ action.url }}{{ url_params|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
-                       {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                        {% if action.url %}
+                            {{ action.method.value }}="{{ action.url }}{% if action.add_url_params %}{{ url_params|default_if_none:'?' }}{% endif %}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
+                        {% endif %}
+                       {{ action.attrs_str }}
                     >{{ action.name }}
                     </a>
                 {% endif %}

{accrete-0.0.27 → accrete-0.0.29}/accrete/forms.py

@@ -292,7 +292,7 @@ class TenantModelForm(One2ManyModelForm):
         return self.instance
 
 
-def save_form(form, reraise=False):
+def save_form(form, reraise=False, log=True):
     form.is_saved = False
     try:
         if form.is_valid():
@@ -300,10 +300,11 @@ def save_form(form, reraise=False):
                 form.save()
             form.is_saved = True
     except Exception as e:
-        error_id = str(uuid4())[:8]
-        _logger.exception(f'{error_id}: {e}')
-        form.save_error = e
-        form.save_error_id = error_id
+        form.save_error = repr(e)
+        if log:
+            error_id = str(uuid4())[:8]
+            _logger.exception(f'{error_id}: {e}')
+            form.save_error_id = error_id
         if reraise:
             raise e
     return form

{accrete-0.0.27 → accrete-0.0.29}/accrete/utils/dates.py

@@ -9,7 +9,6 @@ def current_year_start() -> datetime:
     first_day = now.replace(
         month=1, day=1, hour=0, minute=0, second=0, microsecond=0
     )
-    # calendar.monthrange(date.year, date.month)[1]
     return first_day
 
 
@@ -23,7 +22,6 @@ def current_year_end() -> datetime:
 
 def current_month_start() -> datetime:
     now = timezone.now()
-    monthrange = calendar.monthrange(now.year, now.month)
     first_day = now.replace(
         day=1, hour=0, minute=0, second=0, microsecond=0
     )
@@ -37,3 +35,13 @@ def current_month_end() -> datetime:
         day=monthrange[1], hour=23, minute=59, second=59, microsecond=999999
     )
     return last_day
+
+
+def next_relative_month_start(start_date: date) -> date:
+    monthrange = calendar.monthrange(start_date.year, start_date.month)
+    return start_date.replace(day=monthrange[1]) + timedelta(days=1)
+
+
+def next_relative_year_start(start_date: date) -> date:
+    current = current_year_end().date().replace(year=start_date.year)
+    return current + relativedelta(days=1)

{accrete-0.0.27 → accrete-0.0.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.27'
+version = '0.0.29'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]
@@ -33,7 +33,8 @@ dev = [
 ]
 contrib = [
     'celery >= 5.3.4',
-    'django_celery_beat'
+    'django_celery_beat',
+    'sqlalchemy'
 ]
 
 [tool.hatch.build]