Thorsten
624644619c
- Character sheets gain structured combat_stats, abilities (name + plain-language explanation), and equipment fields, populated by the upsert_character_sheet tool; the detail page renders them as their own sections instead of one prose block, with a player-card-style attribute grid (full ability names + modifiers). - Fix double-escaped unicode occasionally left in tool-call JSON arguments (a model quirk) and stop the app's own json.dumps calls from re-introducing it (ensure_ascii=False). - Render chat messages as markdown (react-markdown + Tailwind typography) instead of raw text, and widen the games/characters/ chat layout to use more of the screen on desktop. - Sharpen the DM system prompt: state the ability + DC for each offered action option before the player commits, and narrate rolls as DC → result → pass/fail before the story consequence; also stop re-asking Session-0 questions already answered in the game's name/description. - Make the DM's LLM provider configurable (xai default, lmstudio for a local OpenAI-compatible server via host.docker.internal) instead of hardcoded to x.ai. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
103 lines
3.5 KiB
Python
103 lines
3.5 KiB
Python
import json
|
|
import logging
|
|
import uuid
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.config import settings
|
|
from app.llm.client import get_dm_system_prompt, get_llm_client
|
|
from app.llm.context import build_context
|
|
from app.llm.json_utils import fix_double_escaped_unicode
|
|
from app.llm.tools import character_sheet, dice
|
|
from app.models.game import Game
|
|
from app.models.message import Message
|
|
from app.rag.retrieval import build_rag_block
|
|
|
|
logger = logging.getLogger("app.llm.orchestrator")
|
|
|
|
MAX_TOOL_ROUNDS = 5
|
|
MAX_TOKENS = 4096
|
|
|
|
TOOLS = [
|
|
{"type": "function", "function": dice.TOOL_SCHEMA},
|
|
{"type": "function", "function": character_sheet.TOOL_SCHEMA},
|
|
]
|
|
|
|
|
|
async def _execute_tool_call(
|
|
session: AsyncSession, game_id: uuid.UUID, tool_name: str, tool_input: dict
|
|
) -> dict:
|
|
"""Runs one tool call. Errors are returned as a payload (not raised), so the DM sees them
|
|
as a tool result and can recover instead of the whole turn crashing."""
|
|
try:
|
|
if tool_name == "roll_dice":
|
|
return dice.roll(tool_input["notation"])
|
|
if tool_name == "upsert_character_sheet":
|
|
return await character_sheet.upsert(session, game_id, tool_input)
|
|
return {"error": f"Unknown tool {tool_name!r}"}
|
|
except Exception as exc: # noqa: BLE001
|
|
logger.warning("Tool call %s failed: %s", tool_name, exc)
|
|
await session.rollback()
|
|
return {"error": str(exc)}
|
|
|
|
|
|
async def run_dm_turn(
|
|
session: AsyncSession, game_id: uuid.UUID, latest_player_message: str | None = None
|
|
) -> Message:
|
|
client = get_llm_client()
|
|
system_prompt = get_dm_system_prompt()
|
|
|
|
game = await session.get(Game, game_id)
|
|
if game is not None:
|
|
system_prompt = (
|
|
f"{system_prompt}\n\n"
|
|
"Spiel-Rahmendaten (vom Ersteller beim Anlegen bereits festgelegt — NICHT erneut "
|
|
"abfragen, in Session 0 höchstens knapp bestätigen):\n"
|
|
f"Name: {game.name}\nBeschreibung: {game.description}"
|
|
)
|
|
|
|
if latest_player_message:
|
|
rag_block = await build_rag_block(session, latest_player_message)
|
|
if rag_block:
|
|
system_prompt = f"{system_prompt}\n\n{rag_block}"
|
|
|
|
messages = [{"role": "system", "content": system_prompt}]
|
|
messages.extend(await build_context(session, game_id))
|
|
|
|
final_text = ""
|
|
for _ in range(MAX_TOOL_ROUNDS):
|
|
response = await client.chat.completions.create(
|
|
model=settings.dm_model,
|
|
max_tokens=MAX_TOKENS,
|
|
messages=messages,
|
|
tools=TOOLS,
|
|
)
|
|
choice = response.choices[0]
|
|
message = choice.message
|
|
final_text = message.content or ""
|
|
|
|
if not message.tool_calls:
|
|
break
|
|
|
|
messages.append(message.model_dump(exclude_unset=True))
|
|
|
|
for tool_call in message.tool_calls:
|
|
tool_input = fix_double_escaped_unicode(json.loads(tool_call.function.arguments))
|
|
result = await _execute_tool_call(session, game_id, tool_call.function.name, tool_input)
|
|
messages.append(
|
|
{
|
|
"role": "tool",
|
|
"tool_call_id": tool_call.id,
|
|
"content": json.dumps(result, ensure_ascii=False),
|
|
}
|
|
)
|
|
else:
|
|
if not final_text:
|
|
final_text = "(Der Dungeon Master braucht einen Moment länger als erwartet — bitte versuche es erneut.)"
|
|
|
|
dm_message = Message(game_id=game_id, sender_type="dm", content=final_text)
|
|
session.add(dm_message)
|
|
await session.commit()
|
|
await session.refresh(dm_message)
|
|
return dm_message
|