コミットを比較
1 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| 7b7dbdabb2 |
@@ -349,7 +349,7 @@ class Main:
|
|||||||
sunset_start + (sunset_end - sunset_start) / 2)
|
sunset_start + (sunset_end - sunset_start) / 2)
|
||||||
|
|
||||||
jojoko: pygame.Surface = cls.get_jojoko (jojoko_original,
|
jojoko: pygame.Surface = cls.get_jojoko (jojoko_original,
|
||||||
moon_days_old)
|
moon_days_old, moon_alt)
|
||||||
|
|
||||||
dt: datetime = datetime.now ()
|
dt: datetime = datetime.now ()
|
||||||
|
|
||||||
@@ -391,9 +391,10 @@ class Main:
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_jojoko (
|
def get_jojoko (
|
||||||
jojoko_original: pygame.Surface,
|
jojoko_original: pygame.Surface,
|
||||||
moon_days_old: float) \
|
moon_days_old: float,
|
||||||
|
moon_alt: float) \
|
||||||
-> pygame.Surface:
|
-> pygame.Surface:
|
||||||
jojoko: pygame.Surface = jojoko_original.copy ()
|
jojoko: pygame.Surface = pygame.transform.rotate (jojoko_original, -moon_alt)
|
||||||
|
|
||||||
jojoko.set_colorkey ((0, 255, 0))
|
jojoko.set_colorkey ((0, 255, 0))
|
||||||
|
|
||||||
|
|||||||
@@ -24,13 +24,7 @@ class Talk:
|
|||||||
top_p: float = 1.
|
top_p: float = 1.
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def main (
|
def main (cls, message: str, name: str | None = None, histories: list = [], goatoh_mode: bool = False) -> str:
|
||||||
cls,
|
|
||||||
message: str,
|
|
||||||
name: str | None = None,
|
|
||||||
histories: list = [],
|
|
||||||
goatoh_mode: bool = False,
|
|
||||||
) -> str:
|
|
||||||
# ChatGPT API Organisation ID
|
# ChatGPT API Organisation ID
|
||||||
openai.organization = OPENAI_ORGANISATION
|
openai.organization = OPENAI_ORGANISATION
|
||||||
|
|
||||||
@@ -44,13 +38,8 @@ class Talk:
|
|||||||
return answer.content if answer is not None else cls.DUMMY_RESPONSE
|
return answer.content if answer is not None else cls.DUMMY_RESPONSE
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def __get_message (
|
def __get_message (cls, message: str, name: str | None, histories: list, goatoh_mode: bool = False) \
|
||||||
cls,
|
-> chat.chat_completion_message.ChatCompletionMessage | None:
|
||||||
message: str,
|
|
||||||
name: str | None,
|
|
||||||
histories: list,
|
|
||||||
goatoh_mode: bool = False,
|
|
||||||
) -> chat.chat_completion_message.ChatCompletionMessage | None:
|
|
||||||
# プロンプト(JSON 等外部ファイルに置くことを検討)
|
# プロンプト(JSON 等外部ファイルに置くことを検討)
|
||||||
if goatoh_mode:
|
if goatoh_mode:
|
||||||
messages: list = [{'role': 'system',
|
messages: list = [{'role': 'system',
|
||||||
@@ -214,13 +203,13 @@ class Talk:
|
|||||||
+ 'ふざけるのはいい加減にするぬ゛ぬ゛ん゛。'))},
|
+ 'ふざけるのはいい加減にするぬ゛ぬ゛ん゛。'))},
|
||||||
|
|
||||||
{'role': 'system',
|
{'role': 'system',
|
||||||
'content': '洗澡歌(しーざおぐあ)歌って'},
|
'content': '洗操歌(しーざおぐあ)歌って'},
|
||||||
|
|
||||||
{'role': 'assistant',
|
{'role': 'assistant',
|
||||||
'content': ('おけだぬ゛~゛ん゛(苦笑)。'
|
'content': ('おけだぬ゛~゛ん゛(苦笑)。'
|
||||||
+ '毛巾浴帽小鴨鴨水溫剛剛好♪'
|
+ '毛巾浴帽小鸭鸭水温刚刚好♪'
|
||||||
+ '潑潑水來搓泡泡今天眞是美妙♪'
|
+ '泼泼水来搓泡泡今天真是美妙♪'
|
||||||
+ '大聲唱歌扭扭腰我愛洗洗澡♪'
|
+ '大声唱歌扭扭腰我爱洗洗澡♪'
|
||||||
+ 'だぬ゛ん♪')},
|
+ 'だぬ゛ん♪')},
|
||||||
|
|
||||||
{'role': 'system',
|
{'role': 'system',
|
||||||
|
|||||||
新しい課題から参照
ユーザをブロックする