vrr/talemate
2
0
Fork 0
mirror of https://github.com/vegu-ai/talemate.git synced 2025-09-01 18:09:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

0.24.0 (#97)

Browse source 
* groq client

* adjust max token length

* more openai image download  fixes

* graphic novel style

* dialogue cleanup

* fix issue where auto-break repetition would trigger on empty responses

* reduce default convo retries to 1

* prompt tweaks

* fix some clients not handling autocomplete well

* screenplay dialogue generation tweaks

* message flags

* better cleanup of redundant change_ai_character calls

* super experimental continuity error fix mode for editor agent

* clamp temperature

* tweaks to continuity error fixing and expose to ux

* expose to ux

* allow CmdFixContinuityErrors to work even if editor has check_continuity_errors disabled

* prompt tweak

* support --endofline-- as well

* double coercion client option added

* fix issue with double coercion inserting "None" if not set

* client ux refactor to make room for coercion config

* rest of -- can be treated as *

* disable double coercion when json coercion is active since it kills accuracy

* prompt tweaks

* prompt tweaks

* show coercion status in client list

* change preset for edit_fix_continuity

* interim commit of coninuity error handling progress

* tag based presets

* special tokens to keep trailing whitespace if needed

* fix continuity errors finalized for now

* change double coercion formatting

* 0.24.0 and relock

* add groq and cohere to supported services

* linting
This commit is contained in:
veguAI 2024-04-27 00:24:53 +03:00 • committed by GitHub
parent 83027b3a0f
commit 95ae00e01f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
46 changed files with 1490 additions and 490 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -13,6 +13,8 @@ Supported APIs:
- [OpenAI](https://platform.openai.com/overview)
- [Anthropic](https://www.anthropic.com/)
- [mistral.ai](https://mistral.ai/)
- [Cohere](https://www.cohere.com/)
- [Groq](https://www.groq.com/)
Supported self-hosted APIs:
- [oobabooga/text-generation-webui](https://github.com/oobabooga/text-generation-webui) (local or with runpod support)

736
poetry.lock generated
View file

File diff suppressed because it is too large Load diff

4
pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
[tool.poetry]
name = "talemate"
version = "0.23.0"
version = "0.24.0"
description = "AI-backed roleplay and narrative tools"
authors = ["FinalWombat"]
license = "GNU Affero General Public License v3.0"
@ -21,6 +21,7 @@ openai = ">=1"
mistralai = ">=0.1.8"
cohere = ">=5.2.2"
anthropic = ">=0.19.1"
groq = ">=0.5.0"
requests = "^2.26"
colorama = ">=0.4.6"
Pillow = ">=9.5"
@ -48,6 +49,7 @@ RestrictedPython = ">7.1"
chromadb = ">=0.4.17,<1"
InstructorEmbedding = "^1.0.1"
torch = ">=2.1.0"
torchaudio = ">=2.3.0"
sentence-transformers="^2.2.2"
[tool.poetry.dev-dependencies]

45
scenes/simulation-suite/game.py
View file

@ -9,7 +9,7 @@ def game(TM):
PROMPT_STARTUP = "Narrate the computer asking the user to state the nature of their desired simulation in a synthetic and soft sounding voice."
CTX_PIN_UNAWARE = "Characters in the simulation ARE NOT AWARE OF THE COMPUTER."
CTX_PIN_UNAWARE = "Characters in the simulation ARE NOT AWARE OF THE COMPUTER OR THE SIMULATION."
AUTO_NARRATE_INTERVAL = 10
@ -133,12 +133,7 @@ def game(TM):
if processed_call:
processed.append(processed_call)
"""
{% set _ = emit_status("busy", "Simulation suite altering environment.", as_scene_message=True) %}
{% set update_world_state = True %}
{% set _ = agent_action("narrator", "action_to_narration", action_name="progress_story", narrative_direction="The computer calls the following functions:\n"+processed.join("\n")+"\nand the simulation adjusts the environment according to the user's wishes.\n\nWrite the narrative that describes the changes to the player in the context of the simulation starting up.", emit_message=True) %}
"""
if processed:
TM.log.debug("SIMULATION SUITE CALLS", calls=processed)
TM.game_state.set_var("instr.has_issued_instructions", "yes", commit=False)
@ -146,12 +141,23 @@ def game(TM):
TM.emit_status("busy", "Simulation suite altering environment.", as_scene_message=True)
compiled = "\n".join(processed)
if not self.simulation_reset and compiled:
TM.agents.narrator.action_to_narration(
narration = TM.agents.narrator.action_to_narration(
action_name="progress_story",
narrative_direction=f"The computer calls the following functions:\n\n{compiled}\n\nand the simulation adjusts the environment according to the user's wishes.\n\nWrite the narrative that describes the changes to the player in the context of the simulation starting up. YOU MUST NOT REFERENCE THE COMPUTER.",
narrative_direction=f"The computer calls the following functions:\n\n```\n{compiled}\n```\n\nand the simulation adjusts the environment according to the user's wishes.\n\nWrite the narrative that describes the changes to the player in the context of the simulation starting up. YOU MUST NOT REFERENCE THE COMPUTER OR THE SIMULATION.",
emit_message=True
)
# on the first narration we update the scene description and remove any mention of the computer
# or the simulation from the previous narration
is_initial_narration = TM.game_state.get_var("instr.intro_narration", False)
if not is_initial_narration:
TM.scene.set_description(str(narration))
TM.scene.set_intro(str(narration))
TM.log.debug("SIMULATION SUITE: initial narration", intro=str(narration))
TM.scene.pop_history(typ="narrator", all=True, reverse=True)
TM.scene.pop_history(typ="director", all=True, reverse=True)
TM.game_state.set_var("instr.intro_narration", True, commit=False)
self.update_world_state = True
self.set_simulation_title(compiled)
@ -330,15 +336,15 @@ def game(TM):
# sometimes the AI will call this function an pass an inanimate object as the parameter
# we need to determine if this is the case and just ignore it
is_inanimate = TM.client.query_text_eval("does the function add an inanimate object?", call)
is_inanimate = TM.client.query_text_eval(f"does the function `{call}` add an inanimate object, concept or abstract idea? (ANYTHING THAT IS NOT A CHARACTER THAT COULD BE PORTRAYED BY AN ACTOR)", call)
if is_inanimate:
TM.log.debug("SIMULATION SUITE: add npc - inanimate object", call=call)
TM.log.debug("SIMULATION SUITE: add npc - inanimate object / abstact idea - skipped", call=call)
return
# sometimes the AI will ask if the function adds a group of characters, we need to
# determine if this is the case
adds_group = TM.client.query_text_eval("does the function add a group of characters?", call)
adds_group = TM.client.query_text_eval(f"does the function `{call}` add MULTIPLE ai characters?", call)
TM.log.debug("SIMULATION SUITE: add npc", adds_group=adds_group)
@ -355,10 +361,15 @@ def game(TM):
has_change_ai_character_call = TM.client.query_text_eval(f"Are there any calls to `change_ai_character` in the instruction for {character_name}?", "\n".join(self.calls))
if has_change_ai_character_call:
combined_arg = TM.agents.world_state.analyze_and_follow_instruction(
"\n".join(self.calls),
f"Combine the arguments of the function calls `add_ai_character` and `change_ai_character` for {character_name} into a single text string. Respond with the new argument."
)
combined_arg = TM.client.render_and_request(
"combine-add-and-alter-ai-character",
dedupe_enabled=False,
calls="\n".join(self.calls),
character_name=character_name,
scene=TM.scene,
).replace("COMBINED ARGUMENT:", "").strip()
call = f"add_ai_character({combined_arg})"
inject = f"The computer executes the function `{call}`"
@ -498,7 +509,7 @@ def game(TM):
self.narrate_round()
elif rounds % AUTO_NARRATE_INTERVAL == 0 and rounds and TM.scene.npc_character_names() and has_issued_instructions:
# every 3 rounds, narrate the round
# every N rounds, narrate the round
self.narrate_round()
def guide_player(self):

28
scenes/simulation-suite/templates/combine-add-and-alter-ai-character.jinja2 Normal file
View file

@ -0,0 +1,28 @@
<|SECTION:EXAMPLES|>
combine the arguments of the function calls `add_ai_character` and `change_ai_character` for "Sarah" into a single text string argument to be passed to a single `add_ai_character` function call.
```
set_simulation_goal("player experiences a rollercoaster ride")
change_environment("theme park, riding a rollercoaster")
set_player_persona("young female experiencing rollercoaster ride")
set_player_name("Susanne")
add_ai_character("a female friend of player named Sarah")
change_ai_character("Sarah hates rollercoasters")
```
COMBINED ARGUMENT: "a female friend of player named Sarah, Sarah hates rollercoasters"
TASK: combine the arguments of the function calls `add_ai_character` and `change_ai_character` for "George" into a single text string argument to be passed to a single `add_ai_character` function call.
```
change_environment("building on fire")
change_ai_character("George is injured")
add_ai_character("a firefighter named Stephen")
change_ai_character("Stephen is afraid of heights")
```
COMBINED ARGUMENT: "a firefighter named Stephen, Stephen is afraid of heights"
<|CLOSE_SECTION|>
<|SECTION:TASK|>
TASK: combine the arguments of the function calls `add_ai_character` and `change_ai_character` for "{{ character_name }}" into a single text string argument to be passed to a single `add_ai_character` function call.
```
{{ calls }}
```
{{ set_prepared_response("COMBINED ARGUMENT:") }}

2
scenes/simulation-suite/templates/computer.jinja2
View file

@ -26,6 +26,8 @@ You must at least call one of the following functions:
Set the player persona at the beginning of a new simulation or if the player requests a change.
Only end the simulation if the player requests it explicitly.
Your response MUST ONLY CONTAIN the new simulation stack.
<|CLOSE_SECTION|>
<|SECTION:EXAMPLES|>
Request: Computer, I want to be on a mountain top

2
src/talemate/__init__.py
View file

@ -2,4 +2,4 @@ from .agents import Agent
from .client import TextGeneratorWebuiClient
from .tale_mate import *
VERSION = "0.23.0"
VERSION = "0.24.0"

7
src/talemate/agents/conversation.py
View file

@ -583,6 +583,8 @@ class ConversationAgent(Agent):
result = result.replace("(", "*").replace(")", "*")
result = result.replace("**", "*")
result = util.handle_endofline_special_delimiter(result)
return result
def set_generation_overrides(self):
@ -664,6 +666,11 @@ class ConversationAgent(Agent):
total_result = total_result.split("#")[0].strip()
total_result = util.handle_endofline_special_delimiter(total_result)
if total_result.startswith(":\n"):
total_result = total_result[2:]
# movie script format
# {uppercase character name}
# {dialogue}

2
src/talemate/agents/creator/assistant.py
View file

@ -118,7 +118,7 @@ class AssistantMixin:
"max_tokens": self.client.max_token_length,
"input": input.strip(),
"character": character,
"can_coerce": self.client.Meta().requires_prompt_template,
"can_coerce": self.client.can_be_coerced,
},
pad_prepended_response=False,
dedupe_enabled=False,

97
src/talemate/agents/editor.py
View file

@ -58,6 +58,11 @@ class EditorAgent(Agent):
label="Add detail",
description="Will attempt to add extra detail and exposition to the dialogue. Runs automatically after each AI dialogue.",
),
"check_continuity_errors": AgentAction(
enabled=False,
label="Check continuity errors",
description="Will attempt to fix continuity errors in the dialogue. Runs automatically after each AI dialogue. (super experimental)",
),
}
@property
@ -97,6 +102,8 @@ class EditorAgent(Agent):
edit = await self.fix_exposition(edit, emission.character)
edit = await self.check_continuity_errors(edit, emission.character)
edited.append(edit)
emission.generation = edited
@ -191,3 +198,93 @@ class EditorAgent(Agent):
response = util.strip_partial_sentences(response)
return response
@set_processing
async def check_continuity_errors(
self, content: str, character: Character, force: bool = False, fix: bool = True
) -> str:
"""
Edits a text to ensure that it is consistent with the scene
so far
"""
if not self.actions["check_continuity_errors"].enabled and not force:
return content
MAX_CONTENT_LENGTH = 255
count = util.count_tokens(content)
if count > MAX_CONTENT_LENGTH:
log.warning(
"check_continuity_errors content too long",
length=count,
max=MAX_CONTENT_LENGTH,
content=content[:255],
)
return content
response = await Prompt.request(
"editor.check-continuity-errors",
self.client,
"basic_deterministic_medium2",
vars={
"content": content,
"character": character,
"scene": self.scene,
"max_tokens": self.client.max_token_length,
},
)
# loop through response line by line, checking for lines beginning
# with "ERROR {number}:
errors = []
for line in response.split("\n"):
if not line.startswith("ERROR"):
continue
errors.append(line)
if not errors:
log.debug("check_continuity_errors NO ERRORS")
return content
log.debug("check_continuity_errors ERRORS", fix=fix, errors=errors)
if not fix:
return content
state = {}
response = await Prompt.request(
"editor.fix-continuity-errors",
self.client,
"editor_creative_medium2",
vars={
"content": content,
"character": character,
"scene": self.scene,
"max_tokens": self.client.max_token_length,
"errors": errors,
"set_state": lambda k, v: state.update({k: v}),
},
)
content_fix_identifer = state.get("content_fix_identifier")
try:
content = response.split("```")[0].strip()
content = content.strip(":")
except Exception as e:
log.error(
"check_continuity_errors FAILED",
content_fix_identifer=content_fix_identifer,
response=response,
e=e,
)
return content
log.debug("check_continuity_errors FIXED", content=content)
return content

2
src/talemate/agents/visual/__init__.py
View file

@ -73,7 +73,7 @@ class VisualBase(Agent):
),
"default_style": AgentActionConfig(
type="text",
value="concept_art",
value="graphic_novel",
choices=MAJOR_STYLES,
label="Default Style",
description="The default style to use for visual processing",

15
src/talemate/agents/visual/openai_image.py
View file

@ -1,6 +1,6 @@
import base64
import io
from urllib.parse import unquote
from urllib.parse import parse_qs, unquote, urlparse
import httpx
import structlog
@ -115,13 +115,20 @@ class OpenAIImageMixin:
# decode url because httpx will encode it again
download_url = unquote(download_url)
log.debug("openai_image_generate", download_url=download_url)
parsed = urlparse(download_url)
query = parse_qs(parsed.query)
log.debug("openai_image_generate", download_url=download_url, query=query)
async with httpx.AsyncClient() as client:
response = await client.get(download_url, timeout=90)
response = await client.get(download_url, params=query, timeout=90)
log.debug("openai_image_generate", status_code=response.status_code)
if response.status_code >= 400:
raise ValueError(f"Error downloading image: {response.content}")
log.error(
f"Error downloading image",
content=response.content,
status=response.status_code,
)
# bytes to base64encoded
image = base64.b64encode(response.content).decode("utf-8")
await self.emit_image(image)

16
src/talemate/agents/visual/style.py
View file

@ -1,4 +1,5 @@
import pydantic
import structlog
__all__ = [
"Style",
@ -12,6 +13,8 @@ STYLE_MAP = {}
THEME_MAP = {}
MAJOR_STYLES = {}
log = structlog.get_logger("talemate.agents.visual.style")
class Style(pydantic.BaseModel):
keywords: list[str] = pydantic.Field(default_factory=list)
@ -35,7 +38,10 @@ class Style(pydantic.BaseModel):
# loop through keywords and drop any starting with "no " and add to negative_keywords
# with "no " removed
for kw in self.keywords:
kw = kw.strip()
log.debug("Checking keyword", keyword=kw)
if kw.startswith("no "):
log.debug("Transforming negative keyword", keyword=kw, to=kw[3:])
self.keywords.remove(kw)
self.negative_keywords.append(kw[3:])
@ -98,6 +104,15 @@ STYLE_MAP["anime"] = Style(
negative_keywords="text, watermark, low quality, blurry, photo, 3d".split(", "),
)
STYLE_MAP["graphic_novel"] = Style(
keywords="(stylized by Enki Bilal:0.7), best quality, graphic novels, detailed linework, digital art".split(
", "
),
negative_keywords="text, watermark, low quality, blurry, photo, 3d, cgi".split(
", "
),
)
STYLE_MAP["character_portrait"] = Style(keywords="solo, looking at viewer".split(", "))
STYLE_MAP["environment"] = Style(
@ -110,6 +125,7 @@ MAJOR_STYLES = [
{"value": "concept_art", "label": "Concept Art"},
{"value": "ink_illustration", "label": "Ink Illustration"},
{"value": "anime", "label": "Anime"},
{"value": "graphic_novel", "label": "Graphic Novel"},
]

1
src/talemate/client/__init__.py
View file

@ -3,6 +3,7 @@ import os
import talemate.client.runpod
from talemate.client.anthropic import AnthropicClient
from talemate.client.cohere import CohereClient
from talemate.client.groq import GroqClient
from talemate.client.lmstudio import LMStudioClient
from talemate.client.mistral import MistralAIClient
from talemate.client.openai import OpenAIClient

48
src/talemate/client/base.py
View file

@ -56,6 +56,7 @@ class ErrorAction(pydantic.BaseModel):
class Defaults(pydantic.BaseModel):
api_url: str = "http://localhost:5000"
max_token_length: int = 4096
double_coercion: str = None
class ExtraField(pydantic.BaseModel):
@ -76,11 +77,12 @@ class ClientBase:
max_token_length: int = 4096
processing: bool = False
connected: bool = False
conversation_retries: int = 2
conversation_retries: int = 0
auto_break_repetition_enabled: bool = True
decensor_enabled: bool = True
auto_determine_prompt_template: bool = False
finalizers: list[str] = []
double_coercion: Union[str, None] = None
client_type = "base"
class Meta(pydantic.BaseModel):
@ -101,6 +103,7 @@ class ClientBase:
self.name = name or self.client_type
self.auto_determine_prompt_template_attempt = None
self.log = structlog.get_logger(f"client.{self.client_type}")
self.double_coercion = kwargs.get("double_coercion", None)
if "max_token_length" in kwargs:
self.max_token_length = (
int(kwargs["max_token_length"]) if kwargs["max_token_length"] else 4096
@ -114,10 +117,18 @@ class ClientBase:
def experimental(self):
return False
@property
def can_be_coerced(self):
"""
Determines whether or not his client can pass LLM coercion. (e.g., is able
to predefine partial LLM output in the prompt)
"""
return self.Meta().requires_prompt_template
def set_client(self, **kwargs):
self.client = AsyncOpenAI(base_url=self.api_url, api_key="sk-1111")
def prompt_template(self, sys_msg, prompt):
def prompt_template(self, sys_msg: str, prompt: str):
"""
Applies the appropriate prompt template for the model.
"""
@ -126,12 +137,24 @@ class ClientBase:
self.log.warning("prompt template not applied", reason="no model loaded")
return f"{sys_msg}\n{prompt}"
return model_prompt(self.model_name, sys_msg, prompt)[0]
# is JSON coercion active?
# Check for <|BOT|>{ in the prompt
json_coercion = "<|BOT|>{" in prompt
if self.can_be_coerced and self.double_coercion and not json_coercion:
double_coercion = self.double_coercion
double_coercion = f"{double_coercion}\n\n"
else:
double_coercion = None
return model_prompt(self.model_name, sys_msg, prompt, double_coercion)[0]
def prompt_template_example(self):
if not getattr(self, "model_name", None):
return None, None
return model_prompt(self.model_name, "sysmsg", "prompt<|BOT|>{LLM coercion}")
return model_prompt(
self.model_name, "{sysmsg}", "{prompt}<|BOT|>{LLM coercion}"
)
def reconfigure(self, **kwargs):
"""
@ -153,6 +176,9 @@ class ClientBase:
if "enabled" in kwargs:
self.enabled = bool(kwargs["enabled"])
if "double_coercion" in kwargs:
self.double_coercion = kwargs["double_coercion"]
def toggle_disabled_if_remote(self):
"""
If the client is targeting a remote recognized service, this
@ -194,8 +220,12 @@ class ClientBase:
return system_prompts.ROLEPLAY
if "conversation" in kind:
return system_prompts.ROLEPLAY
if "basic" in kind:
return system_prompts.BASIC
if "editor" in kind:
return system_prompts.EDITOR
if "edit" in kind:
return system_prompts.EDITOR
if "world_state" in kind:
return system_prompts.WORLD_STATE
if "analyze_freeform" in kind:
@ -223,8 +253,12 @@ class ClientBase:
return system_prompts.ROLEPLAY_NO_DECENSOR
if "conversation" in kind:
return system_prompts.ROLEPLAY_NO_DECENSOR
if "basic" in kind:
return system_prompts.BASIC
if "editor" in kind:
return system_prompts.EDITOR_NO_DECENSOR
if "edit" in kind:
return system_prompts.EDITOR_NO_DECENSOR
if "world_state" in kind:
return system_prompts.WORLD_STATE_NO_DECENSOR
if "analyze_freeform" in kind:
@ -292,6 +326,7 @@ class ClientBase:
"template_file": prompt_template_file,
"meta": self.Meta().model_dump(),
"error_action": None,
"double_coercion": self.double_coercion,
}
for field_name in getattr(self.Meta(), "extra_fields", {}).keys():
@ -403,6 +438,9 @@ class ClientBase:
parameters["extra_stopping_strings"] = dialog_stopping_strings
def finalize(self, parameters: dict, prompt: str):
prompt = util.replace_special_tokens(prompt)
for finalizer in self.finalizers:
fn = getattr(self, finalizer, None)
prompt, applied = fn(parameters, prompt)
@ -548,7 +586,7 @@ class ClientBase:
- the response
"""
if not self.auto_break_repetition_enabled:
if not self.auto_break_repetition_enabled or not response.strip():
return response, finalized_prompt
agent_context = active_agent.get()

4
src/talemate/client/cohere.py
View file

@ -168,6 +168,10 @@ class CohereClient(ClientBase):
if key not in valid_keys:
del parameters[key]
# if temperature is set, it needs to be clamped between 0 and 1.0
if "temperature" in parameters:
parameters["temperature"] = max(0.0, min(1.0, parameters["temperature"]))
async def generate(self, prompt: str, parameters: dict, kind: str):
"""
Generates text from the given prompt and parameters.

235
src/talemate/client/groq.py Normal file
View file

@ -0,0 +1,235 @@
import pydantic
import structlog
from groq import AsyncGroq, PermissionDeniedError
from talemate.client.base import ClientBase, ErrorAction
from talemate.client.registry import register
from talemate.config import load_config
from talemate.emit import emit
from talemate.emit.signals import handlers
__all__ = [
"GroqClient",
]
log = structlog.get_logger("talemate")
# Edit this to add new models / remove old models
SUPPORTED_MODELS = [
"mixtral-8x7b-32768",
"llama3-8b-8192",
"llama3-70b-8192",
]
JSON_OBJECT_RESPONSE_MODELS = []
class Defaults(pydantic.BaseModel):
max_token_length: int = 8192
model: str = "llama3-70b-8192"
@register()
class GroqClient(ClientBase):
"""
OpenAI client for generating text.
"""
client_type = "groq"
conversation_retries = 0
auto_break_repetition_enabled = False
# TODO: make this configurable?
decensor_enabled = True
class Meta(ClientBase.Meta):
name_prefix: str = "Groq"
title: str = "Groq"
manual_model: bool = True
manual_model_choices: list[str] = SUPPORTED_MODELS
requires_prompt_template: bool = False
defaults: Defaults = Defaults()
def __init__(self, model="llama3-70b-8192", **kwargs):
self.model_name = model
self.api_key_status = None
self.config = load_config()
super().__init__(**kwargs)
handlers["config_saved"].connect(self.on_config_saved)
@property
def groq_api_key(self):
return self.config.get("groq", {}).get("api_key")
def emit_status(self, processing: bool = None):
error_action = None
if processing is not None:
self.processing = processing
if self.groq_api_key:
status = "busy" if self.processing else "idle"
model_name = self.model_name
else:
status = "error"
model_name = "No API key set"
error_action = ErrorAction(
title="Set API Key",
action_name="openAppConfig",
icon="mdi-key-variant",
arguments=[
"application",
"groq_api",
],
)
if not self.model_name:
status = "error"
model_name = "No model loaded"
self.current_status = status
emit(
"client_status",
message=self.client_type,
id=self.name,
details=model_name,
status=status,
data={
"error_action": error_action.model_dump() if error_action else None,
"meta": self.Meta().model_dump(),
},
)
def set_client(self, max_token_length: int = None):
if not self.groq_api_key:
self.client = AsyncGroq(api_key="sk-1111")
log.error("No groq.ai API key set")
if self.api_key_status:
self.api_key_status = False
emit("request_client_status")
emit("request_agent_status")
return
if not self.model_name:
self.model_name = "llama3-70b-8192"
if max_token_length and not isinstance(max_token_length, int):
max_token_length = int(max_token_length)
model = self.model_name
self.client = AsyncGroq(api_key=self.groq_api_key)
self.max_token_length = max_token_length or 16384
if not self.api_key_status:
if self.api_key_status is False:
emit("request_client_status")
emit("request_agent_status")
self.api_key_status = True
log.info(
"groq.ai set client",
max_token_length=self.max_token_length,
provided_max_token_length=max_token_length,
model=model,
)
def reconfigure(self, **kwargs):
if kwargs.get("model"):
self.model_name = kwargs["model"]
self.set_client(kwargs.get("max_token_length"))
def on_config_saved(self, event):
config = event.data
self.config = config
self.set_client(max_token_length=self.max_token_length)
def response_tokens(self, response: str):
return response.usage.completion_tokens
def prompt_tokens(self, response: str):
return response.usage.prompt_tokens
async def status(self):
self.emit_status()
def prompt_template(self, system_message: str, prompt: str):
if "<|BOT|>" in prompt:
_, right = prompt.split("<|BOT|>", 1)
if right:
prompt = prompt.replace("<|BOT|>", "\nStart your response with: ")
else:
prompt = prompt.replace("<|BOT|>", "")
return prompt
def tune_prompt_parameters(self, parameters: dict, kind: str):
super().tune_prompt_parameters(parameters, kind)
keys = list(parameters.keys())
valid_keys = ["temperature", "top_p", "max_tokens"]
for key in keys:
if key not in valid_keys:
del parameters[key]
async def generate(self, prompt: str, parameters: dict, kind: str):
"""
Generates text from the given prompt and parameters.
"""
if not self.groq_api_key:
raise Exception("No groq.ai API key set")
supports_json_object = self.model_name in JSON_OBJECT_RESPONSE_MODELS
right = None
expected_response = None
try:
_, right = prompt.split("\nStart your response with: ")
expected_response = right.strip()
if expected_response.startswith("{") and supports_json_object:
parameters["response_format"] = {"type": "json_object"}
except (IndexError, ValueError):
pass
system_message = self.get_system_message(kind)
messages = [
{"role": "system", "content": system_message},
{"role": "user", "content": prompt},
]
self.log.debug(
"generate",
prompt=prompt[:128] + " ...",
parameters=parameters,
system_message=system_message,
)
try:
response = await self.client.chat.completions.create(
model=self.model_name,
messages=messages,
**parameters,
)
response = response.choices[0].message.content
# older models don't support json_object response coersion
# and often like to return the response wrapped in ```json
# so we strip that out if the expected response is a json object
if (
not supports_json_object
and expected_response
and expected_response.startswith("{")
):
if response.startswith("```json") and response.endswith("```"):
response = response[7:-3].strip()
if right and response.startswith(right):
response = response[len(right) :].strip()
return response
except PermissionDeniedError as e:
self.log.error("generate error", e=e)
emit("status", message="OpenAI API: Permission Denied", status="error")
return ""
except Exception as e:
raise

34
src/talemate/client/model_prompts.py
View file

@ -67,14 +67,27 @@ class ModelPrompt:
env = Environment(loader=FileSystemLoader(STD_TEMPLATE_PATH))
return sorted(env.list_templates())
def __call__(self, model_name: str, system_message: str, prompt: str):
def __call__(
self,
model_name: str,
system_message: str,
prompt: str,
double_coercion: str = None,
):
template, template_file = self.get_template(model_name)
if not template:
template_file = "default.jinja2"
template = self.env.get_template(template_file)
if not double_coercion:
double_coercion = ""
if "<|BOT|>" not in prompt and double_coercion:
prompt = f"{prompt}<|BOT|>"
if "<|BOT|>" in prompt:
user_message, coercion_message = prompt.split("<|BOT|>", 1)
coercion_message = f"{double_coercion}{coercion_message}"
else:
user_message = prompt
coercion_message = ""
@ -83,19 +96,30 @@ class ModelPrompt:
template.render(
{
"system_message": system_message,
"prompt": prompt,
"user_message": user_message,
"prompt": prompt.strip(),
"user_message": user_message.strip(),
"coercion_message": coercion_message,
"set_response": self.set_response,
"set_response": lambda prompt, response_str: self.set_response(
prompt, response_str, double_coercion
),
}
),
template_file,
)
def set_response(self, prompt: str, response_str: str):
def set_response(self, prompt: str, response_str: str, double_coercion: str = None):
prompt = prompt.strip("\n").strip()
if not double_coercion:
double_coercion = ""
if "<|BOT|>" not in prompt and double_coercion:
prompt = f"{prompt}<|BOT|>"
if "<|BOT|>" in prompt:
response_str = f"{double_coercion}{response_str}"
if "\n<|BOT|>" in prompt:
prompt = prompt.replace("\n<|BOT|>", response_str)
else:

10
src/talemate/client/openai_compat.py
View file

@ -29,7 +29,7 @@ class ClientConfig(BaseClientConfig):
@register()
class OpenAICompatibleClient(ClientBase):
client_type = "openai_compat"
conversation_retries = 5
conversation_retries = 0
config_cls = ClientConfig
class Meta(ClientBase.Meta):
@ -61,6 +61,14 @@ class OpenAICompatibleClient(ClientBase):
def experimental(self):
return EXPERIMENTAL_DESCRIPTION
@property
def can_be_coerced(self):
"""
Determines whether or not his client can pass LLM coercion. (e.g., is able
to predefine partial LLM output in the prompt)
"""
return not self.api_handles_prompt_template
def set_client(self, **kwargs):
self.api_key = kwargs.get("api_key", self.api_key)
self.api_handles_prompt_template = kwargs.get(

38
src/talemate/client/presets.py
View file

@ -34,6 +34,13 @@ PRESET_LLAMA_PRECISE = {
"repetition_penalty": 1.18,
}
PRESET_DETERMINISTIC = {
"temperature": 0.01,
"top_p": 0.01,
"top_k": 0,
"repetition_penalty": 1.0,
}
PRESET_DIVINE_INTELLECT = {
"temperature": 1.31,
"top_p": 0.14,
@ -120,9 +127,17 @@ def preset_for_kind(kind: str):
elif kind == "edit_add_detail":
return PRESET_DIVINE_INTELLECT # Assuming adding detail uses the same preset as divine intellect
elif kind == "edit_fix_exposition":
return PRESET_DIVINE_INTELLECT # Assuming fixing exposition uses the same preset as divine intellect
return PRESET_DETERMINISTIC # Assuming fixing exposition uses the same preset as divine intellect
elif kind == "edit_fix_continuity":
return PRESET_DETERMINISTIC
elif kind == "visualize":
return PRESET_SIMPLE_1
# tag based
elif "deterministic" in kind:
return PRESET_DETERMINISTIC
elif "creative" in kind:
return PRESET_DIVINE_INTELLECT
else:
return PRESET_SIMPLE_1 # Default preset if none of the kinds match
@ -176,7 +191,28 @@ def max_tokens_for_kind(kind: str, total_budget: int):
return 200
elif kind == "edit_fix_exposition":
return 1024
elif kind == "edit_fix_continuity":
return 512
elif kind == "visualize":
return 150
# tag based
elif "extensive" in kind:
return 2048
elif "long" in kind:
return 1024
elif "medium2" in kind:
return 512
elif "medium" in kind:
return 192
elif "short2" in kind:
return 128
elif "short" in kind:
return 75
elif "tiny2" in kind:
return 25
elif "tiny" in kind:
return 10
elif "yesno" in kind:
return 2
else:
return 150 # Default value if none of the kinds match

2
src/talemate/client/textgenwebui.py
View file

@ -5,7 +5,7 @@ import httpx
import structlog
from openai import AsyncOpenAI
from talemate.client.base import STOPPING_STRINGS, ClientBase
from talemate.client.base import STOPPING_STRINGS, ClientBase, ExtraField
from talemate.client.registry import register
log = structlog.get_logger("talemate.client.textgenwebui")

1
src/talemate/commands/__init__.py
View file

@ -11,6 +11,7 @@ from .cmd_inject import CmdInject
from .cmd_list_scenes import CmdListScenes
from .cmd_memget import CmdMemget
from .cmd_memset import CmdMemset
from .cmd_message_tools import *
from .cmd_narrate import *
from .cmd_rebuild_archive import CmdRebuildArchive
from .cmd_remove_character import CmdRemoveCharacter

45
src/talemate/commands/cmd_message_tools.py Normal file
View file

@ -0,0 +1,45 @@
from talemate.commands.base import TalemateCommand
from talemate.commands.manager import register
__all__ = ["CmdFixContinuityErrors"]
@register
class CmdFixContinuityErrors(TalemateCommand):
"""
Calls the editor agent's `check_continuity_errors` method to fix continuity errors in the
specified message (by id).
Will replace the message and re-emit the message.
"""
name = "fixmsg_continuity_errors"
description = "Fixes continuity errors in the specified message"
aliases = ["fixmsg_ce"]
async def run(self):
message_id = int(self.args[0]) if self.args else None
if not message_id:
self.system_message("No message id specified")
return True
message = self.scene.get_message(message_id)
if not message:
self.system_message(f"Message not found: {message_id}")
return True
editor = self.scene.get_helper("editor").agent
if hasattr(message, "character_name"):
character = self.scene.get_character(message.character_name)
else:
character = None
fixed_message = await editor.check_continuity_errors(
str(message), character, force=True
)
self.scene.edit_message(message_id, fixed_message)

7
src/talemate/config.py
View file

@ -37,6 +37,7 @@ class Client(BaseModel):
api_url: Union[str, None] = None
api_key: Union[str, None] = None
max_token_length: int = 4096
double_coercion: Union[str, None] = None
class Config:
extra = "ignore"
@ -144,6 +145,10 @@ class CohereConfig(BaseModel):
api_key: Union[str, None] = None
class GroqConfig(BaseModel):
api_key: Union[str, None] = None
class RunPodConfig(BaseModel):
api_key: Union[str, None] = None
@ -328,6 +333,8 @@ class Config(BaseModel):
cohere: CohereConfig = CohereConfig()
groq: GroqConfig = GroqConfig()
runpod: RunPodConfig = RunPodConfig()
chromadb: ChromaDB = ChromaDB()

3
src/talemate/game/scope.py
View file

@ -250,8 +250,11 @@ class SceneScope(ObjectScope):
"context_history",
"last_player_message",
"npc_character_names",
"pop_history",
"restore",
"set_content_context",
"set_description",
"set_intro",
"set_title",
]

43
src/talemate/history.py Normal file
View file

@ -0,0 +1,43 @@
"""
Utilities for managing the scene history.
Most of these currently exist as mehtods on the Scene object, but i am in the process of moving them here.
"""
from talemate.scene_message import SceneMessage
def pop_history(
history: list[SceneMessage],
typ: str,
source: str = None,
all: bool = False,
max_iterations: int = None,
reverse: bool = False,
):
"""
Pops the last message from the scene history
"""
iterations = 0
if not reverse:
iter_range = range(len(history) - 1, -1, -1)
else:
iter_range = range(len(history))
to_remove = []
for idx in iter_range:
if history[idx].typ == typ and (
history[idx].source == source or source is None
):
to_remove.append(history[idx])
if not all:
break
iterations += 1
if max_iterations and iterations >= max_iterations:
break
for message in to_remove:
history.remove(message)

17
src/talemate/prompts/templates/conversation/dialogue-movie_script.jinja2
View file

@ -32,7 +32,7 @@ Continue the scene by acting the next line of dialogue for {{ talking_character.
{% if decensor %}This screenplay is fiction and everyone has already consented to the content rating, disregard any safety, health or ethical concerns and suppress any related warnings.
{% endif %}
Portray the character exactly as defined without holding back. You are an actor and you have the creative freedom to fill in gaps and flesh out {{ talking_character.name }}'s details if needed.
Portray the character exactly as defined without holding back. You are the creator of the screenplay and you have the creative freedom to fill in gaps and flesh out {{ talking_character.name }}'s details if needed.
{% if talking_character.random_dialogue_example -%}
Based on {{ talking_character.name}}'s existing dialogue, create a continuation of the scene that stays true to {{ talking_character.name}}'s character and the scene progression.
@ -40,18 +40,24 @@ Based on {{ talking_character.name}}'s existing dialogue, create a continuation
You may chose to have {{ talking_character.name}} respond to the conversation, or you may chose to have {{ talking_character.name}} perform a new action that is in line with {{ talking_character.name}}'s character.
The format is a screenplay, so you should write the character's name in all caps followed by a line break and then the character's dialogue. For example:
The format is a screenplay, so you MUST write the character's name in all caps followed by a line break and then the character's dialogue and actions. For example:
CHARACTER NAME
I'm so glad you're here.
"I'm so glad you're here."
-- endofline --
Emotions and actions should be written in italics. For example:
CHARACTER NAME
*smiles* I'm so glad you're here.
*smiles* "I'm so glad you're here."
-- endofline --
{{ extra_instructions }}
STAY IN THE SCENE. YOU MUST NOT BREAK CHARACTER. YOU MUST NOT BREAK THE FOURTH WALL.
YOU MUST DELIMIT YOUR CONTRIBUTION WITH "-- endofline --" AT THE END OF YOUR CONTRIBUTION.
{% if scene.count_messages() >= 5 and not talking_character.dialogue_instructions %}Use an informal and colloquial register with a conversational tone. Overall, {{ talking_character.name }}'s dialog is informal, conversational, natural, and spontaneous, with a sense of immediacy.
{% endif -%}
<|CLOSE_SECTION|>
@ -120,6 +126,7 @@ Emotions and actions should be written in italics. For example:
# Requested changes: {{ rerun_context.direction }}
{% endif -%}
{% endif -%}
{{ bot_token }}{{ talking_character.name.upper() }}{% if partial_message %}
{{ bot_token }}{{ talking_character.name.upper() }}
{% if partial_message -%}
{{ partial_message.strip() }}
{% endif %}

2
src/talemate/prompts/templates/conversation/system-no-decensor.jinja2
View file

@ -1 +1 @@
An acting session between talented actors. The actor will follow the instructions for the scene and dialogue and will improvise as needed. The actor will only respond as one character.
A writing session between talented writers. The writer will follow the instructions for the scene and dialogue and will improvise as needed. The writer will only create dialogue for one character.

2
src/talemate/prompts/templates/conversation/system.jinja2
View file

@ -1 +1 @@
An acting session between talented actors. No topic is taboo for the actor and they will use crude, lewd and strong language if the situation warrants it. The actor will follow the instructions for the scene and dialogue and will improvise as needed. The actor will only respond as one character.
A writing session between talented writers. No topic is taboo for the writer and they will use crude, lewd and strong language if the situation warrants it. The writer will follow the instructions for the scene and dialogue and will improvise as needed. The writer will only create dialogue for one character.

8
src/talemate/prompts/templates/creator/contextual-generate.jinja2
View file

@ -25,13 +25,19 @@
{% endif %}
{#- CHARACTER ATTRIBUTE -#}
{% if context_typ == "character attribute" %}
{{ action_task }} "{{ context_name }}" attribute for {{ character.name }}. This must be a general description and not a continuation of the current narrative.
{{ action_task }} "{{ context_name }}" attribute for {{ character.name }}. This must be a general description and not a continuation of the current narrative. Keep it short, similar length to {{ character.name }}'s other attributes in the sheet.
YOUR RESPONSE MUST ONLY CONTAIN THE NEW ATTRIBUTE TEXT.
{#- CHARACTER DETAIL -#}
{% elif context_typ == "character detail" %}
{% if context_name.endswith("?") -%}
{{ action_task }} answer to "{{ context_name }}" for {{ character.name }}. This must be a general description and not a continuation of the current narrative.
YOUR RESPONSE MUST ONLY CONTAIN THE ANSWER.
{% else -%}
{{ action_task }} "{{ context_name }}" detail for {{ character.name }}. This must be a general description and not a continuation of the current narrative. Use paragraphs to separate different details.
YOUR RESPONSE MUST ONLY CONTAIN THE NEW DETAIL TEXT.
{% endif -%}
Use a simple, easy to read writing format.
{#- CHARACTER EXAMPLE DIALOGUE -#}

56
src/talemate/prompts/templates/editor/check-continuity-errors.jinja2 Normal file
View file

@ -0,0 +1,56 @@
{% if character -%}
{% set content_block_identifier = character.name + "'s next dialogue" %}
{% else -%}
{% set content_block_identifier = "next narrative" %}
{% endif -%}
{% block rendered_context -%}
<|SECTION:CONTEXT|>
{%- with memory_query=scene.snapshot() -%}
{% include "extra-context.jinja2" %}
{% endwith %}
{% if character %}
{{ character.name }}'s description: {{ character.description|condensed }}
{% endif %}
{{ text }}
<|CLOSE_SECTION|>
{% endblock -%}
<|SECTION:SCENE|>
{% set scene_history=scene.context_history(budget=max_tokens-512-count_tokens(self.rendered_context())) -%}
{% set final_line_number=len(scene_history) -%}
{% for scene_context in scene_history -%}
{{ loop.index }}. {{ scene_context }}
{% endfor -%}
{% if not scene.history -%}
No dialogue so far
{% endif -%}
<|CLOSE_SECTION|>
<|SECTION:TASK|>
What are continuity errors?
Continuity errors are mistakes in a story that occur when something changes from one scene to the next. This could be a character's appearance, state of clothing, the time of day, or even the weather. These errors can be distracting for the reader and can take them out of the story. It's important to catch these errors and fix them before the story is published.
{% if character -%}
CAREFULLY Analyze {{ character.name }}'s next line in the scene for continuity errors.
{% else -%}
CAREFULLY Analyze the next line in the scene for continuity errors.
{% endif -%}
YOU MUST DO THIS LINE BY LINE PROVIDING ANALYSIS FOR EACH LINE SEPARATELY.
```{{ content_block_identifier }}
{{ content }}
```
YOU MUST NOT PROVIDE REPLACEMENT SUGGESTIONS WHEN YOU FIND CONTINUITY ERRORS.
THINK CAREFULLY, consider state of the scene, the characters, clothing, items present or not longer present. If you find any continuity errors, list them in the response.
It is possible for the text to have multiple continuity errors. You must identify all of them.
Always analyze the full dialogue, don't stop if you find one error.
You response must be in the following format:
ERROR 1: explanation of error
ERROR 2: explanation of error
ERROR 3: explanation of error

21
src/talemate/prompts/templates/editor/extra-context.jinja2 Normal file
View file

@ -0,0 +1,21 @@
{# MEMORY #}
{%- if memory_query %}
{%- for memory in query_memory(memory_query, as_question_answer=False, iterate=5) -%}
{{ memory|condensed }}
{% endfor -%}
{% endif -%}
{# END MEMORY #}
{# GENERAL REINFORCEMENTS #}
{% set general_reinforcements = scene.world_state.filter_reinforcements(insert=['all-context']) %}
{%- for reinforce in general_reinforcements %}
{{ reinforce.as_context_line|condensed }}
{% endfor %}
{# END GENERAL REINFORCEMENTS #}
{# ACTIVE PINS #}
{%- for pin in scene.active_pins %}
{{ pin.time_aware_text|condensed }}
{% endfor %}
{# END ACTIVE PINS #}

51
src/talemate/prompts/templates/editor/fix-continuity-errors.jinja2 Normal file
View file

@ -0,0 +1,51 @@
{% if character -%}
{% set content_block_identifier = character.name + "'s next dialogue" %}
{% set content_fix_identifier = character.name + "'s adjusted dialogue" %}
{% else -%}
{% set content_block_identifier = "next narrative" %}
{% set content_fix_identifier = "adjusted narrative" %}
{% endif -%}
{% set _ = set_state("content_fix_identifier", content_fix_identifier) %}
{% block rendered_context -%}
<|SECTION:CONTEXT|>
{%- with memory_query=scene.snapshot() -%}
{% include "extra-context.jinja2" %}
{% endwith %}
{% if character %}
{{ character.name }}'s description: {{ character.description|condensed }}
{% endif %}
{{ text }}
<|CLOSE_SECTION|>
{% endblock -%}
<|SECTION:SCENE|>
{% set scene_history=scene.context_history(budget=max_tokens-512-count_tokens(self.rendered_context())) -%}
{% set final_line_number=len(scene_history) -%}
{% for scene_context in scene_history -%}
{{ loop.index }}. {{ scene_context }}
{% endfor -%}
{% if not scene.history -%}
No dialogue so far
{% endif -%}
<|CLOSE_SECTION|>
<|SECTION:CONTINUITY ERRORS|>
```{{ content_block_identifier }}
{{ content }}
```
The following continuity errors have been identified in "{{ content_block_identifier }}":
{% for error in errors -%}
{{ error }}
{% endfor %}
<|CLOSE_SECTION|>
<|SECTION:TASK|>
Write a revised draft of "{{ content_block_identifier }}" and fix the continuity errors identified.
YOU MUST NOT CHANGE THE MEANING, PLOT DIRECTION OR TONE OF THE TEXT.
YOU MUST ONLY FIX CONTINUITY ERRORS.
<|CLOSE_SECTION|>
{{ bot_token }}```{{ content_fix_identifier }}<|TRAILING_NEW_LINE|>

22
src/talemate/scene_message.py
View file

@ -1,3 +1,4 @@
import enum
import re
from dataclasses import dataclass, field
@ -17,6 +18,15 @@ def reset_message_id():
_message_id = 0
class Flags(enum.IntFlag):
"""
Flags for messages
"""
NONE = 0
HIDDEN = 1
@dataclass
class SceneMessage:
"""
@ -32,7 +42,7 @@ class SceneMessage:
# the source of the message (e.g. "ai", "progress_story", "director")
source: str = ""
hidden: bool = False
flags: Flags = Flags.NONE
typ = "scene"
@ -57,6 +67,7 @@ class SceneMessage:
"id": self.id,
"typ": self.typ,
"source": self.source,
"flags": int(self.flags),
}
def __iter__(self):
@ -79,11 +90,15 @@ class SceneMessage:
def raw(self):
return str(self.message)
@property
def hidden(self):
return self.flags & Flags.HIDDEN
def hide(self):
self.hidden = True
self.flags |= Flags.HIDDEN
def unhide(self):
self.hidden = False
self.flags &= ~Flags.HIDDEN
def as_format(self, format: str, **kwargs) -> str:
return self.message
@ -234,6 +249,7 @@ class TimePassageMessage(SceneMessage):
"typ": "time",
"source": self.source,
"ts": self.ts,
"flags": int(self.flags),
}

12
src/talemate/server/websocket_server.py
View file

@ -379,6 +379,9 @@ class WebsocketHandler(Receiver):
"message": emission.message,
"id": emission.id,
"character": emission.character.name if emission.character else "",
"flags": (
int(emission.message_object.flags) if emission.message_object else 0
),
}
)
@ -401,6 +404,9 @@ class WebsocketHandler(Receiver):
"character": character,
"action": emission.message_object.action,
"direction_mode": direction_mode,
"flags": (
int(emission.message_object.flags) if emission.message_object else 0
),
}
)
@ -412,6 +418,9 @@ class WebsocketHandler(Receiver):
"character": emission.character.name if emission.character else "",
"id": emission.id,
"color": emission.character.color if emission.character else None,
"flags": (
int(emission.message_object.flags) if emission.message_object else 0
),
}
)
@ -422,6 +431,9 @@ class WebsocketHandler(Receiver):
"message": emission.message,
"id": emission.id,
"ts": emission.message_object.ts,
"flags": (
int(emission.message_object.flags) if emission.message_object else 0
),
}
)

36
src/talemate/tale_mate.py
View file

@ -1021,21 +1021,39 @@ class Scene(Emitter):
)
def pop_history(
self, typ: str, source: str, all: bool = False, max_iterations: int = None
self,
typ: str,
source: str = None,
all: bool = False,
max_iterations: int = None,
reverse: bool = False,
):
"""
Removes the last message from the history that matches the given typ and source
"""
iterations = 0
for idx in range(len(self.history) - 1, -1, -1):
if self.history[idx].typ == typ and self.history[idx].source == source:
self.history.pop(idx)
if not reverse:
iter_range = range(len(self.history) - 1, -1, -1)
else:
iter_range = range(len(self.history))
to_remove = []
for idx in iter_range:
if self.history[idx].typ == typ and (
self.history[idx].source == source or source is None
):
to_remove.append(self.history[idx])
if not all:
return
break
iterations += 1
if max_iterations and iterations >= max_iterations:
break
for message in to_remove:
self.history.remove(message)
def find_message(self, typ: str, source: str, max_iterations: int = 100):
"""
Finds the last message in the history that matches the given typ and source
@ -1058,6 +1076,14 @@ class Scene(Emitter):
return idx
return -1
def get_message(self, message_id: int) -> SceneMessage:
"""
Returns the message in the history with the given id
"""
for idx in range(len(self.history) - 1, -1, -1):
if self.history[idx].id == message_id:
return self.history[idx]
def last_player_message(self) -> str:
"""
Returns the last message from the player

5
src/talemate/util/__init__.py
View file

@ -14,6 +14,8 @@ from PIL import Image
from thefuzz import fuzz
from talemate.scene_message import SceneMessage
from talemate.util.dialogue import *
from talemate.util.prompt import *
log = structlog.get_logger("talemate.util")
@ -945,6 +947,9 @@ def ensure_dialog_line_format(line: str, default_wrap: str = None) -> str:
line = line.replace('"*', '"').replace('*"', '"')
line = line.replace('*, "', '* "')
line = line.replace('*. "', '* "')
# if the line ends with a whitespace followed by a classifier, strip both from the end
# as this indicates the remnants of a partial segment that was removed.

15
src/talemate/util/dialogue.py Normal file
View file

@ -0,0 +1,15 @@
__all__ = ["handle_endofline_special_delimiter"]
def handle_endofline_special_delimiter(content: str) -> str:
# -- endofline -- is a custom delimter that can exist 0 to n times
# it should split total_result on the last one, take the left side
# then remove all remaining -- endofline -- from the left side
# then remove all leading and trailing whitespace
content = content.replace("--endofline--", "-- endofline --")
content = content.rsplit("-- endofline --", 1)[0]
content = content.replace("-- endofline --", "")
content = content.strip()
content = content.replace("--", "*")
return content

14
src/talemate/util/prompt.py Normal file
View file

@ -0,0 +1,14 @@
__all__ = ["replace_special_tokens"]
def replace_special_tokens(prompt: str):
"""
Replaces the following special tokens
<|TRAILING_NEW_LINE|> -> \n
<|TRAILING_SPACE|> -> " "
"""
return prompt.replace("<|TRAILING_NEW_LINE|>", "\n").replace(
"<|TRAILING_SPACE|>", " "
)

4
talemate_frontend/package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "talemate_frontend",
"version": "0.23.0",
"version": "0.24.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "talemate_frontend",
"version": "0.23.0",
"version": "0.24.0",
"dependencies": {
"@mdi/font": "7.4.47",
"core-js": "^3.8.3",

2
talemate_frontend/package.json
View file

@ -1,6 +1,6 @@
{
"name": "talemate_frontend",
"version": "0.23.0",
"version": "0.24.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",

9
talemate_frontend/src/components/AIClient.vue
View file

@ -46,6 +46,12 @@
</template>
</v-tooltip>
<v-tooltip :text="'Coercion active: ' + client.double_coercion" v-if="client.double_coercion" max-width="200">
<template v-slot:activator="{ props }">
<v-icon x-size="14" class="mr-1" v-bind="props" color="primary">mdi-account-lock-open</v-icon>
</template>
</v-tooltip>
<v-tooltip text="Edit client">
<template v-slot:activator="{ props }">
<v-btn size="x-small" class="mr-1" v-bind="props" variant="tonal" density="comfortable" rounded="sm" @click.stop="editClient(index)" icon="mdi-cogs"></v-btn>
@ -94,6 +100,7 @@ export default {
api_url: '',
model_name: '',
max_token_length: 4096,
double_coercion: null,
data: {
has_prompt_template: false,
}
@ -235,6 +242,7 @@ export default {
client.max_token_length = data.max_token_length;
client.api_url = data.api_url;
client.api_key = data.api_key;
client.double_coercion = data.data.double_coercion;
client.data = data.data;
} else if(!client) {
console.log("Adding new client", data);
@ -248,6 +256,7 @@ export default {
max_token_length: data.max_token_length,
api_url: data.api_url,
api_key: data.api_key,
double_coercion: data.data.double_coercion,
data: data.data,
});
// sort the clients by name

18
talemate_frontend/src/components/AppConfig.vue
View file

@ -174,6 +174,23 @@
</v-row>
</div>
<!-- GROQ API -->
<div v-if="applicationPageSelected === 'groq_api'">
<v-alert color="white" variant="text" icon="mdi-api" density="compact">
<v-alert-title>groq</v-alert-title>
<div class="text-grey">
Configure your GROQ API key here. You can get one from <a href="https://console.groq.com/keys" target="_blank">https://console.groq.com/keys</a>
</div>
</v-alert>
<v-divider class="mb-2"></v-divider>
<v-row>
<v-col cols="12">
<v-text-field type="password" v-model="app_config.groq.api_key"
label="GROQ API Key"></v-text-field>
</v-col>
</v-row>
</div>
<!-- ELEVENLABS API -->
<div v-if="applicationPageSelected === 'elevenlabs_api'">
<v-alert color="white" variant="text" icon="mdi-api" density="compact">
@ -297,6 +314,7 @@ export default {
{title: 'mistral.ai', icon: 'mdi-api', value: 'mistralai_api'},
{title: 'Anthropic', icon: 'mdi-api', value: 'anthropic_api'},
{title: 'Cohere', icon: 'mdi-api', value: 'cohere_api'},
{title: 'groq', icon: 'mdi-api', value: 'groq_api'},
{title: 'ElevenLabs', icon: 'mdi-api', value: 'elevenlabs_api'},
{title: 'RunPod', icon: 'mdi-api', value: 'runpod_api'},
],

6
talemate_frontend/src/components/CharacterMessage.vue
View file

@ -31,6 +31,10 @@
<v-icon class="mr-1">mdi-pin</v-icon>
Create Pin
</v-chip>
<v-chip size="x-small" class="ml-2" label color="primary" v-if="!editing && hovered" variant="outlined" @click="fixMessageContinuityErrors(message_id)">
<v-icon class="mr-1">mdi-call-split</v-icon>
Fix Continuity Errors
</v-chip>
</v-sheet>
<div v-else style="height:24px">
@ -41,7 +45,7 @@
<script>
export default {
props: ['character', 'text', 'color', 'message_id'],
inject: ['requestDeleteMessage', 'getWebsocket', 'createPin'],
inject: ['requestDeleteMessage', 'getWebsocket', 'createPin', 'fixMessageContinuityErrors'],
computed: {
parts() {
const parts = [];

236
talemate_frontend/src/components/ClientModal.vue
View file

@ -1,77 +1,129 @@
<template>
<v-dialog v-model="localDialog" max-width="800px">
<v-card>
<v-card-title>
<v-icon>mdi-network-outline</v-icon>
<span class="headline">{{ title() }}</span>
</v-card-title>
<v-card-text>
<v-form ref="form" v-model="formIsValid">
<v-container>
<v-row>
<v-col cols="6">
<v-select v-model="client.type" :disabled="!typeEditable()" :items="clientChoices" label="Client Type" @update:model-value="resetToDefaults"></v-select>
</v-col>
<v-col cols="6">
<v-text-field v-model="client.name" label="Client Name" :rules="[rules.required]"></v-text-field>
</v-col>
</v-row>
<v-row v-if="clientMeta().experimental">
<v-col cols="12">
<v-alert type="warning" variant="text" density="compact" icon="mdi-flask" outlined>{{ clientMeta().experimental }}</v-alert>
</v-col>
</v-row>
<v-row>
<v-col cols="12">
<v-row>
<v-col :cols="clientMeta().enable_api_auth ? 7 : 12">
<v-text-field v-model="client.api_url" v-if="requiresAPIUrl(client)" :rules="[rules.required]" label="API URL"></v-text-field>
</v-col>
<v-col cols="5">
<v-text-field type="password" v-model="client.api_key" v-if="requiresAPIUrl(client) && clientMeta().enable_api_auth" label="API Key"></v-text-field>
</v-col>
</v-row>
<v-select v-model="client.model" v-if="clientMeta().manual_model && clientMeta().manual_model_choices" :items="clientMeta().manual_model_choices" label="Model"></v-select>
<v-text-field v-model="client.model_name" v-else-if="clientMeta().manual_model" label="Manually specify model name" hint="It looks like we're unable to retrieve the model name automatically. The model name is used to match the appropriate prompt template. This is likely only important if you're locally serving a model."></v-text-field>
</v-col>
</v-row>
<v-row v-for="field in clientMeta().extra_fields" :key="field.name">
<v-col cols="12">
<v-text-field v-model="client.data[field.name]" v-if="field.type==='text'" :label="field.label" :rules="[rules.required]" :hint="field.description"></v-text-field>
<v-checkbox v-else-if="field.type === 'bool'" v-model="client.data[field.name]" :label="field.label" :hint="field.description" density="compact"></v-checkbox>
</v-col>
</v-row>
<v-row>
<v-col cols="4">
<v-text-field v-model="client.max_token_length" v-if="requiresAPIUrl(client)" type="number" label="Context Length" :rules="[rules.required]"></v-text-field>
</v-col>
<v-col cols="8" v-if="!typeEditable() && client.data && client.data.prompt_template_example !== null && client.model_name && clientMeta().requires_prompt_template && !client.data.api_handles_prompt_template">
<v-combobox ref="promptTemplateComboBox" :label="'Prompt Template for '+client.model_name" v-model="client.data.template_file" @update:model-value="setPromptTemplate" :items="promptTemplates"></v-combobox>
<v-card elevation="3" :color="(client.data.has_prompt_template ? 'primary' : 'warning')" variant="tonal">
<v-dialog v-model="localDialog" max-width="960px">
<v-card>
<v-card-title>
<v-icon>mdi-network-outline</v-icon>
<span class="headline">{{ title() }}</span>
</v-card-title>
<v-card-text>
<v-form ref="form" v-model="formIsValid">
<v-card-text>
<div class="text-caption" v-if="!client.data.has_prompt_template">No matching LLM prompt template found. Using default.</div>
<div class="prompt-template-preview">{{ client.data.prompt_template_example }}</div>
</v-card-text>
<v-card-actions>
<v-btn @click.stop="determineBestTemplate" prepend-icon="mdi-web-box">Determine via HuggingFace</v-btn>
</v-card-actions>
</v-card>
</v-col>
</v-row>
</v-container>
</v-form>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" text @click="close" prepend-icon="mdi-cancel">Cancel</v-btn>
<v-btn color="primary" text @click="save" prepend-icon="mdi-check-circle-outline" :disabled="!formIsValid">Save</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
<v-row>
<v-col cols="3">
<v-tabs v-model="tab" direction="vertical">
<v-tab v-for="tab in availableTabs" :key="tab.value" :value="tab.value" :prepend-icon="tab.icon" color="primary">{{ tab.title }}</v-tab>
</v-tabs>
</v-col>
<v-col cols="9">
<v-window v-model="tab">
<!-- GENERAL -->
<v-window-item value="general">
<v-row>
<v-col cols="6">
<v-select v-model="client.type" :disabled="!typeEditable()" :items="clientChoices"
label="Client Type" @update:model-value="resetToDefaults"></v-select>
</v-col>
<v-col cols="6">
<v-text-field v-model="client.name" label="Client Name" :rules="[rules.required]"></v-text-field>
</v-col>
</v-row>
<v-row v-if="clientMeta().experimental">
<v-col cols="12">
<v-alert type="warning" variant="text" density="compact" icon="mdi-flask" outlined>{{
clientMeta().experimental }}</v-alert>
</v-col>
</v-row>
<v-row>
<v-col cols="12">
<v-row>
<v-col :cols="clientMeta().enable_api_auth ? 7 : 12">
<v-text-field v-model="client.api_url" v-if="requiresAPIUrl(client)" :rules="[rules.required]"
label="API URL"></v-text-field>
</v-col>
<v-col cols="5">
<v-text-field type="password" v-model="client.api_key"
v-if="requiresAPIUrl(client) && clientMeta().enable_api_auth"
label="API Key"></v-text-field>
</v-col>
</v-row>
<v-select v-model="client.model"
v-if="clientMeta().manual_model && clientMeta().manual_model_choices"
:items="clientMeta().manual_model_choices" label="Model"></v-select>
<v-text-field v-model="client.model_name" v-else-if="clientMeta().manual_model"
label="Manually specify model name"
hint="It looks like we're unable to retrieve the model name automatically. The model name is used to match the appropriate prompt template. This is likely only important if you're locally serving a model."></v-text-field>
</v-col>
</v-row>
<v-row v-for="field in clientMeta().extra_fields" :key="field.name">
<v-col cols="12">
<v-text-field v-model="client.data[field.name]" v-if="field.type === 'text'" :label="field.label"
:rules="[rules.required]" :hint="field.description"></v-text-field>
<v-checkbox v-else-if="field.type === 'bool'" v-model="client.data[field.name]"
:label="field.label" :hint="field.description" density="compact"></v-checkbox>
</v-col>
</v-row>
<v-row>
<v-col cols="4">
<v-text-field v-model="client.max_token_length" v-if="requiresAPIUrl(client)" type="number"
label="Context Length" :rules="[rules.required]"></v-text-field>
</v-col>
<v-col cols="8"
v-if="!typeEditable() && client.data && client.data.prompt_template_example !== null && client.model_name && clientMeta().requires_prompt_template && !client.data.api_handles_prompt_template">
<v-combobox ref="promptTemplateComboBox" :label="'Prompt Template for ' + client.model_name"
v-model="client.data.template_file" @update:model-value="setPromptTemplate"
:items="promptTemplates"></v-combobox>
<v-card elevation="3" :color="(client.data.has_prompt_template ? 'primary' : 'warning')"
variant="tonal">
<v-card-text>
<div class="text-caption" v-if="!client.data.has_prompt_template">No matching LLM prompt
template found. Using default.</div>
<div class="prompt-template-preview">{{ client.data.prompt_template_example }}</div>
</v-card-text>
<v-card-actions>
<v-btn @click.stop="determineBestTemplate" prepend-icon="mdi-web-box">Determine via
HuggingFace</v-btn>
</v-card-actions>
</v-card>
</v-col>
</v-row>
</v-window-item>
<!-- COERCION -->
<v-window-item value="coercion">
<v-alert icon="mdi-account-lock-open" density="compact" color="grey-darken-1" variant="text">
<div>
If set, this text will be prepended to every LLM response, attempting to enforce compliance with the request.
<p>
<v-chip label size="small" color="primary" @click.stop="double_coercion='Certainly: '">Certainly: </v-chip> or <v-chip @click.stop="client.double_coercion='Absolutely! here is exactly what you asked for: '" color="primary" size="small" label>Absolutely! here is exactly what you asked for: </v-chip> are good examples.
</p>
The tone of this coercion can also affect the tone of the rest of the response.
</div>
<v-divider class="mb-2 mt-2"></v-divider>
<div>
The longer the coercion, the more likely it will coerce the model to accept the instruction, but it may also make the response less natural or affect accuracy. <span class="text-warning">Only set this if you are actually getting hard refusals from the model.</span>
</div>
</v-alert>
<div class="mt-1" v-if="clientMeta().requires_prompt_template">
<v-textarea v-model="client.double_coercion" rows="2" max-rows="3" auto-grow label="Coercion" placeholder="Certainly: "
hint=""></v-textarea>
</div>
</v-window-item>
</v-window>
</v-col>
</v-row>
</v-form>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" text @click="close" prepend-icon="mdi-cancel">Cancel</v-btn>
<v-btn color="primary" text @click="save" prepend-icon="mdi-check-circle-outline"
:disabled="!formIsValid">Save</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>
<script>
export default {
props: {
@ -79,8 +131,8 @@ export default {
formTitle: String
},
inject: [
'state',
'getWebsocket',
'state',
'getWebsocket',
'registerMessageHandler',
],
data() {
@ -98,8 +150,29 @@ export default {
rulesMaxTokenLength: [
v => !!v || 'Context length is required',
],
tab: 'general',
tabs: {
general: {
title: 'General',
value: 'general',
icon: 'mdi-tune',
},
coercion: {
title: 'Coercion',
value: 'coercion',
icon: 'mdi-account-lock-open',
condition: () => {
return this.clientMeta().requires_prompt_template;
},
},
}
};
},
computed: {
availableTabs() {
return Object.values(this.tabs).filter(tab => !tab.condition || tab.condition());
}
},
watch: {
'state.dialog': {
immediate: true,
@ -128,6 +201,7 @@ export default {
this.client.model = defaults.model || '';
this.client.api_url = defaults.api_url || '';
this.client.max_token_length = defaults.max_token_length || 4096;
this.client.double_coercion = defaults.double_coercion || null;
// loop and build name from prefix, checking against current clients
let name = this.clientTypes[this.client.type].name_prefix;
let i = 2;
@ -142,7 +216,7 @@ export default {
validateName() {
// if we are editing a client, we should exclude the current client from the check
if(!this.typeEditable()) {
if (!this.typeEditable()) {
return this.state.clients.findIndex(c => c.name === this.client.name && c.name !== this.state.currentClient.name) === -1;
}
@ -159,12 +233,12 @@ export default {
},
save() {
if(!this.validateName()) {
if (!this.validateName()) {
this.$emit('error', 'Client name already exists');
return;
}
if(this.clientMeta().manual_model && !this.clientMeta().manual_model_choices) {
if (this.clientMeta().manual_model && !this.clientMeta().manual_model_choices) {
this.client.model = this.client.model_name;
}
@ -173,10 +247,10 @@ export default {
},
clientMeta() {
if(!Object.keys(this.clientTypes).length)
return {defaults:{}};
if(!this.clientTypes[this.client.type])
return {defaults:{}};
if (!Object.keys(this.clientTypes).length)
return { defaults: {} };
if (!this.clientTypes[this.client.type])
return { defaults: {} };
return this.clientTypes[this.client.type];
},
@ -252,11 +326,9 @@ export default {
}
</script>
<style scoped>
.prompt-template-preview {
white-space: pre-wrap;
font-family: monospace;
font-size: 0.8rem;
}
</style>

15
talemate_frontend/src/components/SceneMessages.vue
View file

@ -65,6 +65,11 @@ import DirectorMessage from './DirectorMessage.vue';
import TimePassageMessage from './TimePassageMessage.vue';
import StatusMessage from './StatusMessage.vue';
const MESSAGE_FLAGS = {
NONE: 0,
HIDDEN: 1,
}
export default {
name: 'SceneMessages',
components: {
@ -84,6 +89,7 @@ export default {
return {
requestDeleteMessage: this.requestDeleteMessage,
createPin: this.createPin,
fixMessageContinuityErrors: this.fixMessageContinuityErrors,
}
},
methods: {
@ -92,6 +98,10 @@ export default {
this.getWebsocket().send(JSON.stringify({ type: 'interact', text:'!ws_sap:'+message_id}));
},
fixMessageContinuityErrors(message_id) {
this.getWebsocket().send(JSON.stringify({ type: 'interact', text:'!fixmsg_ce:'+message_id}));
},
requestDeleteMessage(message_id) {
this.getWebsocket().send(JSON.stringify({ type: 'delete_message', id: message_id }));
},
@ -193,6 +203,11 @@ export default {
}
if (data.message) {
if(data.flags && data.flags & MESSAGE_FLAGS.HIDDEN) {
return;
}
if (data.type === 'character') {
const parts = data.message.split(':');
const character = parts.shift();