Merge pull request #96 from neph1/update-v0.36.1

Update v0.36.1

Author: neph1

llm_config.yaml

@@ -16,7 +16,7 @@ DUNGEON_LOCATION_TEMPLATE: '{"index": (int), "name": "", "description": 25 words
 CHARACTER_TEMPLATE: '{"name":"", "description": "50 words", "appearance": "25 words", "personality": "50 words", "money":(int), "level":"", "gender":"m/f/n", "age":(int), "race":"", "occupation":""}'
 FOLLOW_TEMPLATE: '{{"response":"yes or no", "reason":"50 words"}}'
 ITEM_TYPES: ["Weapon", "Wearable", "Health", "Money", "Trash"]
-PRE_PROMPT: 'You are a creative game keeper for an interactive fiction story telling session. You craft detailed worlds and interesting characters with unique and deep personalities for the player to interact with. Do not acknowledge the task or speak directly to the user, or respond with anything besides the request..'
+PRE_PROMPT: 'You are a creative game keeper for an interactive fiction story telling session. You craft detailed worlds and interesting characters with unique and deep personalities for the player to interact with. Always follow the instructions given, never acknowledge the task or speak directly to the user or respond with anything besides the request.'
 BASE_PROMPT: '<context>{context}</context>\n[USER_START] Rewrite [{input_text}] in your own words. The information inside the <context> tags should be used to ensure it fits the story. Use about {max_words} words.'
 DIALOGUE_PROMPT: '<context>{context}</context>\nThe following is a conversation between {character1} and {character2}; {character2}s sentiment towards {character1}: {sentiment}. Write a single response as {character2} in third person pov, using {character2} description and other information found inside the <context> tags. If {character2} has a quest active, they will discuss it based on its status. Respond in JSON using this template: """{dialogue_template}""". [USER_START]Continue the following conversation as {character2}: {previous_conversation}'
 COMBAT_PROMPT: '<context>{context}</context>\nThe following is a combat scene between {attackers} and {defenders} in {location}. [USER_START] Describe the following combat result in about 150 words in vivid language, using the characters weapons and their health status: 1.0 is highest, 0.0 is lowest. Combat Result: {input_text}'
@@ -46,3 +46,4 @@ REQUEST_FOLLOW_PROMPT: '<context>{context}</context>\n[USER_START]Act as as {cha
 DAY_CYCLE_EVENT_PROMPT: '<context>{context}</context>\n[USER_START] Write up to two sentences describing the transition from {from_time} to {to_time} in {location_name}, using the information supplied inside the <context> tags.'
 NARRATIVE_EVENT_PROMPT: '<context>{context}</context>\n[USER_START] Write a narrative event that occurs in {location_name} using the information supplied inside the <context> tags. The event should be related to the location and the characters present. Use up to 50 words.'
 RANDOM_SPAWN_PROMPT: '<context>{context}</context>\n[USER_START] An npc or a mob has entered {location_name}. Select either and fill in one of the following templates using the information supplied inside the <context> tags. Respond using JSON in the following format: {npc_template}'
+ADVANCE_STORY_PROMPT: '<context>{context}</context>\n[USER_START] Advance the high-level plot outline in the current story, hidden to the player of this roleplaying game. The story progress is a value between 0 and 10. Consider the pacing of the plot when writing the section. A value below 3 is considered early. An inciting event should happen during this phase. Between 3 and 8 is the middle of the story. A climactic event should happen at 8 or 9. Above 9 is considered to be the ending. Use the information supplied inside the <context> tags to write a short paragraph that progresses the plot outline. Use up to 100 words.'

stories/combat_sandbox/story.py

@@ -7,7 +7,7 @@
 from tale.base import Location
 from tale.driver import Driver
 from tale.json_story import JsonStory
-from tale.llm.llm_ext import DynamicStory
+from tale.llm.dynamic_story import DynamicStory
 from tale.main import run_from_cmdline
 from tale.player import Player, PlayerConnection
 from tale.charbuilder import PlayerNaming

