0.29.0

docs/dev/third-party-reference.md

@@ -0,0 +1,14 @@
+## Third Party API docs
+
+### Chat completions
+
+- Anthropic: https://docs.anthropic.com/en/api/messages
+- Cohere: https://docs.cohere.com/reference/chat
+- Google: https://ai.google.dev/api/generate-content#v1beta.GenerationConfig
+- Groq: https://console.groq.com/docs/api-reference#chat-create
+- KoboldCpp: https://lite.koboldai.net/koboldcpp_api#/api/v1
+- LMStudio: https://lmstudio.ai/docs/api/rest-api
+- MistralAI: https://docs.mistral.ai/api/
+- OpenAI: https://platform.openai.com/docs/api-reference/completions
+- TabbyAPI: https://theroyallab.github.io/tabbyAPI/#operation/chat_completion_request_v1_chat_completions_post
+- Text-Generation-WebUI: https://github.com/oobabooga/text-generation-webui/blob/main/extensions/openai/typing.py

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "talemate"
-version = "0.27.0"
+version = "0.29.0"
 description = "AI-backed roleplay and narrative tools"
 authors = ["FinalWombat"]
 license = "GNU Affero General Public License v3.0"

scenes/infinity-quest/infinity-quest.json

@@ -1,6 +1,6 @@
 {
   "description": "Captain Elmer Farstield and his trusty first officer, Kaira, embark upon a daring mission into uncharted space. Their small but mighty exploration vessel, the Starlight Nomad, is equipped with state-of-the-art technology and crewed by an elite team of scientists, engineers, and pilots. Together they brave the vast cosmos seeking answers to humanity's most pressing questions about life beyond our solar system.",
-  "intro": "*You awaken aboard your ship, the Starlight Nomad, surrounded by darkness. A soft hum resonates throughout the vessel indicating its systems are online. Your mind struggles to recall what brought you here - where 'here' actually is. You remember nothing more than flashes of images; swirling nebulae, foreign constellations, alien life forms... Then there was a bright light followed by this endless void.*\n\n*Gingerly, you make your way through the dimly lit corridors of the ship. It seems smaller than you expected given the magnitude of the mission ahead. However, each room reveals intricate technology designed specifically for long-term space travel and exploration. There appears to be no other living soul besides yourself. An eerie silence fills every corner.*",
+  "intro": "You awaken aboard your ship, the Starlight Nomad, surrounded by darkness. A soft hum resonates throughout the vessel indicating its systems are online. Your mind struggles to recall what brought you here - where 'here' actually is. You remember nothing more than flashes of images; swirling nebulae, foreign constellations, alien life forms... Then there was a bright light followed by this endless void.\n\nGingerly, you make your way through the dimly lit corridors of the ship. It seems smaller than you expected given the magnitude of the mission ahead. However, each room reveals intricate technology designed specifically for long-term space travel and exploration. There appears to be no other living soul besides yourself. An eerie silence fills every corner.",
   "name": "Infinity Quest",
   "history": [],
   "environment": "scene",
@@ -90,9 +90,9 @@
       "gender": "female",
       "color": "red",
       "example_dialogue": [
-        "Kaira: Yes Captain, I believe that is the best course of action *She nods slightly, as if to punctuate her approval of the decision*",
+        "Kaira: \"Yes Captain, I believe that is the best course of action\" She nods slightly, as if to punctuate her approval of the decision*",
         "Kaira: \"This device appears to have multiple functions, Captain. Allow me to analyze its capabilities and determine if it could be useful in our exploration efforts.\"",
-        "Kaira: \"Captain, it appears that this newly discovered planet harbors an ancient civilization whose technological advancements rival those found back home on Altrusia!\" *Excitement bubbles beneath her calm exterior as she shares the news*",
+        "Kaira: \"Captain, it appears that this newly discovered planet harbors an ancient civilization whose technological advancements rival those found back home on Altrusia!\" Excitement bubbles beneath her calm exterior as she shares the news",
         "Kaira: \"Captain, I understand why you would want us to pursue this course of action based on our current data, but I cannot shake the feeling that there might be unforeseen consequences if we proceed without further investigation into potential hazards.\"",
         "Kaira: \"I often find myself wondering what it would have been like if I had never left my home world... But then again, perhaps it was fate that led me here, onto this ship bound for destinations unknown...\""
       ],

scenes/simulation-suite/simulation-suite.json

@@ -7,7 +7,7 @@
     "experimental": true,
     "help": "Address the computer by starting your statements with 'Computer, ' followed by an instruction.\n\nExamples:\n'Computer, i would like to experience an adventure on a derelict space station'\n'Computer, add a horrific alien creature that is chasing me.'",
     "description": "",
-    "intro": "*You have entered the simulation suite. No simulation is currently active and you are in a non-descript space with paneled walls surrounding you. The control panel next to you is pulsating with a green light, indicating readiness to receive a prompt to start the simulation.*",
+    "intro": "You have entered the simulation suite. No simulation is currently active and you are in a non-descript space with paneled walls surrounding you. The control panel next to you is pulsating with a green light, indicating readiness to receive a prompt to start the simulation.",
     "archived_history": [],
     "history": [],
     "ts": "PT1S",

src/talemate/agents/conversation.py

@@ -44,10 +44,13 @@ class ConversationAgentEmission(AgentEmission):
     actor: Actor
     character: Character
     generation: list[str]
+    dynamic_instructions: list[str] = None
 
 
 talemate.emit.async_signals.register(
-    "agent.conversation.before_generate", "agent.conversation.generated"
+    "agent.conversation.before_generate", 
+    "agent.conversation.inject_instructions",
+    "agent.conversation.generated"
 )
 
 
@@ -535,6 +538,21 @@ async def build_prompt_default(
 
         if self.investigate_context:
             await self.run_context_investigation(character)
+
+        dynamic_instructions = []
+
+        await talemate.emit.async_signals.get(
+            "agent.conversation.inject_instructions"
+        ).send(ConversationAgentEmission(
+            agent=self,
+            generation="", 
+            actor=None, 
+            character=character, 
+            dynamic_instructions=dynamic_instructions
+        ))
+
+        log.debug("Dynamic instructions", dynamic_instructions=dynamic_instructions)
+
 
         conversation_format = self.conversation_format
         prompt = Prompt.get(
@@ -557,6 +575,7 @@ async def build_prompt_default(
                 "actor_instructions_offset": self.generation_settings_actor_instructions_offset,
                 "direct_instruction": instruction,
                 "decensor": self.client.decensor_enabled,
+                "dynamic_instructions": dynamic_instructions,
             },
         )
 
@@ -671,11 +690,9 @@ def clean_result(self, result, character):
             result = result.split("(Internal")[0]
 
         result = result.replace(" :", ":")
-        result = result.replace("[", "*").replace("]", "*")
-        result = result.replace("(", "*").replace(")", "*")
-        result = result.replace("**", "*")
 
         result = util.handle_endofline_special_delimiter(result)
+        result = util.remove_trailing_markers(result)
 
         return result
 
@@ -782,7 +799,7 @@ async def converse(self, actor, only_generate:bool = False, instruction:str = No
         total_result = util.clean_dialogue(total_result, main_name=character.name)
 
         # Check if total_result starts with character name, if not, prepend it
-        if not total_result.startswith(character.name):
+        if not total_result.startswith(character.name+":"):
             total_result = f"{character.name}: {total_result}"
 
         total_result = total_result.strip()

src/talemate/agents/creator/assistant.py

@@ -32,6 +32,10 @@ class ContentGenerationContext(pydantic.BaseModel):
     A context for generating content.
     """
 
+    # character attribute:Attribute name
+    # character detail:Detail name
+    # character dialogue:
+    # scene intro:
     context: str
     instructions: str = ""
     length: int = 100
@@ -175,6 +179,7 @@ async def contextual_generate(
         """
 
         context_typ, context_name = generation_context.computed_context
+        editor = get_agent("editor")
 
         if generation_context.length < 100:
             kind = "create_short"
@@ -224,13 +229,61 @@ async def contextual_generate(
             if not content.startswith(generation_context.character + ":"):
                 content = generation_context.character + ": " + content
             content = util.strip_partial_sentences(content)
-            content = util.ensure_dialog_format(
-                content, talking_character=generation_context.character
-            )
+            content = await editor.cleanup_character_message(content, generation_context.character.name)
             return content
 
         return content.strip().strip("*").strip()
 
+    @set_processing
+    async def generate_character_attribute(
+        self,
+        character: "Character",
+        attribute_name: str,
+        instructions: str = "",
+        original: str | None = None,
+        generation_options: GenerationOptions = None,
+    ) -> str:
+        """
+        Wrapper for contextual_generate that generates a character attribute.
+        """
+
+        if not generation_options:
+            generation_options = GenerationOptions()
+
+        return await self.contextual_generate_from_args(
+            context=f"character attribute:{attribute_name}",
+            character=character.name,
+            instructions=instructions,
+            original=original,
+            **generation_options.model_dump(),
+        )
+
+    @set_processing
+    async def generate_character_detail(
+        self,
+        character: "Character",
+        detail_name: str,
+        instructions: str = "",
+        original: str | None = None,
+        length: int = 512,
+        generation_options: GenerationOptions = None,
+    ) -> str:
+        """
+        Wrapper for contextual_generate that generates a character detail.
+        """        
+
+        if not generation_options:
+            generation_options = GenerationOptions()
+
+        return await self.contextual_generate_from_args(
+            context=f"character detail:{detail_name}",
+            character=character.name,
+            instructions=instructions,
+            original=original,
+            length=length,
+            **generation_options.model_dump(),
+        )
+
     @set_processing
     async def autocomplete_dialogue(
         self,

src/talemate/agents/creator/character.py

@@ -7,6 +7,8 @@
 from talemate.agents.base import set_processing
 from talemate.prompts import Prompt
 
+import talemate.game.focal as focal
+
 if TYPE_CHECKING:
     from talemate.tale_mate import Character
 
@@ -127,4 +129,4 @@ async def determine_character_goals(
         log.debug("determine_character_goals", goals=goals, character=character)
         await character.set_detail("goals", goals.strip())
 
-        return goals.strip()
+        return goals.strip()

src/talemate/agents/director.py → src/talemate/agents/director/__init__.py

@@ -1,35 +1,33 @@
 from __future__ import annotations
 
-import asyncio
 import random
-import re
-from typing import TYPE_CHECKING, Callable, List, Optional, Union
+from typing import TYPE_CHECKING, List
 
 import structlog
 
-import talemate.automated_action as automated_action
 import talemate.emit.async_signals
 import talemate.instance as instance
 import talemate.util as util
 from talemate.agents.conversation import ConversationAgentEmission
-from talemate.automated_action import AutomatedAction
-from talemate.emit import emit, wait_for_input
+from talemate.emit import emit
 from talemate.events import GameLoopActorIterEvent, GameLoopStartEvent, SceneStateEvent
 from talemate.game.engine import GameInstructionsMixin
 from talemate.prompts import Prompt
 from talemate.scene_message import DirectorMessage, NarratorMessage, CharacterMessage
 
-from .base import Agent, AgentAction, AgentActionConfig, set_processing
-from .registry import register
+from talemate.agents.base import Agent, AgentAction, AgentActionConfig, set_processing
+from talemate.agents.registry import register
+
+from talemate.agents.director.analyze import SceneAnalyzationMixin
 
 if TYPE_CHECKING:
-    from talemate import Actor, Character, Player, Scene
+    from talemate import Character
 
 log = structlog.get_logger("talemate.agent.director")
 
 
 @register()
-class DirectorAgent(GameInstructionsMixin, Agent):
+class DirectorAgent(SceneAnalyzationMixin, GameInstructionsMixin, Agent):
     agent_type = "director"
     verbose_name = "Director"
 
@@ -129,6 +127,8 @@ def __init__(self, client, **kwargs):
             ),
 
         }
+
+        SceneAnalyzationMixin.add_actions(self)
 
     @property
     def enabled(self):