Backend: HTML-unescape and strip <think>/<thinking> from generated titles; trim and return cleaned value; add debug logs. Electron: send 'window-focused' from main; expose onWindowFocus in preload. Frontend: stream-safe AssistantMessageContent with collapsible Thoughts; switch streaming render to React state updates; autofocus textarea on window focus/new chat and when clicking empty chat area; sanitize session title client-side. Markdown: support blockquotes; allow '-' or '*' bullets; simplify <think> removal to handle streaming; drop table wrapper div (emit <table class='nice'>); theme-aware code block headers/borders. CSS: rounded 'nice' tables with light inner grid; blockquote styling; Thoughts toggle/panel styles. Color: brighten Grayscale --accent. Follow-ups: add IPC listener cleanup; ensure single source of truth for colorSchemes.
171 lines
6.7 KiB
Python
171 lines
6.7 KiB
Python
from fastapi import FastAPI, Depends, HTTPException
|
|
from fastapi.middleware.cors import CORSMiddleware
|
|
from fastapi.responses import StreamingResponse
|
|
from sqlalchemy.orm import Session
|
|
from typing import List
|
|
import re # Import the regex module
|
|
import html # Import the html module for unescaping
|
|
from . import models, schemas
|
|
from .database import Base, engine, SessionLocal
|
|
from .ollama_client import list_models as ollama_list, chat as ollama_chat, chat_stream as ollama_chat_stream
|
|
|
|
# Create tables
|
|
Base.metadata.create_all(bind=engine)
|
|
|
|
app = FastAPI(title="LLM Desktop Backend", version="0.1.0" )
|
|
|
|
# CORS (dev-friendly; tighten later)
|
|
app.add_middleware(
|
|
CORSMiddleware,
|
|
allow_origins=["*"],
|
|
allow_credentials=True,
|
|
allow_methods=["*"],
|
|
allow_headers=["*"],
|
|
)
|
|
|
|
def get_db():
|
|
db = SessionLocal()
|
|
try:
|
|
yield db
|
|
finally:
|
|
db.close()
|
|
|
|
@app.get("/health")
|
|
def health():
|
|
return {"ok": True}
|
|
|
|
@app.get("/models")
|
|
async def get_models():
|
|
try:
|
|
data = await ollama_list()
|
|
return {"models": [{"name": n} for n in data.get("models", [])]}
|
|
except Exception as e:
|
|
raise HTTPException(status_code=502, detail=f"Ollama not available: {e}")
|
|
|
|
@app.get("/sessions", response_model=schemas.SessionsResponse)
|
|
def get_sessions(db: Session = Depends(get_db)):
|
|
sessions = db.query(models.ChatSession).order_by(models.ChatSession.created_at.desc()).all()
|
|
return {"sessions": sessions}
|
|
|
|
@app.post("/sessions", response_model=schemas.ChatSession)
|
|
def create_session(req: schemas.CreateSessionRequest, db: Session = Depends(get_db)):
|
|
new_session = models.ChatSession(session_id=req.session_id)
|
|
db.add(new_session)
|
|
db.commit()
|
|
db.refresh(new_session)
|
|
return new_session
|
|
|
|
@app.get("/history", response_model=schemas.HistoryResponse)
|
|
def history(session_id: str, db: Session = Depends(get_db)):
|
|
session = db.query(models.ChatSession).filter(models.ChatSession.session_id == session_id).first()
|
|
if not session:
|
|
return {"messages": []}
|
|
rows = db.query(models.ChatMessage) .filter(models.ChatMessage.session_pk == session.id) .order_by(models.ChatMessage.created_at.asc()) .all()
|
|
msgs = [{"role": r.role, "content": r.content} for r in rows]
|
|
return {"messages": msgs}
|
|
|
|
@app.post("/chat")
|
|
async def chat(req: schemas.ChatRequest, db: Session = Depends(get_db)):
|
|
# Find or create session
|
|
session = db.query(models.ChatSession).filter(models.ChatSession.session_id == req.session_id).first()
|
|
if not session:
|
|
session = models.ChatSession(session_id=req.session_id)
|
|
db.add(session)
|
|
db.commit()
|
|
db.refresh(session)
|
|
|
|
# Save user message
|
|
user_row = models.ChatMessage(session_pk=session.id, role='user', content=req.message)
|
|
db.add(user_row)
|
|
db.commit()
|
|
|
|
# Build minimal conversation context (last 20 messages)
|
|
last_msgs = db.query(models.ChatMessage) .filter(models.ChatMessage.session_pk == session.id) .order_by(models.ChatMessage.created_at.asc()) .all()[-20:]
|
|
|
|
messages = [{"role": m.role, "content": m.content} for m in last_msgs]
|
|
|
|
if req.stream:
|
|
async def stream_generator():
|
|
full_reply = ""
|
|
try:
|
|
async for chunk in ollama_chat_stream(req.model, messages):
|
|
full_reply += chunk
|
|
yield chunk
|
|
except Exception as e:
|
|
# How to handle errors in a stream? Could yield an error message.
|
|
yield f"Ollama error: {e}"
|
|
|
|
# Save full reply after stream is complete
|
|
as_row = models.ChatMessage(session_pk=session.id, role='assistant', content=full_reply)
|
|
db.add(as_row)
|
|
db.commit()
|
|
|
|
return StreamingResponse(stream_generator(), media_type="text/plain")
|
|
else:
|
|
try:
|
|
reply = await ollama_chat(req.model, messages)
|
|
except Exception as e:
|
|
raise HTTPException(status_code=502, detail=f"Ollama error: {e}")
|
|
|
|
# Save assistant reply
|
|
as_row = models.ChatMessage(session_pk=session.id, role='assistant', content=reply)
|
|
db.add(as_row)
|
|
db.commit()
|
|
|
|
return {"reply": reply}
|
|
|
|
@app.post("/generate-title", response_model=schemas.GenerateTitleResponse)
|
|
async def generate_title(req: schemas.GenerateTitleRequest, db: Session = Depends(get_db)):
|
|
session = db.query(models.ChatSession).filter(models.ChatSession.session_id == req.session_id).first()
|
|
if not session:
|
|
raise HTTPException(status_code=404, detail="Session not found")
|
|
|
|
prompt = f"Generate a very short, concise title (5 words or less) for a chat conversation that begins with this user message: \"{req.message}\". Do not use quotation marks in the title."
|
|
|
|
try:
|
|
title = await ollama_chat(req.model, [{"role": "user", "content": prompt}])
|
|
except Exception as e:
|
|
raise HTTPException(status_code=502, detail=f"Ollama error: {e}")
|
|
|
|
print(f"Original title from LLM: {title}") # Debugging line to see the raw title
|
|
|
|
# HTML unescape the title first to handle encoded tags
|
|
unescaped_title = html.unescape(title)
|
|
print(f"Unescaped title: {unescaped_title}") # Debugging line to see the unescaped title
|
|
|
|
# Remove <think> blocks from the unescaped title
|
|
# Use re.IGNORECASE to handle potential variations in casing (e.g., <Think>)
|
|
cleaned_title = re.sub(r'<think>.*?</think>', '', unescaped_title, flags=re.DOTALL | re.IGNORECASE)
|
|
|
|
print(f"Cleaned title before saving: {cleaned_title.strip()}") # Debugging line to see the cleaned title
|
|
|
|
session.name = cleaned_title.strip() # Use .strip() to remove any leading/trailing whitespace after removal
|
|
db.commit()
|
|
|
|
return {"title": cleaned_title.strip()}
|
|
|
|
@app.delete("/sessions/{session_id}")
|
|
def delete_session(session_id: str, db: Session = Depends(get_db)):
|
|
session = db.query(models.ChatSession).filter(models.ChatSession.session_id == session_id).first()
|
|
if not session:
|
|
raise HTTPException(status_code=404, detail="Session not found")
|
|
|
|
# Delete associated messages
|
|
db.query(models.ChatMessage).filter(models.ChatMessage.session_pk == session.id).delete()
|
|
|
|
db.delete(session)
|
|
db.commit()
|
|
return {"ok": True}
|
|
|
|
@app.put("/sessions/{session_id}/rename")
|
|
def rename_session(session_id: str, req: schemas.GenerateTitleResponse, db: Session = Depends(get_db)):
|
|
session = db.query(models.ChatSession).filter(models.ChatSession.session_id == session_id).first()
|
|
if not session:
|
|
raise HTTPException(status_code=404, detail="Session not found")
|
|
|
|
session.name = req.title
|
|
db.commit()
|
|
return {"ok": True}
|
|
|
|
# To run standalone: python -m uvicorn backend.main:app --host 127.0.0.1 --port 8000
|