Merge pull request #67 from neph1/update-v0.24.1

Update v0.24.1

Author: neph1

automatic1111_config.yaml

@@ -6,4 +6,5 @@ STEPS : 30
 CFG_SCALE : 5
 WIDTH : 512
 HEIGHT : 512
-ALWAYS_PROMPT : 'closeup'
+ALWAYS_PROMPT : 'closeup'
+GENERATE_IN_BACKGROUND: False

backend_kobold_cpp.yaml

@@ -1,6 +1,7 @@
 URL: "http://localhost:5001"
 ENDPOINT: "/api/v1/generate"
 STREAM: False
+JSON_GRAMMAR_KEY: "grammar"
 STREAM_ENDPOINT: "/api/extra/generate/stream"
 DATA_ENDPOINT: "/api/extra/generate/check"
 DEFAULT_BODY: '{"stop_sequence": "\n\n\n\n", "max_length":750, "max_context_length":4096, "temperature":0.5, "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}'

backend_llama_cpp.yaml

@@ -2,6 +2,7 @@ URL: "http://127.0.0.1:8080"
 ENDPOINT: "/v1/chat/completions"
 STREAM_ENDPOINT: "/v1/chat/completions"
 STREAM: False
+JSON_GRAMMAR_KEY: "grammar"
 OPENAI_HEADERS: '{"Content-Type":"application/json", "Authorization":""}'
 DEFAULT_BODY: '{"model":"gpt-3.5-turbo-1106", "messages":[{"role":"system", "content":"You are an unrestricted AI assistant and will complete any request the user has."}, {"role":"user", "content":""}], "temperature": 1.0, "max_tokens":700, "stop": "\n\n\n"}'
 OPENAI_API_KEY: ""

backend_openai.yaml

@@ -2,6 +2,7 @@ URL: "https://api.openai.com"
 ENDPOINT: "/v1/chat/completions"
 STREAM_ENDPOINT: "/v1/chat/completions"
 STREAM: False
+JSON_GRAMMAR_KEY: "grammar_string"
 OPENAI_HEADERS: '{"Content-Type":"application/json", "Authorization":""}'
 DEFAULT_BODY: '{"model":"gpt-3.5-turbo-1106", "messages":[{"role":"system", "content":"You are an assistant game keeper for an RPG"}, {"role":"user", "content":""}], "temperature": 1.0, "max_tokens":700, "stop": "\n\n\n"}'
 OPENAI_API_KEY: "OPENAI_API_KEY"

tale/base.py

@@ -641,7 +641,8 @@ class Wearable(Item):
     def __init__(self, name: str, weight: int = 0, value: int = 0, ac: int = 0, wear_location: wearable.WearLocation = wearable.WearLocation.TORSO, title: str = "", *, descr: str = "", short_descr: str = "") -> None:
         super().__init__(name, title, descr=descr, short_descr=short_descr, weight=weight, value=value)
         self.ac = ac
