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>
126 lines
5.5 KiB
Python
126 lines
5.5 KiB
Python
import uuid
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.models.character import Character
|
|
from app.models.game import GameParticipant
|
|
from app.models.user import User
|
|
|
|
TOOL_SCHEMA = {
|
|
"name": "upsert_character_sheet",
|
|
"description": (
|
|
"Create or update a player's character sheet as facts about them are confirmed or change during play "
|
|
"(name, race, class, ability stats, combat stats, abilities, equipment, backstory). Call this "
|
|
"proactively as soon as details are settled — do not wait until the end of the session."
|
|
),
|
|
"parameters": {
|
|
"type": "object",
|
|
"properties": {
|
|
"player_name": {
|
|
"type": "string",
|
|
"description": "The real first name of the player this character belongs to, exactly as they introduced themselves.",
|
|
},
|
|
"character_id": {
|
|
"type": "string",
|
|
"description": "Omit when creating a new character. Provide the existing character's id when updating one.",
|
|
},
|
|
"name": {"type": "string"},
|
|
"race": {"type": "string"},
|
|
"char_class": {"type": "string"},
|
|
"stats": {
|
|
"type": "object",
|
|
"description": "Ability scores, e.g. {\"STR\": 15, \"DEX\": 12, \"CON\": 14, \"INT\": 10, \"WIS\": 8, \"CHA\": 13}",
|
|
},
|
|
"combat_stats": {
|
|
"type": "object",
|
|
"description": (
|
|
"Key/value readouts, e.g. {\"HP\": \"13/13\", \"RK\": \"19\", \"Initiative\": \"+1\", "
|
|
"\"Tempo\": \"7,5 m\", \"Übungsbonus\": \"+2\"}. Send the full current set each time — "
|
|
"this replaces whatever was stored before."
|
|
),
|
|
},
|
|
"abilities": {
|
|
"type": "array",
|
|
"description": (
|
|
"Every notable class feature, racial trait, feat, or spell the character has — one "
|
|
"entry per ability. Each 'description' must be a clear, beginner-friendly explanation "
|
|
"of what it does and when/how to use it, not just its rules name. Send the full current "
|
|
"list each time — this replaces whatever was stored before."
|
|
),
|
|
"items": {
|
|
"type": "object",
|
|
"properties": {
|
|
"name": {"type": "string"},
|
|
"description": {"type": "string"},
|
|
},
|
|
"required": ["name", "description"],
|
|
},
|
|
},
|
|
"equipment": {
|
|
"type": "array",
|
|
"description": "Full current equipment/inventory list, one item per string. Replaces whatever was stored before.",
|
|
"items": {"type": "string"},
|
|
},
|
|
"description": {
|
|
"type": "string",
|
|
"description": "Backstory/background narrative only — oaths, personality, motivation, current situation. Abilities and equipment go in their own fields, not here.",
|
|
},
|
|
},
|
|
"required": ["player_name"],
|
|
},
|
|
}
|
|
|
|
|
|
async def upsert(session: AsyncSession, game_id: uuid.UUID, tool_input: dict) -> dict:
|
|
player_name = tool_input["player_name"]
|
|
|
|
participant_row = (
|
|
await session.execute(
|
|
select(GameParticipant, User)
|
|
.join(User, User.id == GameParticipant.user_id)
|
|
.where(GameParticipant.game_id == game_id, User.name == player_name)
|
|
)
|
|
).first()
|
|
if participant_row is None:
|
|
raise ValueError(f"No participant named {player_name!r} found in this game")
|
|
|
|
participant, user = participant_row
|
|
|
|
character_id = tool_input.get("character_id")
|
|
character: Character | None = None
|
|
if character_id:
|
|
character = await session.get(Character, uuid.UUID(character_id))
|
|
if character is None or character.owner_id != user.id:
|
|
raise ValueError(f"Character {character_id!r} does not belong to {player_name!r}")
|
|
elif participant.character_id is not None:
|
|
# The player already has a character in this game (set by an earlier call in this
|
|
# session) — reuse it instead of creating a duplicate when the model omits character_id.
|
|
character = await session.get(Character, participant.character_id)
|
|
|
|
if character is None:
|
|
character = Character(owner_id=user.id, name=tool_input.get("name", "Unbenannt"), stats={})
|
|
session.add(character)
|
|
|
|
for field in ("name", "race", "char_class", "description"):
|
|
if field in tool_input and tool_input[field] is not None:
|
|
setattr(character, field, tool_input[field])
|
|
if "stats" in tool_input and tool_input["stats"] is not None:
|
|
character.stats = {**(character.stats or {}), **tool_input["stats"]}
|
|
if "combat_stats" in tool_input and tool_input["combat_stats"] is not None:
|
|
character.combat_stats = {**(character.combat_stats or {}), **tool_input["combat_stats"]}
|
|
if "abilities" in tool_input and tool_input["abilities"] is not None:
|
|
character.abilities = tool_input["abilities"]
|
|
if "equipment" in tool_input and tool_input["equipment"] is not None:
|
|
character.equipment = tool_input["equipment"]
|
|
|
|
await session.flush()
|
|
|
|
if participant.character_id != character.id:
|
|
participant.character_id = character.id
|
|
|
|
await session.commit()
|
|
await session.refresh(character)
|
|
|
|
return {"character_id": str(character.id), "name": character.name}
|