Recover Lost File, Delete 3d_model folder

.gitattributes

@@ -40,4 +40,4 @@ images/beeuty_545jlbh1_v12_alpha96_300dpi_depth.png filter=lfs diff=lfs merge=lf
 *.gltf filter=lfs diff=lfs merge=lfs -text
 *.ply filter=lfs diff=lfs merge=lfs -text
 *.stl filter=lfs diff=lfs merge=lfs -text
-*.obj filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text

app.py

@@ -1,10 +1,13 @@
 import gradio as gr
 import os
+import random
 import modules.constants as constants
 import modules.version_info as version_info
+import modules.storage as storage
 
 
 user_dir = constants.TMPDIR
+default_folder = "saved_models/3d_model_" + format(random.randint(1, 999999), "06d")
 
 def getVersions():
     #return html_versions
@@ -53,10 +56,10 @@ def process_upload(files, current_model, current_images):
         file_name = f.name if hasattr(f, "name") else f
         ext = os.path.splitext(file_name)[1].lower()
         
-        if ext in [".glb", ".gltf", ".obj", ".ply"]:
+        if ext in constants.model_extensions:
             if extracted_model is None:
                 extracted_model = file_name
-        elif ext in [".png", ".jpg", ".jpeg"]:
+        elif ext in constants.image_extensions:
             if len(extracted_images) < 2:
                 extracted_images.append(file_name)
                 
