From 081ab9aa2eedbba0485bead7fa87d0fa1126b20a Mon Sep 17 00:00:00 2001 From: miteruzo Date: Tue, 3 Sep 2024 01:10:50 +0900 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=85=A5=E5=8A=9B=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- talk.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/talk.py b/talk.py index 8053c75..00530b2 100644 --- a/talk.py +++ b/talk.py @@ -47,7 +47,7 @@ class Talk: @classmethod def __get_message ( cls, - message: str, + message: str | list, name: str | None, histories: list, goatoh_mode: bool = False, @@ -234,10 +234,17 @@ class Talk: messages += histories + [{'role': 'user', 'content': message}] + # デバッグ用 + print (messages) + try: - return openai.chat.completions.create ( - model = 'gpt-4o' if random.random () < .2 else 'gpt-3.5-turbo', - messages = messages).choices[0].message + return (openai.chat.completions.create ( + model = ('gpt-4o' + if any (type (e['content']) is list + for e in messages) + else 'gpt-3.5-turbo'), + messages = messages) + .choices[0].message) except: return None