handle error message

neph1 · Jan 10, 2024 · 26317f8 · 26317f8
1 parent 8b43163
commit 26317f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/tale/llm/LivingNpc.py b/tale/llm/LivingNpc.py
@@ -260,7 +260,7 @@ def tell_action_deferred(self):
         actions = '\n'.join(self.deferred_actions)
         deferred_action = ParseResult(verb='idle-action', unparsed=actions, who_info=None)
         self.tell_others(actions + '\n')
-        #self.location._notify_action_all(deferred_action, actor=self)
+        self.location._notify_action_all(deferred_action, actor=self)
         self.deferred_actions.clear()
 
     def _clear_quest(self):

diff --git a/tale/llm/llm_io.py b/tale/llm/llm_io.py
@@ -36,12 +36,9 @@ def synchronous_request(self, request_body: dict, prompt: str, context: str = ''
         request_body = self.io_adapter._set_prompt(request_body, prompt, context)
         print(request_body)
         response = requests.post(self.url + self.endpoint, headers=self.headers, data=json.dumps(request_body))
-        try:
-            parsed_response = self.io_adapter._parse_result(response.text)
-        except LlmResponseException as exc:
-            print("Error parsing response from backend - ", exc)
-            return ''
-        return parsed_response
+        if response.status_code == 200:
+            return self.io_adapter._parse_result(response.text)
+        return ''
 
     def asynchronous_request(self, request_body: dict, prompt: str, context: str = '') -> str:
         if self.backend != 'kobold_cpp':

diff --git a/tests/test_llm_io.py b/tests/test_llm_io.py
@@ -79,6 +79,17 @@ def test_set_prompt_llama_cpp(self):
         assert(config_file['USER_START'] in result['messages'][1]['content'])
         assert(config_file['USER_END'] in result['messages'][1]['content'])
 
+    @responses.activate
+    def test_error_response(self):
+        config_file = self._load_config()
+        backend_config = self._load_backend_config('kobold_cpp')
+        responses.add(responses.POST, backend_config['URL'] + backend_config['ENDPOINT'],
+                    json={'results':['']}, status=500)
+        io_util = IoUtil(config=config_file, backend_config=backend_config)
+
+        response = io_util.synchronous_request(request_body=json.loads(backend_config['DEFAULT_BODY']), prompt='test evoke', context='')
+        assert(response == '')
+
     @responses.activate
     def test_stream_kobold_cpp(self):
         config = {'BACKEND':'kobold_cpp', 'USER_START':'', 'USER_END':''}