Merge pull request #41 from neph1/story-content-hotfix

v0.14.1 using json grammar when generating creatures

Author: neph1

llm_config.yaml

@@ -5,14 +5,14 @@ STREAM_ENDPOINT: "/api/extra/generate/stream"
 DATA_ENDPOINT: "/api/extra/generate/check"
 WORD_LIMIT: 200
 BACKEND: "kobold_cpp" # "openai"
-DEFAULT_BODY: '{"stop_sequence": "", "max_length":500, "max_context_length":4096, "temperature":1.0, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'
-GENERATION_BODY: '{"stop_sequence": "\n\n", "max_length":500, "max_context_length":4096, "temperature":1.0, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1, "grammar":"grammars/json.gbnf"}'
-ANALYSIS_BODY: '{"banned_tokens":"\n\n", "stop_sequence": "\n\n\n", "max_length":500, "max_context_length":4096, "temperature":0.15, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "mirostat":2, "mirostat_tau":6.0, "mirostat_eta":0.1, "sampler_order":[6,0,1,3,4,2,5], "seed":-1, "grammar":"grammars/json.gbnf"}'
+DEFAULT_BODY: '{"stop_sequence": "", "max_length":750, "max_context_length":4096, "temperature":1.0, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'
+GENERATION_BODY: '{"stop_sequence": "\n\n", "max_length":750, "max_context_length":4096, "temperature":1.0, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'
+ANALYSIS_BODY: '{"banned_tokens":"\n\n", "stop_sequence": "\n\n\n\n", "max_length":500, "max_context_length":4096, "temperature":0.15, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "mirostat":2, "mirostat_tau":6.0, "mirostat_eta":0.1, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'
 MEMORY_SIZE: 512
-PRE_PROMPT: 'Below is an instruction that describes a task, paired with an input that provides further context. Write a response that appropriately completes the request.\n\n'
+PRE_PROMPT: 'Below is an instruction that describes a task, paired with an input that provides further context. As an game keeper for an RPG, write a response that appropriately completes the request.\n\n'
 BASE_PROMPT: "[Story context: {story_context}]; [History: {history}]; ### Instruction: Rewrite the following Text in your own words using the supplied Context and History to create a background for your text. Use about {max_words} words. [Text:{input_text}] \n\nEnd of text.\n\n ### Instruction: Rewrite [Text] in your own words. ### Response:\n"
 ACTION_PROMPT: "[Story context: {story_context}]; [History: {history}]; ### Instruction: 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.\n\n### Response:\n"
-DIALOGUE_PROMPT: '[Story context: {story_context}]; [Location: {location}]; 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}]. ### Instruction: Write a single response for {character2} in third person pov, using {character2} description.\n\n### Response:\n'
+DIALOGUE_PROMPT: '[Story context: {story_context}]; [Location: {location}]; 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}]. ### Instruction: Write a single response for {character2} in third person pov, using {character2} description. \n\n### Response:\n'
 ITEM_PROMPT: 'Items:[{items}];Characters:[{character1},{character2}]  \n\n ### Instruction: 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":"my thoughts", "result": {{ "item":"", "from":"", "to":""}}, {{"sentiment":"sentiment assessment"}} }} End of example. \n\n Write your response in valid JSON\n\n### Response:\n'
 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. ### Instruction: Rewrite the following combat result in about 150 words, using the characters weapons . Combat Result: {attacker_msg} ### Response:\n\n'
 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.\n\n'
@@ -31,6 +31,6 @@ STORY_BACKGROUND_PROMPT: "### Instruction: For an RPG described as {story_type}
 START_LOCATION_PROMPT: '[Story context: {story_context}]; Zone info: {zone_info}; Item json example: {{"name":"", "type":"", "short_descr":"10 words"}}, type can be "Weapon", "Wearable", "Other" or "Money"; Npc example: {{"name":"", "sentiment":"", "race":"", "gender":"m, f, or n", "level":(int), "description":"25 words"}} ; Exit json example: {{"direction":"", "name":"name of new location", "short_descr":"exit description"}}; ### Instruction: For a {story_type}, come up with a name for the location with this description: {location_description}. {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: {{"name": "", "exits":[], "items":[], "npcs":[]}}.\n\n ### Response:\n'
 STORY_PLOT_PROMPT: "### Instruction: For an RPG described as {story_type} set in a world described as {world_mood}, {world_info}. Based on the following background: {story_background} write an innovative and engaging plot that the player can become part of. Use less than 400 words\n\n ### Response:\n"
 WORLD_ITEMS: '[Story context: {story_context}]; For an RPG described as {story_type} set in a world described as {world_mood}, {world_info}, come up with 7 common items that can be found in the world. Item example: {{"name":"", "type":"", "short_descr":"", "level":int, "value":int}}, type can be "Weapon", "Wearable", "Health", "Other" or "Money"; Fill in this JSON template and do not write anything else: {{"items": []}}.\n\n ### Response:\n'
