Merge branch 'main' into ofotukuy

このコミットが含まれているのは:
2024-05-19 09:17:35 +09:00
コミット f2683bca27
+18 -7
ファイルの表示
@@ -24,7 +24,13 @@ class Talk:
top_p: float = 1.
@classmethod
def main (cls, message: str, name: str | None = None, histories: list = [], goatoh_mode: bool = False) -> str:
def main (
cls,
message: str,
name: str | None = None,
histories: list = [],
goatoh_mode: bool = False,
) -> str:
# ChatGPT API Organisation ID
openai.organization = OPENAI_ORGANISATION
@@ -38,8 +44,13 @@ class Talk:
return answer.content if answer is not None else cls.DUMMY_RESPONSE
@classmethod
def __get_message (cls, message: str, name: str | None, histories: list, goatoh_mode: bool = False) \
-> chat.chat_completion_message.ChatCompletionMessage | None:
def __get_message (
cls,
message: str,
name: str | None,
histories: list,
goatoh_mode: bool = False,
) -> chat.chat_completion_message.ChatCompletionMessage | None:
# プロンプト(JSON 等外部ファイルに置くことを検討)
if goatoh_mode:
messages: list = [{'role': 'system',
@@ -203,13 +214,13 @@ class Talk:
+ 'ふざけるのはいい加減にするぬ゛ぬ゛ん゛。'))},
{'role': 'system',
'content': '歌(しーざおぐあ)歌って'},
'content': '歌(しーざおぐあ)歌って'},
{'role': 'assistant',
'content': ('おけだぬ゛~゛ん゛(苦笑)。'
+ '毛巾浴帽小鸭鸭水温刚刚好♪'
+ '泼泼水来搓泡泡今天是美妙♪'
+ '唱歌扭扭腰我洗洗澡♪'
+ '毛巾浴帽小鴨鴨水溫剛剛好♪'
+ '潑潑水來搓泡泡今天是美妙♪'
+ '唱歌扭扭腰我洗洗澡♪'
+ 'だぬ゛ん♪')},
{'role': 'system',