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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyview-web
-Version: 0.4.3
+Version: 0.5.1
 Summary: LiveView in Python
 License: MIT
 License-File: LICENSE

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

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

{pyview_web-0.4.3 → pyview_web-0.5.1}/pyview/assets/js/app.js

@@ -61,6 +61,7 @@ let csrfToken = document
 let liveSocket = new LiveSocket("/live", Socket, {
   hooks: Hooks,
   params: { _csrf_token: csrfToken },
+  uploaders: window.Uploaders || {},
 });
 
 // Show progress bar on live navigation and form submits

pyview_web-0.5.1/pyview/assets/js/uploaders.js

@@ -0,0 +1,221 @@
+/**
+ * PyView External S3 Uploaders
+ *
+ * Client-side uploaders for external S3 uploads.
+ *
+ * Available uploaders:
+ * - S3: Simple POST upload to S3 using presigned POST URLs
+ * - S3Multipart: Multipart upload for large files (>5GB)
+ */
+
+window.Uploaders = window.Uploaders || {};
+
+// S3 Simple POST uploader
+// Uses presigned POST URLs for direct upload to S3
+// Works for files up to ~5GB
+if (!window.Uploaders.S3) {
+  window.Uploaders.S3 = function (entries, onViewError) {
+    entries.forEach((entry) => {
+      let formData = new FormData();
+      let { url, fields } = entry.meta;
+
+      // Add all fields from presigned POST
+      Object.entries(fields).forEach(([key, val]) =>
+        formData.append(key, val)
+      );
+      formData.append("file", entry.file);
+
+      let xhr = new XMLHttpRequest();
+      onViewError(() => xhr.abort());
+
+      xhr.onload = () => {
+        if (xhr.status === 204 || xhr.status === 200) {
+          entry.progress(100);
+        } else {
+          entry.error(`S3 upload failed with status ${xhr.status}`);
+        }
+      };
+      xhr.onerror = () => entry.error("Network error during upload");
+
+      xhr.upload.addEventListener("progress", (event) => {
+        if (event.lengthComputable) {
+          let percent = Math.round((event.loaded / event.total) * 100);
+          if (percent < 100) {
+            entry.progress(percent);
+          }
+        }
+      });
+
+      xhr.open("POST", url, true);
+      xhr.send(formData);
+    });
+  };
+}
+
+// S3 Multipart uploader for large files
+// Uploads file in chunks with retry logic and concurrency control
+//
+// - Exponential backoff retry (max 3 attempts per part)
+// - Concurrency limit (max 6 parallel uploads)
+// - Automatic cleanup on fatal errors
+//
+// Based on AWS best practices:
+// https://docs.aws.amazon.com/AmazonS3/latest/userguide/mpuoverview.html
+//
+// Server must:
+// 1. Return metadata with: uploader="S3Multipart", upload_id, part_urls, chunk_size
+// 2. Provide entry_complete callback to finalize the upload
+if (!window.Uploaders.S3Multipart) {
+  window.Uploaders.S3Multipart = function (entries, onViewError) {
+    entries.forEach((entry) => {
+      const { upload_id, part_urls, chunk_size, key } = entry.meta;
+      const file = entry.file;
+      const parts = []; // Store {PartNumber, ETag} for each uploaded part
+
+      const MAX_RETRIES = 3;
+      const MAX_CONCURRENT = 6;
+      let uploadedParts = 0;
+      let activeUploads = 0;
+      let partIndex = 0;
+      let hasError = false;
+      const totalParts = part_urls.length;
+
+      console.log(`[S3Multipart] Starting upload for ${entry.file.name}`);
+      console.log(`[S3Multipart] Total parts: ${totalParts}, chunk size: ${chunk_size}`);
+      console.log(`[S3Multipart] Max concurrent uploads: ${MAX_CONCURRENT}, max retries: ${MAX_RETRIES}`);
+
+      // Add a custom method to send completion data directly
+      // This bypasses entry.progress() which only handles numbers
+      entry.complete = function(completionData) {
+        console.log(`[S3Multipart] Calling entry.complete with:`, completionData);
+        // Call pushFileProgress directly with the completion data
+        entry.view.pushFileProgress(entry.fileEl, entry.ref, completionData);
+      };
+
+      // Upload a single part with retry logic
+      const uploadPart = (index, retryCount = 0) => {
+        if (hasError) return;  // Stop if we've hit a fatal error
+
+        const partNumber = index + 1;
+        const url = part_urls[index];
+        const start = index * chunk_size;
+        const end = Math.min(start + chunk_size, file.size);
+        const chunk = file.slice(start, end);
+
+        console.log(`[S3Multipart] Starting part ${partNumber}/${totalParts}, size: ${chunk.size} bytes, attempt ${retryCount + 1}`);
+
+        const xhr = new XMLHttpRequest();
+        onViewError(() => xhr.abort());
+
+        // Track upload progress within this chunk
+        xhr.upload.addEventListener("progress", (event) => {
+          if (event.lengthComputable) {
+            // Calculate overall progress: completed parts + current part's progress
+            const completedBytes = uploadedParts * chunk_size;
+            const currentPartBytes = event.loaded;
+            const totalBytes = file.size;
+            const overallPercent = Math.round(((completedBytes + currentPartBytes) / totalBytes) * 100);
+
+            // Don't report 100% until all parts complete and we send completion data
+            if (overallPercent < 100) {
+              entry.progress(overallPercent);
+            }
+          }
+        });
+
+        xhr.onload = () => {
+          activeUploads--;
+
+          if (xhr.status === 200) {
+            const etag = xhr.getResponseHeader('ETag');
+            console.log(`[S3Multipart] Part ${partNumber} succeeded, ETag: ${etag}`);
+
+            if (!etag) {
+              console.error(`[S3Multipart] Part ${partNumber} missing ETag!`);
+              entry.error(`Part ${partNumber} upload succeeded but no ETag returned`);
+              hasError = true;
+              return;
+            }
+
+            // Store the part with its ETag
+            parts.push({
+              PartNumber: partNumber,
+              ETag: etag.replace(/"/g, '')
+            });
+            uploadedParts++;
+
+            // Update progress
+            const progressPercent = Math.round((uploadedParts / totalParts) * 100);
+            console.log(`[S3Multipart] Progress: ${uploadedParts}/${totalParts} parts (${progressPercent}%)`);
+
+            if (uploadedParts < totalParts) {
+              entry.progress(progressPercent < 100 ? progressPercent : 99);
+              uploadNextPart();  // Start next part
+            } else {
+              // All parts complete!
+              const completionData = {
+                complete: true,
+                upload_id: upload_id,
+                key: key,
+                parts: parts.sort((a, b) => a.PartNumber - b.PartNumber)
+              };
+              console.log(`[S3Multipart] All parts complete! Sending completion data`);
+              entry.complete(completionData);
+            }
+          } else {
+            // Upload failed - retry with exponential backoff
+            console.error(`[S3Multipart] Part ${partNumber} failed with status ${xhr.status}, attempt ${retryCount + 1}`);
+
+            if (retryCount < MAX_RETRIES) {
+              // Exponential backoff: 1s, 2s, 4s, max 10s
+              const delay = Math.min(1000 * (2 ** retryCount), 10000);
+              console.log(`[S3Multipart] Retrying part ${partNumber} in ${delay}ms...`);
+
+              setTimeout(() => {
+                uploadPart(index, retryCount + 1);
+              }, delay);
+            } else {
+              // Max retries exceeded - fatal error
+              console.error(`[S3Multipart] Part ${partNumber} failed after ${MAX_RETRIES} retries, aborting upload`);
+              entry.error(`Part ${partNumber} failed after ${MAX_RETRIES} attempts. Upload aborted.`);
+              hasError = true;
+            }
+          }
+        };
+
+        xhr.onerror = () => {
+          activeUploads--;
+          console.error(`[S3Multipart] Network error on part ${partNumber}, attempt ${retryCount + 1}`);
+
+          if (retryCount < MAX_RETRIES) {
+            const delay = Math.min(1000 * (2 ** retryCount), 10000);
+            console.log(`[S3Multipart] Retrying part ${partNumber} after network error in ${delay}ms...`);
+
+            setTimeout(() => {
+              uploadPart(index, retryCount + 1);
+            }, delay);
+          } else {
+            console.error(`[S3Multipart] Part ${partNumber} network error after ${MAX_RETRIES} retries, aborting upload`);
+            entry.error(`Part ${partNumber} network error after ${MAX_RETRIES} attempts. Upload aborted.`);
+            hasError = true;
+          }
+        };
+
+        xhr.open('PUT', url, true);
+        xhr.send(chunk);
+        activeUploads++;
+      };
+
+      // Upload next part if we haven't hit the concurrency limit
+      const uploadNextPart = () => {
+        while (partIndex < totalParts && activeUploads < MAX_CONCURRENT && !hasError) {
+          uploadPart(partIndex);
+          partIndex++;
+        }
+      };
+
+      // Start initial batch of uploads
+      uploadNextPart();
+    });
+  };
+}

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

@@ -52,12 +52,16 @@ class UnconnectedSocket(Generic[T]):
         constraints: UploadConstraints,
         auto_upload: bool = False,
         progress: Optional[Callable] = None,
+        external: Optional[Callable] = None,
+        entry_complete: Optional[Callable] = None,
     ) -> UploadConfig:
         return UploadConfig(
             name=upload_name,
             constraints=constraints,
             autoUpload=auto_upload,
             progress_callback=progress,
+            external_callback=external,
+            entry_complete_callback=entry_complete,
         )
 
 
