Update app.py

app.py

@@ -3,34 +3,35 @@ import json
 import requests
 import shutil
 import time
+import traceback
 from typing import List, Optional
 from fastapi import FastAPI, HTTPException, UploadFile, File, Form, Body
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import FileResponse, JSONResponse
 from pydantic import BaseModel
+# Kita ganti hashing ke yang lebih stabil untuk debugging
 from passlib.context import CryptContext
 from datetime import datetime
 
 # --- KONFIGURASI ---
-app = FastAPI(title="BlackSpaces Brain v1.1")
+app = FastAPI(title="BlackSpaces Brain v1.2 (Debug Mode)")
 
-# JSONBIN CONFIG (USER DATABASE)
+# JSONBIN CONFIG
 JSONBIN_ID = "6962ebfe43b1c97be927b07d"
 JSONBIN_KEY = "$2a$10$khoKkhYEAUCG.O0xHDHiY.Ei88KlSV1l3olI2pxc86mUSsTaNpJx6"
 JSONBIN_URL = f"https://api.jsonbin.io/v3/b/{JSONBIN_ID}"
 
-# SECURITY
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+# SECURITY (Menggunakan scheme 'sha256_crypt' yang lebih compatible daripada bcrypt di beberapa env)
+pwd_context = CryptContext(schemes=["sha256_crypt"], deprecated="auto")
 
-# STORAGE (LOCAL HF - EPHEMERAL)
+# STORAGE
 GALLERY_DIR = "gallery_storage"
 if not os.path.exists(GALLERY_DIR):
     os.makedirs(GALLERY_DIR)
 
-# CORS (Agar Perchance bisa akses)
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"],  # Izinkan semua origin (Perchance)
+    allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
@@ -41,26 +42,22 @@ class UserAuth(BaseModel):
     username: str
     password: str
 
-class GalleryMeta(BaseModel):
-    username: str
-    prompt: str
-    neg_prompt: str
-    cfg: float
-    width: int
-    height: int
-    model_ver: str
-
-# --- HELPER FUNCTIONS ---
-
+# --- HELPER FUNCTIONS (WITH ERROR HANDLING) ---
 def get_users_db():
     headers = {"X-Master-Key": JSONBIN_KEY}
     try:
-        response = requests.get(JSONBIN_URL + "/latest", headers=headers)
+        response = requests.get(JSONBIN_URL + "/latest", headers=headers, timeout=10)
         if response.status_code == 200:
-            return response.json().get("record", {}).get("users", [])
-        return []
+            # Handle jika JSONBin mengembalikan struktur root yang berbeda
+            data = response.json()
+            if "record" in data:
+                return data["record"].get("users", [])
+            return data.get("users", [])
+        else:
+            print(f"JSONBin Error {response.status_code}: {response.text}")
+            return []
     except Exception as e:
-        print(f"Error fetching DB: {e}")
+        print(f"DB Connection Error: {e}")
         return []
 
 def update_users_db(users_list):
@@ -69,10 +66,18 @@ def update_users_db(users_list):
         "Content-Type": "application/json"
     }
     payload = {"users": users_list}
-    requests.put(JSONBIN_URL, headers=headers, json=payload)
+    try:
+        r = requests.put(JSONBIN_URL, headers=headers, json=payload, timeout=10)
+        if r.status_code >= 400:
+            print(f"Failed to save DB: {r.text}")
+    except Exception as e:
+        print(f"Save DB Exception: {e}")
 
 def verify_password(plain_password, hashed_password):
-    return pwd_context.verify(plain_password, hashed_password)
+    try:
+        return pwd_context.verify(plain_password, hashed_password)
+    except:
+        return False
 
 def get_password_hash(password):
     return pwd_context.hash(password)
@@ -81,122 +86,97 @@ def get_password_hash(password):
 
 @app.get("/")
 def home():
-    return {"status": "online", "system": "BlackSpaces Brain v1.1", "time": str(datetime.now())}
+    return {"status": "online", "system": "BlackSpaces Brain v1.2", "time": str(datetime.now())}
+
+@app.get("/ping")
+def ping():
+    return {"status": "alive"}
 
-# 1. AUTH SYSTEM
 @app.post("/auth/signup")
 def signup(user: UserAuth):
-    users = get_users_db()
-    
-    # Cek duplikat
-    for u in users:
-        if u['username'].lower() == user.username.lower():
-            raise HTTPException(status_code=400, detail="Username already taken")
-    
-    # Hash password & Simpan
-    hashed_pw = get_password_hash(user.password)
-    new_user = {
-        "username": user.username,
-        "password": hashed_pw, # Simpan hash, bukan plain text!
-        "joined_at": str(datetime.now())
-    }
-    
-    users.append(new_user)
-    update_users_db(users)
-    
-    return {"status": "success", "message": "User registered successfully"}
+    try:
+        print(f"Attempting signup for {user.username}")
+        users = get_users_db()
+        
+        # Cek duplikat
+        for u in users:
+            if u['username'].lower() == user.username.lower():
+                return JSONResponse(status_code=400, content={"status": "error", "detail": "Username already taken"})
+        
+        # Hash password
+        hashed_pw = get_password_hash(user.password)
+        
+        new_user = {
+            "username": user.username,
+            "password": hashed_pw,
+            "joined_at": str(datetime.now())
+        }
+        
+        users.append(new_user)
+        update_users_db(users)
+        
+        return {"status": "success", "message": "User registered successfully"}
+    except Exception as e:
+        error_msg = traceback.format_exc()
+        print(error_msg)
+        return JSONResponse(status_code=500, content={"status": "error", "detail": f"Server Error: {str(e)}"})
 
 @app.post("/auth/login")
 def login(user: UserAuth):
