pyview-web 0.4.0__tar.gz → 0.4.3__tar.gz

{pyview_web-0.4.0 → pyview_web-0.4.3}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyview-web
-Version: 0.4.0
+Version: 0.4.3
 Summary: LiveView in Python
 License: MIT
+License-File: LICENSE
 Keywords: web,api,LiveView
 Author: Larry Ogrodnek
 Author-email: ogrodnek@gmail.com

{pyview_web-0.4.0 → pyview_web-0.4.3}/pyproject.toml

@@ -5,7 +5,7 @@ packages = [
   { include = "pyview" },
 ]
 
-version = "0.4.0"
+version = "0.4.3"
 description = "LiveView in Python"
 authors = ["Larry Ogrodnek <ogrodnek@gmail.com>"]
 license = "MIT"

{pyview_web-0.4.0 → pyview_web-0.4.3}/pyview/live_socket.py

@@ -11,6 +11,7 @@ from typing import (
     Union,
     TypeAlias,
     TypeGuard,
+    Callable,
 )
 from urllib.parse import urlencode
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
@@ -46,9 +47,18 @@ class UnconnectedSocket(Generic[T]):
     connected: bool = False
 
     def allow_upload(
-        self, upload_name: str, constraints: UploadConstraints
+        self,
+        upload_name: str,
+        constraints: UploadConstraints,
+        auto_upload: bool = False,
+        progress: Optional[Callable] = None,
     ) -> UploadConfig:
-        return UploadConfig(name=upload_name, constraints=constraints)
+        return UploadConfig(
+            name=upload_name,
+            constraints=constraints,
+            autoUpload=auto_upload,
+            progress_callback=progress,
+        )
 
 
 class ConnectedLiveViewSocket(Generic[T]):
@@ -192,13 +202,38 @@ class ConnectedLiveViewSocket(Generic[T]):
         except Exception:
             logger.warning("Error sending navigation message", exc_info=True)
 
+    async def redirect(self, path: str, params: dict[str, Any] = {}):
+        """Redirect to a new location with full page reload"""
+        to = path
+        if params:
+            to = to + "?" + urlencode(params)
+
+        message = [
+            None,
+            None,
+            self.topic,
+            "redirect",
+            {"to": to},
+        ]
+
+        try:
+            await self.websocket.send_text(json.dumps(message))
+        except Exception:
+            logger.warning("Error sending redirect message", exc_info=True)
+
     async def push_event(self, event: str, value: dict[str, Any]):
         self.pending_events.append((event, value))
 
     def allow_upload(
-        self, upload_name: str, constraints: UploadConstraints
+        self,
+        upload_name: str,
+        constraints: UploadConstraints,
+        auto_upload: bool = False,
+        progress: Optional[Callable] = None,
     ) -> UploadConfig:
-        return self.upload_manager.allow_upload(upload_name, constraints)
+        return self.upload_manager.allow_upload(
+            upload_name, constraints, auto_upload, progress
+        )
 
     async def close(self):
         self.connected = False

{pyview_web-0.4.0 → pyview_web-0.4.3}/pyview/uploads.py

@@ -2,7 +2,7 @@ import datetime
 import uuid
 import logging
 from pydantic import BaseModel, Field
-from typing import Optional, Any, Literal, Generator
+from typing import Optional, Any, Literal, Generator, Callable
 from dataclasses import dataclass, field
 from contextlib import contextmanager
 import os
@@ -105,6 +105,7 @@ class UploadConfig(BaseModel):
     errors: list[ConstraintViolation] = Field(default_factory=list)
     autoUpload: bool = False
     constraints: UploadConstraints = Field(default_factory=UploadConstraints)
+    progress_callback: Optional[Callable] = None
 
     uploads: ActiveUploads = Field(default_factory=ActiveUploads)
 
@@ -135,8 +136,9 @@ class UploadConfig(BaseModel):
             self.errors.append(ConstraintViolation(ref=self.ref, code="too_many_files"))
 
     def update_progress(self, ref: str, progress: int):
-        self.entries_by_ref[ref].progress = progress
-        self.entries_by_ref[ref].done = progress == 100
+        if ref in self.entries_by_ref:
+            self.entries_by_ref[ref].progress = progress
+            self.entries_by_ref[ref].done = progress == 100
 
     @contextmanager
     def consume_uploads(self) -> Generator[list["ActiveUpload"], None, None]:
@@ -152,6 +154,34 @@ class UploadConfig(BaseModel):
             self.uploads = ActiveUploads()
             self.entries_by_ref = {}
 
+    @contextmanager  
+    def consume_upload_entry(self, entry_ref: str) -> Generator[Optional["ActiveUpload"], None, None]:
+        """Consume a single upload entry by its ref"""
+        upload = None
+        join_ref = None
+        
+        # Find the join_ref for this entry
+        for jr, active_upload in self.uploads.uploads.items():
+            if active_upload.entry.ref == entry_ref:
+                upload = active_upload
+                join_ref = jr
+                break
+        
+        try:
+            yield upload
+        finally:
+            if upload and join_ref:
+                try:
+                    upload.close()
+                except Exception:
+                    logger.warning("Error closing upload entry", exc_info=True)
+                
+                # Remove only this specific upload
+                if join_ref in self.uploads.uploads:
+                    del self.uploads.uploads[join_ref]
+                if entry_ref in self.entries_by_ref:
+                    del self.entries_by_ref[entry_ref]
+
     def close(self):
         self.uploads.close()
 
@@ -165,9 +195,9 @@ class UploadManager:
         self.upload_config_join_refs = {}
 
     def allow_upload(
-        self, upload_name: str, constraints: UploadConstraints
+        self, upload_name: str, constraints: UploadConstraints, auto_upload: bool = False, progress: Optional[Callable] = None
     ) -> UploadConfig:
-        config = UploadConfig(name=upload_name, constraints=constraints)
+        config = UploadConfig(name=upload_name, constraints=constraints, autoUpload=auto_upload, progress_callback=progress)
         self.upload_configs[upload_name] = config
         return config
 
@@ -242,13 +272,33 @@ class UploadManager:
             config.update_progress(entry_ref, progress)
 
             if progress == 100:
-                joinRef = config.uploads.join_ref_for_entry(entry_ref)
-                del self.upload_config_join_refs[joinRef]
+                try:
+                    joinRef_to_remove = config.uploads.join_ref_for_entry(entry_ref)
+                    if joinRef_to_remove in self.upload_config_join_refs:
+                        del self.upload_config_join_refs[joinRef_to_remove]
+                except (IndexError, KeyError):
+                    # Entry might have already been consumed and removed
+                    pass
 
     def no_progress(self, joinRef) -> bool:
         config = self.upload_config_join_refs[joinRef]
         return config.uploads.no_progress()
 
+    async def trigger_progress_callback_if_exists(self, payload: dict[str, Any], socket):
+        """Trigger progress callback if one exists for this upload config"""
+        upload_config_ref = payload["ref"]
+        config = self.config_for_ref(upload_config_ref)
+        
+        if config and config.progress_callback:
+            entry_ref = payload["entry_ref"]
+            if entry_ref in config.entries_by_ref:
+                entry = config.entries_by_ref[entry_ref]
+                # Update entry progress before calling callback
+                progress = int(payload["progress"])
+                entry.progress = progress
+                entry.done = progress == 100
+                await config.progress_callback(entry, socket)
+
     def close(self):
         for config in self.upload_configs.values():
             config.close()
@@ -272,6 +322,7 @@ def live_file_input(config: Optional[UploadConfig]) -> Markup:
     accepted = ",".join(config.constraints.accept)
     accept = f'accept="{accepted}"' if accepted else ""
     multiple = "multiple" if config.constraints.max_files > 1 else ""
+    auto_upload = "data-phx-auto-upload" if config.autoUpload else ""
 
     return Markup(
         f"""
@@ -281,7 +332,7 @@ def live_file_input(config: Optional[UploadConfig]) -> Markup:
                data-phx-done-refs="{done_refs}"
                data-phx-preflighted-refs="{preflighted_refs}"
                data-phx-update="ignore" phx-hook="Phoenix.LiveFileUpload"
-               {accept} {multiple}>
+               {accept} {multiple} {auto_upload}>
             </input>
         """
     )

{pyview_web-0.4.0 → pyview_web-0.4.3}/pyview/ws_handler.py

@@ -340,7 +340,11 @@ class LiveSocketHandler:
                 )
 
             if event == "progress":
+                # Trigger progress callback BEFORE updating progress (which may consume the entry)
+                await socket.upload_manager.trigger_progress_callback_if_exists(payload, socket)
+                
                 socket.upload_manager.update_progress(joinRef, payload)
+                
                 rendered = await _render(socket)
                 diff = socket.diff(rendered)