-WORLD_CREATURES: '[Story context: {story_context}]; For an RPG described as {story_type} set in a world described as {world_mood}, {world_info}, come up with 5 creatures of various level and sentiment that can be found in the world. Creature example: {{"name":"", "body":"", "mass":int(kg), "hp":int, "level":int, "unarmed_attack":One of [FISTS, CLAWS, BITE, TAIL, HOOVES, HORN, TUSKS, BEAK, TALON], "short_descr":""}}. Fill in this JSON template and do not write anything else: {{"creatures": []}}.\n\n ### Response:\n'
+WORLD_CREATURES: '[Story context: {story_context}]; For an RPG described as {story_type} set in a world described as {world_mood}, {world_info}, come up with 5 creatures of various level and sentiment that can be found in the world. Creature example: {{"name":"", "body":"", "mass":int(kg), "hp":int, "type":"Npc or Mob", "level":int, "unarmed_attack":One of [FISTS, CLAWS, BITE, TAIL, HOOVES, HORN, TUSKS, BEAK, TALON], "short_descr":""}}. Fill in this JSON template and do not write anything else: {{"creatures": []}}.\n\n ### Response:\n'
 GOAL_PROMPT: '[Characters:{characters}][Sentiments towards characters: {sentiments}]  [Last action: {last_action}] [Location: {location}] [Known locations: {locations}][Acting character: {character}] [Actions available:{actions}] ### Instruction: For {character_name}, come up with a goal that plays along with their character description that involves an item, a character or a location in the prompt. Then construct up to three tasks that will lead towards the achievement of said goal. Fill in the following JSON template: {{"goal":"", "tasks":[{"action":"", "what":""}, {"action":"", "what":""}, {"action":"", "what":""}]}}\n\n ### Response:\n'
 JSON_GRAMMAR: "root   ::= object\nvalue  ::= object | array | string | number | (\"true\" | \"false\" | \"null\") ws\n\nobject ::=\n  \"{\" ws (\n            string \":\" ws value\n    (\",\" ws string \":\" ws value)*\n  )? \"}\" ws\n\narray  ::=\n  \"[\" ws (\n            value\n    (\",\" ws value)*\n  )? \"]\" ws\n\nstring ::=\n  \"\\\"\" (\n    [^\"\\\\] |\n    \"\\\\\" ([\"\\\\/bfnrt] | \"u\" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes\n  )* \"\\\"\" ws\n\nnumber ::= (\"-\"? ([0-9] | [1-9] [0-9]*)) (\".\" [0-9]+)? ([eE] [-+]? [0-9]+)? ws\n\n# Optional space: by convention, applied in this grammar after literal chars when allowed\nws ::= ([ \\t\\n] ws)?"

tale/json_story.py

@@ -14,16 +14,22 @@ def __init__(self, path: str, config: StoryConfig):
         self.config = config
         self.path = path
         locs = {}
+        zones = []
         for zone in self.config.zones:
             zones, exits = parse_utils.load_locations(parse_utils.load_json(self.path +'zones/'+zone + '.json'))
+        if len(zones) < 1:
+            print("No zones found in story config")
+            return
         for name in zones.keys():
             zone = zones[name]
             for loc in zone.locations.values():
                 locs[loc.name] = loc
         self._locations = locs
         self._zones = zones # type: dict(str, dict)
-        self._world["creatures"] = parse_utils.load_npcs(parse_utils.load_json(self.path +'npcs/'+self.config.npcs + '.json'), self._zones)
-        self._world["items"] = parse_utils.load_items(parse_utils.load_json(self.path + self.config.items + '.json'), self._zones)
+        if self.config.npcs:
+            self._world["creatures"] = parse_utils.load_npcs(parse_utils.load_json(self.path +'npcs/'+self.config.npcs + '.json'), self._zones)
+        if self.config.items:
+            self._world["items"] = parse_utils.load_items(parse_utils.load_json(self.path + self.config.items + '.json'), self._zones)
 
     def init(self, driver) -> None:
         pass

tale/llm/character.py

@@ -16,7 +16,7 @@
 class Character():
 
     def __init__(self, backend: str, io_util: IoUtil, default_body: dict):
