Merge pull request #118 from neph1/update-v0.40.0

Update v0.40.0

Author: neph1

llm_config.yaml

@@ -123,7 +123,7 @@ def add_zone(self, zone: Zone) -> bool:
             self.world.add_item_spawner(item_spawner)
 
         if zone.center.z == self.max_depth:
-            self.llm_util.generate_character
+            self._generate_boss(zone=zone)
 
         if not first_zone:
             self.layout_generator.spawn_gold(zone=zone)

stories/dungeon/story.py

@@ -334,6 +334,33 @@ def short_description(self, value: str) -> None:
     @property
     def extra_desc(self) -> Dict[str, str]:
         return self._extradesc
+    
+    @property
+    def roleplay_prompt(self) -> str:
+        return self._extradesc.get("roleplay_prompt","")
+    
+    @property
+    def roleplay_description(self) -> str:
+        return self._extradesc.get("roleplay_description","")
+    
+    def set_roleplay_prompt(self, prompt: str, description: str = '', timeout: int = -1) -> None:
+        self._extradesc["roleplay_prompt"] = prompt
+        self._extradesc["roleplay_description"] = description
+        if timeout > 0:
+            mud_context.driver.defer(timeout, self.clear_roleplay_prompt, owner=self)
+
+    @property
+    def look_description(self) -> str:
+        """Returns the description text shown when a player 'looks' in a location."""
+        if self.roleplay_description:
+            return " ".join([self.short_description, self.roleplay_description])
+        return self.short_description
+
+    def clear_roleplay_prompt(self) -> None:
+        if "roleplay_prompt" in self._extradesc:
+            del self._extradesc["roleplay_prompt"]
+        if "roleplay_description" in self._extradesc:
+            del self._extradesc["roleplay_description"]
 
     @extra_desc.setter
     def extra_desc(self, value: Dict[str, str]) -> None:
