pyview-web 0.3.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

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,9 @@ 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]):
@@ -196,9 +197,9 @@ class ConnectedLiveViewSocket(Generic[T]):
         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/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/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)
 

{pyview_web-0.3.0.dist-info → pyview_web-0.4.2.dist-info}/METADATA

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyview-web
-Version: 0.3.0
+Version: 0.4.2
 Summary: LiveView in Python
 License: MIT
+License-File: LICENSE
 Keywords: web,api,LiveView
 Author: Larry Ogrodnek
 Author-email: ogrodnek@gmail.com
-Requires-Python: >=3.11,<3.13
+Requires-Python: >=3.11,<3.14
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
@@ -20,6 +21,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
@@ -34,7 +36,7 @@ Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
 Requires-Dist: markupsafe (>=3.0.2,<4.0.0)
 Requires-Dist: pydantic (>=2.9.2,<3.0.0)
-Requires-Dist: starlette (==0.47.1)
+Requires-Dist: starlette (>=0.47.2,<0.48.0)
 Requires-Dist: uvicorn (==0.34.3)
 Requires-Dist: wsproto (==1.2.0)
 Project-URL: Homepage, https://pyview.rocks

{pyview_web-0.3.0.dist-info → pyview_web-0.4.2.dist-info}/RECORD

@@ -21,7 +21,7 @@ pyview/instrumentation/interfaces.py,sha256=AhVDM_vzETWtM-wfOXaM13K2OgdL0H8lu5wh
 pyview/instrumentation/noop.py,sha256=VP8UjiI--A7KWqnSFh7PMG7MqY0Z9ddQjBYVW7iHZa0,2941
 pyview/js.py,sha256=E6HMsUfXQjrcLqYq26ieeYuzTjBeZqfJwwOm3uSR4ME,3498
 pyview/live_routes.py,sha256=IN2Jmy8b1umcfx1R7ZgFXHZNbYDJp_kLIbADtDJknPM,1749
-pyview/live_socket.py,sha256=exzWVlDhmYEgeNQzz7ROhdFrqPrMU1JtFMImL3Uh5ZQ,6755
+pyview/live_socket.py,sha256=s41hancNG_hJOl17SSSc2Bg2UzxbBF8mihk4AedFy3k,6972
 pyview/live_view.py,sha256=mwAp7jiABSZCBgYF-GLQCB7zcJ7Wpz9cuC84zjzsp2U,1455
 pyview/meta.py,sha256=01Z-qldB9jrewmIJHQpUqyIhuHodQGgCvpuY9YM5R6c,74
 pyview/phx_message.py,sha256=DUdPfl6tlw9K0FNXJ35ehq03JGgynvwA_JItHQ_dxMQ,2007
@@ -36,7 +36,7 @@ pyview/template/render_diff.py,sha256=1P-OgtcGb0Y-zJ9uUH3bKWX-qQTHBa4jgg73qJD7eg
 pyview/template/root_template.py,sha256=zCUs1bt8R7qynhBE0tTSEYfdkGtbeKNmPhwzRiFNdsI,2031
 pyview/template/serializer.py,sha256=WDZfqJr2LMlf36fUW2CmWc2aREc63553_y_GRP2-qYc,826
 pyview/template/utils.py,sha256=S8593UjUJztUrtC3h1EL9MxQp5uH7rFDTNkv9C6A_xU,642
-pyview/uploads.py,sha256=AMdlp50uMMI5tS5DaQoaSrKVstu-7cGxIxaFWzg943A,9717
+pyview/uploads.py,sha256=G8zcVoTfWUjFs4nW3XZj60PqWujWTw2Rs3WOyyo52nY,12077
 pyview/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyview/vendor/flet/pubsub/__init__.py,sha256=JSPCeKB26b5E-IVHNRvVHrlf_CBGDLCulE9ADrostGs,39
 pyview/vendor/flet/pubsub/pub_sub.py,sha256=gpdruSxKQBqL7_Dtxo4vETm1kM0YH7S299msw2oyUoE,10184
@@ -50,9 +50,9 @@ pyview/vendor/ibis/nodes.py,sha256=TgFt4q5MrVW3gC3PVitrs2LyXKllRveooM7XKydNATk,2
 pyview/vendor/ibis/template.py,sha256=6XJXnztw87CrOaKeW3e18LL0fNM8AI6AaK_QgMdb7ew,2353
 pyview/vendor/ibis/tree.py,sha256=hg8f-fKHeo6DE8R-QgAhdvEaZ8rKyz7p0nGwPy0CBTs,2509
 pyview/vendor/ibis/utils.py,sha256=nLSaxPR9vMphzV9qinlz_Iurv9c49Ps6Knv8vyNlewU,2768
-pyview/ws_handler.py,sha256=QAmD_ANP6UCgghMSFjPcyaQP9R1eKjoebq4CxnUDrbU,14492
-pyview_web-0.3.0.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
-pyview_web-0.3.0.dist-info/METADATA,sha256=8VCRjuMu-E2wWussavO1C4Sk1bSTZKKKQIlZhXPy_Qo,5199
-pyview_web-0.3.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyview_web-0.3.0.dist-info/entry_points.txt,sha256=GAT-ic-VYmmSMUSUVKdV1bp4w-vgEeVP-XzElvarQ9U,42
-pyview_web-0.3.0.dist-info/RECORD,,
+pyview/ws_handler.py,sha256=f6iI4vvLesepI9tCTHLyRBbdKCGPS6Gzj_UUjfIrPT8,14722
+pyview_web-0.4.2.dist-info/METADATA,sha256=-tCEwOMH_NssPzXFOfuhSwVQ75TpDGiV6ltYZ3HXsSE,5280
+pyview_web-0.4.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyview_web-0.4.2.dist-info/entry_points.txt,sha256=GAT-ic-VYmmSMUSUVKdV1bp4w-vgEeVP-XzElvarQ9U,42
+pyview_web-0.4.2.dist-info/licenses/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
+pyview_web-0.4.2.dist-info/RECORD,,

{pyview_web-0.3.0.dist-info → pyview_web-0.4.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any