-    users = get_users_db()
-    
-    for u in users:
-        if u['username'].lower() == user.username.lower():
-            if verify_password(user.password, u['password']):
-                return {"status": "success", "username": u['username'], "token": "dummy-token-v1"} # Simplifikasi token
-            else:
-                raise HTTPException(status_code=401, detail="Invalid password")
-    
-    raise HTTPException(status_code=404, detail="User not found")
-
-# 2. GALLERY SYSTEM
-@app.post("/gallery/save")
-async def save_to_gallery(
-    username: str = Form(...),
-    prompt: str = Form(...),
-    meta: str = Form(...), # JSON string of other metadata
-    image: UploadFile = File(...)
-):
-    # Buat folder user jika belum ada
-    user_dir = os.path.join(GALLERY_DIR, username)
-    if not os.path.exists(user_dir):
-        os.makedirs(user_dir)
-    
-    # Generate Filename unik
-    timestamp = int(time.time())
-    filename_img = f"{timestamp}.jpg"
-    filename_meta = f"{timestamp}.json"
-    
-    path_img = os.path.join(user_dir, filename_img)
-    path_meta = os.path.join(user_dir, filename_meta)
-    
-    # Simpan Gambar
-    with open(path_img, "wb") as buffer:
-        shutil.copyfileobj(image.file, buffer)
+    try:
+        users = get_users_db()
         
-    # Simpan Metadata
-    metadata = {
-        "prompt": prompt,
-        "details": meta,
-        "date": str(datetime.now())
-    }
-    with open(path_meta, "w") as f:
-        json.dump(metadata, f)
+        for u in users:
+            if u['username'].lower() == user.username.lower():
+                if verify_password(user.password, u['password']):
+                    return {"status": "success", "username": u['username'], "token": "access-granted"}
+                else:
+                    return JSONResponse(status_code=401, content={"status": "error", "detail": "Wrong Password"})
         
-    return {"status": "success", "file_id": timestamp}
+        return JSONResponse(status_code=404, content={"status": "error", "detail": "User not found"})
+    except Exception as e:
+        return JSONResponse(status_code=500, content={"status": "error", "detail": f"Login Error: {str(e)}"})
+
+# Gallery endpoints tetap sama (dipersingkat untuk hemat karakter, tapi logic sama)
+@app.post("/gallery/save")
+async def save_to_gallery(username: str = Form(...), prompt: str = Form(...), meta: str = Form(...), image: UploadFile = File(...)):
+    try:
+        user_dir = os.path.join(GALLERY_DIR, username)
+        if not os.path.exists(user_dir): os.makedirs(user_dir)
+        timestamp = int(time.time())
+        path_img = os.path.join(user_dir, f"{timestamp}.jpg")
+        path_meta = os.path.join(user_dir, f"{timestamp}.json")
+        
+        with open(path_img, "wb") as buffer: shutil.copyfileobj(image.file, buffer)
+        metadata = {"prompt": prompt, "details": meta, "date": str(datetime.now())}
+        with open(path_meta, "w") as f: json.dump(metadata, f)
+            
+        return {"status": "success", "file_id": timestamp}
+    except Exception as e:
+        return JSONResponse(status_code=500, content={"status": "error", "detail": str(e)})
 
 @app.get("/gallery/{username}")
 def get_user_gallery(username: str):
-    user_dir = os.path.join(GALLERY_DIR, username)
-    if not os.path.exists(user_dir):
-        return {"images": []}
-    
-    # List semua gambar
-    images = []
-    for file in os.listdir(user_dir):
-        if file.endswith(".jpg"):
-            img_id = file.split(".")[0]
-            # Baca metadata
-            meta_path = os.path.join(user_dir, f"{img_id}.json")
-            meta_data = {}
-            if os.path.exists(meta_path):
-                with open(meta_path, "r") as f:
-                    meta_data = json.load(f)
-            
-            # Construct URL (HF Space URL logic needs to be handled in frontend, we send relative path)
-            images.append({
-                "id": img_id,
-                "url": f"/gallery/view/{username}/{file}",
-                "meta": meta_data
-            })
-    
-    # Sort by terbaru
-    images.sort(key=lambda x: x['id'], reverse=True)
-    return {"images": images}
+    try:
+        user_dir = os.path.join(GALLERY_DIR, username)
+        if not os.path.exists(user_dir): return {"images": []}
+        
+        images = []
+        for file in os.listdir(user_dir):
+            if file.endswith(".jpg"):
+                img_id = file.split(".")[0]
+                meta_path = os.path.join(user_dir, f"{img_id}.json")
+                meta_data = {}
+                if os.path.exists(meta_path):
+                    with open(meta_path, "r") as f: meta_data = json.load(f)
+                images.append({"id": img_id, "url": f"/gallery/view/{username}/{file}", "meta": meta_data})
+        images.sort(key=lambda x: x['id'], reverse=True)
+        return {"images": images}
+    except Exception as e:
+        return {"images": [], "error": str(e)}
 
 @app.get("/gallery/view/{username}/{filename}")
 def view_image(username: str, filename: str):
-    file_path = os.path.join(GALLERY_DIR, username, filename)
-    if os.path.exists(file_path):
-        return FileResponse(file_path)
-    raise HTTPException(status_code=404, detail="Image not found")
-
-# 3. KEEP ALIVE (PING)
-@app.get("/ping")
-def ping():
-    return {"status": "alive", "timestamp": time.time()}
-
-# Jalankan server
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    path = os.path.join(GALLERY_DIR, username, filename)
+    if os.path.exists(path): return FileResponse(path)
+    raise HTTPException(status_code=404, detail="Not found")