diff --git a/dsh/app.py b/dsh/app.py index e3afdc3..0f545a7 100644 --- a/dsh/app.py +++ b/dsh/app.py @@ -93,16 +93,20 @@ def load_session(sid): d = json.load(fh) msgs = [m for m in d.get("messages", []) if m.get("role") in ("user", "assistant")] return {"id": d.get("id", sid or "main"), "name": d.get("name", "Conversation"), - "messages": msgs[-HISTORY_LIMIT:]} + "messages": msgs[-HISTORY_LIMIT:], + "model": d.get("model") or LLM_MODEL} except Exception: - return {"id": sid or "main", "name": "Conversation", "messages": []} + return {"id": sid or "main", "name": "Conversation", "messages": [], + "model": LLM_MODEL} -def save_session(sid, msgs): +def save_session(sid, msgs, model=None): _sdir() sid = (sid or "main") with _history_lock: d = load_session(sid) + if model: + d["model"] = model d["messages"] = msgs[-HISTORY_LIMIT:] d["updated"] = datetime.now(timezone.utc).isoformat() if not d.get("name") or d["name"] in ("Conversation", "New conversation"): @@ -213,7 +217,8 @@ async def index(request: Request) -> HTMLResponse: @app.post("/api/chat") async def chat(message: Annotated[str, Form()], image: Annotated[str, Form()] = "", - session_id: Annotated[str, Form()] = "") -> StreamingResponse: + session_id: Annotated[str, Form()] = "", + model: Annotated[str, Form()] = "") -> StreamingResponse: """Stream an answer as SSE. When `image` is a data:image URI the vision model (OpenRouter) is used instead of the text LLM (image ingest).""" use_vision = bool(image and image.startswith("data:image/")) @@ -221,6 +226,8 @@ async def chat(message: Annotated[str, Form()], async def event_stream(): sid = session_id or "main" session = load_session(sid) + if model and model in MODEL_CHOICES: + session["model"] = model hist = session["messages"] hist.append({"role": "user", "content": message}) if use_vision: @@ -242,7 +249,7 @@ async def chat(message: Annotated[str, Form()], base = LLM_BASE key = LLM_KEY payload = { - "model": LLM_MODEL, + "model": session.get("model") or LLM_MODEL, "messages": [{"role": "system", "content": SYSTEM_PROMPT}] + hist, "stream": True, "temperature": 0.7, @@ -276,7 +283,7 @@ async def chat(message: Annotated[str, Form()], return if full: hist.append({"role": "assistant", "content": "".join(full)}) - save_session(sid, hist) + save_session(sid, hist, session.get("model")) # always persist user turn + chosen model return StreamingResponse( event_stream(), @@ -314,6 +321,16 @@ async def generate_image(prompt: Annotated[str, Form()]) -> dict: return {"ok": False, "error": f"{type(exc).__name__}: {exc}"} + +MODEL_CHOICES = ["auto/best-chat", "auto/best-fast", "auto/best-reasoning", + "auto/best-coding", "auto/best-vision"] + + +@app.get("/api/models") +async def models_list() -> dict: + return {"ok": True, "default": LLM_MODEL, "current": MODEL_CHOICES} + + @app.get("/api/sessions") async def sessions_list() -> dict: return {"ok": True, "sessions": list_sessions()} @@ -336,7 +353,8 @@ async def sessions_new() -> dict: @app.get("/api/sessions/{sid}") async def sessions_get(sid: str) -> dict: s = load_session(sid) - return {"ok": True, "id": s["id"], "name": s["name"], "messages": s["messages"]} + return {"ok": True, "id": s["id"], "name": s["name"], "messages": s["messages"], + "model": s.get("model") or LLM_MODEL} @app.post("/api/sessions/{sid}/delete") diff --git a/dsh/templates/chat.html b/dsh/templates/chat.html index 4829c5d..ebfc5c6 100644 --- a/dsh/templates/chat.html +++ b/dsh/templates/chat.html @@ -11,12 +11,12 @@ header.top { flex: none; } .app { display: flex; flex: 1; min-height: 0; } #sidebar { - width: 240px; flex: none; border-right: 1px solid var(--hairline, #e6e6e6); + width: 230px; flex: none; border-right: 1px solid var(--hairline, #e6e6e6); display: flex; flex-direction: column; background: var(--canvas-soft, #f7f7f7); } #sidebar h2 { font: 600 12px/1.3 var(--font-family, sans-serif); color: var(--ink-faint, #999); margin: 12px 12px 6px; } - #newBtn { margin: 6px 12px 8px; padding: 7px 10px; border: 1px solid #ddd; border-radius: 8px; background: #fff; cursor: pointer; text-align: left; } - #sessions { list-style: none; margin: 0; padding: 0 8px; overflow: auto; } + #newBtn, #dlBtn { margin: 4px 12px; padding: 7px 10px; border: 1px solid #ddd; border-radius: 8px; background: #fff; cursor: pointer; text-align: left; } + #sessions { list-style: none; margin: 0; padding: 0 8px; overflow: auto; flex: 1; } #sessions li { display: flex; align-items: center; gap: 6px; padding: 7px 8px; margin: 2px 0; border-radius: 8px; cursor: pointer; font-size: 13px; color: var(--ink-secondary, #333); @@ -25,9 +25,17 @@ #sessions li .t { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } #sessions li .n { font-size: 11px; opacity: .7; } #sessions li .del { background: none; border: none; cursor: pointer; color: inherit; opacity: .5; font-size: 13px; } - #sessions li .del:hover { opacity: 1; } .chat-col { display: flex; flex-direction: column; flex: 1; min-width: 0; } .log { flex: 1; overflow: auto; } + .bubble { position: relative; white-space: pre-wrap; } + .bubble .copy { + position: absolute; top: 4px; right: 4px; display: none; + font-size: 11px; padding: 2px 6px; border: 1px solid #ddd; border-radius: 6px; background: #fff; cursor: pointer; color: #555; + } + .msg:hover .bubble .copy { display: block; } + .modelrow { display: flex; gap: 8px; align-items: center; } + .modelrow select { border: 1px solid #ddd; border-radius: 8px; padding: 6px 8px; font-size: 13px; } + .modelrow label { font-size: 12px; color: #777; }
@@ -40,12 +48,17 @@