Update app.py

app.py

@@ -25,42 +25,20 @@ print("✅ 로딩 완료!")
 # ------------------------------------------------------------------
 # 2. 시스템 프롬프트
 # ------------------------------------------------------------------
-SYSTEM_PROMPT = """너는 사용자와 반말을 쓰는 사이야.
+SYSTEM_PROMPT = """너는 사용자의 오랜 찐친 '똘배'야.
 - 반말로 편하게 대화해. 존댓말 절대 쓰지 마.
 - PC통신 채팅방에서 대화하듯이 텍스트 위주로 툭툭 던져.
 - 이모지(😊) 같은 건 쓰지 말고, 옛날 텍스트 이모티콘(^^, ㅡㅡ;, ㅋㅋ)을 주로 써.
-- MZ말투를 유지해 주고 상대가 먼저 욕 박으면 같이 욕해.
+- MZ세대 특유의 알빠노 감성을 유지해 주고 먼저 욕 하면 너도 욕 박아.
 - 질문에는 솔직하게 대답하되, 너무 길지 않게 채팅하듯 끊어서 말해."""
 
 # ------------------------------------------------------------------
 # 3. 채팅 로직
 # ------------------------------------------------------------------
-def _normalize_history(history):
+def chat_response(user_input, history_pairs):
     """
-    Gradio Chatbot history는 보통:
-      - [[u, b], [u, b], ...]  (list of lists)
-      - [(u, b), (u, b), ...]  (list of tuples)
-    인데 상황에 따라 섞여 들어오기도 해서 안전하게 표준화.
+    history_pairs: [(user, bot), ...] 형태로 받아서 llama_cpp messages로 변환
     """
-    if not history:
-        return []
-
-    norm = []
-    for h in history:
-        if not h:
-            continue
-        if isinstance(h, (list, tuple)) and len(h) == 2:
-            u, b = h[0], h[1]
-            if u is None:
-                continue
-            # b가 None인 "작성중" 행은 모델 입력 히스토리에서 제외
-            if b is None:
-                continue
-            norm.append((str(u), str(b)))
-    return norm
-
-
-def chat_response(user_input, history_for_model):
     clean_input = (user_input or "").replace(" ", "")
 
     greeting_words = ["안녕", "ㅎㅇ", "하이", "반가", "접속"]
@@ -73,7 +51,7 @@ def chat_response(user_input, history_for_model):
         final_instruction = (
             f"(사용자가 밸런스 게임을 하자고 한다. 주제는 '{topic}'이다. "
             "아주 고르기 곤란하고 짜증나는 두 가지 선택지(A vs B)를 제시해라. "
-            "말투는 요즘 MZ들처럼 시니컬하게 해라.) "
+            "말투는 자 어디 한 번 골라보라는 듯이 시니컬하게 해라.) "
             "자, 질문해."
         )
     elif is_greeting:
@@ -82,12 +60,14 @@ def chat_response(user_input, history_for_model):
         final_instruction = user_input
 
     messages = [{"role": "system", "content": SYSTEM_PROMPT}]
-    for u, b in (history_for_model or []):
-        messages.append({"role": "user", "content": u})
-        messages.append({"role": "assistant", "content": b})
+    for u, b in (history_pairs or []):
+        if u is None or b is None:
+            continue
+        messages.append({"role": "user", "content": str(u)})
+        messages.append({"role": "assistant", "content": str(b)})
     messages.append({"role": "user", "content": final_instruction})
 
-    response = llm.create_chat_completion(
+    r = llm.create_chat_completion(
         messages=messages,
         max_tokens=256,
         stop=["<|end_of_text|>", "###", "User:"],
@@ -95,127 +75,104 @@ def chat_response(user_input, history_for_model):
         top_p=0.9,
         repeat_penalty=1.2
     )
-    return response["choices"][0]["message"]["content"].strip()
-
+    return r["choices"][0]["message"]["content"].strip()
 
 # ------------------------------------------------------------------
-# 4. CSS - 가독성 개선 & 레이아웃 수정
+# 4. CSS (네 감성 그대로)
 # ------------------------------------------------------------------
 PC_COM_CSS = r"""
 @import url('https://cdn.jsdelivr.net/gh/neodgm/neodgm-webfont@latest/neodgm/neodgm.css');
 
 :root {
-  --pc-bg: #000084;
-  --pc-input-bg: #000042;
-  --pc-text: #FFFFFF;
-  --pc-user: #FFFF55;
-  --pc-bot: #FFFFFF;
-  --pc-accent: #00AAAA;
+  --pc-blue: #0000AA;
+  --pc-white: #EFEFEF;
+  --pc-yellow: #FFFF55;
+  --pc-cyan: #00AAAA;
   --pc-grey: #AAAAAA;
 }
 
 body, .gradio-container {
-  background-color: var(--pc-bg) !important;
+  background-color: var(--pc-blue) !important;
   font-family: 'NeoDunggeunmo', monospace !important;
-  color: var(--pc-text) !important;
+  color: var(--pc-white) !important;
 }
 
 h1 {
   font-family: 'NeoDunggeunmo', monospace !important;
-  color: var(--pc-user) !important;
-  background-color: var(--pc-bg) !important;
-  border-bottom: 2px double var(--pc-text) !important;
+  color: var(--pc-yellow) !important;
+  background-color: #000084 !important;
+  border-bottom: 2px double var(--pc-white) !important;
+  padding-bottom: 10px !important;
+  margin-bottom: 20px !important;
   text-align: center;
-  font-size: 28px !important;
-  margin-bottom: 10px !important;
+  font-size: 32px !important;
+  letter-spacing: 2px;
 }
