Spaces:

Hans-R-D
/

nexus-uploader

Runtime error

App Files Files Community

ChandimaPrabath commited on Oct 27, 2024

Commit

7a826c8

1 Parent(s): d96ee2f

access key patch

Browse files

Files changed (2) hide show

app.py +9 -1
index.html +49 -26

app.py CHANGED Viewed

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, File, UploadFile, Form, BackgroundTasks, HTTPException
 from fastapi.responses import HTMLResponse, JSONResponse
 from pathlib import Path
 from typing import List
@@ -20,6 +20,9 @@ STATUS_FOLDER = Path("status")
 UPLOAD_FOLDER.mkdir(exist_ok=True)
 STATUS_FOLDER.mkdir(exist_ok=True)
 def save_progress(status_file, filename, status):
     """Helper function to update progress to a status file."""
     with status_file.open("a", encoding="utf-8") as f:
@@ -64,9 +67,14 @@ async def main():
 @app.post("/upload")
 async def upload_files(
     background_tasks: BackgroundTasks,
     destination_folder: str = Form(...),
     files: List[UploadFile] = File(...)
 ):
     temp_folder_path = UPLOAD_FOLDER / uuid.uuid4().hex
     temp_folder_path.mkdir(parents=True, exist_ok=True)

+from fastapi import FastAPI, File, UploadFile, Form, BackgroundTasks, HTTPException, Depends
 from fastapi.responses import HTMLResponse, JSONResponse
 from pathlib import Path
 from typing import List
 UPLOAD_FOLDER.mkdir(exist_ok=True)
 STATUS_FOLDER.mkdir(exist_ok=True)
+# Access key for upload authorization
+ACCESS_KEY = os.getenv("PASSWORD")
 def save_progress(status_file, filename, status):
     """Helper function to update progress to a status file."""
     with status_file.open("a", encoding="utf-8") as f:
 @app.post("/upload")
 async def upload_files(
     background_tasks: BackgroundTasks,
+    access_key: str = Form(...),
     destination_folder: str = Form(...),
     files: List[UploadFile] = File(...)
 ):
+    # Verify access key
+    if access_key != ACCESS_KEY:
+        raise HTTPException(status_code=403, detail="Invalid access key")
     temp_folder_path = UPLOAD_FOLDER / uuid.uuid4().hex
     temp_folder_path.mkdir(parents=True, exist_ok=True)

index.html CHANGED Viewed

@@ -8,6 +8,9 @@
 <body>
     <h2>Upload Files to Hugging Face Repository</h2>
     <form id="uploadForm" enctype="multipart/form-data">
         <label for="destination_folder">Destination Folder:</label>
         <input type="text" id="destination_folder" name="destination_folder" required>
@@ -19,39 +22,59 @@
     <div id="progress">
         <h3>Upload Progress:</h3>
-        <pre id="progressText">No upload in progress...</pre>
     </div>
     <script>
         document.getElementById("uploadForm").onsubmit = async function(event) {
             event.preventDefault();
             const formData = new FormData(this);
-            try {
-                const response = await fetch("/upload", {
-                    method: "POST",
-                    body: formData
-                });
-                const result = await response.json();
-                const statusId = result.status_id;
-                // Start polling for progress
-                const progressText = document.getElementById("progressText");
-                progressText.textContent = "Starting upload...";
-                const intervalId = setInterval(async () => {
-                    const progressResponse = await fetch(`/progress/${statusId}`);
-                    if (progressResponse.ok) {
-                        const progressResult = await progressResponse.json();
-                        progressText.textContent = progressResult.progress.join("");
-                    } else {
-                        clearInterval(intervalId);
-                        progressText.textContent += "\nUpload completed or status not found.";
-                    }
-                }, 2000);
-            } catch (error) {
-                document.getElementById("progressText").textContent = "Upload failed.";
-            }
         };
     </script>
 </body>

 <body>
     <h2>Upload Files to Hugging Face Repository</h2>
     <form id="uploadForm" enctype="multipart/form-data">
+        <label for="access_key">Access Key:</label>
+        <input type="password" id="access_key" name="access_key" required>
         <label for="destination_folder">Destination Folder:</label>
         <input type="text" id="destination_folder" name="destination_folder" required>
     <div id="progress">
         <h3>Upload Progress:</h3>
+        <pre id="clientProgressText">Client to Server: No upload in progress...</pre>
+        <pre id="serverProgressText">Server to Storage: No upload in progress...</pre>
     </div>
     <script>
         document.getElementById("uploadForm").onsubmit = async function(event) {
             event.preventDefault();
             const formData = new FormData(this);
+            const clientProgressText = document.getElementById("clientProgressText");
+            const serverProgressText = document.getElementById("serverProgressText");
+            // Reset progress text
+            clientProgressText.textContent = "Client to Server: Starting upload...";
+            serverProgressText.textContent = "Server to Storage: No upload in progress...";
+            // Create XMLHttpRequest to track client-to-server upload progress
+            const xhr = new XMLHttpRequest();
+            xhr.open("POST", "/upload", true);
+            // Add a progress event listener to track the upload to the server
+            xhr.upload.onprogress = function(event) {
+                if (event.lengthComputable) {
+                    const percentComplete = (event.loaded / event.total) * 100;
+                    clientProgressText.textContent = `Client to Server: ${percentComplete.toFixed(2)}% uploaded`;
+                }
+            };
+            // Handle server response
+            xhr.onload = async function() {
+                if (xhr.status === 200) {
+                    const result = JSON.parse(xhr.responseText);
+                    const statusId = result.status_id;
+                    // Start polling for server-to-storage progress
+                    serverProgressText.textContent = "Server to Storage: Starting upload...";
+                    const intervalId = setInterval(async () => {
+                        const progressResponse = await fetch(`/progress/${statusId}`);
+                        if (progressResponse.ok) {
+                            const progressResult = await progressResponse.json();
+                            serverProgressText.textContent = progressResult.progress.join("");
+                        } else {
+                            clearInterval(intervalId);
+                            serverProgressText.textContent += "\nServer to Storage: Upload completed or status not found.";
+                        }
+                    }, 2000);
+                } else {
+                    clientProgressText.textContent = "Client to Server: Upload failed.";
+                }
+            };
+            // Send the request
+            xhr.send(formData);
         };
     </script>
 </body>