Fix permalink downloads

.gitattributes

@@ -34,8 +34,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
 images/logo.png filter=lfs diff=lfs merge=lfs -text
-images/beeuty_545jlbh1_v12_alpha96_300dpi.png filter=lfs diff=lfs merge=lfs -text
-images/beeuty_545jlbh1_v12_alpha96_300dpi_depth.png filter=lfs diff=lfs merge=lfs -text
+images/slider/beeuty_545jlbh1_v12_alpha96_300dpi.png filter=lfs diff=lfs merge=lfs -text
+images/slider/beeuty_545jlbh1_v12_alpha96_300dpi_depth.png filter=lfs diff=lfs merge=lfs -text
 *.glb filter=lfs diff=lfs merge=lfs -text
 *.gltf filter=lfs diff=lfs merge=lfs -text
 *.ply filter=lfs diff=lfs merge=lfs -text

app.py

@@ -12,22 +12,156 @@ default_folder = "saved_models/3d_model_" + format(random.randint(1, 999999), "0
 def getVersions():
     #return html_versions
     return version_info.versions_html()
+    # Process URLs and download files if needed.
 
-def load_data(query_params, model_3d, image_slider):
-    # set default values or pull from querystring
-    model_url = query_params.get("3d", None) if query_params else None
-    hm_url = query_params.get("hm", None) if query_params else None
-    img_url = query_params.get("image", None) if query_params else None
+def process_url(url, default_ext=".png"):
+    """Download file from URL if it's a remote URL and return its local path.
+    
+    Performs HuggingFace authentication if the URL requires it.
+    The caller can pass an appropriate default_ext (e.g. ".glb" for models).
+    Uses huggingface_hub library for HuggingFace URLs for better authentication.
+    """
+    if not url:
+        return None
+        
+    # If it's already a local file, return it.
+    if os.path.exists(url) or not (url.startswith('http://') or url.startswith('https://')):
+        return url
+    
+    # Parse URL to get components
+    try:
+        import urllib.request
+        from urllib.parse import urlparse
+        
+        # Create filename from URL.
+        parsed_url = urlparse(url)
+        filename = os.path.basename(parsed_url.path)
+        if not filename:
+            filename = f"downloaded_{hash(url) % 10000}.file"
+            
+        # Add extension if missing.
+        ext = os.path.splitext(filename)[1].lower()
+        if not ext:
+            filename += default_ext
+            
+        # Create local path.
+        local_path = os.path.join(constants.TMPDIR, filename)
+        
+        # If the file is hosted on HuggingFace, use huggingface_hub
+        if 'huggingface.co' in url or 'hf.co' in url:
+            try:
+                from huggingface_hub import login, hf_hub_download
+
+                # Log in to HuggingFace
+                login(token=constants.HF_API_TOKEN)
+
+                # Extract repo information from URL
+                # Format: https://huggingface.co/datasets/{repo_id}/resolve/main/{path}
+                if '/datasets/' in url and '/resolve/main/' in url:
+                    parts = url.split('/datasets/')[1].split('/resolve/main/')
+                    repo_id = parts[0]
+                    
+                    # The remaining path may contain subfolders and filename
+                    full_path = parts[1]
+                    
+                    # Extract the filename and subfolder
+                    if '/' in full_path:
+                        subfolder, filename = full_path.rsplit('/', 1)
+                    else:
+                        subfolder = None
+                        filename = full_path
+                    
+                    print(f"Downloading from HF repo '{repo_id}', filename '{filename}', subfolder '{subfolder}'")
+                    
+                    # Download using huggingface_hub
+                    local_path = hf_hub_download(
+                        repo_id=repo_id,
+                        filename=filename,
+                        subfolder=subfolder,
+                        repo_type="dataset",
+                        local_dir=constants.TMPDIR,
+                        local_dir_use_symlinks=False
+                    )
+                    return local_path
+                else:
+                    # Fall back to standard download for other HF URLs
+                    print("URL format not recognized for huggingface_hub download, falling back to standard method")
+            except Exception as e:
+                print(f"Error using huggingface_hub download: {e}, falling back to standard method")
+        
+        # Standard download for non-HF URLs or as fallback
+        print(f"Downloading {url} to {local_path}")
+        urllib.request.urlretrieve(url, local_path)
+        return local_path
+            
+    except Exception as e:
+        print(f"Error downloading file {url}: {e}")
+        return url  # Return original URL if download fails
+
+
+def load_data(request: gr.Request, model_3d, image_slider):
+    """
+    Load data from query parameters, download files if needed,
+    and use current component values as defaults if no query parameters are provided.
+    
+    If query parameters are provided, generate a permalink using storage.generate_permalink_from_urls.
+    
+    Parameters:
+        request: Gradio request object containing query parameters.
+        model_3d: Current value or component for the 3D model.
+        image_slider: Current value or component for the image slider.
+    
+    Returns:
+        tuple: (model_url, slider_images, permalink)
+               - model_url: processed URL for the 3D model.
+               - slider_images: processed list of image URLs.
+               - permalink: a generated permalink if query parameters were provided,
+                 or an empty string if not.
+    """
+    # Parse query parameters.
+    query_params = dict(request.query_params) if request is not None else {}
+    
+    # Extract URLs from query parameters.
+    model_url = query_params.get("3d", None)
+    hm_url = query_params.get("hm", None)
+    img_url = query_params.get("image", None)
+    
+    # Process the model URL if provided.
+    if model_url:
+        model_url = process_url(model_url, default_ext=".glb")
+    
+    # Process image URLs if provided.
     slider_images = []
-    if hm_url:
-        slider_images.append(hm_url)
     if img_url:
-        slider_images.append(img_url)
+        local_img = process_url(img_url, default_ext=".png")
+        if local_img:
+            slider_images.append(local_img)
+    if hm_url:
+        local_hm = process_url(hm_url, default_ext=".png")
+        if local_hm:
+            slider_images.append(local_hm)
+
+    
+    # Set default values if no URLs provided:
+    default_model = getattr(model_3d, "value", model_3d)
+    default_images = getattr(image_slider, "value", image_slider)
+    
     if not slider_images:
-        slider_images = ["images/beeuty_545jlbh1_v12_alpha96_300dpi.png", "images/beeuty_545jlbh1_v12_alpha96_300dpi_depth.png"]
+        slider_images = default_images if default_images else constants.default_slider_images
+        
     if not model_url:
-        model_url = "models/beeuty_545jlbh1_300dpi.glb"
-    return model_url, slider_images
+        model_url = default_model if default_model else constants.default_model_3d
+
+    # If any query parameters were provided, generate a permalink.
+    permalink = ""
+    if query_params:
+        try:
+            # Use the helper function defined in storage.py
+            permalink = storage.generate_permalink_from_urls(model_url, hm_url, img_url)
+        except Exception as e:
+            print(f"Error generating permalink: {e}")
+    
+    return model_url, slider_images, permalink
 
 def process_upload(files, current_model, current_images):
     """
@@ -141,20 +275,24 @@ with gr.Blocks(css_paths="style_20250503.css", title="3D viewer", theme='Surn/be
             max_lines=5,
             lines=3
         )
-        gr.Markdown("### Copy the link above to share your model and images.", elem_classes="solid centered",)
+        gr.Markdown("### Copy the permalink to share your model and images.", elem_classes="solid centered",)
     with gr.Row():
         gr.HTML(value=getVersions(), visible=True, elem_id="versions")
     
     # Use JavaScript to pass the query parameters to your callback.
     viewer3d.load(
         load_data,
-        inputs=[gr.JSON(), model_3d, image_slider],
-        outputs=[model_3d, image_slider],
-        js="""() => {
-            const params = Object.fromEntries(new URLSearchParams(window.location.search));
-            return params;
-        }""",
+        inputs=[model_3d, image_slider],
+        outputs=[model_3d, image_slider, permalink],
         scroll_to_output=True
+    ).then(
+        # If the returned permalink (link) is non-empty then make the permalink row visible
+        # and disable the permalink button; otherwise, hide the row and enable the button.
+        lambda link: (gr.update(visible=True), gr.update(interactive=False))
+            if link and len(link) > 0
+            else (gr.update(visible=False), gr.update(interactive=True)),
+        inputs=[permalink],
+        outputs=[permalink_row, permalink_button]
     )
 
     # Process uploaded files to update the Model3D or ImageSlider component.
@@ -165,7 +303,11 @@ with gr.Blocks(css_paths="style_20250503.css", title="3D viewer", theme='Surn/be
         scroll_to_output=True,
         api_name="process_upload",
         show_progress=True
-
+    ).then(
+        # After a successful upload, enable the permalink button.
+        lambda m, i: gr.update(interactive=True),
+        inputs=[model_3d, image_slider],
+        outputs=[permalink_button]
     )
     # Generate a permalink based on the current model, images, and folder name.
     permalink_button.click(

modules/constants.py

@@ -27,4 +27,11 @@ 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
+upload_file_types = model_extensions_list + image_extensions_list
+
+default_slider_images = [
+            "images/slider/beeuty_545jlbh1_v12_alpha96_300dpi.png",
+            "images/slider/beeuty_545jlbh1_v12_alpha96_300dpi_depth.png"
+        ]
+
+default_model_3d = "models/beeuty_545jlbh1_300dpi.glb"

modules/storage.py

@@ -6,7 +6,50 @@ 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"):
+def generate_permalink(valid_files, base_url_external, permalink_viewer_url="surn-3d-viewer.hf.space"):
+    """
+    Given a list of valid files, checks if they contain exactly 1 model file and 2 image files.
+    Constructs and returns a permalink URL with query parameters if the criteria is met.
+    Otherwise, returns None.
+    """
+    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 query parameters.
+        permalink_viewer_url = f"https:{permalink_viewer_url}/"
+        params = {"3d": model_link, "hm": images_links[0], "image": images_links[1]}
+        query_str = urllib.parse.urlencode(params)
+        return f"{permalink_viewer_url}?{query_str}"
+    return None
+
+def generate_permalink_from_urls(model_url, hm_url, img_url, permalink_viewer_url="surn-3d-viewer.hf.space"):
+    """
+    Constructs and returns a permalink URL with query string parameters for the viewer.
+    Each parameter is passed separately so that the image positions remain consistent.
+    
+    Parameters:
+        model_url (str): Processed URL for the 3D model.
+        hm_url (str): Processed URL for the height map image.
+        img_url (str): Processed URL for the main image.
+        permalink_viewer_url (str): The base viewer URL.
+    
+    Returns:
+        str: The generated permalink URL.
+    """
+    import urllib.parse
+    params = {"3d": model_url, "hm": hm_url, "image": img_url}
+    query_str = urllib.parse.urlencode(params)
+    return f"https://{permalink_viewer_url}/?{query_str}"
+
+def upload_files_to_repo(files, repo_id, folder_name, create_permalink=False, repo_type="dataset", permalink_viewer_url="surn-3d-viewer.hf.space"):
     """
     Uploads multiple files to a Hugging Face repository using a batch upload approach via upload_folder.
 
@@ -32,7 +75,7 @@ def upload_files_to_repo(files, repo_id, folder_name, create_permalink=False, re
     valid_files = []
     
     # Ensure folder_name does not have a trailing slash.
-    folder_name = folder_name.rstrip("/")    
+    folder_name = folder_name.rstrip("/")
     
     # Filter for valid files based on allowed extensions.
     for f in files:
@@ -46,7 +89,7 @@ def upload_files_to_repo(files, repo_id, folder_name, create_permalink=False, re
     if not valid_files:
         return []  # or raise an exception
     
-    # Create a temporary directory; copy valid files directly into it (without using folder_name).
+    # Create a temporary directory; copy valid files directly into it.
     with tempfile.TemporaryDirectory() as temp_dir:
         for file_path in valid_files:
             filename = os.path.basename(file_path)
@@ -73,25 +116,11 @@ def upload_files_to_repo(files, repo_id, folder_name, create_permalink=False, re
         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 permalink creation is requested and exactly 3 valid files are provided,
+    # try to generate a permalink using generate_permalink().
     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}"
+        permalink = generate_permalink(valid_files, base_url_external, permalink_viewer_url)
+        if permalink:
             return response, permalink
 
     # Otherwise, return individual tuples for each file.

requirements.txt

@@ -1,3 +1,4 @@
 torch --extra-index-url https://download.pytorch.org/whl/cu124
 transformers
-python-dotenv
+python-dotenv
+huggingface_hub