django-spire 0.23.5__py3-none-any.whl → 0.23.7__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.23.5'
+__VERSION__ = '0.23.7'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/contrib/progress/__init__.py

@@ -4,7 +4,6 @@ from django_spire.contrib.progress.runner import TaskProgressUpdater
 from django_spire.contrib.progress.states import TaskState, TrackerState
 from django_spire.contrib.progress.task import ProgressMessages, Task, TaskResult
 from django_spire.contrib.progress.tracker import ProgressTracker
-from django_spire.contrib.progress.views import sse_stream_view
 
 
 __all__ = [
@@ -16,6 +15,5 @@ __all__ = [
     'TaskProgressUpdater',
     'TaskResult',
     'TaskState',
-    'TrackerState',
-    'sse_stream_view',
+    'TrackerState'
 ]

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

@@ -1,61 +1,86 @@
 class ProgressStream {
     constructor(url, config = {}) {
         this.url = url;
-        this.event_source = null;
+        this.is_running = false;
+        this.poll_interval = null;
+
         this.config = {
             on_update: config.on_update || (() => {}),
             on_complete: config.on_complete || (() => {}),
             on_error: config.on_error || (() => {}),
             redirect_on_complete: config.redirect_on_complete || null,
-            redirect_delay: config.redirect_delay || 1000
+            redirect_delay: config.redirect_delay || 1000,
+            poll_interval: config.poll_interval || 1000
         };
     }
 
-    start() {
-        this.event_source = new EventSource(this.url);
+    async start() {
+        if (this.is_running) return;
+
+        this.is_running = true;
+        this._start_polling();
+    }
+
+    stop() {
+        if (!this.is_running) return;
+
+        this.is_running = false;
+
+        if (this.poll_interval) {
+            clearInterval(this.poll_interval);
+            this.poll_interval = null;
+        }
+    }
+
+    _start_polling() {
+        this._poll();
+
+        this.poll_interval = setInterval(() => {
+            if (this.is_running) {
+                this._poll();
+            }
+        }, this.config.poll_interval);
+    }
 
-        this.event_source.onmessage = (event) => {
-            const data = JSON.parse(event.data);
+    async _poll() {
+        try {
+            let response = await fetch(this.url, {
+                method: 'POST',
+                headers: {
+                    'X-CSRFToken': get_cookie('csrftoken'),
+                }
+            });
+
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`);
+            }
+
+            let data = await response.json();
 
             this.config.on_update(data);
 
             if (data.step === 'error') {
                 this.config.on_error(data);
                 this.stop();
-
                 return;
             }
 
             if (data.progress >= 100) {
                 this.config.on_complete(data);
                 this.stop();
-
-                if (this.config.redirect_on_complete) {
-                    setTimeout(() => {
-                        window.location.href = this.config.redirect_on_complete;
-                    }, this.config.redirect_delay);
-                }
+                this._redirect();
             }
-        };
-
-        this.event_source.onerror = (error) => {
-            console.error('ProgressStream error:', error);
-
-            this.config.on_error({
-                step: 'error',
-                message: 'Connection error',
-                progress: 0
-            });
-
-            this.stop();
-        };
+        } catch (error) {
+            console.warn('Poll error:', error.message);
+        }
     }
 
-    stop() {
-        if (this.event_source) {
-            this.event_source.close();
-            this.event_source = null;
-        }
+    _redirect() {
+        if (!this.config.redirect_on_complete) return;
+
+        setTimeout(() => {
+            window.location.href = this.config.redirect_on_complete;
+        }, this.config.redirect_delay);
     }
 }
 

{django_spire-0.23.5.dist-info → django_spire-0.23.7.dist-info}/METADATA

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

{django_spire-0.23.5.dist-info → django_spire-0.23.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=c5Hs-7lk9T15254tOasiQ2ZTFLQIVJof9_QJDfm1PAI,933
-django_spire/consts.py,sha256=YR9sX6FXBUPmKDLHD7b1mDlQp6jwxIOoAF39q4rJoiM,171
+django_spire/consts.py,sha256=ab54JzPcaJsVKbgkIP9oB2Dn-58eOdewXxUUZlbYeRw,171
 django_spire/exceptions.py,sha256=L5ndRO5ftMmh0pHkO2z_NG3LSGZviJ-dDHNT73SzTNw,48
 django_spire/settings.py,sha256=B4GPqBGt_dmkt0Ay0j-IP-SZ6mY44m2Ap5kVSON5YLA,1005
 django_spire/urls.py,sha256=mKeZszb5U4iIGqddMb5Tt5fRC72U2wABEOi6mvOfEBU,656
@@ -348,16 +348,15 @@ django_spire/contrib/pagination/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TI
 django_spire/contrib/pagination/templatetags/pagination_tags.py,sha256=xE3zTDJZDdDvWf6D7fMyg_Vi0PW37OA3aZxCjOHDp4I,1173
 django_spire/contrib/performance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/contrib/performance/decorators.py,sha256=xOjXX-3FVOEWqr2TTTqdh4lkIhmHTlROevOVgXDeyt8,507
-django_spire/contrib/progress/__init__.py,sha256=YEXnnbomc32c2J7e3sXHjtLboZ-PijiZOguoVHPfoUQ,719
+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/views.py,sha256=CwJu-L09tTiCpsjVuqzvMEKVqp6-etLDi7L9ibmlq8U,1694
 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=2Zuwiu1nWJpghzU-6fmf6s4qKLLyiZUcAJwB9-v5xWI,1701
+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/queryset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1201,8 +1200,8 @@ django_spire/theme/urls/page_urls.py,sha256=S8nkKkgbhG3XHI3uMUL-piOjXIrRkuY2UlM_
 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.5.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
-django_spire-0.23.5.dist-info/METADATA,sha256=NsK-z_MdElXotF4ZnWMERuHNpLZODw6_kRI_lO7bt-Q,5127
-django_spire-0.23.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.23.5.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.23.5.dist-info/RECORD,,
+django_spire-0.23.7.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
+django_spire-0.23.7.dist-info/METADATA,sha256=NY3tdv-HT8M7IrLFbnRDxJtMCYxoanCmUPR7PDyy0Uk,5127
+django_spire-0.23.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.23.7.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.23.7.dist-info/RECORD,,

django_spire/contrib/progress/views.py

@@ -1,64 +0,0 @@
-from __future__ import annotations
-
-import json
-import time
-
-from typing import TYPE_CHECKING
-
-from django.core.cache import cache
-from django.http import StreamingHttpResponse
-
-if TYPE_CHECKING:
-    from typing import Callable, Generator
-
-
-def sse_stream_view(
-    key: str,
-    interval: float = 0.5,
-    should_continue: Callable[[dict], bool] | None = None,
-    timeout: int = 300
-) -> StreamingHttpResponse:
-    cache_key = f'progress_tracker_{key}'
-
-    def event_stream() -> Generator[str, None, None]:
-        previous_data = None
-        start_time = time.time()
-        last_heartbeat = time.time()
-
-        yield ': connected\n\n'
-
-        while True:
-            elapsed = time.time() - start_time
-
-            if elapsed > timeout:
-                yield f'data: {json.dumps({"step": "error", "message": "Timeout", "progress": 0})}\n\n'
-                break
-
-            data = cache.get(cache_key)
-
-            if data and data != previous_data:
-                yield f'data: {json.dumps(data)}\n\n'
-                previous_data = data
-                last_heartbeat = time.time()
-
-                if should_continue and not should_continue(data):
-                    break
-
-                if data.get('progress', 0) >= 100 or data.get('step') == 'error':
-                    break
-
-            if time.time() - last_heartbeat > 10:
-                yield ': heartbeat\n\n'
-                last_heartbeat = time.time()
-
-            time.sleep(interval)
-
-    response = StreamingHttpResponse(
-        event_stream(),
-        content_type='text/event-stream'
-    )
-
-    response['Cache-Control'] = 'no-cache, no-store'
-    response['X-Accel-Buffering'] = 'no'
-
-    return response