user_history update

app.py

@@ -463,9 +463,9 @@ def predict(
         if not isinstance(seed_used, (int, float)):  # Allow float for seed then cast later
             raise gr.Error(f"MCP tool returned a non-numeric seed. Received type: {type(seed_used)}, value: {seed_used}")
 
-        if isinstance(waveform_video_path, str) and (waveform_video_path.startswith("http://", "https://")):
+        if isinstance(waveform_video_path, str) and (waveform_video_path.startswith("http://") or waveform_video_path.startswith("https://")):
             waveform_video_path = str(download_and_save_file(waveform_video_path, Path(TMPDIR) / str(profile_username_to_send), HF_API_TOKEN))
-        if isinstance(wave_file_path, str) and (wave_file_path.startswith("http://", "https://")):
+        if isinstance(wave_file_path, str) and (wave_file_path.startswith("http://") or wave_file_path.startswith("https://")):
             wave_file_path = str(download_and_save_file(wave_file_path, Path(TMPDIR) / str(profile_username_to_send), HF_API_TOKEN))
 
         return waveform_video_path, wave_file_path, int(seed_used)

modules/user_history.py

@@ -18,7 +18,7 @@ Useful links:
 Update by Surn (Charles Fettinger)
 """
 
-__version__ = "0.3.6"
+__version__ = "0.3.8"
 
 import json
 import os
@@ -173,7 +173,7 @@ def save_image(
     # Ignore images from logged out users
     if profile is None:
         return
-    username = profile["preferred_username"]
+    username = profile if isinstance(profile, str) else profile["preferred_username"]
 
     # Ignore images if user history not used
     user_history = _UserHistory()
@@ -210,7 +210,7 @@ def save_file(
     # Ignore files from logged out users
     if profile is None:
         return
-    username = profile["preferred_username"]
+    username = profile if isinstance(profile, str) else profile["preferred_username"]
 
     # Ignore files if user history not used
     user_history = _UserHistory()
@@ -406,7 +406,7 @@ def _fetch_user_history(profile: gr.OAuthProfile | None) -> List[Tuple[str, str]
     if profile is None:
         user_profile = gr.State(None)
         return []
-    username = str(profile["preferred_username"])
+    username = profile if isinstance(profile, str) else str(profile["preferred_username"])
     
     user_profile = gr.State(profile)
 
@@ -442,7 +442,7 @@ def _export_user_history(profile: gr.OAuthProfile | None) -> Dict | None:
     # Cannot load history for logged out users
     if profile is None:
         return None
-    username = profile["preferred_username"]
+    username = profile if isinstance(profile, str) else profile["preferred_username"]
 
     user_history = _UserHistory()
     if not user_history.initialized:
@@ -471,7 +471,7 @@ def _delete_user_history(profile: gr.OAuthProfile | None) -> None:
     # Cannot load history for logged out users
     if profile is None:
         return
-    username = profile["preferred_username"]
+    username = profile if isinstance(profile, str) else profile["preferred_username"]
 
     user_history = _UserHistory()
     if not user_history.initialized:
@@ -489,10 +489,16 @@ def _delete_user_history(profile: gr.OAuthProfile | None) -> None:
 
 def _copy_image(image: Image.Image | np.ndarray | str | Path, dst_folder: Path, uniqueId: str = "") -> Path:
     try:
+        dst = dst_folder
         """Copy image to the images folder."""
-        # Already a path => copy it
+        # If image is a string, check if it's a URL.
         if isinstance(image, str):
-            image = Path(image)
+            if image.startswith("http://") or image.startswith("https://"):
+                return _download_and_save_image(image, dst_folder)
+            else:
+                # Assume it's a local filepath string.
+                image = Path(image)
+            
         if isinstance(image, Path):
             dst = dst_folder / Path(f"{uniqueId}_{Path(image).name}")  # keep file ext
             shutil.copyfile(image, dst)
@@ -653,6 +659,8 @@ def _display_if_admin() -> Callable:
             return ""
         if profile["preferred_username"] in _fetch_admins():
             return _admin_content()
+        if profile in _fetch_admins():
+            return _admin_content()
         return ""
 
     return _inner