django-spire 0.23.9__py3-none-any.whl → 0.23.10__py3-none-any.whl

django_spire/contrib/progress/templates/django_spire/contrib/progress/modal/content.html

@@ -10,115 +10,106 @@
 
 {% block modal_content_content %}
     <div
-        data-stream-url="{% block progress_stream_url %}{% endblock %}"
-        data-redirect-url="{% block progress_redirect_url %}{% endblock %}"
         data-redirect-delay="{% block progress_redirect_delay %}1000{% endblock %}"
+        data-redirect-url="{% block progress_redirect_url %}{% endblock %}"
+        data-stream-url="{% block progress_stream_url %}{% endblock %}"
         x-data="{
-            tasks: {},
-            task_order: [],
-            overall_progress: 0,
-            message: 'Initializing...',
             has_error: false,
-            stream: null,
-
-            init() {
-                let stream_url = this.$el.dataset.streamUrl;
-                let redirect_url = this.$el.dataset.redirectUrl;
-                let redirect_delay = parseInt(this.$el.dataset.redirectDelay);
+            message: 'Initializing...',
+            overall_percent: 0,
+            tasks: {},
 
-                this.stream = new ProgressStream(stream_url, {
-                    on_update: (data) => {
-                        this.message = data.message;
-                        this.overall_progress = data.progress;
-                        if (data.task_order) {
-                            this.task_order = data.task_order;
-                        }
-                        if (data.tasks) {
-                            this.tasks = data.tasks;
-                        }
-                    },
-                    on_complete: (data) => {
-                        setTimeout(() => {
-                            close_modal();
-                        }, 500);
+            async init() {
+                let stream = new ProgressStream(this.$el.dataset.streamUrl, {
+                    on_complete: () => {
+                        setTimeout(() => close_modal(), 500);
                     },
                     on_error: (data) => {
                         this.has_error = true;
-                        this.message = data.message;
+                        this.message = data.message || 'An error occurred';
+                    },
+                    on_update: (data) => {
+                        this.overall_percent = data.overall_percent;
+                        this.tasks = data.tasks;
                     },
-                    redirect_on_complete: redirect_url,
-                    redirect_delay: redirect_delay
+                    redirect_delay: parseInt(this.$el.dataset.redirectDelay),
+                    redirect_url: this.$el.dataset.redirectUrl,
                 });
-                this.stream.start();
-            },
 
-            format_task_name(name) {
-                return name.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
+                await stream.start();
             },
 
-            get_progress_class(step) {
-                if (step === 'complete') return 'bg-success';
-                if (step === 'error') return 'bg-danger';
-                if (step === 'processing') return 'bg-app-accent';
-                return 'bg-secondary';
+            get_status_icon(status) {
+                if (status === 'complete') return 'bi-check-circle-fill text-success';
+                if (status === 'error') return 'bi-x-circle-fill text-danger';
+                if (status === 'running') return 'bi-arrow-repeat text-primary spin';
+                return 'bi-circle text-secondary';
             }
         }"
     >
         <div class="row g-3">
             <div class="col-12" x-show="!has_error">
-                <template x-for="name in task_order" :key="name">
-                    <div class="mb-3" x-show="tasks[name]">
-                        <div class="d-flex justify-content-between align-items-center mb-1">
-                            <span class="fs-7" x-text="format_task_name(name)"></span>
-                            <span class="fs-7" x-text="tasks[name]?.progress + '%'"></span>
+                <template x-for="(task, task_id) in tasks" :key="task_id">
+                    <div class="mb-3">
+                        <div class="d-flex align-items-center mb-1">
+                            <i class="bi me-2" :class="get_status_icon(task.status)"></i>
+                            <span class="fw-medium" x-text="task.name"></span>
+                            <span class="ms-auto fs-7" x-text="task.percent + '%'"></span>
                         </div>
-                        <div class="progress" style="height: 6px;">
+                        <div class="progress" style="height: 4px;">
                             <div
                                 class="progress-bar"
-                                :class="get_progress_class(tasks[name]?.step)"
+                                :class="task.status === 'error' ? 'bg-danger' : 'bg-success'"
                                 role="progressbar"
-                                :style="'width: ' + (tasks[name]?.progress || 0) + '%'"
+                                :style="'width: ' + task.percent + '%'"
                             ></div>
                         </div>
+                        <small class="text-muted" x-text="task.message"></small>
                     </div>
                 </template>
 
                 <div class="mt-4 pt-3 border-top">
                     <div class="d-flex justify-content-between align-items-center mb-2">
-                        <span class="fs-6 fw-medium">Overall Progress</span>
-                        <span class="fs-6" x-text="overall_progress + '%'"></span>
+                        <span class="fw-semibold">Overall Progress</span>
+                        <span x-text="overall_percent + '%'"></span>
                     </div>
                     <div class="progress" style="height: 8px;">
                         <div
-                            class="progress-bar bg-app-accent"
+                            class="progress-bar bg-primary"
                             role="progressbar"
-                            :style="'width: ' + overall_progress + '%'"
+                            :style="'width: ' + overall_percent + '%'"
                         ></div>
                     </div>
                 </div>
-            </div>
 
-            <div class="col-12" x-show="!has_error">
-                <p class="text-app-secondary mb-0 fs-7">
-                    {% block progress_wait_message %}Processing your request. This may take a moment.{% endblock %}
+                <p class="text-app-secondary mb-0 fs-7 text-center mt-3">
+                    {% block progress_wait_message %}This may take a moment. Please do not close this window.{% endblock %}
                 </p>
             </div>
 
             <div class="col-12" x-show="has_error" x-cloak>
-                <div class="row g-2">
-                    <div class="col-12">
-                        {% include 'django_spire/element/attribute_element.html' with attribute_title='Error' %}
-                        <span class="fs-6 text-app-danger" x-text="message"></span>
-                    </div>
-                    <div class="col-12">
-                        <span @click="close_modal()">
-                            {% block progress_error_button %}
-                                {% include 'django_spire/button/primary_button.html' with button_text='Close' %}
-                            {% endblock %}
-                        </span>
-                    </div>
+                <div class="d-flex align-items-center justify-content-center py-4">
+                    <i class="bi bi-x-circle-fill text-danger me-3 fs-4"></i>
+                    <span class="fs-5" x-text="message"></span>
+                </div>
+                <div class="text-center">
+                    <span @click="close_modal()">
+                        {% block progress_error_button %}
+                            {% include 'django_spire/button/primary_button.html' with button_text='Close' %}
+                        {% endblock %}
+                    </span>
                 </div>
             </div>
         </div>
     </div>
+
+    <style>
+        .spin {
+            animation: spin 1s linear infinite;
+        }
+        @keyframes spin {
+            from { transform: rotate(0deg); }
+            to { transform: rotate(360deg); }
+        }
+    </style>
 {% endblock %}

{django_spire-0.23.9.dist-info → django_spire-0.23.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.23.9
+Version: 0.23.10
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2025 Stratus Advanced Technologies and Contributors.

{django_spire-0.23.9.dist-info → django_spire-0.23.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=3oUB1mtgHRjvbJsxfQWG5uL1KUP9uGig3zdP2dZphe8,942
-django_spire/consts.py,sha256=t8xJZKeg5w7HOvKrg7zQgCDjdqExo49Aay7f11XOD8M,171
+django_spire/consts.py,sha256=d5_qKitqKzGvVZucpkte-GZyZj9s2j8C0KuzkalsyVQ,172
 django_spire/exceptions.py,sha256=M7buFvm-K4lK09pH5fVcZ-MxsDIzdpEJBF33Xss5bSw,289
 django_spire/settings.py,sha256=0xImrKpF7VW4wc9jLGO07e2ev6D4-i_TREgpTepLp3I,1042
 django_spire/urls.py,sha256=wQx6R-nXx69MeOF-WmDxcEUM5WmUHGplbY5uZ_HnDp8,703
@@ -397,17 +397,14 @@ django_spire/contrib/performance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 django_spire/contrib/performance/decorators.py,sha256=vCENOqcmXoEvi1Y3Uw55J21zB-ZvpWk7rRo2jqyg8pc,731
 django_spire/contrib/performance/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/contrib/performance/tests/test_performance.py,sha256=wVNzrUEG0bTMcvJrqkSWkAE27LSyJMxrRZRd04ZKDQM,3029
-django_spire/contrib/progress/__init__.py,sha256=pvd6_7puMDWStjZqcwsWEulpeGupQPv2fladV1IiaXg,631
-django_spire/contrib/progress/enums.py,sha256=nwyfKxQno_ghGGTbpK8lRO1cY7dCfbxnnsQ4cSbkXBw,194
-django_spire/contrib/progress/mixins.py,sha256=V84LRtniFDLK2E5dKcSZNh-a1zTf9Ee7QXg1rDfoFHo,895
-django_spire/contrib/progress/runner.py,sha256=3jSqpdk2MJ7HPNutwF43Hs81O0NlzX4E9gnVaenhXUs,4445
-django_spire/contrib/progress/states.py,sha256=V7JU_nzpZN77TQFW0S51Gjil8xn8CKLKkAWDOpqzA8k,1908
-django_spire/contrib/progress/task.py,sha256=4pMbzOsjRRNqPKNohh08D39DRFpC3QomTCH5IdqQS0A,780
-django_spire/contrib/progress/tracker.py,sha256=xjGlEyKe5aiKW_KC8NKZ8F0BjQdFpLUqHz5Gr_C7jws,6490
+django_spire/contrib/progress/__init__.py,sha256=5a7LTmUyw_cfO-3_QuN5M6zAhrCNs7MjEypL13qhoQA,345
+django_spire/contrib/progress/enums.py,sha256=Rexk804FhmVQou7UOKSOCnjaZrSDZdniV_MWLh-kGxI,218
+django_spire/contrib/progress/session.py,sha256=Oo1QS8f7aTN7K_Y9bwXZHo6otZQkRSp6V_6c0stvYcI,8825
+django_spire/contrib/progress/tasks.py,sha256=afC4vhWzvuRq6-P80LdB-BmDGD5kADtgYGM2SaKz8Ao,1625
 django_spire/contrib/progress/static/django_spire/css/contrib/progress/progress.css,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js,sha256=BeT52b8rHoBzk3tMpXX3bO3R-bDYTjyrEHjjc1AS2LQ,2228
-django_spire/contrib/progress/templates/django_spire/contrib/progress/card/card.html,sha256=2Ajv0UBJEGwc4InVe69aLe2u4K56yh2JAuvO6uH24j8,3353
-django_spire/contrib/progress/templates/django_spire/contrib/progress/modal/content.html,sha256=Qxer-q4GBC5h8onzno2NUlPrXluw_tO1kWlGComQ98E,5232
+django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js,sha256=vhjwLWTqkjcuK7j_z9ndCGdWfBFmRAM4MvF8zpEKJL0,1730
+django_spire/contrib/progress/templates/django_spire/contrib/progress/card/card.html,sha256=UB5PpaZzaSihiE6BnThYrM21qVrf1iT1fF-TbtkoZrc,3389
+django_spire/contrib/progress/templates/django_spire/contrib/progress/modal/content.html,sha256=613hvePQFurk4Q0Id8NuQz9Umbh35eJSOR-IQipo_o4,4857
 django_spire/contrib/queryset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/contrib/queryset/enums.py,sha256=dkzI464Q53huqtNGfnM-biuKpHUQU78WwuWvt3Pm8mI,145
 django_spire/contrib/queryset/filter_tools.py,sha256=V_s6pG2uyqvoTNtBXXXNKXE69ipwexxWAR-X30H1-XI,1129
@@ -1372,8 +1369,8 @@ django_spire/theme/urls/page_urls.py,sha256=Oak3x_xwQEb01NKdrsB1nk6yPaOEnheuSG1m
 django_spire/theme/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/theme/views/json_views.py,sha256=PWwVTaty0BVGbj65L5cxex6JNhc-xVAI_rEYjbJWqEM,1893
 django_spire/theme/views/page_views.py,sha256=WenjOa6Welpu3IMolY56ZwBjy4aK9hpbiMNuygjAl1A,3922
-django_spire-0.23.9.dist-info/licenses/LICENSE.md,sha256=ZAeCT76WvaoEZE9xPhihyWjTwH0wQZXQmyRsnV2VPFs,1091
-django_spire-0.23.9.dist-info/METADATA,sha256=pZhtFdrVEEo-IDoUkT28tzpPjfN-SFkXAKi1EWvcS-U,5127
-django_spire-0.23.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.23.9.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.23.9.dist-info/RECORD,,
+django_spire-0.23.10.dist-info/licenses/LICENSE.md,sha256=ZAeCT76WvaoEZE9xPhihyWjTwH0wQZXQmyRsnV2VPFs,1091
+django_spire-0.23.10.dist-info/METADATA,sha256=tdZ2P4q_PlnHfvRd4XibSjAzFHyxjzKG9PDX3EjAVU4,5128
+django_spire-0.23.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.23.10.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.23.10.dist-info/RECORD,,

django_spire/contrib/progress/mixins.py

@@ -1,36 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from django_spire.contrib.progress.tracker import ProgressTracker
-
-if TYPE_CHECKING:
-    from typing import Any
-
-    from django_spire.contrib.progress.enums import ProgressStatus
-
-
-class ProgressTrackingMixin:
-    _tracker: ProgressTracker | None = None
-
-    def get_tracker_key(self) -> str:
-        raise NotImplementedError
-
-    @property
-    def tracker(self) -> ProgressTracker:
-        if self._tracker is None:
-            self._tracker = ProgressTracker(self.get_tracker_key())
-
-        return self._tracker
-
-    def progress_error(self, message: str) -> None:
-        self.tracker.error(message)
-
-    def update_progress(
-        self,
-        status: ProgressStatus,
-        message: str,
-        progress: int,
-        **kwargs: Any
-    ) -> None:
-        self.tracker.update(status, message, progress, **kwargs)

django_spire/contrib/progress/runner.py

@@ -1,140 +0,0 @@
-from __future__ import annotations
-
-import math
-import random
-import threading
-import time
-
-from typing import TYPE_CHECKING
-
-from django_spire.contrib.progress.enums import ProgressStatus
-from django_spire.contrib.progress.task import ProgressMessages, Task, TaskResult
-
-if TYPE_CHECKING:
-    from typing import Any, Callable
-
-    from django_spire.contrib.progress.tracker import ProgressTracker
-
-
-class TaskProgressUpdater:
-    def __init__(self, tracker: ProgressTracker, task: Task) -> None:
-        self._messages = ProgressMessages()
-        self._task = task
-        self._tracker = tracker
-
-    def complete(self, message: str | None = None) -> None:
-        self._tracker._update_task(
-            self._task.name,
-            ProgressStatus.COMPLETE,
-            self._format(message or self._messages.complete),
-            100
-        )
-
-    def error(self, message: str) -> None:
-        self._tracker._update_task(
-            self._task.name,
-            ProgressStatus.ERROR,
-            self._format(message),
-            0
-        )
-
-    def start(self) -> None:
-        self._tracker._update_task(
-            self._task.name,
-            ProgressStatus.PROCESSING,
-            self._format(self._messages.starting),
-            2
-        )
-
-    def update(self, message: str, progress: int) -> None:
-        self._tracker._update_task(
-            self._task.name,
-            ProgressStatus.PROCESSING,
-            self._format(message),
-            progress
-        )
-
-    def _format(self, message: str) -> str:
-        return f'{self._task.label}: {message}'
-
-
-class ProgressSimulator:
-    def __init__(
-        self,
-        updater: TaskProgressUpdater,
-        max_progress: int = 90,
-        update_interval: float = 0.15
-    ) -> None:
-        self._max_progress = max_progress
-        self._messages = ProgressMessages()
-        self._update_interval = update_interval
-        self._updater = updater
-
-    def run(self, stop_event: threading.Event) -> None:
-        start_time = time.time()
-        duration = random.uniform(8.0, 15.0)
-
-        while not stop_event.is_set():
-            elapsed = time.time() - start_time
-            t = min(elapsed / duration, 1.0)
-
-            progress = self._ease_out_expo(t) * self._max_progress
-            progress = min(int(progress), self._max_progress)
-
-            jitter = random.uniform(-1.5, 1.5) if progress < self._max_progress - 5 else 0
-            progress = max(2, min(int(progress + jitter), self._max_progress))
-
-            message = self._get_message_for_progress(progress)
-            self._updater.update(message, progress)
-
-            if progress >= self._max_progress:
-                break
-
-            time.sleep(self._update_interval + random.uniform(0, 0.1))
-
-    def _ease_out_expo(self, t: float) -> float:
-        if t >= 1.0:
-            return 1.0
-
-        return 1.0 - math.pow(2, -10 * t)
-
-    def _get_message_for_progress(self, progress: int) -> str:
-        steps = self._messages.steps
-        index = min(int(progress / (self._max_progress / len(steps))), len(steps) - 1)
-
-        return steps[index]
-
-
-class TaskRunner:
-    def __init__(self, tracker: ProgressTracker, task: Task) -> None:
-        self._stop_event = threading.Event()
-        self._task = task
-        self._tracker = tracker
-        self._updater = TaskProgressUpdater(tracker, task)
-
-    def run_parallel(self, results: dict[str, TaskResult]) -> None:
-        self._execute(results, lambda: self._task.func())
-
-    def run_sequential(self, results: dict[str, TaskResult]) -> None:
-        unwrapped = {name: result.value for name, result in results.items()}
-        self._execute(results, lambda: self._task.func(unwrapped))
-
-    def stop(self) -> None:
-        self._stop_event.set()
-
-    def _execute(self, results: dict[str, TaskResult], executor: Callable[[], Any]) -> None:
-        simulator = ProgressSimulator(self._updater)
-        progress_thread = threading.Thread(target=simulator.run, args=(self._stop_event,))
-        progress_thread.start()
-
-        try:
-            self._updater.start()
-            value = executor()
-            results[self._task.name] = TaskResult(value=value)
-            self._updater.complete()
-        except BaseException as e:
-            results[self._task.name] = TaskResult(error=e)
-            self._updater.error(str(e))
-        finally:
-            self._stop_event.set()
-            progress_thread.join(timeout=1)

django_spire/contrib/progress/states.py

@@ -1,64 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-from typing import TYPE_CHECKING
-
-from django_spire.contrib.progress.enums import ProgressStatus
-
-if TYPE_CHECKING:
-    from typing import Any
-
-
-@dataclass
-class TaskState:
-    message: str = 'Waiting...'
-    progress: int = 0
-    status: ProgressStatus = ProgressStatus.PENDING
-
-    @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> TaskState:
-        return cls(
-            message=data.get('message', 'Waiting...'),
-            progress=data.get('progress', 0),
-            status=ProgressStatus(data.get('step', ProgressStatus.PENDING)),
-        )
-
-    def to_dict(self) -> dict[str, Any]:
-        return {
-            'message': self.message,
-            'progress': self.progress,
-            'step': self.status.value,
-        }
-
-
-@dataclass
-class TrackerState:
-    message: str = 'Initializing...'
-    progress: int = 0
-    status: ProgressStatus = ProgressStatus.PENDING
-    task_order: list[str] = field(default_factory=list)
-    tasks: dict[str, TaskState] = field(default_factory=dict)
-
-    @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> TrackerState:
-        tasks = {
-            name: TaskState.from_dict(task_data)
-            for name, task_data in data.get('tasks', {}).items()
-        }
-
-        return cls(
-            message=data.get('message', 'Initializing...'),
-            progress=data.get('progress', 0),
-            status=ProgressStatus(data.get('step', ProgressStatus.PENDING)),
-            task_order=data.get('task_order', []),
-            tasks=tasks,
-        )
-
-    def to_dict(self) -> dict[str, Any]:
-        return {
-            'message': self.message,
-            'progress': self.progress,
-            'step': self.status.value,
-            'task_order': self.task_order,
-            'tasks': {name: task.to_dict() for name, task in self.tasks.items()},
-        }

django_spire/contrib/progress/task.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Any, Callable
-
-
-@dataclass
-class ProgressMessages:
-    complete: str = 'Complete'
-    error: str = 'Error'
-    starting: str = 'Starting...'
-    steps: list[str] = field(default_factory=lambda: [
-        'Initializing...',
-        'Processing...',
-        'Analyzing...',
-        'Working...',
-        'Almost there...',
-        'Finalizing...',
-    ])
-
-
-@dataclass
-class Task:
-    func: Callable
-    label: str
-    name: str
-    parallel: bool = False
-
-
-@dataclass
-class TaskResult:
-    error: BaseException | None = None
-    value: Any = None
-
-    @property
-    def failed(self) -> bool:
-        return self.error is not None