accrete 0.0.96__tar.gz → 0.0.98__tar.gz

{accrete-0.0.96 → accrete-0.0.98}/PKG-INFO

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

{accrete-0.0.96 → accrete-0.0.98}/accrete/contrib/ui/templates/ui/partials/filter.html

@@ -71,17 +71,19 @@
                         </button>
                     </div>
                 {% endif %}
-                <div class="control is-expanded">
-                    <button id="list-customization-order-trigger"
-                            class="button dropdown-button side-panel-action-content is-fullwidth"
-                            onclick="setDropDown(this)" data-dropdown-id="list-customization-order"
-                    >
-                        <span>{% translate 'Order' %}</span>
-                        <span class="icon is-small">
-                            <i class="fa fa-angle-down"></i>
-                        </span>
-                    </button>
-                </div>
+                {% if order_selection %}
+                    <div class="control is-expanded">
+                        <button id="list-customization-order-trigger"
+                                class="button dropdown-button side-panel-action-content is-fullwidth"
+                                onclick="setDropDown(this)" data-dropdown-id="list-customization-order"
+                        >
+                            <span>{% translate 'Order' %}</span>
+                            <span class="icon is-small">
+                                <i class="fa fa-angle-down"></i>
+                            </span>
+                        </button>
+                    </div>
+                {% endif %}
             </div>
         </div>
 
@@ -114,26 +116,28 @@
             </div>
         {% endif %}
 
-        <div id="list-customization-order" class="dropdown is-flex-grow-1 pt-0" role="menu" data-dropdown-trigger-id="list-customization-order-trigger">
-            <div class="dropdown-menu pt-0" style="width: 100%">
-                <div class="dropdown-content">
-                    <div class="dropdown-item">
-                        <div class="field has-addons mr-1">
-                            <p class="control is-expanded">
-                                <input class="input is-small" type="text" aria-label="Query Input" style="height: 100%">
-                            </p>
-                            <p class="control">
-                                <button id="order-selection-reset" class="button is-small has-icon" style="box-shadow: none;">
-                                    <span class="icon"><i class="fas fa-arrow-rotate-left"></i></span>
-                                </button>
-                            </p>
+        {% if order_selection %}
+            <div id="list-customization-order" class="dropdown is-flex-grow-1 pt-0" role="menu" data-dropdown-trigger-id="list-customization-order-trigger">
+                <div class="dropdown-menu pt-0" style="width: 100%">
+                    <div class="dropdown-content">
+                        <div class="dropdown-item">
+                            <div class="field has-addons mr-1">
+                                <p class="control is-expanded">
+                                    <input class="input is-small" type="text" aria-label="Query Input" style="height: 100%">
+                                </p>
+                                <p class="control">
+                                    <button id="order-selection-reset" class="button is-small has-icon" style="box-shadow: none;">
+                                        <span class="icon"><i class="fas fa-arrow-rotate-left"></i></span>
+                                    </button>
+                                </p>
+                            </div>
+                        </div>
+                        <div id="order-path-apply" hx-get="" hx-trigger="click" hx-replace-url="true"
+                             hx-select-oob="#content,#order-path-apply,#list-pagination">
                         </div>
-                    </div>
-                    <div id="order-path-apply" hx-get="" hx-trigger="click" hx-replace-url="true"
-                         hx-select-oob="#content,#order-path-apply,#list-pagination">
                     </div>
                 </div>
             </div>
-        </div>
+        {% endif %}
     </div>
 </div>

{accrete-0.0.96 → accrete-0.0.98}/accrete/managers.py

@@ -21,12 +21,20 @@ class TenantManager(models.Manager, AnnotationManagerMixin):
             unique_fields=None,
     ):
         tenant = get_tenant()
-        if tenant is None and not all(obj.tenant_id for obj in objs):
+        if tenant is None and any(obj.tenant_id in (False, None) for obj in objs):
             raise ValueError(
-                'Tenant must be set for all objects when calling bulk_create'
+                'Tenant must be set for all objects when calling '
+                'bulk_create without an active tenant set.'
+            )
+        list(map(
+            lambda x: setattr(x, 'tenant_id', tenant.pk),
+            filter(lambda o: o.tenant_id is None, objs)
+        ))
+        if tenant is not None and any(obj.tenant_id != tenant.pk for obj in objs):
+            raise ValueError(
+                'Objects must have set the active Tenant when calling '
+                'bulk_create while a tenant is active.'
             )
-        for obj in objs:
-            obj.tenant_id = tenant.pk
         return super().bulk_create(
             objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
             update_conflicts=update_conflicts, update_fields=update_fields,

accrete-0.0.98/accrete/utils/log.py

@@ -0,0 +1,16 @@
+import logging
+from functools import wraps
+from timeit import default_timer as timer
+
+_logger = logging.getLogger(__name__)
+
+
+def log_time(f):
+    @wraps(f)
+    def decorator(*args, **kwargs):
+        start = timer()
+        result = f(*args, **kwargs)
+        stop = timer()
+        _logger.info(f'{f.__module__}.{f.__name__} Duration: {(stop - start)} Seconds')
+        return result
+    return decorator

{accrete-0.0.96 → accrete-0.0.98}/pyproject.toml

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