Update app.py

app.py

@@ -1,108 +1,187 @@
+# app.py — FastAPI-only (no WebSockets/SSE)
 import os
-import gradio as gr
-from dotenv import load_dotenv
+from typing import List, Optional, Tuple
+
+from fastapi import FastAPI
+from fastapi.responses import HTMLResponse, JSONResponse
+from pydantic import BaseModel, Field
 from openai import OpenAI
+
+# --- Your prompts (edit these files in /prompts) ---
 from prompts.initial_prompt import INITIAL_PROMPT
 from prompts.main_prompt import MAIN_PROMPT
 
-# .env 파일에서 OPENAI_API_KEY 로드
-if os.path.exists(".env"):
-    load_dotenv(".env")
-
+# Read key from Hugging Face Secret (Settings → Variables and secrets)
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
+if not OPENAI_API_KEY:
+    print("WARNING: OPENAI_API_KEY secret is not set. Set it in the Space settings.")
 client = OpenAI(api_key=OPENAI_API_KEY)
 
-
-
-def gpt_call(history, user_message,
-             model="gpt-4o-mini",
-             max_tokens=512,
-             temperature=0.7,
-             top_p=0.95):
-    """
-    OpenAI ChatCompletion API를 통해 답변을 생성하는 함수.
-    - history: [(user_text, assistant_text), ...]
-    - user_message: 사용자가 방금 입력한 메시지
-    """
-    # 1) 시스템 메시지(=MAIN_PROMPT)를 가장 앞에 추가
-    messages = [{"role": "system", "content": MAIN_PROMPT}]
-    
-    # 2) 기존 대화 기록(history)을 OpenAI 형식으로 변환
-    #    user_text -> 'user' / assistant_text -> 'assistant'
-    for user_text, assistant_text in history:
-        if user_text:
-            messages.append({"role": "user", "content": user_text})
-        if assistant_text:
-            messages.append({"role": "assistant", "content": assistant_text})
-
-    # 3) 마지막에 이번 사용자의 입력을 추가
-    messages.append({"role": "user", "content": user_message})
-
-    # 4) OpenAI API 호출
-    completion = client.chat.completions.create(
-        model=model,
-        messages=messages,
-        max_tokens=max_tokens,
-        temperature=temperature,
-        top_p=top_p
+# ---------- Models for API I/O ----------
+class ChatIn(BaseModel):
+    message: str = Field("", description="The latest user message.")
+    # Optional: carry conversation history as a list of [user, assistant] turns
+    history: Optional[List[Tuple[str, str]]] = Field(
+        default=None,
+        description="Optional history as list of (user, assistant) tuples."
     )
-    return completion.choices[0].message.content
-
-def respond(user_message, history):
+    model: str = Field(default="gpt-4o-mini")
+    temperature: float = Field(default=0.7)
+    top_p: float = Field(default=0.95)
+    max_tokens: int = Field(default=600)
+
+class ChatOut(BaseModel):
+    reply: str
+
+# ---------- Core non-streaming OpenAI call (server-side) ----------
+def generate_reply(
+    user_message: str,
+    history: Optional[List[Tuple[str, str]]] = None,
+    model: str = "gpt-4o-mini",
+    temperature: float = 0.7,
+    top_p: float = 0.95,
+    max_tokens: int = 600,
+) -> str:
     """
-    Gradio 상에서 submit할 때 호출되는 함수
-    - user_message: 사용자가 방금 친 메시지
-    - history: 기존 (user, assistant) 튜플 리스트
+    Builds messages as:
+      system: MAIN_PROMPT
+      assistant: INITIAL_PROMPT (so users see your intro)
+      ... then optional history [(user, assistant), ...]
+      user: latest message
     """
-    # 사용자가 빈 문자열을 보냈다면 아무 일도 하지 않음
-    if not user_message:
-        return "", history
-
-    # GPT 모델로부터 응답을 받음
-    assistant_reply = gpt_call(history, user_message)
-
-    # history에 (user, assistant) 쌍 추가
-    history.append((user_message, assistant_reply))
-
-    # Gradio에서는 (새로 비워질 입력창, 갱신된 history)를 반환
-    return "", history
-
-##############################
-#  Gradio Blocks UI
-##############################
-with gr.Blocks() as demo:
-    gr.Markdown("## Simple Chat Interface")
-
-    # Chatbot 초기 상태를 설정
-    # 첫 번째 메시지는 (user="", assistant=INITIAL_PROMPT) 형태로 넣어
-    # 화면상에서 'assistant'가 INITIAL_PROMPT를 말한 것처럼 보이게 함
-    chatbot = gr.Chatbot(
-        value=[("", INITIAL_PROMPT)],  # (user, assistant)
-        height=500
-    )
-
-    # (user, assistant) 쌍을 저장할 히스토리 상태
-    # 여기서도 동일한 초기 상태를 넣어줌
-    state_history = gr.State([("", INITIAL_PROMPT)])
-
-    # 사용자 입력
-    user_input = gr.Textbox(
-        placeholder="Type your message here...",
-        label="Your Input"
+    messages = [
+        {"role": "system", "content": MAIN_PROMPT},
+        {"role": "assistant", "content": INITIAL_PROMPT},
+    ]
+
+    if history:
+        for u, a in history:
+            if u:
+                messages.append({"role": "user", "content": u})
+            if a:
+                messages.append({"role": "assistant", "content": a})
+
+    messages.append({"role": "user", "content": user_message or ""})
+
+    try:
+        resp = client.chat.completions.create(
+            model=model,
+            messages=messages,
+            temperature=temperature,
+            top_p=top_p,
+            max_tokens=max_tokens,
+        )
+        return resp.choices[0].message.content
+    except Exception as e:
+        # Return the error to the UI
+        return f"Error: {e}"
+
+# ---------- FastAPI app + routes ----------
+app = FastAPI(title="Module Chat — Basic Mode")
+
+@app.get("/health")
+async def health():
+    return {"status": "ok"}
+
+@app.post("/api/chat", response_model=ChatOut)
+async def api_chat(payload: ChatIn):
+    reply = generate_reply(
+        user_message=payload.message,
+        history=payload.history,
+        model=payload.model,
+        temperature=payload.temperature,
+        top_p=payload.top_p,
+        max_tokens=payload.max_tokens,
     )
-
-    # 입력이 submit되면 respond() 호출 → 출력은 (새 입력창, 갱신된 chatbot)
-    user_input.submit(
-        respond,
-        inputs=[user_input, state_history],
-        outputs=[user_input, chatbot]
-    ).then(
-        # respond 끝난 뒤, 최신 history를 state_history에 반영
-        fn=lambda _, h: h,
-        inputs=[user_input, chatbot],
-        outputs=[state_history]
-    )
-
-# 메인 실행
-if __name__ == "__main__":
-    demo.launch(server_name="0.0.0.0", server_port=7860, share=True)
+    return ChatOut(reply=reply)
+
+# Single-page minimal UI that uses ONLY plain HTTPS (no WebSockets)
+INDEX_HTML = f"""
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1"/>
+  <title>Module Chat — Basic Mode</title>
+  <style>
+    :root {{ color-scheme: light dark; }}
+    body {{ font-family: system-ui, Arial, sans-serif; max-width: 820px; margin: 24px auto; padding: 0 12px; }}
+    textarea {{ width: 100%; height: 140px; }}
+    #reply {{ white-space: pre-wrap; border: 1px solid #ddd; padding: 12px; border-radius: 10px; min-height: 120px; }}
+    button {{ padding: 10px 16px; border-radius: 10px; cursor: pointer; }}
+    .tip {{ color: #555; font-size: 0.95rem; }}
+    .row {{ display: flex; gap: 8px; align-items: center; }}
+    .row > * {{ flex: 1; }}
+    .small {{ font-size: 12px; color: #666; }}
+  </style>
+</head>
+<body>
+  <h1>Module Chat — Basic Mode</h1>
+  <p class="tip">
+    This version uses only normal HTTPS requests (works even on strict campus Wi-Fi).<br/>
+    <b>Assistant:</b> {INITIAL_PROMPT}
+  </p>
+
+  <textarea id="msg" placeholder="Type your message..."></textarea>
+  <div class="row">
+    <button id="send">Send</button>
+    <label style="flex:0 0 auto">
+      <input type="checkbox" id="keepHistory" checked /> keep history
+    </label>
+  </div>
+
+  <h3>Reply</h3>
+  <div id="reply"></div>
+
+  <p class="small">Tip: Press Ctrl/Cmd+Enter to send.</p>
+
+  <script>
+    const btn = document.getElementById("send");
+    const msg = document.getElementById("msg");
+    const out = document.getElementById("reply");
+    const keep = document.getElementById("keepHistory");
+    let history = [];
+
+    async function sendOnce() {{
+      out.textContent = "Thinking...";
+      const payload = {{
+        message: msg.value || "",
+        history: keep.checked ? history : null
+      }};
+      try {{
+        const res = await fetch("/api/chat", {{
+          method: "POST",
+          headers: {{ "Content-Type": "application/json" }},
+          body: JSON.stringify(payload)
+        }});
+        if (!res.ok) {{
+          const txt = await res.text();
+          out.textContent = "Server error: " + res.status + " " + txt;
+          return;
+        }}
+        const data = await res.json();
+        const reply = data.reply || "(no reply)";
+        out.textContent = reply;
+        if (keep.checked) {{
+          history.push([msg.value || "", reply]);
+        }}
+      }} catch (e) {{
+        out.textContent = "Network error: " + e;
+      }}
+    }}
+
+    btn.onclick = sendOnce;
+    msg.addEventListener("keydown", (ev) => {{
+      if (ev.key === "Enter" && (ev.ctrlKey || ev.metaKey)) {{
+        ev.preventDefault();
+        sendOnce();
+      }}
+    }});
+  </script>
+</body>
+</html>
+"""
+
+@app.get("/", response_class=HTMLResponse)
+async def root():
+    return INDEX_HTML