[Feat] Add user history (#9)

- Update README.md (40937a297f3253c08c0bcb3f68692a39e2948706)
- Update requirements.txt (d673a8260634704122c03692c40acd0d9e6f41bb)
- Update app.py (70cd9d271ce767eada9427aab751b9f8f3c73451)
- Create gallery_history.py (c08f6e3cbb28492165c1d9c7d63d72a174f8741c)
- Update gallery_history.py (2d15147a69c3cb16f6660a65c863d157ea4d06a3)


Co-authored-by: Lucain Pouget <[email protected]>

README.md

@@ -8,6 +8,7 @@ sdk_version: 3.44.3
 app_file: app.py
 pinned: false
 license: openrail
+hf_oauth: true
 ---
 
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

app.py

@@ -12,6 +12,7 @@ from diffusers import (
     EulerDiscreteScheduler  # <-- Added import
 )
 from share_btn import community_icon_html, loading_icon_html, share_js
+from gallery_history import fetch_gallery_history, show_gallery_history
 from illusion_style import css
 
 BASE_MODEL = "SG161222/Realistic_Vision_V5.1_noVAE"
@@ -125,11 +126,15 @@ with gr.Blocks(css=css) as app:
                 community_icon = gr.HTML(community_icon_html)
                 loading_icon = gr.HTML(loading_icon_html)
                 share_button = gr.Button("Share to community", elem_id="share-btn")
-            
+
+    history = show_gallery_history()
+
     run_btn.click(
         inference,
         inputs=[control_image, prompt, negative_prompt, guidance_scale, controlnet_conditioning_scale, seed, sampler],
         outputs=[result_image, share_group]
+    ).then(
+        fn=fetch_gallery_history, inputs=[prompt, result_image], outputs=history
     )
     share_button.click(None, [], [], _js=share_js)
 app.queue(max_size=20)

gallery_history.py

@@ -0,0 +1,128 @@
+"""
+How to use:
+1. Create a Space with a Persistent Storage attached. Filesystem will be available under `/data`.
+2. Add `hf_oauth: true` to the Space metadata (README.md). Make sure to have Gradio>=3.41.0 configured.
+3. Add `HISTORY_FOLDER` as a Space variable (example. `"/data/history"`).
+4. Add `filelock` as dependency in `requirements.txt`.
+5. Add history gallery to your Gradio app:
+    a. Add imports: `from gallery_history import fetch_gallery_history, show_gallery_history`
+    a. Add `history = show_gallery_history()` within `gr.Blocks` context.
+    b. Add `.then(fn=fetch_gallery_history, inputs=[prompt, result], outputs=history)` on the generate event.
+"""
+import json
+import os
+import numpy as np
+import shutil
+from pathlib import Path
+from PIL import Image
+from typing import Dict, List, Optional, Tuple
+from uuid import uuid4
+
+import gradio as gr
+from filelock import FileLock
+
+_folder = os.environ.get("HISTORY_FOLDER")
+if _folder is None:
+    print(
+        "'HISTORY_FOLDER' environment variable not set. User history will be saved "
+        "locally and will be lost when the Space instance is restarted."
+    )
+    _folder = Path(__file__).parent / "history"
+HISTORY_FOLDER_PATH = Path(_folder)
+
+IMAGES_FOLDER_PATH = HISTORY_FOLDER_PATH / "images"
+IMAGES_FOLDER_PATH.mkdir(parents=True, exist_ok=True)
+
+
+def show_gallery_history():
+    gr.Markdown(
+        "## Your past generations\n\n(Log in to keep a gallery of your previous generations."
+        " Your history will be saved and available on your next visit.)"
+    )
+    with gr.Column():
+        with gr.Row():
+            gr.LoginButton(min_width=250)
+            gr.LogoutButton(min_width=250)
+        gallery = gr.Gallery(
+            label="Past images",
+            show_label=True,
+            elem_id="gallery",
+            object_fit="contain",
+            columns=4,
+            height=512,
+            preview=False,
+            show_share_button=False,
+            show_download_button=False,
+        )
+        gr.Markdown(
+            "Make sure to save your images from time to time, this gallery may be deleted in the future."
+        )
+        gallery.attach_load_event(fetch_gallery_history, every=None)
+        return gallery
+
+
+def fetch_gallery_history(
+    prompt: Optional[str] = None,
+    result: Optional[np.ndarray] = None,
+    user: Optional[gr.OAuthProfile] = None,
+):
+    if user is None:
+        return []
+    try:
+        if prompt is not None and result is not None:  # None values means no new images
+            new_image = Image.fromarray(result, 'RGB')
+            return _update_user_history(user["preferred_username"], new_image, prompt)
+        else:
+            return _read_user_history(user["preferred_username"])
+    except Exception as e:
+        raise gr.Error(f"Error while fetching history: {e}") from e
+
+
+####################
+# Internal helpers #
+####################
+
+
+def _read_user_history(username: str) -> List[Tuple[str, str]]:
+    """Return saved history for that user."""
+    with _user_lock(username):
+        path = _user_history_path(username)
+        if path.exists():
+            return json.loads(path.read_text())
+        return []  # No history yet
+
+
+def _update_user_history(
+    username: str, new_image: Image.Image, prompt: str
+) -> List[Tuple[str, str]]:
+    """Update history for that user and return it."""
+    with _user_lock(username):
+        # Read existing
+        path = _user_history_path(username)
+        if path.exists():
+            images = json.loads(path.read_text())
+        else:
+            images = []  # No history yet
+
+        # Copy image to persistent folder
+        images = [(_copy_image(new_image), prompt)] + images
+
+        # Save and return
+        path.write_text(json.dumps(images))
+        return images
+
+
+def _user_history_path(username: str) -> Path:
+    return HISTORY_FOLDER_PATH / f"{username}.json"
+
+
+def _user_lock(username: str) -> FileLock:
+    """Ensure history is not corrupted if concurrent calls."""
+    return FileLock(f"{_user_history_path(username)}.lock")
+
+
+def _copy_image(new_image: Image.Image) -> str:
+    """Copy image to the persistent storage."""
+    dst = str(IMAGES_FOLDER_PATH / f"{uuid4().hex}.png")
+    new_image.save(dst)
+    return dst

requirements.txt

@@ -5,4 +5,5 @@ torch
 xformers
 gradio
 Pillow
-qrcode
+qrcode
+filelock