generate safe file name

app.py

@@ -20,6 +20,7 @@ from huggingface_hub import HfApi, HfFolder, create_repo
 from huggingface_hub.utils import RepositoryNotFoundError
 from huggingface_hub.hf_api import RepoFile
 import tempfile
+import time
 
 # Create FastAPI app
 app = FastAPI(title="Image Uploader")
@@ -474,6 +475,18 @@ def delete_from_hf_and_local(filename):
     return local_success or hf_success
 
 
+def generate_safe_filename(original_filename):
+    """Generate a safe filename that preserves the original name but avoids collisions."""
+    # Extract base name and extension
+    base_name, extension = os.path.splitext(original_filename)
+    # Remove invalid characters from base name
+    safe_base = "".join(c for c in base_name if c.isalnum() or c in "-_. ")
+    safe_base = safe_base.replace(" ", "_")
+    # Add timestamp to ensure uniqueness
+    timestamp = int(time.time() * 1000)
+    return f"{safe_base}_{timestamp}{extension}"
+
+
 @app.post("/upload/")
 async def upload_image(
     request: Request, 
@@ -538,24 +551,24 @@ async def upload_image(
         if not is_valid_image(extension):
             continue  # Skip non-image files
 
-        # Preserve original filename in metadata but make it safe for filesystem
+        # Preserve original filename in metadata
         original_filename = file.filename
 
-        # Generate a unique filename to prevent overwrites
-        unique_filename = f"{uuid.uuid4()}{extension}"
+        # Generate a safe filename that preserves the original name
+        safe_filename = generate_safe_filename(original_filename)
 
         # Read file content for upload
         file.file.seek(0)
         file_content = await file.read()
 
         # Save file to both local storage and Hugging Face
-        upload_success = upload_to_hf_and_local(file_content, unique_filename)
+        upload_success = upload_to_hf_and_local(file_content, safe_filename)
 
         if not upload_success:
             continue  # Skip to next file if upload failed
 
         # Save hashtags and original filename
-        add_hashtags_to_image(unique_filename, hashtag_list, original_filename)
+        add_hashtags_to_image(safe_filename, hashtag_list, original_filename)
 
         # For base64 encoding
         base64_encoded = base64.b64encode(file_content).decode("utf-8")
@@ -571,7 +584,7 @@ async def upload_image(
         }.get(extension, 'application/octet-stream')
 
         # Get direct image URL using Space URL if available
-        image_url = f"/static/uploads/{unique_filename}"  # Local URL
+        image_url = f"/static/uploads/{safe_filename}"  # Local URL
 
         # Full URL for embedding
         if (
@@ -579,21 +592,23 @@ async def upload_image(
             and HF_USERNAME
             and os.environ.get("ENV", "development") == "production"
         ):
-            full_url = f"https://{HF_USERNAME.lower()}-{SPACE_NAME}.hf.space/static/uploads/{unique_filename}"
+            full_url = f"https://{HF_USERNAME.lower()}-{SPACE_NAME}.hf.space/static/uploads/{safe_filename}"
         else:
-            full_url = f"{request.base_url}static/uploads/{unique_filename}"
-
-        results.append({
-            "success": True,
-            "file_name": unique_filename,
-            "original_filename": original_filename,
-            "file_url": image_url,
-            "full_url": full_url,
-            "embed_html": f'<img src="{full_url}" alt="{original_filename}" />',
-            "base64_data": f"data:{mime_type};base64,{base64_encoded[:20]}...{base64_encoded[-20:]}",
-            "base64_embed": f'<img src="data:{mime_type};base64,{base64_encoded}" alt="{original_filename}" />',
-            "hashtags": hashtag_list
-        })
+            full_url = f"{request.base_url}static/uploads/{safe_filename}"
+
+        results.append(
+            {
+                "success": True,
+                "file_name": safe_filename,
+                "original_filename": original_filename,
+                "file_url": image_url,
+                "full_url": full_url,
+                "embed_html": f'<img src="{full_url}" alt="{original_filename}" />',
+                "base64_data": f"data:{mime_type};base64,{base64_encoded[:20]}...{base64_encoded[-20:]}",
+                "base64_embed": f'<img src="data:{mime_type};base64,{base64_encoded}" alt="{original_filename}" />',
+                "hashtags": hashtag_list,
+            }
+        )
 
     if len(results) == 1:
         return results[0]
@@ -660,17 +675,17 @@ async def upload_with_replace(
                 del metadata[old_filename]
                 save_image_metadata(metadata)
 
-        # Generate a unique filename to prevent overwrites
-        unique_filename = f"{uuid.uuid4()}{extension}"
+        # Generate a safe filename that preserves the original name
+        safe_filename = generate_safe_filename(original_filename)
 
         # Upload to both local storage and Hugging Face
-        upload_success = upload_to_hf_and_local(file_content, unique_filename)
+        upload_success = upload_to_hf_and_local(file_content, safe_filename)
 
         if not upload_success:
             continue  # Skip to next file if upload failed
 
         # Save hashtags and original filename
-        add_hashtags_to_image(unique_filename, hashtag_list, original_filename)
+        add_hashtags_to_image(safe_filename, hashtag_list, original_filename)
 
         # For base64 encoding
         base64_encoded = base64.b64encode(file_content).decode("utf-8")
@@ -686,7 +701,7 @@ async def upload_with_replace(
         }.get(extension, 'application/octet-stream')
 
         # Get direct image URL using Space URL if available
-        image_url = f"/static/uploads/{unique_filename}"  # Local URL
+        image_url = f"/static/uploads/{safe_filename}"  # Local URL
 
         # Full URL for embedding
         if (
@@ -694,21 +709,23 @@ async def upload_with_replace(
             and HF_USERNAME
             and os.environ.get("ENV", "development") == "production"
         ):
-            full_url = f"https://{HF_USERNAME.lower()}-{SPACE_NAME}.hf.space/static/uploads/{unique_filename}"
+            full_url = f"https://{HF_USERNAME.lower()}-{SPACE_NAME}.hf.space/static/uploads/{safe_filename}"
         else:
-            full_url = f"{request.base_url}static/uploads/{unique_filename}"
-
-        results.append({
-            "success": True,
-            "file_name": unique_filename,
-            "original_filename": original_filename,
-            "file_url": image_url,
-            "full_url": full_url,
-            "embed_html": f'<img src="{full_url}" alt="{original_filename}" />',
-            "base64_data": f"data:{mime_type};base64,{base64_encoded[:20]}...{base64_encoded[-20:]}",
-            "base64_embed": f'<img src="data:{mime_type};base64,{base64_encoded}" alt="{original_filename}" />',
-            "hashtags": hashtag_list
-        })
+            full_url = f"{request.base_url}static/uploads/{safe_filename}"
+
+        results.append(
+            {
+                "success": True,
+                "file_name": safe_filename,
+                "original_filename": original_filename,
+                "file_url": image_url,
+                "full_url": full_url,
+                "embed_html": f'<img src="{full_url}" alt="{original_filename}" />',
+                "base64_data": f"data:{mime_type};base64,{base64_encoded[:20]}...{base64_encoded[-20:]}",
+                "base64_embed": f'<img src="data:{mime_type};base64,{base64_encoded}" alt="{original_filename}" />',
+                "hashtags": hashtag_list,
+            }
+        )
 
     if len(results) == 1:
         return results[0]