stories/demo/story.py

@@ -5,10 +5,12 @@
 Copyright by Irmen de Jong ([email protected])
 """
 import datetime
+import pathlib
 import sys
 from typing import Optional, Generator
 
 from tale.driver import Driver
+from tale.main import run_from_cmdline
 from tale.player import Player, PlayerConnection
 from tale.charbuilder import PlayerNaming
 from tale.story import *
@@ -85,5 +87,9 @@ def goodbye(self, player: Player) -> None:
 
 if __name__ == "__main__":
     # story is invoked as a script, start it.
-    from tale.main import run_from_cmdline
-    run_from_cmdline(["--game", sys.path[0]])
+    gamedir = pathlib.Path(__file__).parent
+    if gamedir.is_dir() or gamedir.is_file():
+        cmdline_args = sys.argv[1:]
+        cmdline_args.insert(0, "--game")
+        cmdline_args.insert(1, str(gamedir))
+        run_from_cmdline(cmdline_args)

stories/prancingllama/story.py

@@ -6,14 +6,15 @@
 from tale.base import Location
 from tale.cmds import spells
 from tale.driver import Driver
-from tale.llm.llm_ext import DynamicStory
+from tale.llm.dynamic_story import DynamicStory
 from tale.skills.magic import MagicType
 from tale.main import run_from_cmdline
 from tale.player import Player, PlayerConnection
 from tale.charbuilder import PlayerNaming
 from tale.skills.skills import SkillType
 from tale.story import *
 from tale.skills.weapon_type import WeaponType
+from tale.story import StoryContext
 from tale.zone import Zone
 
 class Story(DynamicStory):
@@ -34,15 +35,15 @@ class Story(DynamicStory):
     config.startlocation_player = "prancingllama.entrance"
     config.startlocation_wizard = "prancingllama.entrance"
     config.zones = ["prancingllama"]
-    config.context = "The final outpost high up in a cold, craggy mountain range. It's frequented by adventurers and those seeking to avoid attention."
+    config.context = StoryContext(base_story="The final outpost high up in a cold, craggy mountain range. A drama unfolds between those avoiding the cold and those seeking the cold. And what is lurking underneath the snow covered peaks and uncharted valleys?")
     config.type = "A low level fantasy adventure with focus of character building and interaction."
     config.custom_resources = True
 
 
     def init(self, driver: Driver) -> None:
         """Called by the game driver when it is done with its initial initialization."""
         self.driver = driver
-        self._zones = dict() # type: dict(str, Zone)
+        self._zones = dict() # type: {str, Zone}
         self._zones["The Prancing Llama"] = Zone("The Prancing Llama", description="A cold, craggy mountain range. Snow covered peaks and uncharted valleys hide and attract all manners of creatures.")
         import zones.prancingllama
         for location in zones.prancingllama.all_locations:
@@ -96,13 +97,13 @@ def goodbye(self, player: Player) -> None:
         player.tell("Goodbye, %s. Please come back again soon." % player.title)
         player.tell("\n")
 
-    def races_for_zone(self, zone: str) -> [str]:
+    def races_for_zone(self, zone: str) -> list[str]:
         return self._catalogue._creatures
 
-    def items_for_zone(self, zone: str) -> [str]:
+    def items_for_zone(self, zone: str) -> list[str]:
         return self._catalogue._items
 
-    def zone_info(self, zone_name: str, location: str) -> dict():
+    def zone_info(self, zone_name: str, location: str) -> dict:
         zone_info = super.zone_info(zone_name, location)
         zone_info['races'] = self.races_for_zone(zone_name)
         zone_info['items'] = self.items_for_zone(zone_name)

tale/cmds/normal.py

@@ -11,7 +11,7 @@
 from typing import Iterable, List, Dict, Generator, Union, Optional
 from tale.llm.LivingNpc import LivingNpc
 
-from tale.llm.llm_ext import DynamicStory
+from tale.llm.dynamic_story import DynamicStory
 from tale.skills.skills import SkillType
 
 from . import abbreviations, cmd, disabled_in_gamemode, disable_notify_action, overrides_soul, no_soul_parse

tale/driver.py

@@ -31,12 +31,12 @@
 
 from . import __version__ as tale_version_str, _check_required_libraries
 from . import mud_context, errors, util, cmds, player, pubsub, charbuilder, lang, verbdefs, vfs, base
-from .story import TickMethod, GameMode, MoneyType, StoryBase
+from .story import StoryContext, TickMethod, GameMode, MoneyType, StoryBase
 from .tio import DEFAULT_SCREEN_WIDTH
 from .races import playable_races
 from .errors import StoryCompleted
 from tale.load_character import CharacterLoader, CharacterV2
-from tale.llm.llm_ext import DynamicStory
+from tale.llm.dynamic_story import DynamicStory
 from tale.llm.llm_utils import LlmUtil
 from tale.web.web_utils import clear_resources, copy_web_resources
 
@@ -535,6 +535,9 @@ def _server_tick(self) -> None:
                 events, idle_time, subbers = topicinfo[topicname]
                 if events == 0 and not subbers and idle_time > 30:
                     pubsub.topic(topicname).destroy()
+        progress = self.story.increase_progress(0.0001)
+        if progress:
+            self.llm_util.advance_story_section(self.story)
 
     def disconnect_idling(self, conn: player.PlayerConnection) -> None:
         raise NotImplementedError
@@ -933,7 +936,7 @@ def build_location(self, targetLocation: base.Location, zone: Zone, player: play
             # try to add location, and if it fails, remove exit to it
             result = dynamic_story.add_location(location, zone=zone.name)
             if not result:
-                for exit in exits: # type: Exit
+                for exit in exits:
                     if exit.name == location.name:
                         exits.remove(exit)
         for exit in exits:

tale/dungeon/dungeon_generator.py

@@ -5,7 +5,7 @@
 from tale.coord import Coord
 from tale.item_spawner import ItemSpawner
 from tale.items.basic import Money
-from tale.llm.llm_ext import DynamicStory
+from tale.llm.dynamic_story import DynamicStory
 from tale.mob_spawner import MobSpawner
 from tale.zone import Zone
 

tale/json_story.py

@@ -2,7 +2,7 @@
 from tale.day_cycle.day_cycle import DayCycle
 from tale.day_cycle.llm_day_cycle_listener import LlmDayCycleListener
 from tale.items import generic
-from tale.llm.llm_ext import DynamicStory
+from tale.llm.dynamic_story import DynamicStory
 from tale.player import Player
 from tale.random_event import RandomEvent
 from tale.story import GameMode, StoryConfig

tale/llm/contexts/AdvanceStoryContext.py

@@ -0,0 +1,12 @@
+
+
+from tale.llm.contexts.BaseContext import BaseContext
+
+
+class AdvanceStoryContext(BaseContext):
+    
+        def __init__(self, story_context: str):
+            super().__init__(story_context)
+    
+        def to_prompt_string(self) -> str:
+            return f"{self.story_context}"

tale/llm/contexts/BaseContext.py

@@ -1,12 +1,16 @@
-
-
 from abc import ABC, abstractmethod
+from typing import Union
+
+from tale.story import StoryContext
 
 
 class BaseContext(ABC):
 
-    def __init__(self, story_context: str) -> None:
-        self.story_context = story_context
+    def __init__(self, story_context: Union[StoryContext, str]) -> None:
+        if isinstance(story_context, StoryContext):
+            self.story_context = story_context.to_context_with_past()
+        else:
+            self.story_context = story_context
 
     @abstractmethod
     def to_prompt_string(self) -> str: