Update 0.15.2 (#45)

neph1 · web-flow · commit 9bed64a96d66 · 2023-10-15T10:44:11.000+02:00
* use health status when generating combat message
consider existing neighbor locations when generating location

* fix idle action tell

* add max_hp to db account

* fix test
diff --git a/llm_config.yaml b/llm_config.yaml
@@ -14,7 +14,7 @@ BASE_PROMPT: "[Story context: {story_context}]; [History: {history}]; [USER_STAR
 ACTION_PROMPT: "[Story context: {story_context}]; [History: {history}]; [USER_START] Rewrite the Action, and nothing else, in your own words using the supplied Context and Location. History is what happened before. Use less than {max_words} words. [Text: {input_text}] \n\nEnd of text."
 DIALOGUE_PROMPT: '[Story context: {story_context}]; [Location: {location}]; [History: {history}]; The following is a conversation between {character1} and {character2}; {character1}:{character1_description}; character2:{character2_description}; [Chat history: {previous_conversation}]\n\n [{character2}s sentiment towards {character1}: {sentiment}].[USER_START] Write a single response for {character2} in third person pov, using {character2} description.'
 ITEM_PROMPT: 'Items:[{items}];Characters:[{character1},{character2}]  \n\n [USER_START] Decide if an item was explicitly given, taken, dropped or put somewhere in the following text:[Text:{text}]. Insert your thoughts about whether an item was explicitly given, taken, put somewhere or dropped in "my thoughts", and the results in "item", "from" and "to", or make them empty if . Insert {character1}s sentiment towards {character2} in a single word in "sentiment assessment". Fill in the following JSON template: {{ "thoughts":"", "result": {{ "item":"", "from":"", "to":""}}, {{"sentiment":"sentiment assessment"}} }} End of example. \n\n Write your response in valid JSON'
-COMBAT_PROMPT: 'Rewrite the following combat between user {attacker} using {attacker_weapon}, and {victim} using {victim_weapon} in {location}, {location_description} into a vivid description in less than 300 words. [USER_START] Rewrite the following combat result in about 150 words, using the characters weapons . Combat Result: {attacker_msg}'
+COMBAT_PROMPT: 'The following is a combat scene between user {attacker} and {victim} in {location}, {location_description} into a vivid description. [USER_START] Rewrite the following combat result in about 150 words, using the characters weapons and their health status: 1.0 is highest, 0.0 is lowest. Combat Result: {attacker_msg}'
 PRE_JSON_PROMPT: 'Below is an instruction that describes a task, paired with an input that provides further context. Write a response in valid JSON format that appropriately completes the request.'
 CREATE_CHARACTER_PROMPT: '[USER_START] For a {story_type}, create a diverse character with rich personality that can be interacted with using the story context and keywords. Do not mention height. Story context: {story_context}; keywords: {keywords}. Fill in this JSON template and write nothing else: {{"name":"", "description": "50 words", "appearance": "25 words", "personality": "50 words", "money":(int), "level":"", "gender":"m/f/n", "age":(int), "race":""}}'
 CREATE_LOCATION_PROMPT: '[Story context: {story_context}]; World info: {world_info}; Zone info: {zone_info}; Exit json example: {{"direction":"", "name":"name of new location", "short_descr":"exit description"}};  Npc or mob example: {{"name":"", "sentiment":"", "race":"", "gender":"m, f, or n", "level":(int), "description":"25 words"}}. Existing connected locations: {exit_locations}. [USER_START] For a {story_type}, describe the following location: {location_name}. {items_prompt} {spawn_prompt} Add a brief description, and one to three additional exits leading to new locations. Fill in this JSON template and do not write anything else: {{"description": "25 words", "exits":[], "items":[], "npcs":[]}}. Write the response in valid JSON.'
diff --git a/tale/accounts.py b/tale/accounts.py
@@ -101,6 +101,7 @@ def _create_database(self) -> None:
                             level integer NOT NULL,
                             xp integer NOT NULL,
                             hp integer NOT NULL,
+                            max_hp integer NOT NULL,
                             ac integer NOT NULL,
                             wc integer NOT NULL,
                             maxhp_dice varchar NULL,
diff --git a/tale/base.py b/tale/base.py
@@ -921,6 +921,7 @@ def __init__(self) -> None:
         self.level = 1
         self.xp = 0
         self.hp = 5
+        self.max_hp = 5
         self.maxhp_dice = ""
         self.ac = 0
         self.wc = 0
@@ -958,6 +959,7 @@ def set_stats_from_race(self) -> None:
         self.weight = r.mass
         self.size = r.size
         self.hp = r.hp
+        self.max_hp = r.hp
         self.unarmed_attack = Weapon(name=r.unarmed_attack.name)
 
     def get_weapon_skill(self, weapon_type: WeaponType) -> int:
@@ -1373,7 +1375,7 @@ def locate_item(self, name: str, include_inventory: bool=True, include_location:
         return (found, containing_object) if found else (None, None)
 
     def start_attack(self, victim: 'Living') -> None:
-        """Starts attacking the given living until death ensues on either side."""
+        """Starts attacking the given living for one round."""
         attacker_name = lang.capital(self.title)
         victim_name = lang.capital(victim.title)
         c = combat.Combat(self, victim)
diff --git a/tale/coord.py b/tale/coord.py
@@ -6,6 +6,11 @@ def __init__(self, x=0, y=0, z=0):
         self.y = y
         self.z = z
 
+    @classmethod
+    def from_coord(self, coord: 'Coord'):
+        return Coord(coord.x, coord.y, coord.z)
+
+
     def distance(self, other) -> float:
         """ Returns the manhattan distance between this and another coordinate."""
         return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
diff --git a/tale/driver.py b/tale/driver.py
@@ -624,11 +624,13 @@ def go_through_exit(self, player: player.Player, direction: str, evoke: bool=Tru
             
             # generate the location if it's not built yet. retry 5 times.
             for i in range(5):
+                neighbor_locations = dynamic_story.neighbors_for_location(xt.target)
                 new_locations, exits = self.llm_util.build_location(location=xt.target, 
                                                              exit_location_name=player.location.name, 
                                                              zone_info=new_zone.get_info(),
                                                              world_creatures=dynamic_story.world_creatures,
-                                                             world_items=dynamic_story.world_items,)
+                                                             world_items=dynamic_story.world_items,
+                                                             neighbors=neighbor_locations,)
                 if new_locations:
                     break
             if not new_locations:
@@ -878,10 +880,16 @@ def prepare_combat_prompt(self,
             victim_name += " (as 'You')"
             attacker_msg.replace(victim_name, "you")
 
-        return self.llm_util.combat_prompt.format(attacker=attacker_name, 
-                                                                         victim=victim_name, 
-                                                                         attacker_weapon=attacker.wielding.name,
-                                                                         victim_weapon=victim.wielding.name,
-                                                                         attacker_msg=attacker_msg,
-                                                                         location=location_title,
-                                                                         location_description=location_description)
+        victim_info = {"name": victim_name, 
+                       "health": victim.stats.hp / victim.stats.max_hp, 
+                       "weapon": victim.wielding.title}
+
+        attacker_info = {"name": attacker_name, 
+                         "health": attacker.stats.hp / attacker.stats.max_hp, 
+                         "weapon": attacker.wielding.title}
+
+        return self.llm_util.combat_prompt.format(attacker=attacker_info, 
+                                                    victim=victim_info,
+                                                    attacker_msg=attacker_msg,
+                                                    location=location_title,
+                                                    location_description=location_description)
diff --git a/tale/llm/LivingNpc.py b/tale/llm/LivingNpc.py
@@ -72,7 +72,6 @@ def do_say(self, what_happened: str, actor: Living) -> None:
 
         tell_hash = llm_cache.cache_tell('{actor.title}:{response}'.format(actor=self.title, response=response))
         self._conversations.add(tell_hash)
-
         self.tell_others("{response}".format(response=response), evoke=False)
         if item_result:
             self.handle_item_result(item_result, actor)
@@ -134,7 +133,7 @@ def idle_action(self):
                                                 event_history=llm_cache.get_events(self._observed_events),
                                                 sentiments=self.sentiments)
             if actions:
-                self.planned_actions.extend(actions)
+                self.planned_actions.append(actions)
         if len(self.planned_actions) > 0:
             action = self.planned_actions.pop(0)
             self.action_history.append(action)
diff --git a/tale/llm/llm_ext.py b/tale/llm/llm_ext.py
@@ -1,5 +1,7 @@
 import json
+from tale import parse_utils
 from tale.base import Item, Living, Location
+from tale.coord import Coord
 from tale.story import StoryBase
 
 from tale.zone import Zone
@@ -10,7 +12,8 @@ def __init__(self) -> None:
         self._zones = dict() # type: dict[str, Zone]
         self._world = dict() # type: dict[str, any]
         self._world["creatures"] = dict()
-        self._world["items"] = dict()
+        self._world["items"] = dict() 
+        self._world["locations"] = dict() # type: dict[Coord, Location]
 
     def get_zone(self, name: str) -> Zone:
         """ Find a zone by name."""
@@ -45,6 +48,7 @@ def add_location(self, location: Location, zone: str = '') -> bool:
         """ Add a location to the story. 
         If zone is specified, add to that zone, otherwise add to first zone.
         """
+        self._world["locations"][location.world_location] = location
         if zone:
             return self._zones[zone].add_location(location)
         for zone in self._zones:
@@ -68,7 +72,15 @@ def get_npc(self, npc: str) -> Living:
     
     def get_item(self, item: str) -> Item:
         return self._world["items"][item]
+    
 
+    def neighbors_for_location(self, location: Location) -> dict:
+        """ Return a dict of neighboring locations for a given location."""
+        neighbors = dict() # type: dict[str, Location]
+        for dir in ['north', 'east', 'south', 'west', 'up', 'down']:
+            neighbors[dir] = self._world["locations"][Coord(location.world_location.add(parse_utils.coordinates_from_direction(dir)))]
+        return neighbors
+    
     @property
     def world_creatures(self) -> dict:
         return self._world["creatures"]
diff --git a/tale/llm/llm_utils.py b/tale/llm/llm_utils.py
@@ -120,7 +120,7 @@ def generate_character(self, story_context: str = '', keywords: list = [], story
     def get_neighbor_or_generate_zone(self, current_zone: Zone, current_location: Location, target_location: Location) -> Zone:
         return self._world_building.get_neighbor_or_generate_zone(current_zone, current_location, target_location, self.__story)
 
-    def build_location(self, location: Location, exit_location_name: str, zone_info: dict, world_items: dict = {}, world_creatures: dict = {}):
+    def build_location(self, location: Location, exit_location_name: str, zone_info: dict, world_items: dict = {}, world_creatures: dict = {}, neighbors: dict = {}):
         """ Generate a location based on the current story context"""
         return self._world_building.build_location(location, 
                                                    exit_location_name, 
@@ -129,7 +129,8 @@ def build_location(self, location: Location, exit_location_name: str, zone_info:
                                                    self.__story.config.context,
                                                    self.__story.config.world_info,
                                                    world_creatures=world_creatures,
-                                                   world_items=world_items)
+                                                   world_items=world_items,
+                                                   neighbors=neighbors)
      
     def perform_idle_action(self, character_name: str, location: Location, character_card: str = '', sentiments: dict = {}, last_action: str = '', event_history: str = '') -> list:
         return self._character.perform_idle_action(character_name, location, self.__story.config.context, character_card, sentiments, last_action, event_history=event_history)
@@ -138,7 +139,13 @@ def perform_travel_action(self, character_name: str, location: Location, locatio
         return self._character.perform_travel_action(character_name, location, locations, directions, character_card)
     
     def perform_reaction(self, action: str, character_name: str, acting_character_name: str, location: Location, character_card: str = '', sentiment: str = '', event_history: str = ''):
-        return self._character.perform_reaction(action, character_name, acting_character_name, location, character_card, sentiment, story_context=self.__story.config.context, event_history=event_history)
+        return self._character.perform_reaction(action=action, 
+                                                character_name=character_name, 
+                                                acting_character_name=acting_character_name, 
+                                                location=location, character_card=character_card, 
+                                                sentiment=sentiment, 
+                                                story_context=self.__story.config.context,
+                                                event_history=event_history)
     
     def generate_story_background(self, world_mood: int, world_info: str, story_type: str):
         return self._story_building.generate_story_background(world_mood, world_info, story_type)
@@ -180,6 +187,6 @@ def _kobold_generation_prompt(self, request_body: dict) -> dict:
         #request_body['banned_tokens'] = ['```']
         return request_body
     
-    
+
 
 
diff --git a/tale/llm/requests/build_location.py b/tale/llm/requests/build_location.py
@@ -24,7 +24,7 @@ def build_prompt(self, args: dict) -> str:
         story_context = args['story_context'] # Type: str
 
         spawn_prompt = ''
-        spawn_chance = 0.25
+        spawn_chance = 0.35
         spawn = random.random() < spawn_chance
         if spawn:
             mood = zone_info.get('mood', 0)
diff --git a/tale/llm/world_building.py b/tale/llm/world_building.py
@@ -38,7 +38,8 @@ def build_location(self, location: Location,
                        story_context: str, 
                        world_info: str, 
                        world_items: dict = {}, 
-                       world_creatures: dict = {}):
+                       world_creatures: dict = {},
+                       neighbors: dict = {}) -> (list, list):
         
         extra_items = generic.generic_items.get(self._check_setting(story_type), {})
         if extra_items:
@@ -62,7 +63,7 @@ def build_location(self, location: Location,
         result = self.io_util.synchronous_request(request_body, prompt=prompt)
         try:
             json_result = json.loads(parse_utils.sanitize_json(result))
-            return self._validate_location(json_result, location, exit_location_name, world_items, world_creatures)
+            return self._validate_location(json_result, location, exit_location_name, world_items, world_creatures, neighbors)
         except json.JSONDecodeError as exc:
             print(exc)
             return None, None
@@ -73,7 +74,8 @@ def _validate_location(self, json_result: dict,
                            location_to_build: Location, 
                            exit_location_name: str, 
                            world_items: dict = {}, 
-                           world_creatures: dict = {}):
+                           world_creatures: dict = {},
+                           neighbors: dict = {}):
         """Validate the location generated by LLM and update the location object."""
         try:
             # start locations have description already, and we don't want to overwrite it
@@ -88,7 +90,7 @@ def _validate_location(self, json_result: dict,
 
             self._add_npcs(location_to_build, json_result, world_creatures)
 
-            new_locations, exits = parse_utils.parse_generated_exits(json_result, 
+            new_locations, exits = parse_utils.parse_generated_exits(json_result.get('exits', []), 
                                                                      exit_location_name, 
                                                                      location_to_build)
             location_to_build.built = True
diff --git a/tale/parse_utils.py b/tale/parse_utils.py
diff --git a/tests/test_combat.py b/tests/test_combat.py
diff --git a/tests/test_json_story.py b/tests/test_json_story.py
diff --git a/tests/test_parse_utils.py b/tests/test_parse_utils.py
