9 コミット

作成者 SHA1 メッセージ 日付
みてるぞ 7277819b6e 'talk.py' を更新 2024-05-14 20:52:10 +09:00
みてるぞ 0b8e9812b9 冗長な記述を削除 2024-05-13 21:55:16 +09:00
みてるぞ a00eaf7ff2 入りのときに日や月が出ないやぅに(XP草原は東と想定) 2024-05-13 21:08:55 +09:00
みてるぞ 80d6c09967 大月ヨヨコ爆誕 2024-05-13 02:54:10 +09:00
みてるぞ 37618c5df1 本日作業分 2024-05-13 01:00:32 +09:00
みてるぞ d80d03db46 Merge branch 'main' into ofotukuy 2024-05-12 04:49:32 +09:00
みてるぞ fa6b5ba68b き太く陽を昇らせる 2024-05-12 04:49:08 +09:00
みてるぞ cff0ec27d8 tukuy no iri 2024-05-09 03:55:34 +00:00
みてるぞ d676372276 夜の風景から月を削除 2024-05-09 08:29:24 +09:00
8個のファイルの変更157行の追加30行の削除
バイナリ
ファイルの表示
バイナリファイルは表示されません.

変更後

幅:  |  高さ:  |  サイズ: 99 KiB

バイナリ
ファイルの表示
バイナリファイルは表示されません.

変更前

幅:  |  高さ:  |  サイズ: 38 KiB

変更後

幅:  |  高さ:  |  サイズ: 53 KiB

