Spaces:

DLPO
/

mbok_dev

Running on CPU Upgrade

App Files Files Community

Renecto commited on 12 days ago

Commit

a4bd58d

verified ·

1 Parent(s): e575259

feat: add /reset-password page

Browse files

Files changed (3) hide show

app.py +158 -2
bootstrap.py +117 -117
requirements.txt +1 -0

app.py CHANGED Viewed

@@ -12,8 +12,8 @@ import logging
 logging.getLogger("uvicorn.access").setLevel(logging.WARNING)
 from pathlib import Path
-from fastapi import FastAPI, Request, Depends, HTTPException
-from fastapi.responses import RedirectResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from starlette.middleware.base import BaseHTTPMiddleware
 import gradio as gr
@@ -370,6 +370,162 @@ async def healthz():
     print(f"[HEALTHZ] {status}")
     return JSONResponse(content=status)
 print("[ROUTES] Root, logout, and healthz routes registered")
 # --- Mount Gradio UIs ---

 logging.getLogger("uvicorn.access").setLevel(logging.WARNING)
 from pathlib import Path
+from fastapi import FastAPI, Request, Depends, HTTPException, Form
+from fastapi.responses import RedirectResponse, JSONResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from starlette.middleware.base import BaseHTTPMiddleware
 import gradio as gr
     print(f"[HEALTHZ] {status}")
     return JSONResponse(content=status)
