Update app.py
Browse files
app.py
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
|
|
|
|
|
| 1 |
import os
|
| 2 |
import gradio as gr
|
| 3 |
from openai import OpenAI, APIError
|
|
@@ -15,15 +17,48 @@ client = OpenAI(
|
|
| 15 |
)
|
| 16 |
|
| 17 |
|
| 18 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
def _normalize_history(history: list) -> list:
|
| 20 |
-
"""historyλ Gradio λ²μ μ λ°λΌ
|
| 21 |
- μ ν(messages) νμ: [{"role": "user", "content": "..."}, ...]
|
| 22 |
- ꡬν(tuples) νμ: [["user λ©μμ§", "bot λ©μμ§"], ...]
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
μκ³ μ΄ ν¨μμμ ν‘μν©λλ€.)
|
| 27 |
"""
|
| 28 |
messages = []
|
| 29 |
if not history:
|
|
@@ -46,15 +81,43 @@ def _normalize_history(history: list) -> list:
|
|
| 46 |
|
| 47 |
if role == "model":
|
| 48 |
role = "assistant"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
messages.append({"role": role, "content": content})
|
| 50 |
|
| 51 |
return messages
|
| 52 |
|
| 53 |
|
| 54 |
# ββ λν ν
μ€νΈ μμ± ν¨μ (OpenRouter chat.completions μ€νΈλ¦¬λ° λ°©μ) ββββββββ
|
| 55 |
-
def predict_chat(message
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 56 |
messages = _normalize_history(history)
|
| 57 |
-
messages.append({"role": "user", "content":
|
| 58 |
|
| 59 |
try:
|
| 60 |
stream = client.chat.completions.create(
|
|
@@ -94,8 +157,8 @@ def predict_chat(message: str, history: list):
|
|
| 94 |
yield f"{partial_output}\n\n---\n_(μ€μ μ¬μ© λͺ¨λΈ: `{resolved_model}`)_"
|
| 95 |
|
| 96 |
except APIError as e:
|
| 97 |
-
# λ¬΄λ£ λͺ¨λΈμ λΆλΉ/μΌμΌ μμ² νλ μ΄κ³Ό, λͺ¨λΈ
|
| 98 |
-
# OpenRouter μͺ½ μ¬μ λ‘ μ€λ₯κ° λλ κ²½μ°μ
λλ€.
|
| 99 |
yield f"β OpenRouter API μ€λ₯: {str(e)}"
|
| 100 |
except Exception as e:
|
| 101 |
yield f"β λ€νΈμν¬ ν΅μ μ€ μ€λ₯κ° λ°μνμ΅λλ€: {str(e)}"
|
|
@@ -103,15 +166,24 @@ def predict_chat(message: str, history: list):
|
|
| 103 |
|
| 104 |
# ββ UI λΉλ λ° API κ°μ€ ββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 105 |
with gr.Blocks() as demo:
|
| 106 |
-
gr.Markdown(
|
|
|
|
|
|
|
|
|
|
|
|
|
| 107 |
|
| 108 |
chatbot_ui = gr.Chatbot(height=480)
|
| 109 |
-
textbox_ui = gr.
|
|
|
|
|
|
|
|
|
|
|
|
|
| 110 |
|
| 111 |
gr.ChatInterface(
|
| 112 |
fn=predict_chat,
|
| 113 |
chatbot=chatbot_ui,
|
| 114 |
textbox=textbox_ui,
|
|
|
|
| 115 |
api_name="chat", # μΈλΆ μ°λμ μν /chat κ²½λ‘ λͺ
μ νμ±ν
|
| 116 |
)
|
| 117 |
|
|
|
|
| 1 |
+
import base64
|
| 2 |
+
import mimetypes
|
| 3 |
import os
|
| 4 |
import gradio as gr
|
| 5 |
from openai import OpenAI, APIError
|
|
|
|
| 17 |
)
|
| 18 |
|
| 19 |
|
| 20 |
+
def _encode_image_to_data_url(path: str) -> str:
|
| 21 |
+
"""λ‘컬 μ΄λ―Έμ§ νμΌ κ²½λ‘λ₯Ό OpenRouterκ° μꡬνλ base64 data URL
|
| 22 |
+
νμ(data:image/png;base64,...)μΌλ‘ λ³νν©λλ€.
|
| 23 |
+
(OpenRouter 곡μ λ¬Έμ: Image Inputs κ°μ΄λ κΈ°μ€)
|
| 24 |
+
"""
|
| 25 |
+
mime_type, _ = mimetypes.guess_type(path)
|
| 26 |
+
mime_type = mime_type or "image/png"
|
| 27 |
+
with open(path, "rb") as f:
|
| 28 |
+
encoded = base64.b64encode(f.read()).decode("utf-8")
|
| 29 |
+
return f"data:{mime_type};base64,{encoded}"
|
| 30 |
+
|
| 31 |
+
|
| 32 |
+
def _build_content(text: str | None, files: list) -> list | str:
|
| 33 |
+
"""ν
μ€νΈμ μ΄λ―Έμ§ νμΌλ€μ OpenAI/OpenRouter νΈν content λ°°μ΄λ‘
|
| 34 |
+
λ³νν©λλ€. μ΄λ―Έμ§κ° μμΌλ©΄ ν
μ€νΈλ§ λ΄κΈ΄ λ¬Έμμ΄μ κ·Έλλ‘ λ°νν©λλ€.
|
| 35 |
+
"""
|
| 36 |
+
if not files:
|
| 37 |
+
return text or ""
|
| 38 |
+
|
| 39 |
+
content = []
|
| 40 |
+
if text:
|
| 41 |
+
content.append({"type": "text", "text": text})
|
| 42 |
+
for path in files:
|
| 43 |
+
try:
|
| 44 |
+
content.append({
|
| 45 |
+
"type": "image_url",
|
| 46 |
+
"image_url": {"url": _encode_image_to_data_url(path)},
|
| 47 |
+
})
|
| 48 |
+
except Exception:
|
| 49 |
+
# μ΄λ―Έμ§κ° μλκ±°λ μ½μ μ μλ νμΌμ μ‘°μ©ν 건λλλλ€.
|
| 50 |
+
continue
|
| 51 |
+
return content
|
| 52 |
+
|
| 53 |
+
|
| 54 |
+
# ββ Gradio λ²μ /λ©ν°λͺ¨λ¬ μ¬λΆμ λ°λΌ history νμμ΄ λ€λ₯΄λ―λ‘ λ€μν νμ μ§μ ββ
|
| 55 |
def _normalize_history(history: list) -> list:
|
| 56 |
+
"""historyλ Gradio λ²μ λ° λ©ν°λͺ¨λ¬ μ¬λΆμ λ°λΌ
|
| 57 |
- μ ν(messages) νμ: [{"role": "user", "content": "..."}, ...]
|
| 58 |
- ꡬν(tuples) νμ: [["user λ©μμ§", "bot λ©μμ§"], ...]
|
| 59 |
+
- μ΄λ―Έμ§ μ²¨λΆ μ: contentκ° νμΌ κ²½λ‘κ° λ΄κΈ΄ νν/리μ€νΈμΈ κ²½μ°λ μμ
|
| 60 |
+
λ€μν ννλ‘ λ€μ΄μ¬ μ μμ΅λλ€. μ΄λ€ νμμ΄ μλ OpenAI/OpenRouter
|
| 61 |
+
νΈν messages λ°°μ΄λ‘ ν΅μΌν΄μ λ°νν©λλ€.
|
|
|
|
| 62 |
"""
|
| 63 |
messages = []
|
| 64 |
if not history:
|
|
|
|
| 81 |
|
| 82 |
if role == "model":
|
| 83 |
role = "assistant"
|
| 84 |
+
|
| 85 |
+
# contentκ° μ΄λ―Έμ§ νμΌ κ²½λ‘(νν/리μ€νΈ)μΈ κ²½μ°, μ΄λ―Έμ§ λ©μμ§λ‘ λ³νν©λλ€.
|
| 86 |
+
if isinstance(content, (tuple, list)) and content:
|
| 87 |
+
path = content[0]
|
| 88 |
+
if isinstance(path, str) and os.path.isfile(path):
|
| 89 |
+
messages.append({
|
| 90 |
+
"role": role,
|
| 91 |
+
"content": _build_content(None, [path]),
|
| 92 |
+
})
|
| 93 |
+
continue
|
| 94 |
+
|
| 95 |
+
# contentκ° {"path": "..."} ννλ‘ λ€μ΄μ€λ κ²½μ°λ μ²λ¦¬ν©λλ€.
|
| 96 |
+
if isinstance(content, dict) and "path" in content:
|
| 97 |
+
messages.append({
|
| 98 |
+
"role": role,
|
| 99 |
+
"content": _build_content(None, [content["path"]]),
|
| 100 |
+
})
|
| 101 |
+
continue
|
| 102 |
+
|
| 103 |
messages.append({"role": role, "content": content})
|
| 104 |
|
| 105 |
return messages
|
| 106 |
|
| 107 |
|
| 108 |
# ββ λν ν
μ€νΈ μμ± ν¨μ (OpenRouter chat.completions μ€νΈλ¦¬λ° λ°©μ) ββββββββ
|
| 109 |
+
def predict_chat(message, history: list):
|
| 110 |
+
# multimodal=TrueμΌ λ messageλ {"text": "...", "files": ["κ²½λ‘", ...]}
|
| 111 |
+
# ννμ λμ
λλ¦¬λ‘ λ€μ΄μ΅λλ€. (Gradio 곡μ λ¬Έμ κΈ°μ€)
|
| 112 |
+
if isinstance(message, dict):
|
| 113 |
+
text = message.get("text") or ""
|
| 114 |
+
files = message.get("files") or []
|
| 115 |
+
else:
|
| 116 |
+
text = message
|
| 117 |
+
files = []
|
| 118 |
+
|
| 119 |
messages = _normalize_history(history)
|
| 120 |
+
messages.append({"role": "user", "content": _build_content(text, files)})
|
| 121 |
|
| 122 |
try:
|
| 123 |
stream = client.chat.completions.create(
|
|
|
|
| 157 |
yield f"{partial_output}\n\n---\n_(μ€μ μ¬μ© λͺ¨λΈ: `{resolved_model}`)_"
|
| 158 |
|
| 159 |
except APIError as e:
|
| 160 |
+
# λ¬΄λ£ λͺ¨λΈμ λΆλΉ/μΌμΌ μμ² νλ μ΄κ³Ό, μ΄λ―Έμ§ λ―Έμ§μ λͺ¨λΈ μ ν,
|
| 161 |
+
# λͺ¨λΈ μΌμ μ€λ¨ λ± OpenRouter μͺ½ μ¬μ λ‘ μ€λ₯κ° λλ κ²½μ°μ
λλ€.
|
| 162 |
yield f"β OpenRouter API μ€λ₯: {str(e)}"
|
| 163 |
except Exception as e:
|
| 164 |
yield f"β λ€νΈμν¬ ν΅μ μ€ μ€λ₯κ° λ°μνμ΅λλ€: {str(e)}"
|
|
|
|
| 166 |
|
| 167 |
# ββ UI λΉλ λ° API κ°μ€ ββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 168 |
with gr.Blocks() as demo:
|
| 169 |
+
gr.Markdown(
|
| 170 |
+
f"# π€ GS-AI API Server (OpenRouter Mode)\nModel: `{MODEL_ID}`\n\n"
|
| 171 |
+
"ν
μ€νΈμ ν¨κ» μ΄λ―Έμ§λ₯Ό 첨λΆν΄μ μ§λ¬Ένμ€ μ μμ΅λλ€. "
|
| 172 |
+
"(λ¨, κ·Έ μμ μ μ΄λ―Έμ§ μΈμ κ°λ₯ν λ¬΄λ£ λͺ¨λΈμ΄ μμΌλ©΄ μ€λ₯κ° λ μ μμ΅λλ€.)"
|
| 173 |
+
)
|
| 174 |
|
| 175 |
chatbot_ui = gr.Chatbot(height=480)
|
| 176 |
+
textbox_ui = gr.MultimodalTextbox(
|
| 177 |
+
placeholder="λ©μμ§λ₯Ό μ
λ ₯νκ±°λ μ΄λ―Έμ§λ₯Ό 첨λΆνμΈμ...",
|
| 178 |
+
file_types=["image"],
|
| 179 |
+
file_count="multiple",
|
| 180 |
+
)
|
| 181 |
|
| 182 |
gr.ChatInterface(
|
| 183 |
fn=predict_chat,
|
| 184 |
chatbot=chatbot_ui,
|
| 185 |
textbox=textbox_ui,
|
| 186 |
+
multimodal=True, # message μΈμκ° {"text": ..., "files": [...]} λμ
λλ¦¬λ‘ μ λ¬λ©λλ€.
|
| 187 |
api_name="chat", # μΈλΆ μ°λμ μν /chat κ²½λ‘ λͺ
μ νμ±ν
|
| 188 |
)
|
| 189 |
|