django-spire 0.23.6__tar.gz → 0.23.7__tar.gz

{django_spire-0.23.6 → django_spire-0.23.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.23.6
+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.6 → django_spire-0.23.7}/django_spire/consts.py

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

{django_spire-0.23.6 → django_spire-0.23.7}/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-0.23.7/django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js

@@ -0,0 +1,87 @@
+class ProgressStream {
+    constructor(url, config = {}) {
+        this.url = url;
+        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,
+            poll_interval: config.poll_interval || 1000
+        };
+    }
+
+    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);
+    }
+
+    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();
+                this._redirect();
+            }
+        } catch (error) {
+            console.warn('Poll error:', error.message);
+        }
+    }
+
+    _redirect() {
+        if (!this.config.redirect_on_complete) return;
+
+        setTimeout(() => {
+            window.location.href = this.config.redirect_on_complete;
+        }, this.config.redirect_delay);
+    }
+}
+
+window.ProgressStream = ProgressStream;

{django_spire-0.23.6 → django_spire-0.23.7}/django_spire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.23.6
+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.6 → django_spire-0.23.7}/django_spire.egg-info/SOURCES.txt

@@ -363,7 +363,6 @@ django_spire/contrib/progress/runner.py
 django_spire/contrib/progress/states.py
 django_spire/contrib/progress/task.py
 django_spire/contrib/progress/tracker.py
-django_spire/contrib/progress/views.py
 django_spire/contrib/progress/static/django_spire/css/contrib/progress/progress.css
 django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js
 django_spire/contrib/progress/templates/django_spire/contrib/progress/card/card.html

django_spire-0.23.6/django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js

@@ -1,131 +0,0 @@
-class ProgressStream {
-    constructor(url, config = {}) {
-        this.url = url;
-        this.controller = null;
-        this.is_running = false;
-
-        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
-        };
-    }
-
-    async start() {
-        if (this.is_running) return;
-
-        this.is_running = true;
-        this.controller = new AbortController();
-
-        try {
-            let response = await this._fetch();
-
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}`);
-            }
-
-            await this._read_stream(response);
-        } catch (error) {
-            this._handle_error(error);
-        }
-    }
-
-    stop() {
-        if (!this.is_running) return;
-
-        this.is_running = false;
-
-        if (this.controller) {
-            this.controller.abort();
-            this.controller = null;
-        }
-    }
-
-    async _fetch() {
-        return fetch(this.url, {
-            method: 'POST',
-            signal: this.controller.signal,
-            headers: {
-                'X-CSRFToken': get_cookie('csrftoken'),
-            }
-        });
-    }
-
-    async _read_stream(response) {
-        let reader = response.body.getReader();
-        let decoder = new TextDecoder();
-        let buffer = '';
-
-        while (this.is_running) {
-            let { done, value } = await reader.read();
-
-            if (done) break;
-
-            buffer += decoder.decode(value, { stream: true });
-            buffer = this._process_buffer(buffer);
-        }
-    }
-
-    _process_buffer(buffer) {
-        let lines = buffer.split('\n');
-        let remainder = lines.pop();
-
-        for (let line of lines) {
-            if (line.startsWith('data: ')) {
-                this._handle_message(line.slice(6));
-            }
-        }
-
-        return remainder;
-    }
-
-    _handle_message(json_string) {
-        let data;
-
-        try {
-            data = JSON.parse(json_string);
-        } catch {
-            return;
-        }
-
-        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();
-            this._redirect();
-        }
-    }
-
-    _handle_error(error) {
-        if (error.name === 'AbortError') return;
-
-        console.error('ProgressStream error:', error);
-
-        this.config.on_error({
-            step: 'error',
-            message: 'Connection error',
-            progress: 0
-        });
-
-        this.stop();
-    }
-
-    _redirect() {
-        if (!this.config.redirect_on_complete) return;
-
-        setTimeout(() => {
-            window.location.href = this.config.redirect_on_complete;
-        }, this.config.redirect_delay);
-    }
-}
-
-window.ProgressStream = ProgressStream;

django_spire-0.23.6/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