13

app.py

@@ -1,25 +1,24 @@
 # app.py
-import os, re, json, logging, threading
+# PapuaTranslate — Flask + SQLAlchemy + Supabase + mT5-LoRA (lazy load)
+import os, re, logging, threading
 from datetime import datetime, timezone
 from functools import wraps
-from typing import Optional, Tuple, List
 from flask import Flask, render_template, request, redirect, url_for, session, jsonify, flash
 
+# ===== Logging =====
 logging.basicConfig(level=logging.INFO, format="%(asctime)s | %(levelname)s | %(message)s")
 log = logging.getLogger("papua-app")
 
-# ==== GANTI: pakai folder 'templates' (atau pastikan file HTML ada di 'frontend') ====
+# ===== Flask (templates di folder 'templates') =====
 app = Flask(__name__, template_folder="templates", static_folder="static")
-
-# cookie aman di HF (HTTPS). Untuk lokal bisa set False via ENV.
-SESSION_SECURE = os.getenv("SESSION_COOKIE_SECURE", "true").lower() in ("1","true","yes")
+SESSION_SECURE = os.getenv("SESSION_COOKIE_SECURE", "true").lower() in ("1", "true", "yes")
 app.config.update(
     SECRET_KEY=os.getenv("SECRET_KEY", "dev-secret-change-me"),
     SESSION_COOKIE_SAMESITE="Lax",
     SESSION_COOKIE_SECURE=SESSION_SECURE,
 )
 
-# ================= DB =================
+# ===== DB: SQLAlchemy (Supabase Postgres / SQLite fallback) =====
 from sqlalchemy import create_engine, Column, Integer, Text, DateTime, ForeignKey, func
 from sqlalchemy.orm import declarative_base, sessionmaker, scoped_session, relationship
 
@@ -28,7 +27,7 @@ if not DATABASE_URL:
     DATABASE_URL = "sqlite:////tmp/app.db"
     log.warning("[DB] DATABASE_URL tidak diset; pakai SQLite /tmp/app.db")
 else:
-    # normalisasi skema lama
+    # normalisasi skema lama → psycopg2 driver
     if DATABASE_URL.startswith("postgres://"):
         DATABASE_URL = DATABASE_URL.replace("postgres://", "postgresql+psycopg2://", 1)
     elif DATABASE_URL.startswith("postgresql://"):
@@ -60,11 +59,11 @@ class Translation(Base):
 
 try:
     Base.metadata.create_all(engine)
-    log.info("[DB] Ready: %s", DATABASE_URL)
+    log.info("[DB] Ready")
 except Exception as e:
     log.exception("[DB] init error: %s", e)
 
-# ================= Auth =================
+# ===== Auth helpers =====
 from werkzeug.security import generate_password_hash, check_password_hash
 def set_password(user: User, raw: str): user.pass_hash = generate_password_hash(raw)
 def verify_password(user: User, raw: str) -> bool:
@@ -79,25 +78,28 @@ def login_required(fn):
         return fn(*args, **kwargs)
     return _wrap
 
-# ================= Prenorm =================
+# ===== Prenorm (heuristik ringan) =====
 PAPUA_MAP = {
     r"\bsa\b": "saya", r"\bko\b": "kamu", r"\btra\b": "tidak", r"\bndak\b": "tidak",
     r"\bmo\b": "mau", r"\bpu\b": "punya", r"\bsu\b": "sudah", r"\bkong\b": "kemudian",
 }
 def prenorm(text: str) -> str:
     t = re.sub(r"\s+", " ", text.strip())
-    t = t.replace("…","...").replace("–","-").replace("—","-")
+    t = t.replace("…", "...").replace("–", "-").replace("—", "-")
     for pat, repl in PAPUA_MAP.items(): t = re.sub(pat, repl, t, flags=re.IGNORECASE)
     return t
 
-# ================= Model (lazy) =================
+# ===== Model (lazy-load LoRA) =====
 from transformers import AutoTokenizer, AutoModelForSeq2SeqLM
 from peft import PeftModel
 
 BASE_MODEL_ID = os.getenv("BASE_MODEL_ID", "amosnbn/cendol-mt5-base-inst")
 ADAPTER_ID    = os.getenv("ADAPTER_ID", "amosnbn/papua-lora-ckpt-168")
-DEVICE        = "cuda" if os.getenv("DEVICE","cpu") == "cuda" else "cpu"
-TOK = None; MODEL = None; _MODEL_LOCK = threading.Lock()
+DEVICE        = "cuda" if os.getenv("DEVICE", "cpu") == "cuda" else "cpu"
+
+TOK = None
+MODEL = None
+_MODEL_LOCK = threading.Lock()
 
 def _load_model():
     global TOK, MODEL
@@ -112,19 +114,24 @@ def get_model():
     global MODEL
     if MODEL is None:
         with _MODEL_LOCK:
-            if MODEL is None: _load_model()
+            if MODEL is None:
+                _load_model()
     return TOK, MODEL
 
 def translate_with_model(text: str, max_new_tokens: int = 48) -> str:
     tok, m = get_model()
     inputs = tok([text], return_tensors="pt").to(DEVICE)
     outputs = m.generate(
-        **inputs, max_new_tokens=max_new_tokens, num_beams=4,
-        length_penalty=0.9, no_repeat_ngram_size=3, early_stopping=True,
+        **inputs,
+        max_new_tokens=max_new_tokens,
+        num_beams=4,
+        length_penalty=0.9,
+        no_repeat_ngram_size=3,
+        early_stopping=True,
     )
     return tok.decode(outputs[0], skip_special_tokens=True)
 