+
 h1::before { content: "☎ "; }
 h1::after { content: " ☎"; }
 
 .gradio-container p {
-  color: var(--pc-accent) !important;
-  font-size: 16px !important;
-  margin-bottom: 20px !important;
+  color: var(--pc-cyan) !important;
+  font-size: 18px !important;
+  border-bottom: 1px dashed var(--pc-grey);
+  padding-bottom: 5px;
 }
 
 .chatbot {
-  height: 65vh !important;
-  background-color: var(--pc-input-bg) !important;
-  border: 2px solid var(--pc-text) !important;
+  background-color: var(--pc-blue) !important;
+  border: 2px solid var(--pc-white) !important;
   border-radius: 0 !important;
-  padding: 20px !important;
+  height: 60vh !important;
   overflow-y: scroll !important;
 }
 
 .message {
   background: transparent !important;
   border: none !important;
-  padding: 5px 0 !important;
-  font-size: 18px !important;
-  line-height: 1.6 !important;
+  padding: 5px 10px !important;
+  font-size: 20px !important;
   box-shadow: none !important;
+  line-height: 1.4 !important;
 }
 
-.message.user-row, .user {
-  justify-content: flex-start !important;
-  background: transparent !important;
-  border-bottom: 1px dashed #333 !important;
-}
-.message.user-row .message, .user .message {
-  color: var(--pc-user) !important;
-  text-align: left !important;
-  font-weight: bold !important;
-}
-.message.user-row .message::before, .user .message::before {
-  content: "나 > ";
-  color: var(--pc-grey);
-  margin-right: 8px;
-}
+.message.user-row, .user { justify-content: flex-start !important; background: transparent !important; }
+.message.user-row .message, .user .message { color: var(--pc-yellow) !important; text-align: left !important; }
+.message.user-row .message::before, .user .message::before { content: "나 > "; color: var(--pc-grey); margin-right: 5px; }
 
-.message.bot-row, .bot {
-  background: transparent !important;
-  border-bottom: 1px dashed #333 !important;
-}
-.message.bot-row .message, .bot .message {
-  color: var(--pc-bot) !important;
-  text-align: left !important;
-}
-.message.bot-row .message::before, .bot .message::before {
-  content: "똘배 > ";
-  color: var(--pc-accent);
-  margin-right: 8px;
-}
+.message.bot-row, .bot { background: transparent !important; }
+.message.bot-row .message, .bot .message { color: var(--pc-white) !important; text-align: left !important; }
+.message.bot-row .message::before, .bot .message::before { content: "똘배 > "; color: var(--pc-cyan); margin-right: 5px; }
 
 .avatar { display: none !important; }
 
 .input-container {
+  background-color: var(--pc-blue) !important;
+  border-top: 2px double var(--pc-white) !important;
   margin-top: 10px !important;
-  background: transparent !important;
-  border: none !important;
   gap: 10px !important;
 }
 
 textarea, input {
-  background-color: var(--pc-input-bg) !important;
-  color: var(--pc-text) !important;
-  border: 2px solid var(--pc-grey) !important;
+  background-color: var(--pc-blue) !important;
+  color: var(--pc-white) !important;
+  border: 1px solid var(--pc-grey) !important;
   border-radius: 0 !important;
   font-family: 'NeoDunggeunmo', monospace !important;
-  font-size: 18px !important;
-  padding: 10px !important;
+  font-size: 20px !important;
+  outline: none !important;
+  box-shadow: none !important;
 }
-textarea::placeholder { color: var(--pc-grey) !important; }
 
 button.primary {
   background: var(--pc-grey) !important;
   color: #000 !important;
-  border: 2px solid var(--pc-text) !important;
-  font-weight: bold !important;
+  border: 1px solid var(--pc-white) !important;
+  border-radius: 0 !important;
   font-family: 'NeoDunggeunmo', monospace !important;
+  box-shadow: 2px 2px 0px #000 !important;
 }
-button.primary:hover {
-  background: var(--pc-text) !important;
-}
+button.primary:hover { background: var(--pc-white) !important; }
 
 #clear-btn {
   background: transparent !important;
@@ -225,12 +182,8 @@ button.primary:hover {
   padding: 2px 10px !important;
   margin-top: 5px !important;
   width: auto !important;
-  align-self: flex-start !important;
-}
-#clear-btn:hover {
-  color: var(--pc-text) !important;
-  border-color: var(--pc-text) !important;
 }