@@ -785,28 +812,30 @@ def look(self, exclude_living: 'Living'=None, short: bool=False) -> Sequence[str
         # normal (long) output
         if self.description:
             paragraphs.append(self.description)
+        if self.roleplay_description:
+            paragraphs.append(self.roleplay_description)
         if self.exits and mud_context.config.show_exits_in_look:
             exits_seen = set()  # type: Set[Exit]
             exit_paragraph = []  # type: List[str]
             for exit_name in sorted(self.exits):
                 exit = self.exits[exit_name]
                 if exit not in exits_seen:
                     exits_seen.add(exit)
-                    exit_paragraph.append(exit.short_description)
+                    exit_paragraph.append(exit.look_description)
             paragraphs.append(" ".join(exit_paragraph))
         items_and_livings = []  # type: List[str]
-        items_with_short_descr = [item for item in self.items if item.short_description and item.visible and not item.hidden]
-        items_without_short_descr = [item for item in self.items if not item.short_description and item.visible and not item.hidden]
+        items_with_short_descr = [item for item in self.items if item.look_description and item.visible and not item.hidden]
+        items_without_short_descr = [item for item in self.items if not item.look_description and item.visible and not item.hidden]
         uniq_descriptions = set()
         if items_with_short_descr:
             for item in items_with_short_descr:
-                uniq_descriptions.add(": ".join([item.title, item.short_description]))
+                uniq_descriptions.add(f"{item.title}: {item.look_description}")
         items_and_livings.extend(uniq_descriptions)
         if items_without_short_descr:
             titles = sorted([lang.a(item.title) for item in items_without_short_descr])
             items_and_livings.append("You see " + lang.join(titles) + ".")
-        livings_with_short_descr = [living for living in self.livings if living != exclude_living and living.short_description and living.visible and not living.hidden]
-        livings_without_short_descr = [living for living in self.livings if living != exclude_living and not living.short_description and living.visible and not living.hidden]
+        livings_with_short_descr = [living for living in self.livings if living != exclude_living and living.look_description and living.visible and not living.hidden]
+        livings_without_short_descr = [living for living in self.livings if living != exclude_living and not living.look_description and living.visible and not living.hidden]
         if livings_without_short_descr:
             titles = sorted(living.title for living in livings_without_short_descr)
             if titles:
@@ -819,7 +848,7 @@ def look(self, exclude_living: 'Living'=None, short: bool=False) -> Sequence[str
         uniq_descriptions = set()
         if livings_with_short_descr:
             for living in livings_with_short_descr:
-                uniq_descriptions.add(", ".join([living.title, living.short_description]))
+                uniq_descriptions.add(", ".join([living.title, living.look_description]))
         items_and_livings.extend(uniq_descriptions)
         if items_and_livings:
             paragraphs.append(" ".join(items_and_livings))

tale/base.py

@@ -777,7 +777,9 @@ def do_enrich(player: Player, parsed: base.ParseResult, ctx: util.Context) -> No
 
 @wizcmd("add_event")
 def do_add_event(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """ Add an event that happens in the current location. """
+    """ Add an event that happens in the current location.
+    Usage: add_event <event description>
+    """
     if len(parsed.args) < 1:
         raise ParseError("You need to define an event")
     player.location._notify_action_all( base.ParseResult(verb='location-event', unparsed=parsed.unparsed, who_info=None), actor=None)
@@ -798,7 +800,9 @@ def do_spawn(player: Player, parsed: base.ParseResult, ctx: util.Context) -> Non
 
 @wizcmd("load_character")
 def do_load_character(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """Load a companion character from file."""
+    """Load a companion character from file.
+    Usage: load_character <path to character file>
+    """
     print('load character ' + str(parsed.args) + str(parsed.unparsed))
     if len(parsed.args) != 1:
         raise ParseError("You need to specify the path to the character file")
@@ -814,7 +818,9 @@ def do_load_character(player: Player, parsed: base.ParseResult, ctx: util.Contex
 
 @wizcmd("load_character_from_data")
 def do_load_character_from_data(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """Load a companion character from file."""
+    """Load a companion character from file.
+    Usage: load_character_from_data <json data>
+    """
     try:
         unparsed = str(parsed.unparsed)
         data = json.loads(unparsed)
@@ -828,7 +834,9 @@ def do_load_character_from_data(player: Player, parsed: base.ParseResult, ctx: u
 
 @wizcmd("set_visibility")
 def do_set_visible(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """Set the visibility of a creature."""
+    """Set the visibility of a creature.
+        Usage: set_visibility <object> <true|false>
+    """
     if len(parsed.args) != 2:
         raise ParseError("You need to specify the object and the visibility(true or false)")
     try:
@@ -866,7 +874,9 @@ def do_set_description(player: Player, parsed: base.ParseResult, ctx: util.Conte
 
 @wizcmd("set_goal")
 def do_set_goal(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """Set a goal for a LivingNpc."""
+    """Set a goal for a LivingNpc.
+    Usage: set_goal <character> <goal>
+    """
     if not parsed.who_1:
         raise ParseError("You need to specify a character")
     if len(parsed.args) < 2:
@@ -883,7 +893,9 @@ def do_set_goal(player: Player, parsed: base.ParseResult, ctx: util.Context) ->
 
 @wizcmd("create_item")
 def do_create_item(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """Create an item in the current location."""
+    """Create an item in the current location.
+    Usage: create_item <item_type> [<name>] [<short_description>]
+    """
     if len(parsed.args) < 1:
         raise ParseError("You need to define an item type. Name and description are optional")
     item_dict = dict()
@@ -904,3 +916,42 @@ def do_create_item(player: Player, parsed: base.ParseResult, ctx: util.Context)
         player.tell(item.name + ' added.', evoke=False)
     else:
         raise ParseError("Item could not be added")
+
+@wizcmd("set_rp_prompt")
+def do_set_rp_prompt(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
+    """Set a temporary prompt for roleplaying. Takes both a prompt for the target, and a description of the 'effect'.
+    Any MudObject can have a roleplay prompt, including locations.
+    Usage: set_rp_prompt <target> <prompt> <effect description> [<time in seconds>]
+    If time is not given, the prompt will be permanent until changed again.
+    
+    """
+    
+    if len(parsed.args) < 1:
+        raise ParseError("You need to specify a target")
+    try:
+        target = player.location.search_living(parsed.args[0])
+        if not target:
+            target = player.search_item(parsed.args[0], include_inventory=True, include_location=True)
+        if not target:
+            target = player.location if player.location.name == parsed.args[0] else None
+        if not target:
+            raise ParseError("Target not found")
+        
+        if(parsed.unparsed.count(' ') == 0):
+            raise ParseError("You need to specify a prompt and a description")
+
+        unparsed_args = parsed.unparsed.split(' ', 1)[1].split(',')
+        if len(unparsed_args) < 2:
+            raise ParseError("You need to specify a prompt and a description")
+        prompt =  unparsed_args[0].strip()
+        effect_description = unparsed_args[1].strip()
+
+        if len(unparsed_args) == 3:
+            time = float(unparsed_args[2].strip())
+        else:
+            time = -1
+
+        target.set_roleplay_prompt(prompt, effect_description, time)
+        player.tell("RP prompt set to: %s with effect: %s" % (prompt, effect_description))
+    except ValueError as x:
+        raise ActionRefused(str(x))

tale/cmds/wizard.py

@@ -874,7 +874,7 @@ def load_character(self, player: player.Player, char_data: dict) -> LivingNpc:
             dynamic_story = typing.cast(DynamicStory, self.story)
             dynamic_story.world.add_npc(npc)
         player.location.insert(npc, None)
-        player.location.tell("%s arrives." % npc.title, extra_context=f'Location:{player.location.description}; {npc.character_card}')
+        player.location.tell("%s arrives." % npc.title)
         return npc
 
     @property

tale/driver.py

@@ -1,7 +1,6 @@
 import random
-from tale.llm.contexts.FollowContext import FollowContext
+from tale.llm.character_card import CharacterCard
 from tale.llm.item_handling_result import ItemHandlingResult
-from tale.llm import llm_config
 import tale.llm.llm_cache as llm_cache
 from tale import lang, mud_context
 from tale.base import ContainingType, Living, ParseResult
@@ -369,24 +368,25 @@ def _clear_quest(self):
         self.quest = None
 
     @property
-    def character_card(self) -> str:
-        items = []
-        for i in self.inventory:
-            items.append(f'"{str(i.name)}"')
-        return '{{"name":"{name}", "gender":"{gender}","age":{age},"occupation":"{occupation}","personality":"{personality}","appearance":"{description}","items":[{items}], "race":"{race}", "quest":"{quest}", "goal":"{goal}", "example_voice":"{example_voice}", "wearing":"{wearing}", "wielding":"{wielding}"}}'.format(
-                name=self.title,
-                gender=lang.gender_string(self.gender),
-                age=self.age,
-                personality=self.personality,
-                description=self.description,
-                occupation=self.occupation,
-                race=self.stats.race,
-                quest=self.quest,
-                goal=self.goal,
-                example_voice=self.example_voice,
-                wearing=','.join([f'"{str(i.name)}"' for i in self.get_worn_items()]),
-                wielding=self.wielding.to_dict() if self.wielding else None,
-                items=','.join(items))
+    def character_card(self) -> dict:
+        data = CharacterCard(
+            name=self.title,
+            gender=lang.gender_string(self.gender),
+            age=self.age,
+            occupation=self.occupation,
+            personality=self.personality,
+            appearance=self.description,
+            items=[str(i.name) for i in self.inventory],
+            race=self.stats.race,
+            quest=self.quest,
+            goal=self.goal,
+            example_voice=self.example_voice,
+            wearing=[str(i.name) for i in self.get_worn_items()],
+            wielding=self.wielding.to_dict() if self.wielding else None,
+            roleplay_prompt=self.roleplay_prompt,
+            roleplay_description=self.roleplay_description
+        )
+        return data
 
     def dump_memory(self) -> dict:
         return dict(
@@ -404,4 +404,6 @@ def load_memory(self, memory: dict):
         self.sentiments = memory.get('sentiments', {})
         self.action_history = memory.get('action_history', [])
         self.planned_actions = memory.get('planned_actions', [])
-        self.goal = memory.get('goal', None)
+        self.goal = memory.get('goal', None)
+
+        

tale/llm/LivingNpc.py

@@ -8,6 +8,7 @@
 from tale import json_util, parse_utils
 from tale.base import Location
 from tale.llm import llm_config
+from tale.llm.character_card import CharacterCard
 from tale.llm.contexts.ActionContext import ActionContext
 from tale.llm.contexts.CharacterContext import CharacterContext
 from tale.llm.contexts.FollowContext import FollowContext
@@ -55,6 +56,8 @@ def generate_dialogue(self,
                 sentiment=sentiment)
         request_body = deepcopy(self.default_body)
         request_body['grammar'] = self.json_grammar
+        print(prompt)
+        print(context.to_prompt_string())
         response = self.io_util.synchronous_request(request_body, prompt=prompt, context=context.to_prompt_string())
         try:
             json_result = json_util.safe_load(response)
@@ -93,7 +96,7 @@ def generate_character(self, character_context: CharacterContext) -> CharacterV2
             print(f'Exception while parsing character {json_result}')
             return None
 
-    def perform_idle_action(self, character_name: str, location: Location, story_context: str, character_card: str = '', sentiments: dict = {}, last_action: str = '', event_history: str = '') -> list:
+    def perform_idle_action(self, character_name: str, location: Location, story_context: str, character_card: CharacterCard, sentiments: dict = {}, last_action: str = '', event_history: str = '') -> list:
         characters = {}
         for living in location.livings:
             if living.visible and living.name != character_name.lower():
@@ -119,7 +122,7 @@ def perform_idle_action(self, character_name: str, location: Location, story_con
         text = self.io_util.synchronous_request(request_body, prompt=prompt)
         return (parse_utils.trim_response(text)) if text else None
 
-    def perform_travel_action(self, character_name: str, location: Location, locations: list, directions: list, character_card: str = ''):
+    def perform_travel_action(self, character_name: str, location: Location, locations: list, directions: list, character_card: CharacterCard):
         if location.name in locations:
             locations.remove(location.name)
 
@@ -134,7 +137,7 @@ def perform_travel_action(self, character_name: str, location: Location, locatio
         text = self.io_util.synchronous_request(request_body, prompt=prompt)
         return text
 
-    def perform_reaction(self, action: str, character_name: str, acting_character_name: str, location: Location, story_context: str, character_card: str = '', sentiment: str = '', event_history: str = ''):
+    def perform_reaction(self, action: str, character_name: str, acting_character_name: str, location: Location, story_context: str, character_card: CharacterCard, sentiment: str = '', event_history: str = ''):
         prompt = self.pre_prompt
         prompt += self.reaction_prompt.format(
             action=action,
@@ -191,4 +194,4 @@ def request_follow(self, follow_context: FollowContext) -> FollowResponse:
         if not text:
             return None
         return FollowResponse(json_util.safe_load(text))
-        
+        

tale/llm/character.py

@@ -0,0 +1,25 @@
+
+from tale.quest import Quest
+
+
+class CharacterCard(dict):
+    def __init__(self, *, name: str, gender: str, age: int, occupation: str, personality: str, appearance: str, items: list, race: str, quest: Quest=None, goal: str=None, example_voice: str="", wearing: list=None, wielding: dict=None, roleplay_prompt: str="", roleplay_description: str=""):
+        super().__init__()
+        self['name'] = name
+        self['gender'] = gender
+        self['age'] = age
+        self['occupation'] = occupation
+        self['personality'] = personality
+        self['appearance'] = appearance
+        self['items'] = items
+        self['race'] = race
+        self['goal'] = goal
+        self['example_voice'] = example_voice
+        if quest:
+            self['quest'] = quest.__str__()
+        else:
+            self['quest'] = None
+        self['wearing'] = wearing if wearing else []
+        self['wielding'] = wielding if wielding else {}
+        self['roleplay_prompt'] = roleplay_prompt
+        self['roleplay_appearance'] = roleplay_description

tale/llm/character_card.py

@@ -1,11 +1,12 @@
 import random
 from tale.base import Location
+from tale.llm.character_card import CharacterCard
 from tale.llm.contexts.BaseContext import BaseContext
 
 
 class ActionContext(BaseContext):
 
-    def __init__(self, story_context: str, story_type: str, character_name: str, character_card: str, event_history: str, location: Location, actions: list):
+    def __init__(self, story_context: str, story_type: str, character_name: str, character_card: CharacterCard, event_history: str, location: Location, actions: list):
         super().__init__(story_context)
         self.story_type = story_type
         self.character_name = character_name

tale/llm/contexts/ActionContext.py

@@ -1,5 +1,4 @@
-
-
+from tale.llm.character_card import CharacterCard
 from tale.llm.contexts.BaseContext import BaseContext
 
 
@@ -8,7 +7,7 @@ class DialogueContext(BaseContext):
     def __init__(self, 
             story_context: str,
             location_description: str,
-            speaker_card: str,
+            speaker_card: CharacterCard,
             speaker_name: str,
             target_name: str,
             target_description: str,