+_RESET_PASSWORD_HTML = """<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>パスワード再設定</title>
+  <style>
+    * {{ box-sizing: border-box; margin: 0; padding: 0; }}
+    body {{
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+      background: #f5f5f5;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-height: 100vh;
+    }}
+    .card {{
+      background: #fff;
+      border-radius: 12px;
+      box-shadow: 0 2px 16px rgba(0,0,0,0.1);
+      padding: 40px;
+      width: 100%;
+      max-width: 400px;
+    }}
+    h1 {{ font-size: 1.4rem; margin-bottom: 24px; color: #333; }}
+    label {{ display: block; font-size: 0.85rem; color: #555; margin-bottom: 6px; }}
+    input[type=password] {{
+      width: 100%;
+      padding: 10px 14px;
+      border: 1px solid #ddd;
+      border-radius: 8px;
+      font-size: 1rem;
+      margin-bottom: 16px;
+      outline: none;
+      transition: border 0.2s;
+    }}
+    input[type=password]:focus {{ border-color: #f97316; }}
+    button {{
+      width: 100%;
+      padding: 12px;
+      background: #f97316;
+      color: #fff;
+      border: none;
+      border-radius: 8px;
+      font-size: 1rem;
+      cursor: pointer;
+      transition: background 0.2s;
+    }}
+    button:hover {{ background: #ea6c0a; }}
+    .msg {{ margin-top: 16px; font-size: 0.9rem; color: #e53e3e; text-align: center; }}
+    .msg.success {{ color: #38a169; }}
+  </style>
+</head>
+<body>
+  <div class="card">
+    <h1>🔑 パスワード再設定</h1>
+    <form method="post" action="/reset-password" id="resetForm">
+      <input type="hidden" name="access_token" id="access_token">
+      <input type="hidden" name="refresh_token" id="refresh_token">
+      <label for="new_password">新しいパスワード</label>
+      <input type="password" name="new_password" id="new_password" placeholder="8文字以上" required minlength="8">
+      <label for="confirm_password">確認（再入力）</label>
+      <input type="password" id="confirm_password" placeholder="同じパスワードを入力" required minlength="8">
+      <button type="submit">パスワードを変更する</button>
+    </form>
+    <div class="msg" id="msg">{message}</div>
+  </div>
+  <script>
+    // URLフラグメントからSupabaseのトークンを取得してhidden inputにセット
+    (function() {{
+      var hash = window.location.hash.substring(1);
+      var params = {{}};
+      hash.split('&').forEach(function(part) {{
+        var kv = part.split('=');
+        if (kv.length === 2) params[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+      }});
+      if (params.access_token) {{
+        document.getElementById('access_token').value = params.access_token;
+      }}
+      if (params.refresh_token) {{
+        document.getElementById('refresh_token').value = params.refresh_token;
+      }}
+      if (!params.access_token && !params.refresh_token) {{
+        document.getElementById('msg').textContent = '⚠️ 無効なリンクです。パスワードリセットメールを再送してください。';
+      }}
+    }})();
+    // パスワード一致チェック
+    document.getElementById('resetForm').addEventListener('submit', function(e) {{
+      var pw = document.getElementById('new_password').value;
+      var cpw = document.getElementById('confirm_password').value;
+      if (pw !== cpw) {{
+        e.preventDefault();
+        document.getElementById('msg').textContent = '❌ パスワードが一致しません。';
+      }}
+    }});
+  </script>
+</body>
+</html>"""
+@app.get("/reset-password")
+async def reset_password_page():
+    """パスワード再設定フォームを表示"""
+    return HTMLResponse(_RESET_PASSWORD_HTML.format(message=""))
+@app.post("/reset-password")
+async def reset_password_submit(
+    access_token: str = Form(default=""),
+    refresh_token: str = Form(default=""),
+    new_password: str = Form(...),
+):
+    """パスワード再設定を実行"""
+    if not access_token:
+        html = _RESET_PASSWORD_HTML.format(message="❌ トークンが取得できませんでした。メールのリンクを再度クリックしてください。")
+        return HTMLResponse(html, status_code=400)
+    if len(new_password) < 8:
+        html = _RESET_PASSWORD_HTML.format(message="❌ パスワードは8文字以上で設定してください。")
+        return HTMLResponse(html, status_code=400)
+    try:
+        supabase.auth.set_session(access_token, refresh_token)
+        supabase.auth.update_user({"password": new_password})
+        log_event("auth", "password_reset_success")
+        success_html = """<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="refresh" content="3;url=/login/">
+  <title>パスワード変更完了</title>
+  <style>
+    body {{ font-family: -apple-system, sans-serif; display: flex; align-items: center;
+           justify-content: center; min-height: 100vh; background: #f5f5f5; }}
+    .card {{ background: #fff; border-radius: 12px; padding: 40px; text-align: center;
+             box-shadow: 0 2px 16px rgba(0,0,0,0.1); max-width: 360px; width: 100%; }}
+    h1 {{ color: #38a169; margin-bottom: 12px; }}
+    p {{ color: #555; font-size: 0.95rem; }}
+  </style>
+</head>
+<body>
+  <div class="card">
+    <h1>✅ パスワードを変更しました</h1>
+    <p>3秒後にログイン画面に移動します...</p>
+    <p><a href="/login/">今すぐログイン画面へ</a></p>
+  </div>
+</body>
+</html>"""
+        return HTMLResponse(success_html)
+    except Exception as e:
+        print(f"[AUTH] Password reset failed: {e}")
+        log_event("auth", "password_reset_failure", level="WARNING", metadata={"error": str(e)})
+        html = _RESET_PASSWORD_HTML.format(message=f"❌ エラーが発生しました: {str(e)}")
+        return HTMLResponse(html, status_code=400)
 print("[ROUTES] Root, logout, and healthz routes registered")
 # --- Mount Gradio UIs ---

bootstrap.py CHANGED Viewed

@@ -1,117 +1,117 @@
-#!/usr/bin/env python3
-"""
-Bootstrap module - Downloads ver20 from private DLPO/habadashi Space
-"""
-import os
-from pathlib import Path
-from huggingface_hub import snapshot_download
-def get_hf_token():
-    """Get HF_TOKEN from environment variable"""
-    token = os.environ.get("HF_TOKEN")
-    if not token:
-        print("[BOOTSTRAP_ERROR] HF_TOKEN not found in environment")
-        raise ValueError(
-            "HF_TOKEN not found. Please set HF_TOKEN environment variable "
-            "in HF Space Secrets to access private repository."
-        )
-    print(f"[BOOTSTRAP] HF_TOKEN found (length: {len(token)}, 末尾3文字: ...{token[-3:]})")
-    return token
-def download_private_app(force_download: bool = False):
-    """
-    Download ver20 application from private DLPO/habadashi Space
-    Args:
-        force_download: If True, re-download even if already cached
-    Returns:
-        Path: Local directory containing downloaded ver20 files
-    """
-    repo_id = "DLPO/habadashi"
-    repo_type = "space"
-    local_dir = Path("./private_app")
-    print(f"[BOOTSTRAP] Starting download")
-    print(f"[BOOTSTRAP] repo_id={repo_id} repo_type={repo_type}")
-    print(f"[BOOTSTRAP] local_dir={local_dir} force_download={force_download}")
-    print(f"[BOOTSTRAP] local_dir.exists()={local_dir.exists()}")
-    # Check if already downloaded (skip if exists and not forced)
-    if local_dir.exists() and not force_download:
-        # Verify essential files exist
-        app_py = local_dir / "app.py"
-        print(f"[BOOTSTRAP] Checking cache: app.py exists={app_py.exists()}")
-        if app_py.exists():
-            print(f"[BOOTSTRAP] Using cached download: {local_dir}")
-            # Verify structure
-            _verify_downloaded_structure(local_dir)
-            return local_dir
-        else:
-            print(f"[BOOTSTRAP] Cache invalid (app.py missing), will re-download")
-    print(f"[BOOTSTRAP] Starting fresh download from {repo_id}...")
-    try:
-        token = get_hf_token()
-        # Download entire Space repository (removed local_dir_use_symlinks - deprecated)
-        print(f"[BOOTSTRAP] Calling snapshot_download...")
-        snapshot_download(
-            repo_id=repo_id,
-            repo_type=repo_type,
-            local_dir=str(local_dir),
-            token=token,
-        )
-        print(f"[BOOTSTRAP] Download complete: {local_dir}")
-        # Verify essential structure
-        _verify_downloaded_structure(local_dir)
-        return local_dir
-    except Exception as e:
-        print(f"[BOOTSTRAP_ERROR] Download failed: {e}")
-        import traceback
-        print(f"[TRACEBACK]\n{traceback.format_exc()}")
-        raise
-def _verify_downloaded_structure(local_dir: Path):
-    """Verify downloaded structure has essential components"""
-    print(f"[BOOTSTRAP_VERIFY] Checking downloaded structure...")
-    essential_files = [
-        "app.py",
-        "requirements.txt",
-    ]
-    essential_dirs = [
-        "lib",
-        "exec",
-        "core",
-        "presentation",
-    ]
-    for file_name in essential_files:
-        file_path = local_dir / file_name
-        exists = file_path.exists()
-        print(f"[BOOTSTRAP_VERIFY] {file_name}: {'EXISTS' if exists else 'MISSING'}")
-        if not exists and file_name == "app.py":
-            raise FileNotFoundError(
-                f"Critical file missing: {file_name}. "
-                f"Expected at: {file_path}"
-            )
-    for dir_name in essential_dirs:
-        dir_path = local_dir / dir_name
-        exists = dir_path.exists() and dir_path.is_dir()
-        print(f"[BOOTSTRAP_VERIFY] {dir_name}/: {'EXISTS' if exists else 'MISSING'}")
-    print(f"[BOOTSTRAP_VERIFY] Verification complete")
-if __name__ == "__main__":
-    # Test download
-    download_private_app()
-    print("🎉 Bootstrap test successful!")