+4
ファイルの表示
@@ -2,3 +2,7 @@ class CWindow:
WIDTH: int = 1024
HEIGHT: int = 768
class CMath:
PI: float = 3.14159265358979323846
+20 -4
ファイルの表示
@@ -1,17 +1,28 @@
import unicodedata
from common_const import *
class CommonModule:
@staticmethod
def is_wide (c: str) -> bool:
def is_wide (
c: str) \
-> bool:
return unicodedata.east_asian_width (c) in ['F', 'W', 'A']
@classmethod
def len_by_full (cls, string: str) -> float:
def len_by_full (
cls,
string: str) \
-> float:
return sum (1 if cls.is_wide (c) else .5 for c in string)
@classmethod
def index_by_f2c (cls, string: str, index: float) -> int:
def index_by_f2c (
cls,
string: str,
index: float) \
-> int:
i: int = 0
work: str = ''
for c in string:
@@ -24,7 +35,12 @@ class CommonModule:
return i
@classmethod
def mid_by_full (cls, string: str, start: float, length: float) -> str:
def mid_by_full (
cls,
string: str,
start: float,
length: float) \
-> str:
trimmed_left: str = string[cls.index_by_f2c (string, start):]
return trimmed_left[:cls.index_by_f2c (trimmed_left, length)]
+115 -19
ファイルの表示
@@ -1,6 +1,7 @@
# vim: nosmartindent autoindent
import json
import math
import random
import subprocess
import sys
@@ -10,6 +11,7 @@ from datetime import datetime, timedelta
import emoji
import ephem
import pygame
import pygame.gfxdraw
import pytchat
from playsound import playsound
from pygame.locals import *
@@ -52,10 +54,10 @@ class Main:
observer = ephem.Observer ()
observer.lat, observer.lon = '35', '139'
# き太く陽
# き太く陽オブジェクト
sun = ephem.Sun ()
# 大月ヨヨコ
# 大月ヨヨコ・オブジェクト
moon = ephem.Moon ()
# 吹き出し
@@ -79,6 +81,19 @@ class Main:
pygame.image.load ('bg-night.jpg'),
(CWindow.WIDTH, CWindow.HEIGHT))
# 背景の草
bg_grass: pygame.Surface = pygame.transform.scale (
pygame.image.load ('bg-grass.png'),
(CWindow.WIDTH, CWindow.HEIGHT))
# き太く陽
kita: pygame.Surface = pygame.transform.scale (
pygame.image.load ('sun.png'), (200, 200))
# 大月ヨヨコ
jojoko: pygame.Surface = pygame.transform.scale (
pygame.image.load ('moon.png'), (200, 200))
# 音声再生器の初期化
pygame.mixer.init (frequency = 44100)
@@ -106,11 +121,11 @@ class Main:
# Youtube Chat から取得したコメントたち
chat_items: list = []
# 会話の履歴(3 件分保持)
# 会話の履歴
histories: list = []
while (True):
# 観測の日づけ更新
# 観測の日づけ更新
observer.date: datetime = datetime.now ().date ()
# 日の出開始
@@ -129,8 +144,32 @@ class Main:
# 日の入終了
sunset_end: datetime = sunset_start + timedelta (hours = 1)
cls.draw_bg (screen, bg_day, bg_evening, bg_night,
sunrise_start, sunrise_end, sunset_start, sunset_end)
# 時刻つき観測地
observer_with_time: ephem.Observer = observer
observer_with_time.date = datetime.now () - timedelta (hours = 9)
# 日の角度
sun.compute (observer_with_time)
sun_alt: float = math.degrees (sun.alt)
sun_az: float = math.degrees (sun.az)
# 月の角度
moon.compute (observer_with_time)
moon_alt: float = math.degrees (moon.alt)
moon_az: float = math.degrees (moon.az)
# 月齢
new_moon_dt: datetime = ephem.localtime (
ephem.previous_new_moon (observer_with_time.date))
moon_days_old: float = (
(datetime.now () - new_moon_dt).total_seconds ()
/ 60 / 60 / 24)
# 背景描画
cls.draw_bg (screen, bg_day, bg_evening, bg_night, bg_grass,
kita, jojoko,
sunrise_start, sunrise_end, sunset_start, sunset_end,
sun_alt, sun_az, moon_alt, moon_az, moon_days_old)
# 左上に時刻表示
for i in range (4):
@@ -170,11 +209,13 @@ class Main:
# 履歴に追加
histories = (histories
+ [{'role': 'user', 'content': message},
{'role': 'assistant', 'content': answer}])[(-12):]
{'role': 'assistant', 'content': answer}])[(-12):]
# ログ書込み
with open ('log.txt', 'a') as f:
f.write (f'{datetime.now ()}\t{json.dumps (chat_item.__dict__)}\t{answer}\n')
f.write (f'{datetime.now ()}\t'
+ f'{json.dumps (chat_item.__dict__)}\t'
+ f'{answer}\n')
# 吹出し描画(ニジカは上,ゴートうは下)
if nizika_mode:
@@ -192,7 +233,8 @@ class Main:
screen.blit (
user_font.render (
'> ' + (message
if (CommonModule.len_by_full (message)
if (CommonModule.len_by_full (
message)
<= 21)
else (CommonModule.mid_by_full (
message, 0, 19.5)
@@ -254,8 +296,11 @@ class Main:
break
cls.draw_bg (screen, bg_day, bg_evening, bg_night,
bg_grass, kita, jojoko,
sunrise_start, sunrise_end,
sunset_start, sunset_end)
sunset_start, sunset_end,
sun_alt, sun_az, moon_alt, moon_az,
moon_days_old)
chat_item.author = {'name': 'ゴートうひとり' if goatoh_talking else '伊地知ニジカ',
'id': '',
@@ -281,20 +326,31 @@ class Main:
@classmethod
def draw_bg (
cls,
screen: pygame.Surface,
bg_day: pygame.Surface,
bg_evening: pygame.Surface,
bg_night: pygame.Surface,
sunrise_start: datetime,
sunrise_end: datetime,
sunset_start: datetime,
sunset_end: datetime) \
screen: pygame.Surface,
bg_day: pygame.Surface,
bg_evening: pygame.Surface,
bg_night: pygame.Surface,
bg_grass: pygame.Surface,
kita: pygame.Surface,
jojoko_original: pygame.Surface,
sunrise_start: datetime,
sunrise_end: datetime,
sunset_start: datetime,
sunset_end: datetime,
sun_alt: float,
sun_az: float,
moon_alt: float,
moon_az: float,
moon_days_old: float) \
-> None:
sunrise_centre: datetime = (
sunrise_start + (sunrise_end - sunrise_start) / 2)
sunset_centre: datetime = (
sunset_start + (sunset_end - sunset_start) / 2)
jojoko: pygame.Surface = cls.get_jojoko (jojoko_original,
moon_days_old)
dt: datetime = datetime.now ()
if sunrise_centre <= dt < sunset_centre:
@@ -309,10 +365,50 @@ class Main:
bg_evening.set_alpha (255 - ((abs (dt - sunset_centre) * 510)
/ (sunset_end - sunset_centre)))
else:
return
bg_evening.set_alpha (0)
if sunrise_start <= dt < sunset_end:
jojoko.set_alpha (255 - 255 / 15 * abs (moon_days_old - 15))
else:
jojoko.set_alpha (255)
screen.blit (bg_evening, (0, 0))
if (moon_az < 180) and (-10 <= moon_alt < 40):
y = ((CWindow.HEIGHT / 2 + 100)
- (CWindow.HEIGHT / 2 + 200) / 30 * moon_alt)
screen.blit (jojoko, jojoko.get_rect (center = (400, y)))
screen.blit (bg_grass, (0, 0))
if (sun_az < 180) and (-10 <= sun_alt < 40):
y = ((CWindow.HEIGHT / 2 + 100)
- (CWindow.HEIGHT / 2 + 200) / 30 * sun_alt)
screen.blit (kita, kita.get_rect (center = (400, y)))
screen.blit (bg_grass, (0, 0))
@staticmethod
def get_jojoko (
jojoko_original: pygame.Surface,
moon_days_old: float) \
-> pygame.Surface:
jojoko: pygame.Surface = jojoko_original.copy ()
jojoko.set_colorkey ((0, 255, 0))
for i in range (200):
if 1 <= moon_days_old < 15:
pygame.gfxdraw.bezier (jojoko, ((0, 100 + i), (100, 180 * moon_days_old / 7 - 80 + i), (200, 100 + i)), 3, (0, 255, 0))
elif moon_days_old < 16:
pass
elif moon_days_old < 30:
pygame.gfxdraw.bezier (jojoko, ((0, 100 - i), (100, 180 * (moon_days_old - 15) / 7 - 80 - i), (200, 100 - i)), 3, (0, 255, 0))
else:
jojoko.fill ((0, 255, 0))
return jojoko
if __name__ == '__main__':
Main.main (sys.argv, len (sys.argv))
実行可能ファイル
バイナリ
ファイルの表示
バイナリファイルは表示されません.

変更後

幅:  |  高さ:  |  サイズ: 641 KiB

バイナリ
ファイルの表示
バイナリファイルは表示されません.

変更後

幅:  |  高さ:  |  サイズ: 554 KiB

+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',