+#clear-btn:hover { color: var(--pc-white) !important; border-color: var(--pc-white) !important; }
 
 .examples {
   margin-top: 20px !important;
@@ -246,49 +199,35 @@ button.primary:hover {
 }
 .examples button {
   background: transparent !important;
-  color: var(--pc-accent) !important;
-  border: 1px solid var(--pc-accent) !important;
+  color: var(--pc-cyan) !important;
+  border: 1px solid var(--pc-cyan) !important;
   border-radius: 0 !important;
   padding: 5px 15px !important;
   font-size: 16px !important;
   font-family: 'NeoDunggeunmo', monospace !important;
-  transition: all 0.2s;
-}
-.examples button:hover {
-  background: var(--pc-accent) !important;
-  color: #000 !important;
 }
 
 footer { display: none !important; }
 """
 
 # ------------------------------------------------------------------
-# 5. App 실행 (Blocks)
-#    ✅ 핵심: api_name 붙인 단일 엔드포인트(predict)로 HF가 API 탐지함
-#    �� gradio 4.36.1 호환: Chatbot에 type= 넣지 말기
+# 5. App (가로 배치 + API 엔드포인트 생성)
 # ------------------------------------------------------------------
 with gr.Blocks(theme=gr.themes.Base(), css=PC_COM_CSS, title="CHOLLIAN 98") as demo:
-    gr.Markdown("19금 채팅방")
+    gr.Markdown("# ≪ 십 리 안 ≫")
     gr.Markdown(">> 01410 접속 성공... [대화실]에 입장하셨습니다.")
 
-    chatbot = gr.Chatbot(
-        label="대화내용",
-        show_label=False,
-        elem_classes="chatbot"
-    )
+    # ✅ Chatbot은 4.36.1에서 list-of-lists 포맷이 제일 안전
+    chatbot = gr.Chatbot(show_label=False, elem_classes="chatbot")
 
     with gr.Row(elem_classes="input-container"):
         msg = gr.Textbox(
-            scale=8,
-            show_label=False,
-            placeholder="할 말을 입력하세요...",
-            container=False,
-            autofocus=True
+            scale=8, show_label=False, container=False,
+            placeholder="명령어를 입력하세요..."
         )
-        submit_btn = gr.Button("전 송", scale=1, variant="primary")
+        submit_btn = gr.Button("[ 전송 ]", scale=1, variant="primary")
 
-    with gr.Row():
-        clear = gr.Button("화면 지우기", elem_id="clear-btn")
+    clear = gr.Button("[ 화면 지우기 ]", elem_id="clear-btn")
 
     gr.Examples(
         examples=[
@@ -298,25 +237,27 @@ with gr.Blocks(theme=gr.themes.Base(), css=PC_COM_CSS, title="CHOLLIAN 98") as d
             "야 밥 뭐먹지 추천좀",
         ],
         inputs=msg,
-        label="빠른 입력"
+        label="빠른 입력",
+        cache_examples=False
     )
 
-    def predict(user_message, history):
-        # history는 [[u,b],...] 형태로 들어올 확률이 큼
+    def predict(user_input, history):
         history = history or []
-        history_for_model = _normalize_history(history)
 
-        bot_message = chat_response(user_message, history_for_model)
+        # 모델로 넘길 히스토리: [(u,b), ...]
+        hist_pairs = []
+        for u, b in history:
+            if u is None or b is None:
+                continue
+            hist_pairs.append((u, b))
 
-        # Chatbot 출력은 list of lists로 통일 (4.36.1에서 제일 안전)
-        new_history = []
-        for h in history:
-            if isinstance(h, (list, tuple)) and len(h) == 2:
-                new_history.append([h[0], h[1]])
-        new_history.append([user_message, bot_message])
+        bot_out = chat_response(user_input, hist_pairs)
 
+        # Gradio Chatbot 출력: [[u,b], ...]
+        new_history = [list(x) for x in history] + [[user_input, bot_out]]
         return "", new_history
 
+    # ✅ 이 api_name 때문에 API 문서에 엔드포인트가 생김 -> "No API found" 사라짐
     msg.submit(
         predict,
         inputs=[msg, chatbot],
@@ -324,7 +265,6 @@ with gr.Blocks(theme=gr.themes.Base(), css=PC_COM_CSS, title="CHOLLIAN 98") as d
         queue=True,
         api_name="chat"
     )
-
     submit_btn.click(
         predict,
         inputs=[msg, chatbot],
@@ -332,14 +272,8 @@ with gr.Blocks(theme=gr.themes.Base(), css=PC_COM_CSS, title="CHOLLIAN 98") as d
         queue=True,
         api_name="chat"
     )
-
-    clear.click(
-        lambda: [],
-        inputs=None,
-        outputs=chatbot,
-        queue=False,
-        api_name="clear"
-    )
+    clear.click(lambda: [], None, chatbot, queue=False, api_name="clear")
 
 if __name__ == "__main__":
-    demo.queue().launch(server_name="0.0.0.0", server_port=7860)
+    # Spaces면 보통 포트 지정 안 하는 게 안전함 (지정해도 되는데, 이게 덜 말썽남)
+    demo.queue().launch(server_name="0.0.0.0")