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

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.23.10'
+__VERSION__ = '0.23.11'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/contrib/progress/session.py

@@ -31,7 +31,7 @@ class ProgressSession:
     _COMPLETION_INCREMENT = 3.0
     _COMPLETION_INTERVAL = 0.03
     _MAX_SIMULATED_PERCENT = 85
-    _SIMULATION_INTERVAL = 0.1
+    _SIMULATION_INTERVAL = 0.15
 
     def __init__(self, session_id: str, tasks: dict[str, str]) -> None:
         self._lock = threading.Lock()
@@ -40,7 +40,7 @@ class ProgressSession:
         self._tasks: dict[str, dict[str, Any]] = {
             task_id: {
                 'complete_message': '',
-                'message': '',
+                'message': 'Waiting...',
                 'name': name,
                 'percent': 0.0,
                 'status': ProgressStatus.PENDING,
@@ -53,10 +53,10 @@ class ProgressSession:
     def _calculate_increment(self, current_percent: float) -> float:
         remaining = self._MAX_SIMULATED_PERCENT - current_percent
         ratio = remaining / self._MAX_SIMULATED_PERCENT
-        eased = ratio * ratio
-        increment = 0.8 * eased
+        eased = ratio * ratio * ratio
+        increment = 0.5 * eased
 
-        return max(increment, 0.05)
+        return max(increment, 0.03)
 
     def _calculate_message_index(self, percent: float) -> int:
         message_index = int((percent / 100) * len(SIMULATION_MESSAGES))
@@ -224,8 +224,15 @@ class ProgressSession:
         self._simulation_threads[task_id] = (stop_event, thread)
         thread.start()
 
-    def stream(self, poll_interval: float = 0.05) -> Generator[str, None, None]:
+    def stream(self, poll_interval: float = 0.1) -> Generator[str, None, None]:
+        with self._lock:
+            data = self.to_dict()
+
+        yield f'{json.dumps(data)}\n'
+
         while True:
+            time.sleep(poll_interval)
+
             with self._lock:
                 data = self.to_dict()
 
@@ -235,8 +242,6 @@ class ProgressSession:
                 self._delete()
                 break
 
-            time.sleep(poll_interval)
-
     def to_dict(self) -> dict[str, Any]:
         return {
             'overall_percent': self.overall_percent,

django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js

@@ -22,7 +22,12 @@ class ProgressStream {
     }
 
     async start() {
-        let response = await fetch(this.url);
+        let response = await fetch(this.url, {
+            method: 'POST',
+            headers: {
+                'X-CSRFToken': get_cookie('csrftoken'),
+            },
+        });
 
         if (!response.ok) {
             this.config.on_error({ message: `HTTP ${response.status}` });
@@ -31,6 +36,7 @@ class ProgressStream {
 
         let reader = response.body.getReader();
         let decoder = new TextDecoder();
+        let buffer = '';
 
         while (true) {
             let { done, value } = await reader.read();
@@ -39,10 +45,16 @@ class ProgressStream {
                 break;
             }
 
-            let chunk = decoder.decode(value, { stream: true });
-            let lines = chunk.split('\n').filter(line => line.trim());
+            buffer += decoder.decode(value, { stream: true });
+            let lines = buffer.split('\n');
+
+            buffer = lines.pop();
 
             for (let line of lines) {
+                if (!line.trim()) {
+                    continue;
+                }
+
                 let data = JSON.parse(line);
 
                 this.config.on_update(data);

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

@@ -58,7 +58,7 @@
                         </div>
                         <div class="progress" style="height: 4px;">
                             <div
-                                class="progress-bar"
+                                class="progress-bar progress-bar-smooth"
                                 :class="task.status === 'error' ? 'bg-danger' : 'bg-success'"
                                 role="progressbar"
                                 :style="'width: ' + task.percent + '%'"
@@ -75,7 +75,7 @@
                     </div>
                     <div class="progress" style="height: 8px;">
                         <div
-                            class="progress-bar bg-primary"
+                            class="progress-bar progress-bar-smooth bg-primary"
                             role="progressbar"
                             :style="'width: ' + overall_percent + '%'"
                         ></div>
@@ -104,6 +104,9 @@
     </div>
 
     <style>
+        .progress-bar-smooth {
+            transition: width 0.15s ease-out;
+        }
         .spin {
             animation: spin 1s linear infinite;
         }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.23.10
+Version: 0.23.11
 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.10.dist-info → django_spire-0.23.11.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=d5_qKitqKzGvVZucpkte-GZyZj9s2j8C0KuzkalsyVQ,172
+django_spire/consts.py,sha256=uPnxb1Kh0O33LN3JL8X69bxFtAaLgiTh9fPP99zi_n8,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
@@ -399,12 +399,12 @@ django_spire/contrib/performance/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 django_spire/contrib/performance/tests/test_performance.py,sha256=wVNzrUEG0bTMcvJrqkSWkAE27LSyJMxrRZRd04ZKDQM,3029
 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/session.py,sha256=yQDgqB-O6z9NRzAVbzBnoVS_ki5Z4fk74dpCH41AA10,8942
 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=vhjwLWTqkjcuK7j_z9ndCGdWfBFmRAM4MvF8zpEKJL0,1730
+django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js,sha256=aG-qCMx24Tg1xIUbhI59uziUa3gPissJzfRNPjb7ZGE,1981
 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/progress/templates/django_spire/contrib/progress/modal/content.html,sha256=79u-wnWF8xFBObLCxTYXbPoXjnb8WP1JLWWCd4YPguo,4984
 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
@@ -1369,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.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-0.23.11.dist-info/licenses/LICENSE.md,sha256=ZAeCT76WvaoEZE9xPhihyWjTwH0wQZXQmyRsnV2VPFs,1091
+django_spire-0.23.11.dist-info/METADATA,sha256=IYkoTJgX1v_0PU7tirnx2GeHBL-r1Br0Fc4XdMcFQoI,5128
+django_spire-0.23.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.23.11.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.23.11.dist-info/RECORD,,