From fb826a4ae5f291b7d400e8fd03ab1fdb01655fd5 Mon Sep 17 00:00:00 2001 From: Hendrik Langer Date: Wed, 12 Apr 2023 11:59:56 +0200 Subject: [PATCH] add test command for custom remote endpoint --- matrix_pygmalion_bot/ai/runpod_pygmalion.py | 2 ++ matrix_pygmalion_bot/chatlog.py | 6 +++++- matrix_pygmalion_bot/core.py | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/matrix_pygmalion_bot/ai/runpod_pygmalion.py b/matrix_pygmalion_bot/ai/runpod_pygmalion.py index fc38205..02385a5 100644 --- a/matrix_pygmalion_bot/ai/runpod_pygmalion.py +++ b/matrix_pygmalion_bot/ai/runpod_pygmalion.py @@ -84,6 +84,7 @@ async def generate_sync( return reply else: err_msg = r_json["error"] if "error" in r_json else "" + err_msg = err_msg.replace("\\n", "\n") raise ValueError(f"RETURN CODE {status}: {err_msg}") raise ValueError(f"") else: @@ -217,6 +218,7 @@ async def generate_image(input_prompt: str, negative_prompt: str, api_url: str, break else: err_msg = r_json["error"] if "error" in r_json else "" + err_msg = err_msg.replace("\\n", "\n") raise ValueError(f"RETURN CODE {status}: {err_msg}") if not output: diff --git a/matrix_pygmalion_bot/chatlog.py b/matrix_pygmalion_bot/chatlog.py index ff3e855..5737fc9 100644 --- a/matrix_pygmalion_bot/chatlog.py +++ b/matrix_pygmalion_bot/chatlog.py @@ -30,7 +30,11 @@ class ChatMessage: if not (to_lang in self.message): self.message[to_lang] = translate.translate(self.message["en"], "en", to_lang) return self.message[to_lang] - + def updateText(self, new_text, language="en"): + self.message[self.language] = new_text + self.num_tokens = None + if not (language == "en"): + self.message["en"] = translate.translate(message, language, "en") class ChatHistory: def __init__(self, bot_name, room_name): diff --git a/matrix_pygmalion_bot/core.py b/matrix_pygmalion_bot/core.py index 43d9889..6f95fec 100644 --- a/matrix_pygmalion_bot/core.py +++ b/matrix_pygmalion_bot/core.py @@ -67,6 +67,7 @@ class Callbacks(object): ) ) + api_endpoint = "pygmalion-6b" await self.client.room_read_markers(room.room_id, event.event_id, event.event_id) # Ignore messages when disabled if "disabled" in self.bot.room_config[room.room_id] and self.bot.room_config[room.room_id]["disabled"] == True and not event.body.startswith('!start'): @@ -202,6 +203,9 @@ class Callbacks(object): new_answer = event.body.removeprefix('!replace').strip() await self.bot.send_message(self.client, room.room_id, new_answer, reply_to=chat_history_item.relates_to_event) return + elif event.body.startswith('!2'): + chat_message.updateText( event.body.removeprefix('!2').strip() ) + api_endpoint = "ynznznpn6qz6yh" elif event.body.startswith('!'): await self.bot.send_message(self.client, room.room_id, "UNKNOWN COMMAND") return @@ -232,7 +236,7 @@ class Callbacks(object): # print("") try: typing = lambda : self.client.room_typing(room.room_id, True, 15000) - answer = await ai.generate_sync(full_prompt, self.bot.runpod_api_key, self.bot, typing) + answer = await ai.generate_sync(full_prompt, self.bot.runpod_api_key, self.bot, typing, api_endpoint) answer = answer.strip() await self.client.room_typing(room.room_id, False) if not (self.bot.translate is None):