@@ -94,7 +97,8 @@ with gr.Blocks(css_paths="style_20250503.css", title="3D viewer", theme='Surn/be
                 label="3D Model",
                 value=None,
                 height=480,
-                elem_id="model_3d", key="model_3d"
+                elem_id="model_3d", key="model_3d", clear_color=[1.0, 1.0, 1.0, 0.1], 
+                elem_classes="centered solid imgcontainer", interactive=True
                 
             )
             image_slider = gr.ImageSlider(
@@ -105,12 +109,38 @@ with gr.Blocks(css_paths="style_20250503.css", title="3D viewer", theme='Surn/be
                 type="filepath"
             )
         
+    with gr.Row():
+        gr.Markdown("## Upload your own files")
+        gr.Markdown("### Supported formats: " + ", ".join([f"`{ext}`" for ext in constants.upload_file_types]))
     with gr.Row():
         upload_btn = gr.UploadButton(
-            "Upload", elem_id="upload_btn", key="upload_btn",
+            "Upload 3D Files", elem_id="upload_btn", key="upload_btn",
             file_count="multiple",
-            file_types=[".glb", ".gltf", ".obj", ".png", ".jpg", ".ply"]
+            file_types=constants.upload_file_types
+        )
+        
+    with gr.Row():
+        # New textbox for folder name.
+        folder_name_box = gr.Textbox(
+            label="Folder Name",
+            value=default_folder,
+            elem_id="folder_name",
+            key="folder_name",
+            placeholder="Enter folder name..."
         )
+        permalink_button = gr.Button("Generate Permalink", elem_id="permalink_button", key="permalink_button", elem_classes="solid small centered")
+
+    with gr.Row(visible=False, elem_id="permalink_row") as permalink_row:
+        permalink = gr.Textbox(
+            show_copy_button=True,
+            label="Permalink",
+            elem_id="permalink",
+            key="permalink",
+            elem_classes="solid small centered",
+            max_lines=5,
+            lines=3
+        )
+        gr.Markdown("### Copy the link above to share your model and images.")
     with gr.Row():
         gr.HTML(value=getVersions(), visible=True, elem_id="versions")
     
@@ -136,9 +166,26 @@ with gr.Blocks(css_paths="style_20250503.css", title="3D viewer", theme='Surn/be
         show_progress=True
 
     )
+    # Generate a permalink based on the current model, images, and folder name.
+    permalink_button.click(
+        lambda model, images, folder: storage.upload_files_to_repo(
+            files=[model] + list(images),
+            repo_id="Surn/Storage",
+            folder_name=folder,
+            create_permalink=True,
+            repo_type="dataset"
+        )[1],  # Extract the permalink from the returned tuple if criteria met.
+        inputs=[model_3d, image_slider, folder_name_box],
+        outputs=[permalink],
+        scroll_to_output=True
+    ).then(
+        lambda link: gr.update(visible=True) if link and len(link) > 0 else gr.update(visible=False),
+        inputs=[permalink],
+        outputs=[permalink_row]
+    )
 
 if __name__ == "__main__":
     viewer3d.launch(
-        allowed_paths=["assets", "assets/", "./assets", "images/", "./images", 'e:/TMP', 'models/'],
+        allowed_paths=["assets", "assets/", "./assets", "images/", "./images", 'e:/TMP', 'models/', '3d_model_viewer/'],
         favicon_path="./assets/favicon.ico", show_api=True, strict_cors=False
     )

modules/constants.py

@@ -21,4 +21,10 @@ try:
 except:
     TMPDIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tmp')
 
-os.makedirs(TMPDIR, exist_ok=True)
+os.makedirs(TMPDIR, exist_ok=True)
+
+model_extensions = {".glb", ".gltf", ".obj", ".ply"}
+model_extensions_list = list(model_extensions)
+image_extensions = {".png", ".jpg", ".jpeg", ".webp"}
+image_extensions_list = list(image_extensions)
+upload_file_types = model_extensions_list + image_extensions_list

modules/storage.py

@@ -0,0 +1,100 @@
+# modules/storage.py
+import os
+import urllib.parse
+import tempfile
+import shutil
+from huggingface_hub import login, upload_folder
+from modules.constants import HF_API_TOKEN, upload_file_types, model_extensions, image_extensions
+
+def upload_files_to_repo(files, repo_id, folder_name, create_permalink=False, repo_type="dataset"):
+    """
+    Uploads multiple files to a Hugging Face repository using a batch upload approach via upload_folder.
+
+    Parameters:
+        files (list): A list of file paths (str) to upload.
+        repo_id (str): The repository ID on Hugging Face for storage, e.g. "Surn/Storage".
+        folder_name (str): The subfolder within the repository where files will be saved.
+        create_permalink (bool): If True and if exactly three files are uploaded (1 model and 2 images),
+                                 returns a single permalink to the project with query parameters.
+                                 Otherwise, returns individual permalinks for each file.
+        repo_type (str): Repository type ("space", "dataset", etc.). Default is "dataset".
+
+    Returns:
+        If create_permalink is True and files match the criteria:
+            tuple: (response, permalink) where response is the output of the batch upload
+                   and permalink is the URL string (with fully qualified file paths) for the project.
+        Otherwise:
+            list: A list of tuples (response, permalink) for each file.
+    """
+    # Log in using the HF API token.
+    login(token=HF_API_TOKEN)
+    
+    valid_files = []
+    
+    # Ensure folder_name does not have a trailing slash.
+    folder_name = folder_name.rstrip("/")
+    
+    # Filter for valid files based on allowed extensions.
+    for f in files:
+        file_name = f if isinstance(f, str) else f.name if hasattr(f, "name") else None
+        if file_name is None:
+            continue
+        ext = os.path.splitext(file_name)[1].lower()
+        if ext in upload_file_types:
+            valid_files.append(f)
+    
+    if not valid_files:
+        return []  # or raise an exception
+    
+    # Create a temporary directory and a sub-directory using folder_name; copy valid files into it.
+    with tempfile.TemporaryDirectory() as temp_dir:
+        target_dir = os.path.join(temp_dir, folder_name)
+        os.makedirs(target_dir, exist_ok=True)
+        for file_path in valid_files:
+            filename = os.path.basename(file_path)
+            dest_path = os.path.join(target_dir, filename)
+            shutil.copy(file_path, dest_path)
+        
+        # Batch upload all files in the temporary folder.
+        # Files will be uploaded under the folder (path_in_repo) given by folder_name.
+        response = upload_folder(
+            folder_path=temp_dir,
+            repo_id=repo_id,
+            repo_type=repo_type,
+            path_in_repo=folder_name,
+            commit_message="Batch upload files"
+        )
+    
+    # Construct external URLs for each uploaded file.
+    # For datasets, files are served at:
+    # https://huggingface.co/datasets/<repo_id>/resolve/main/<folder_name>/<filename>
+    base_url_external = f"https://huggingface.co/datasets/{repo_id}/resolve/main/{folder_name}"
+    individual_links = []
+    for file_path in valid_files:
+        filename = os.path.basename(file_path)
+        link = f"{base_url_external}/{filename}"
+        individual_links.append(link)
+    
+    # If exactly 3 files are provided and create_permalink is True,
+    # check if they contain 1 model file and 2 image files.
+    if create_permalink and len(valid_files) == 3:
+        model_link = None
+        images_links = []
+        for f in valid_files:
+            filename = os.path.basename(f)
+            ext = os.path.splitext(filename)[1].lower()
+            if ext in model_extensions:
+                if model_link is None:
+                    model_link = f"{base_url_external}/{filename}"
+            elif ext in image_extensions:
+                images_links.append(f"{base_url_external}/{filename}")
+        if model_link and len(images_links) == 2:
+            # Construct a permalink to the viewer project with querystring parameters.
+            base_viewer_url = "https://huggingface.co/spaces/Surn/3D-Viewer"
+            params = {"3d": model_link, "hm": images_links[0], "image": images_links[1]}
+            query_str = urllib.parse.urlencode(params)
+            permalink = f"{base_viewer_url}?{query_str}"
+            return response, permalink
+
+    # Otherwise, return individual tuples for each file.
+    return [(response, link) for link in individual_links]

style_20250503.css

@@ -102,7 +102,7 @@ a {
     position: relative !important;
 }
 
-.gradio-container .image-container  .preview.svelte-k63p1v {
+.gradio-container .image-container .preview.svelte-k63p1v {
     object-fit: cover;
 }
 .gradio-container::before {
@@ -115,7 +115,7 @@ a {
     height: 100%;
     opacity: 0.25;
     background-image: url('gradio_api/file=./images/logo.png');
-    background-repeat:repeat ;
+    background-repeat:repeat;
     background-position: 50% 0;
     background-size: contain;
     background-color: rgba(0,0,0,0.9);