+#!/usr/bin/env python3
+"""
+Bootstrap module - Downloads ver20 from private DLPO/habadashi Space
+"""
+import os
+from pathlib import Path
+from huggingface_hub import snapshot_download
+def get_hf_token():
+    """Get HF_TOKEN from environment variable"""
+    token = os.environ.get("HF_TOKEN")
+    if not token:
+        print("[BOOTSTRAP_ERROR] HF_TOKEN not found in environment")
+        raise ValueError(
+            "HF_TOKEN not found. Please set HF_TOKEN environment variable "
+            "in HF Space Secrets to access private repository."
+        )
+    print(f"[BOOTSTRAP] HF_TOKEN found (length: {len(token)}, 末尾3文字: ...{token[-3:]})")
+    return token
+def download_private_app(force_download: bool = False):
+    """
+    Download ver20 application from private DLPO/habadashi Space
+    Args:
+        force_download: If True, re-download even if already cached
+    Returns:
+        Path: Local directory containing downloaded ver20 files
+    """
+    repo_id = "DLPO/habadashi"
+    repo_type = "space"
+    local_dir = Path("./private_app")
+    print(f"[BOOTSTRAP] Starting download")
+    print(f"[BOOTSTRAP] repo_id={repo_id} repo_type={repo_type}")
+    print(f"[BOOTSTRAP] local_dir={local_dir} force_download={force_download}")
+    print(f"[BOOTSTRAP] local_dir.exists()={local_dir.exists()}")
+    # Check if already downloaded (skip if exists and not forced)
+    if local_dir.exists() and not force_download:
+        # Verify essential files exist
+        app_py = local_dir / "app.py"
+        print(f"[BOOTSTRAP] Checking cache: app.py exists={app_py.exists()}")
+        if app_py.exists():
+            print(f"[BOOTSTRAP] Using cached download: {local_dir}")
+            # Verify structure
+            _verify_downloaded_structure(local_dir)
+            return local_dir
+        else:
+            print(f"[BOOTSTRAP] Cache invalid (app.py missing), will re-download")
+    print(f"[BOOTSTRAP] Starting fresh download from {repo_id}...")
+    try:
+        token = get_hf_token()
+        # Download entire Space repository (removed local_dir_use_symlinks - deprecated)
+        print(f"[BOOTSTRAP] Calling snapshot_download...")
+        snapshot_download(
+            repo_id=repo_id,
+            repo_type=repo_type,
+            local_dir=str(local_dir),
+            token=token,
+        )
+        print(f"[BOOTSTRAP] Download complete: {local_dir}")
+        # Verify essential structure
+        _verify_downloaded_structure(local_dir)
+        return local_dir
+    except Exception as e:
+        print(f"[BOOTSTRAP_ERROR] Download failed: {e}")
+        import traceback
+        print(f"[TRACEBACK]\n{traceback.format_exc()}")
+        raise
+def _verify_downloaded_structure(local_dir: Path):
+    """Verify downloaded structure has essential components"""
+    print(f"[BOOTSTRAP_VERIFY] Checking downloaded structure...")
+    essential_files = [
+        "app.py",
+        "requirements.txt",
+    ]
+    essential_dirs = [
+        "lib",
+        "exec",
+        "core",
+        "presentation",
+    ]
+    for file_name in essential_files:
+        file_path = local_dir / file_name
+        exists = file_path.exists()
+        print(f"[BOOTSTRAP_VERIFY] {file_name}: {'EXISTS' if exists else 'MISSING'}")
+        if not exists and file_name == "app.py":
+            raise FileNotFoundError(
+                f"Critical file missing: {file_name}. "
+                f"Expected at: {file_path}"
+            )
+    for dir_name in essential_dirs:
+        dir_path = local_dir / dir_name
+        exists = dir_path.exists() and dir_path.is_dir()
+        print(f"[BOOTSTRAP_VERIFY] {dir_name}/: {'EXISTS' if exists else 'MISSING'}")
+    print(f"[BOOTSTRAP_VERIFY] Verification complete")
+if __name__ == "__main__":
+    # Test download
+    download_private_app()
+    print("🎉 Bootstrap test successful!")

requirements.txt CHANGED Viewed

@@ -5,6 +5,7 @@ gradio>=5.34.1
 supabase
 python-multipart
 huggingface_hub
 # ver20 dependencies (from ver20/requirements.txt)
 gradio_client

 supabase
 python-multipart
 huggingface_hub
+python-dotenv
 # ver20 dependencies (from ver20/requirements.txt)
 gradio_client