-        self.pre_prompt = llm_config.params['PRE_JSON_PROMPT']
+        self.pre_prompt = llm_config.params['PRE_PROMPT']
         self.dialogue_prompt = llm_config.params['DIALOGUE_PROMPT']
         self.character_prompt = llm_config.params['CREATE_CHARACTER_PROMPT']
         self.item_prompt = llm_config.params['ITEM_PROMPT']
@@ -80,6 +80,7 @@ def dialogue_analysis(self, text: str, character_card: str, character_name: str,
         if self.backend == 'kobold_cpp':
             request_body = self.analysis_body
             request_body['prompt'] = prompt
+            request_body['grammar'] = self.json_grammar
         elif self.backend == 'openai':
             request_body = self.default_body
             request_body['messages'][1]['content'] = prompt

tale/llm/llm_ext.py

@@ -1,3 +1,4 @@
+import json
 from tale import mud_context
 from tale.base import ContainingType, Item, Living, Location, ParseResult
 from tale.errors import TaleError
@@ -237,3 +238,16 @@ def world_items(self) -> dict:
     @world_items.setter
     def world_items(self, value: dict):
         self._world["items"] = value
+
+    def save(self) -> None:
+        """ Save the story to disk."""
+        story = dict()
+        story["zones"] = dict()
+        story["world"] = self._world
+        for zone in self._zones.values():
+            story["zones"][zone.name] = zone.get_info()
+
+        with open(self.config.name, "w") as fp:
+            json.dump(story , fp) 
+        
+

tale/llm/llm_utils.py

@@ -37,8 +37,7 @@ def __init__(self, io_util: IoUtil = None):
         self._world_building = WorldBuilding(default_body=self.default_body,
                                              io_util=self.io_util,
                                              backend=self.backend)
-        self._character = Character(
-                                    backend=self.backend,
+        self._character = Character(backend=self.backend,
                                     io_util=self.io_util,
                                     default_body=self.default_body)
         self._story_building = StoryBuilding(default_body=self.default_body,

tale/llm/world_building.py

@@ -108,9 +108,12 @@ def _add_npcs(self, location: Location, json_result: dict, world_creatures: dict
             return location
         if world_creatures:
             generated_npcs = parse_utils.replace_creature_with_world_creature(generated_npcs, world_creatures)
-        generated_npcs = parse_utils.load_npcs(generated_npcs)
-        for npc in generated_npcs.values():
-            location.insert(npc, None)
+        try:
+            generated_npcs = parse_utils.load_npcs(generated_npcs)
+            for npc in generated_npcs.values():
+                location.insert(npc, None)
+        except Exception as exc:
+            print(exc)
         return location
 
 
@@ -234,6 +237,9 @@ def generate_world_items(self, story_context: str, story_type: str, world_info:
                                                 world_info=world_info,
                                                 world_mood=parse_utils.mood_string_from_int(world_mood))
         request_body = self.default_body
+        if self.backend == 'kobold_cpp':
+            request_body = self._kobold_generation_prompt(request_body)
+
         result = self.io_util.synchronous_request(request_body, prompt=prompt)
         try:
             json_result = json.loads(parse_utils.sanitize_json(result))
@@ -248,6 +254,9 @@ def generate_world_creatures(self, story_context: str, story_type: str, world_in
                                                 world_info=world_info,
                                                 world_mood=parse_utils.mood_string_from_int(world_mood))
         request_body = self.default_body
+        if self.backend == 'kobold_cpp':
+            request_body = self._kobold_generation_prompt(request_body)
+            
         result = self.io_util.synchronous_request(request_body, prompt=prompt)
         try:
             json_result = json.loads(parse_utils.sanitize_json(result))

tale/npc_defs.py

@@ -1,16 +1,33 @@
 
 
+import random
 from tale.base import Living
+from tale.llm.llm_ext import LivingNpc
 from tale.player import Player
 from tale.util import Context, call_periodically
 
+class StationaryNpc(LivingNpc):
+    
+    def __init__(self, name: str, gender: str, *,
+                 title: str="", descr: str="", short_descr: str="", age: int, personality: str, occupation: str="", race: str=""):
+        super(StationaryNpc, self).__init__(name=name, gender=gender,
+                 title=title, descr=descr, short_descr=short_descr, age=age, personality=personality, occupation=occupation, race=race)
+        
+
+    @call_periodically(20, 45)
+    def do_idle_action(self, ctx: Context) -> None:
+        """ Perform an idle action if a player is in the same location."""
+        player_names = ctx.driver.all_players.keys()
+        player_in_location = any(name == living.name for name in player_names for living in self.location.livings)
+        if player_in_location:
+            self.idle_action()
 
-class StationaryMob(Living):
+class StationaryMob(LivingNpc):
 
     def __init__(self, name: str, gender: str, *,
                  title: str="", descr: str="", short_descr: str="", race: str=""):
         super(StationaryMob, self).__init__(name=name, gender=gender,
-                 title=title, descr=descr, short_descr=short_descr, race=race)
+                 title=title, descr=descr, short_descr=short_descr, race=race, age=0, personality='', occupation='')
 
     @call_periodically(15, 60)
     def do_idle_action(self, ctx: Context) -> None:

tale/parse_utils.py

@@ -4,7 +4,7 @@
 from tale.base import Location, Exit, Item
 from tale.coord import Coord
 from tale.items.basic import Money, Note
-from tale.npc_defs import StationaryMob
+from tale.npc_defs import StationaryMob, StationaryNpc
 from tale.story import GameMode, MoneyType, TickMethod, StoryConfig
 from tale.llm.llm_ext import LivingNpc
 from tale.weapon_type import WeaponType
@@ -95,14 +95,17 @@ def load_npcs(json_file: [], locations = {}) -> dict:
     """
     npcs = {}
     for npc in json_file:
-        npc_type = npc.get('type', 'LivingNpc')
-        if npc_type == 'LivingNpc':
-            if npc['name'].startswith('the') or npc['name'].startswith('The'):
+        npc_type = npc.get('type', 'Mob')
+        if npc_type == 'ignore':
+            continue
+        if npc['name'].startswith('the') or npc['name'].startswith('The'):
                 name = npc['name'].replace('the','').replace('The','').strip()
-            else:
-                name = npc['name']
-            new_npc = LivingNpc(name=name, 
-                                gender=lang.validate_gender(npc.get('gender', 'm')), 
+        else:
+            name = npc['name']
+        if 'npc' in npc_type.lower():
+            
+            new_npc = StationaryNpc(name=name, 
+                                gender=lang.validate_gender_mf(npc.get('gender', 'm')[0]), 
                                 race=npc.get('race', 'human').lower(), 
                                 title=npc.get('title', name), 
                                 descr=npc.get('descr', ''), 
@@ -114,8 +117,9 @@ def load_npcs(json_file: [], locations = {}) -> dict:
             new_npc.stats.set_weapon_skill(WeaponType.UNARMED, random.randint(10, 30))
             new_npc.stats.level = npc.get('level', 1)
         elif npc_type == 'Mob':
+
             new_npc = StationaryMob(name=npc['name'], 
-                                gender=lang.validate_gender(npc.get('gender', 'm')), 
+                                gender=lang.validate_gender_mf(npc.get('gender', 'm')[0]), 
                                 race=npc.get('race', 'human').lower(), 
                                 title=npc.get('title', npc['name']), 
                                 descr=npc.get('descr', ''), 
@@ -198,7 +202,7 @@ def sanitize_json(result: str):
     """ Removes special chars from json string. Some common, and some 'creative' ones. """
     # .replace('}}', '}')
     # .replace('""', '"')
-    result = result.replace('```json', '').replace('\\"', '"').replace('"\\n"', '","').replace('\\n', '').replace('}\n{', '},{').replace('}{', '},{').replace('\\r', '').replace('\\t', '').replace('"{', '{').replace('}"', '}').replace('"\\', '"').replace('\\”', '"').replace('" "', '","').replace(':,',':').replace('},]', '}]').replace('},}', '}}')
+    result = result.replace('```json', '') #.replace('\\"', '"').replace('"\\n"', '","').replace('\\n', '').replace('}\n{', '},{').replace('}{', '},{').replace('\\r', '').replace('\\t', '').replace('"{', '{').replace('}"', '}').replace('"\\', '"').replace('\\”', '"').replace('" "', '","').replace(':,',':').replace('},]', '}]').replace('},}', '}}')
     result = result.split('```')[0]
     print('sanitized json: ' + result)
     return result

tale/story_builder.py

@@ -103,10 +103,13 @@ def apply_to_story(self, story: DynamicStory, llm_util: LlmUtil):
 
         self.connection.output("Generating starting zone...")
         world_info = {'world_description': self.story_info.world_info, 'world_mood': self.story_info.world_mood, 'world_items': items, 'world_creatures': creatures}
-        zone = llm_util.generate_start_zone(location_desc=self.story_info.start_location, 
+        for i in range(3):
+            zone = llm_util.generate_start_zone(location_desc=self.story_info.start_location, 
                                                     story_type=self.story_info.type, 
                                                     story_context=story.config.context,
                                                     world_info=world_info)
+            if zone:
+                break
 
         story.add_zone(zone)