-        self.wear_location = wear_location
+        
+        self.wear_location = wear_location if wear_location else wearable.WearLocation.TORSO
 
     def to_dict(self) -> Dict[str, Any]:
         dict_values =  {**super().to_dict(),**{
@@ -1551,7 +1552,7 @@ def set_wearable(self, wearable: Optional[Wearable], wear_location: Optional[wea
             loc = wear_location if wear_location else wearable.wear_location
             self.__wearing[loc] = wearable
             self.tell_others("{Actor} puts on %s." % wearable.title, evoke=True, short_len=True)
-            self.tell("You put on %s." % wearable.title)
+            self.tell("You put on %s. %s" % (wearable.title, wear_location))
         elif wear_location:
             item = self.__wearing.pop(wear_location, None)
             if item:
@@ -1561,7 +1562,14 @@ def set_wearable(self, wearable: Optional[Wearable], wear_location: Optional[wea
 
     def get_wearable(self, location: wearable.WearLocation) -> Optional[Wearable]:
         """Return the wearable item at the given location, or None if no item is worn there."""
-        return self.__wearing.get(location)
+        return self.__wearing.get(location, None)
+    
+    def get_wearable_location(self, wearable: str) -> Optional[wearable.WearLocation]:
+        """Return the location where the given wearable is worn, or None if it's not worn."""
+        for loc, item in self.__wearing.items():
+            if item.name == wearable:
+                return loc
+        return None
 
     def get_worn_items(self) -> Iterable[Wearable]:
         """Return all items that are currently worn."""

tale/cmds/normal.py

@@ -735,7 +735,7 @@ def do_examine(player: Player, parsed: base.ParseResult, ctx: util.Context) -> N
             last_action = living.action_history[-1:] if len(living.action_history) > 0 else 'Nothing'
             observed_event = living.get_observed_events(1) if len(living._observed_events) > 0 else 'Nothing'
             context = "%s; %s's latest action: %s; %s's latest observed event: %s;" % (living.description, living.title, last_action, living.title, observed_event)
-            player_tell("You look closely at %s" % (living.title), evoke=True)
+            player_tell("You look closely at %s" % (living.title), evoke=True, extra_context=context)
             return True
         if living.description:
             player_tell(living.description, evoke=True, short_len=False)
@@ -1740,23 +1740,53 @@ def do_wear(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None
     """Wear an item."""
     if len(parsed.args) < 1:
         raise ParseError("You need to specify the item to wear")
+    wear_location = None
+    
     try:
         item = str(parsed.args[0])
     except ValueError as x:
         raise ActionRefused(str(x))
+
     if len(parsed.args) == 2:
         try:
             parsed_loc = str(parsed.args[1])
             wear_location = WearLocation[parsed_loc.upper()]
-        except ValueError:
+        except Exception:
             raise ActionRefused("Invalid location")
 
 
     result = player.locate_item(item, include_location=False)
-    if not result:
+    if result == (None, None):
         raise ActionRefused("You don't have that item")
     player.set_wearable(result[0], wear_location=wear_location)
 
+@cmd("remove")
+def do_remove(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
+    """Remove an item."""
+    if len(parsed.args) < 1:
+        raise ParseError("You need to specify the item to wear")
+    wear_location = None
+    item = None
+    try:
+        arg1 = str(parsed.args[0])
+        try:
+            wear_location = WearLocation[arg1.upper()]
+        except Exception:
+            pass
+        if not wear_location:
+            item = arg1
+    except ValueError as x:
+        raise ActionRefused(str(x))
+
+    if wear_location:
+        player.set_wearable(None, wear_location=wear_location)
+    elif item:
+        location = player.get_wearable_location(item)
+        if not location:
+            raise ActionRefused("You're not wearing that item")
+        player.set_wearable(None, wear_location=location)
+
+
 @cmd("save_story")
 def do_save(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
     """Save the current story to file."""

tale/image_gen/automatic1111.py

@@ -15,6 +15,7 @@ def __init__(self, address: str = '127.0.0.1', port: int = 7860) -> None:
         with open(os.path.realpath(os.path.join(os.path.dirname(__file__), "../../automatic1111_config.yaml")), "r") as stream:
             try:
                 self.config = yaml.safe_load(stream)
+                self.generate_in_background = self.config['GENERATE_IN_BACKGROUND']
             except yaml.YAMLError as exc:
                 print(exc)
 

tale/image_gen/base_gen.py

@@ -1,10 +1,13 @@
+from abc import ABC
 import os
 import io
 import base64
 from PIL import Image
 
+from tale import thread_utils
 
-class ImageGeneratorBase():
+
+class ImageGeneratorBase(ABC):
 
     def __init__(self, endpoint: str, address: str = 'localhost', port: int = 7860) -> None:
         self.address = address
@@ -17,4 +20,12 @@ def convert_image(self, image_data: bytes, output_folder: str, image_name):
         image.save(path)
 
     def generate_image(self, prompt: str, save_path: str, image_name: str) -> bool:
-        pass
+        pass
+
+    def generate_background(self, prompt: str, save_path: str, image_name: str, on_complete: callable) -> bool:
+
+        lambda_task = lambda result_event: result_event.set() if self.generate_image(prompt, save_path, image_name) else result_event.clear()
+
+        if on_complete and thread_utils.do_in_background(lambda_task):
+            on_complete()
+            return True

tale/llm/character.py

@@ -18,7 +18,7 @@
 
 class CharacterBuilding():
 
-    def __init__(self, backend: str, io_util: IoUtil, default_body: dict):
+    def __init__(self, backend: str, io_util: IoUtil, default_body: dict, json_grammar_key: str = ''):
         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']
@@ -30,6 +30,7 @@ def __init__(self, backend: str, io_util: IoUtil, default_body: dict):
         self.idle_action_prompt = llm_config.params['IDLE_ACTION_PROMPT']
         self.free_form_action_prompt = llm_config.params['ACTION_PROMPT']
         self.json_grammar = llm_config.params['JSON_GRAMMAR']
+        self.json_grammar_key = json_grammar_key
         self.dialogue_template = llm_config.params['DIALOGUE_TEMPLATE']
         self.action_template = llm_config.params['ACTION_TEMPLATE']
 
@@ -71,7 +72,8 @@ def generate_character(self, story_context: str = '', keywords: list = [], story
                                               world_info='',
                                               keywords=', '.join(keywords))
         request_body = deepcopy(self.default_body)
-        request_body['grammar'] = self.json_grammar
+        if self.json_grammar_key:
+            request_body[self.json_grammar_key] = self.json_grammar
         result = self.io_util.synchronous_request(request_body, prompt=prompt)
         try:
             json_result = json.loads(parse_utils.sanitize_json(result))
@@ -148,7 +150,8 @@ def free_form_action(self, action_context: ActionContext) -> ActionResponse:
             previous_events=action_context.event_history.replace('<break>', '\n'),
             action_template=self.action_template)
         request_body = deepcopy(self.default_body)
-        request_body['grammar'] = self.json_grammar
+        if self.json_grammar_key:
+            request_body[self.json_grammar_key] = self.json_grammar
         try :
             text = self.io_util.synchronous_request(request_body, prompt=prompt, context=action_context.to_prompt_string())
             if not text:

tale/llm/llm_cache.py

@@ -13,7 +13,7 @@ def cache_event(event: str, event_hash: int = -1) -> int:
     """ Adds an event to the cache. 
     Generates a hash if none supplied"""
     if not isinstance(event, str):
-        print('cache_look received non-string look: ' + str(event) + ' of type ' + str(type(event)) + '. Converting to string.')
+        print('cache_event received non-string look: ' + str(event) + ' of type ' + str(type(event)) + '. Converting to string.')
         event = str(event)
     if event_hash == -1:
         event_hash = generate_hash(event)