-# ================= Utilities =================
+# ===== Little utils / logging =====
 @app.before_request
 def _log_req():
     if request.path not in ("/health", "/ping", "/favicon.ico"):
@@ -132,48 +139,58 @@ def _log_req():
 
 @app.errorhandler(Exception)
 def _err(e):
-    # supaya 500 kelihatan jelas di Logs HF
     log.exception("Unhandled error")
     return "Internal Server Error", 500
 
-# ================= Routes =================
-@app.get("/health"); @app.get("/ping")
-def health(): return jsonify({"ok": True, "time": datetime.now(timezone.utc).isoformat()})
+# ===== Routes =====
+@app.get("/health")
+@app.get("/ping")
+def health():
+    return jsonify({"ok": True, "time": datetime.now(timezone.utc).isoformat()})
 
 @app.get("/login")
-def login_get(): return render_template("login.html")
+def login_get():
+    return render_template("login.html")
 
 @app.post("/login")
 def login_post():
     email = (request.form.get("email") or "").strip().lower()
     pwd   = request.form.get("password") or ""
     if not email or not pwd:
-        flash("Isi email dan password", "error"); return redirect(url_for("login_get"))
+        flash("Isi email dan password", "error")
+        return redirect(url_for("login_get"))
     with SessionLocal() as s:
         u = s.query(User).filter_by(email=email).first()
         if not u or not verify_password(u, pwd):
-            flash("Email atau password salah", "error"); return redirect(url_for("login_get"))
+            flash("Email atau password salah", "error")
+            return redirect(url_for("login_get"))
         session["uid"], session["email"] = u.id, u.email
-        return redirect(url_for("index"))
+    return redirect(url_for("index"))
 
 @app.get("/register")
-def register_get(): return render_template("register.html")
+def register_get():
+    return render_template("register.html")
 
 @app.post("/register")
 def register_post():
     email = (request.form.get("email") or "").strip().lower()
     pwd   = request.form.get("password") or ""
     if not email or not pwd:
-        flash("Isi email dan password", "error"); return redirect(url_for("register_get"))
+        flash("Isi email dan password", "error")
+        return redirect(url_for("register_get"))
     with SessionLocal() as s:
         if s.query(User).filter_by(email=email).first():
-            flash("Email sudah terdaftar", "error"); return redirect(url_for("register_get"))
-        u = User(email=email); set_password(u, pwd); s.add(u); s.commit()
+            flash("Email sudah terdaftar", "error")
+            return redirect(url_for("register_get"))
+        u = User(email=email); set_password(u, pwd)
+        s.add(u); s.commit()
         session["uid"], session["email"] = u.id, u.email
     return redirect(url_for("index"))
 
 @app.get("/logout")
-def logout(): session.clear(); return redirect(url_for("login_get"))
+def logout():
+    session.clear()
+    return redirect(url_for("login_get"))
 
 @app.get("/")
 @login_required
@@ -181,33 +198,36 @@ def index():
     with SessionLocal() as s:
         uid = session["uid"]
         items = (s.query(Translation)
-                   .filter(Translation.user_id == uid)
-                   .order_by(Translation.id.desc()).limit(10).all())
+                 .filter(Translation.user_id == uid)
+                 .order_by(Translation.id.desc())
+                 .limit(10).all())
         data = [{"src": it.src, "mt": it.mt, "created_at": it.created_at} for it in items]
-    # ==== GANTI: kirim variabel yang dipakai template ====
-    return render_template("index.html",
-                           user=session.get("email"),
-                           data=data,
-                           device=DEVICE)
+    # index.html kamu memakai 'user' & 'data'
+    return render_template("index.html", user=session.get("email"), data=data, device=DEVICE)
 
 @app.get("/about")
-def about_page(): return render_template("about.html")
+def about_page():
+    return render_template("about.html")
 
 @app.post("/translate")
 def api_translate():
-    if not session.get("uid"): return jsonify({"error": "Unauthorized"}), 401
+    if not session.get("uid"):
+        return jsonify({"error": "Unauthorized"}), 401
     payload = request.get_json(silent=True) or {}
     text = (payload.get("text") or "").strip()
     max_new = int(payload.get("max_new_tokens", 48))
-    if not text: return jsonify({"error": "Empty text"}), 400
+    if not text:
+        return jsonify({"error": "Empty text"}), 400
     try:
-        clean = prenorm(text); mt = translate_with_model(clean, max_new_tokens=max_new)
+        clean = prenorm(text)
+        mt = translate_with_model(clean, max_new_tokens=max_new)
         with SessionLocal() as s:
-            s.add(Translation(user_id=session["uid"], src=text, mt=mt)); s.commit()
+            s.add(Translation(user_id=session["uid"], src=text, mt=mt))
+            s.commit()
         return jsonify({"mt": mt})
-    except Exception as e:
+    except Exception:
         log.exception("translate error")
         return jsonify({"error": "server error"}), 500
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=int(os.getenv("PORT","7860")), debug=False)
+    app.run(host="0.0.0.0", port=int(os.getenv("PORT", "7860")), debug=False)