@@ -230,9 +234,11 @@ class ConnectedLiveViewSocket(Generic[T]):
         constraints: UploadConstraints,
         auto_upload: bool = False,
         progress: Optional[Callable] = None,
+        external: Optional[Callable] = None,
+        entry_complete: Optional[Callable] = None,
     ) -> UploadConfig:
         return self.upload_manager.allow_upload(
-            upload_name, constraints, auto_upload, progress
+            upload_name, constraints, auto_upload, progress, external, entry_complete
         )
 
     async def close(self):

{pyview_web-0.4.3 → pyview_web-0.5.1}/pyview/static/assets/app.js

@@ -39,9 +39,9 @@
     mod
   ));
 
-  // assets/node_modules/nprogress/nprogress.js
+  // node_modules/nprogress/nprogress.js
   var require_nprogress = __commonJS({
-    "assets/node_modules/nprogress/nprogress.js"(exports, module) {
+    "node_modules/nprogress/nprogress.js"(exports, module) {
       (function(root, factory) {
         if (typeof define === "function" && define.amd) {
           define(factory);
@@ -71,8 +71,7 @@
           var key, value;
           for (key in options) {
             value = options[key];
-            if (value !== void 0 && options.hasOwnProperty(key))
-              Settings[key] = value;
+            if (value !== void 0 && options.hasOwnProperty(key)) Settings[key] = value;
           }
           return this;
         };
@@ -84,8 +83,7 @@
           var progress = NProgress2.render(!started), bar = progress.querySelector(Settings.barSelector), speed = Settings.speed, ease = Settings.easing;
           progress.offsetWidth;
           queue(function(next) {
-            if (Settings.positionUsing === "")
-              Settings.positionUsing = NProgress2.getPositioningCSS();
+            if (Settings.positionUsing === "") Settings.positionUsing = NProgress2.getPositioningCSS();
             css(bar, barPositionCSS(n, speed, ease));
             if (n === 1) {
               css(progress, {
@@ -113,23 +111,19 @@
           return typeof NProgress2.status === "number";
         };
         NProgress2.start = function() {
-          if (!NProgress2.status)
-            NProgress2.set(0);
+          if (!NProgress2.status) NProgress2.set(0);
           var work = function() {
             setTimeout(function() {
-              if (!NProgress2.status)
-                return;
+              if (!NProgress2.status) return;
               NProgress2.trickle();
               work();
             }, Settings.trickleSpeed);
           };
-          if (Settings.trickle)
-            work();
+          if (Settings.trickle) work();
           return this;
         };
         NProgress2.done = function(force) {
-          if (!force && !NProgress2.status)
-            return this;
+          if (!force && !NProgress2.status) return this;
           return NProgress2.inc(0.3 + 0.5 * Math.random()).set(1);
         };
         NProgress2.inc = function(amount) {
@@ -171,8 +165,7 @@
           };
         })();
         NProgress2.render = function(fromStart) {
-          if (NProgress2.isRendered())
-            return document.getElementById("nprogress");
+          if (NProgress2.isRendered()) return document.getElementById("nprogress");
           addClass(document.documentElement, "nprogress-busy");
           var progress = document.createElement("div");
           progress.id = "nprogress";
@@ -213,10 +206,8 @@
           }
         };
         function clamp(n, min, max) {
-          if (n < min)
-            return min;
-          if (n > max)
-            return max;
+          if (n < min) return min;
+          if (n > max) return max;
           return n;
         }
         function toBarPerc(n) {
@@ -234,7 +225,7 @@
           barCSS.transition = "all " + speed + "ms " + ease;
           return barCSS;
         }
-        var queue = function() {
+        var queue = /* @__PURE__ */ (function() {
           var pending = [];
           function next() {
             var fn = pending.shift();
@@ -244,11 +235,10 @@
           }
           return function(fn) {
             pending.push(fn);
-            if (pending.length == 1)
-              next();
+            if (pending.length == 1) next();
           };
-        }();
-        var css = function() {
+        })();
+        var css = /* @__PURE__ */ (function() {
           var cssPrefixes = ["Webkit", "O", "Moz", "ms"], cssProps = {};
           function camelCase(string) {
             return string.replace(/^-ms-/, "ms-").replace(/-([\da-z])/gi, function(match, letter) {
@@ -257,13 +247,11 @@
           }
           function getVendorProp(name) {
             var style = document.body.style;
-            if (name in style)
-              return name;
+            if (name in style) return name;
             var i = cssPrefixes.length, capName = name.charAt(0).toUpperCase() + name.slice(1), vendorName;
             while (i--) {
               vendorName = cssPrefixes[i] + capName;
-              if (vendorName in style)
-                return vendorName;
+              if (vendorName in style) return vendorName;
             }
             return name;
           }
@@ -280,28 +268,25 @@
             if (args.length == 2) {
               for (prop in properties) {
                 value = properties[prop];
-                if (value !== void 0 && properties.hasOwnProperty(prop))
-                  applyCss(element, prop, value);
+                if (value !== void 0 && properties.hasOwnProperty(prop)) applyCss(element, prop, value);
               }
             } else {
               applyCss(element, args[1], args[2]);
             }
           };
-        }();
+        })();
         function hasClass(element, name) {
           var list = typeof element == "string" ? element : classList(element);
           return list.indexOf(" " + name + " ") >= 0;
         }
         function addClass(element, name) {
           var oldList = classList(element), newList = oldList + name;
-          if (hasClass(oldList, name))
-            return;
+          if (hasClass(oldList, name)) return;
           element.className = newList.substring(1);
         }
         function removeClass(element, name) {
           var oldList = classList(element), newList;
-          if (!hasClass(element, name))
-            return;
+          if (!hasClass(element, name)) return;
           newList = oldList.replace(" " + name + " ", " ");
           element.className = newList.substring(1, newList.length - 1);
         }
@@ -316,12 +301,11 @@
     }
   });
 
-  // assets/node_modules/phoenix_html/priv/static/phoenix_html.js
+  // node_modules/phoenix_html/priv/static/phoenix_html.js
   (function() {
     var PolyfillEvent = eventConstructor();
     function eventConstructor() {
-      if (typeof window.CustomEvent === "function")
-        return window.CustomEvent;
+      if (typeof window.CustomEvent === "function") return window.CustomEvent;
       function CustomEvent2(event, params) {
         params = params || { bubbles: false, cancelable: false, detail: void 0 };
         var evt = document.createEvent("CustomEvent");
@@ -343,10 +327,8 @@
       form.method = element.getAttribute("data-method") === "get" ? "get" : "post";
       form.action = to;
       form.style.display = "hidden";
-      if (target)
-        form.target = target;
-      else if (targetModifierKey)
-        form.target = "_blank";
+      if (target) form.target = target;
+      else if (targetModifierKey) form.target = "_blank";
       form.appendChild(csrf);
       form.appendChild(method);
       document.body.appendChild(form);
@@ -354,8 +336,7 @@
     }
     window.addEventListener("click", function(e) {
       var element = e.target;
-      if (e.defaultPrevented)
-        return;
+      if (e.defaultPrevented) return;
       while (element && element.getAttribute) {
         var phoenixLinkEvent = new PolyfillEvent("phoenix.link.click", {
           "bubbles": true,
@@ -383,7 +364,7 @@
     }, false);
   })();
 
-  // assets/node_modules/phoenix/priv/static/phoenix.mjs
+  // node_modules/phoenix/priv/static/phoenix.mjs
   var closure = (value) => {
     if (typeof value === "function") {
       return value;
@@ -1354,7 +1335,7 @@
     }
   };
 
-  // assets/node_modules/phoenix_live_view/priv/static/phoenix_live_view.esm.js
+  // node_modules/phoenix_live_view/priv/static/phoenix_live_view.esm.js
   var CONSECUTIVE_RELOADS = "consecutive-reloads";
   var MAX_RELOADS = 10;
   var RELOAD_JITTER_MIN = 5e3;
@@ -5457,7 +5438,7 @@ within:
     }
   };
 
-  // assets/js/app.js
+  // js/app.js
   var import_nprogress = __toESM(require_nprogress());
   var _a;
   var Hooks2 = (_a = window.Hooks) != null ? _a : {};
@@ -5487,7 +5468,8 @@ within:
   var csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content");
   var liveSocket = new LiveSocket("/live", Socket, {
     hooks: Hooks2,
-    params: { _csrf_token: csrfToken }
+    params: { _csrf_token: csrfToken },
+    uploaders: window.Uploaders || {}
   });
   window.addEventListener("phx:page-loading-start", (info) => import_nprogress.default.start());
   window.addEventListener("phx:page-loading-stop", (info) => import_nprogress.default.done());