From 51b883932eb0a7477dc9edb0d039693d6b300eaf Mon Sep 17 00:00:00 2001 From: ikaros <327209194@qq.com> Date: Fri, 26 Jul 2024 21:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E9=A1=B5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E5=94=A4=E9=86=92=E8=AF=8D=E5=92=8C=E7=9D=A1?= =?UTF-8?q?=E7=9C=A0=E8=AF=8D=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=AD=A4=E5=8A=9F=E8=83=BD=E5=94=A4=E9=86=92ai=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E6=97=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9D=A1=E7=9C=A0=E8=AF=8D=E5=81=9C=E6=AD=A2=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 - config.json | 77 +- config.json.bak | 19 + main.py | 1624 ++++++++++++++++++++------------- tests/test_sensevoice/demo.py | 3 + utils/common.py | 69 +- utils/my_handle.py | 4 +- webui.py | 17 +- 8 files changed, 1140 insertions(+), 676 deletions(-) diff --git a/.gitignore b/.gitignore index 0efa26f5..955dbf45 100644 --- a/.gitignore +++ b/.gitignore @@ -225,7 +225,6 @@ Miniconda3/ models/mo* models/iic models/faster-whisper-small -models/faster-whisper-small2 out/sd/* @@ -252,5 +251,3 @@ static/ add_dependencies.py -pyproject.toml -poetry.lock diff --git a/config.json b/config.json index fb2a6ba1..8d1381de 100644 --- a/config.json +++ b/config.json @@ -85,7 +85,7 @@ ] }, "read_comment": { - "enable": true, + "enable": false, "read_username_enable": true, "username_max_len": 10, "voice_change": false, @@ -525,7 +525,7 @@ }, "llm_tpu": { "api_ip_port": "http://127.0.0.1:8003", - "max_length": 1, + "max_length": 1.0, "top_p": 0.8, "temperature": 0.95, "history_enable": true, @@ -951,13 +951,13 @@ "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Edg/113.0.1774.42" }, "talk": { - "key_listener_enable": false, + "key_listener_enable": true, "device_index": "1", "no_recording_during_playback": true, "no_recording_during_playback_sleep_interval": 1.0, "username": "主人", - "type": "google", - "continuous_talk": false, + "type": "faster_whisper", + "continuous_talk": true, "trigger_key": "Q", "stop_trigger_key": "S", "volume_threshold": 800.0, @@ -974,7 +974,7 @@ "tgt_lang": "zh-CN" }, "faster_whisper": { - "model_size": "small", + "model_size": "large-v3", "language": "自动识别", "device": "cuda", "compute_type": "float16", @@ -990,6 +990,25 @@ "text_norm": "woitn", "batch_size_s": 0, "batch_size": 1 + }, + "wakeup_sleep": { + "enable": true, + "wakeup_word": [ + "管家", + "苏醒吧" + ], + "sleep_word": [ + "休息吧", + "退下吧" + ], + "wakeup_copywriting": [ + "主人，我在呢", + "主人，有什么吩咐" + ], + "sleep_copywriting": [ + "好的，主人，我休息了", + "微臣告退" + ] } }, "image_recognition": { @@ -1259,12 +1278,12 @@ "感谢{gift_name}", "感谢{username}送的{gift_name}" ], + "serial_name": "", + "serial_send_data": [], "local_audio": [ "data/闲时任务/音频/ikaros/主人，你刚才是不是说我们会永远在一起.wav", "data/闲时任务/音频/ikaros/好想赶快见到主人.wav" - ], - "serial_name": "", - "serial_send_data": [] + ] }, { "keywords": [ @@ -1282,9 +1301,9 @@ "感谢{gift_name}", "感谢{username}送的{gift_name}" ], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1318,9 +1337,9 @@ "送我{gift_name}，你真是个好人", "感谢{username}送的{gift_num}个单价{unit_price}元，总价{total_price}元的{gift_name}喵" ], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1346,9 +1365,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1375,9 +1394,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1392,9 +1411,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1410,9 +1429,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1440,9 +1459,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1455,9 +1474,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1470,9 +1489,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] }, { "keywords": [ @@ -1487,9 +1506,9 @@ ], "similarity": "1", "copywriting": [], - "local_audio": [], "serial_name": "", - "serial_send_data": [] + "serial_send_data": [], + "local_audio": [] } ] }, diff --git a/config.json.bak b/config.json.bak index fb2a6ba1..fa64f35c 100644 --- a/config.json.bak +++ b/config.json.bak @@ -990,6 +990,25 @@ "text_norm": "woitn", "batch_size_s": 0, "batch_size": 1 + }, + "wakeup_sleep": { + "enable": false, + "wakeup_word": [ + "管家", + "苏醒吧" + ], + "sleep_word": [ + "休息吧", + "退下吧" + ], + "wakeup_copywriting": [ + "主人，我在呢", + "主人，有什么吩咐" + ], + "sleep_copywriting": [ + "好的，主人，我休息了", + "微臣告退" + ] } }, "image_recognition": { diff --git a/main.py b/main.py index 7b1fa319..15c6a93e 100644 --- a/main.py +++ b/main.py @@ -56,9 +56,12 @@ async def web_server_thread(web_server_port): Handler = http.server.SimpleHTTPRequestHandler with socketserver.TCPServer(("", web_server_port), Handler) as httpd: logger.info(f"Web运行在端口：{web_server_port}") - logger.info(f"可以直接访问Live2D页， http://127.0.0.1:{web_server_port}/Live2D/") + logger.info( + f"可以直接访问Live2D页， http://127.0.0.1:{web_server_port}/Live2D/" + ) httpd.serve_forever() + """ _oo0oo_ o8888888o @@ -88,19 +91,26 @@ async def web_server_thread(web_server_port): # 点火起飞 def start_server(): - global config, common, my_handle, last_username_list, config_path, last_liveroom_data - global do_listen_and_comment_thread, stop_do_listen_and_comment_thread_event, faster_whisper_model, sense_voice_model, is_recording - - + global \ + config, \ + common, \ + my_handle, \ + last_username_list, \ + config_path, \ + last_liveroom_data + global do_listen_and_comment_thread, stop_do_listen_and_comment_thread_event + global faster_whisper_model, sense_voice_model, is_recording, is_talk_awake # 按键监听相关 do_listen_and_comment_thread = None stop_do_listen_and_comment_thread_event = threading.Event() # 冷却时间 0.5 秒 - cooldown = 0.5 + cooldown = 0.5 last_pressed = 0 # 正在录音中 标志位 is_recording = False + # 聊天是否唤醒 + is_talk_awake = False # 获取 httpx 库的日志记录器 # httpx_logger = logging.getLogger("httpx") @@ -109,14 +119,14 @@ def start_server(): # 最新的直播间数据 last_liveroom_data = { - 'OnlineUserCount': 0, - 'TotalUserCount': 0, - 'TotalUserCountStr': '0', - 'OnlineUserCountStr': '0', - 'MsgId': 0, - 'User': None, - 'Content': '当前直播间人数 0，累计直播间人数 0', - 'RoomId': 0 + "OnlineUserCount": 0, + "TotalUserCount": 0, + "TotalUserCountStr": "0", + "OnlineUserCountStr": "0", + "MsgId": 0, + "User": None, + "Content": "当前直播间人数 0，累计直播间人数 0", + "RoomId": 0, } # 最新入场的用户名列表 last_username_list = [""] @@ -126,25 +136,29 @@ def start_server(): logger.error("程序初始化失败！") os._exit(0) - - # Live2D线程 try: if config.get("live2d", "enable"): web_server_port = int(config.get("live2d", "port")) - threading.Thread(target=lambda: asyncio.run(web_server_thread(web_server_port))).start() + threading.Thread( + target=lambda: asyncio.run(web_server_thread(web_server_port)) + ).start() except Exception as e: logger.error(traceback.format_exc()) os._exit(0) - if platform != "wxlive": # HTTP API线程 def http_api_thread(): import uvicorn from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware - from utils.models import SendMessage, LLMMessage, CallbackMessage, CommonResult + from utils.models import ( + SendMessage, + LLMMessage, + CallbackMessage, + CommonResult, + ) # 定义FastAPI应用 app = FastAPI() @@ -185,7 +199,7 @@ async def send(msg: SendMessage): except Exception as e: logger.error(f"发送数据失败！{e}") return CommonResult(code=-1, message=f"发送数据失败！{e}") - + @app.post("/llm") async def llm(msg: LLMMessage): global my_handle, config @@ -194,13 +208,17 @@ async def llm(msg: LLMMessage): data_json = msg.dict() logger.info(f"API收到数据：{data_json}") - resp_content = my_handle.llm_handle(data_json["type"], data_json, webui_show=False) + resp_content = my_handle.llm_handle( + data_json["type"], data_json, webui_show=False + ) - return CommonResult(code=200, message="成功", data={"content": resp_content}) + return CommonResult( + code=200, message="成功", data={"content": resp_content} + ) except Exception as e: logger.error(f"调用LLM失败！{e}") return CommonResult(code=-1, message=f"调用LLM失败！{e}") - + @app.post("/callback") async def callback(msg: CallbackMessage): global my_handle, config, global_idle_time @@ -212,11 +230,19 @@ async def callback(msg: CallbackMessage): # 音频播放完成 if data_json["type"] in ["audio_playback_completed"]: # 如果等待播放的音频数量大于10 - if data_json["data"]["wait_play_audio_num"] > int(config.get("idle_time_task", "wait_play_audio_num_threshold")): - logger.info(f'等待播放的音频数量大于限定值，闲时任务的闲时计时由 {global_idle_time} -> {int(config.get("idle_time_task", "idle_time_reduce_to"))}秒') + if data_json["data"]["wait_play_audio_num"] > int( + config.get( + "idle_time_task", "wait_play_audio_num_threshold" + ) + ): + logger.info( + f'等待播放的音频数量大于限定值，闲时任务的闲时计时由 {global_idle_time} -> {int(config.get("idle_time_task", "idle_time_reduce_to"))}秒' + ) # 闲时任务的闲时计时 清零 - global_idle_time = int(config.get("idle_time_task", "idle_time_reduce_to")) - + global_idle_time = int( + config.get("idle_time_task", "idle_time_reduce_to") + ) + return CommonResult(code=200, message="callback处理成功！") except Exception as e: logger.error(f"callback处理失败！{e}") @@ -224,30 +250,28 @@ async def callback(msg: CallbackMessage): logger.info("HTTP API线程已启动！") uvicorn.run(app, host="0.0.0.0", port=config.get("api_port")) - # HTTP API线程并启动 inside_http_api_thread = threading.Thread(target=http_api_thread) inside_http_api_thread.start() - # 添加用户名到最新的用户名列表 def add_username_to_last_username_list(data): """ - data(str): 用户名 + data(str): 用户名 """ global last_username_list # 添加数据到 最新入场的用户名列表 last_username_list.append(data) - + # 保留最新的3个数据 last_username_list = last_username_list[-3:] - """ 按键监听板块 """ + # 录音功能(录音时间过短进入openai的语音转文字会报错，请一定注意) def record_audio(): pressdown_num = 0 @@ -257,16 +281,18 @@ def record_audio(): RATE = 44100 WAVE_OUTPUT_FILENAME = "out/record.wav" p = pyaudio.PyAudio() - stream = p.open(format=FORMAT, - channels=CHANNELS, - rate=RATE, - input=True, - frames_per_buffer=CHUNK) + stream = p.open( + format=FORMAT, + channels=CHANNELS, + rate=RATE, + input=True, + frames_per_buffer=CHUNK, + ) frames = [] logger.info("Recording...") flag = 0 while 1: - while keyboard.is_pressed('RIGHT_SHIFT'): + while keyboard.is_pressed("RIGHT_SHIFT"): flag = 1 data = stream.read(CHUNK) frames.append(data) @@ -277,19 +303,18 @@ def record_audio(): stream.stop_stream() stream.close() p.terminate() - wf = wave.open(WAVE_OUTPUT_FILENAME, 'wb') + wf = wave.open(WAVE_OUTPUT_FILENAME, "wb") wf.setnchannels(CHANNELS) wf.setsampwidth(p.get_sample_size(FORMAT)) wf.setframerate(RATE) - wf.writeframes(b''.join(frames)) + wf.writeframes(b"".join(frames)) wf.close() - if pressdown_num >= 5: # 粗糙的处理手段 + if pressdown_num >= 5: # 粗糙的处理手段 return 1 else: logger.info("杂鱼杂鱼，好短好短(录音时间过短,按右shift重新录制)") return 0 - # THRESHOLD 设置音量阈值,默认值800.0,根据实际情况调整 silence_threshold 设置沉默阈值，根据实际情况调整 def audio_listen(volume_threshold=800.0, silence_threshold=15): audio = pyaudio.PyAudio() @@ -306,14 +331,14 @@ def audio_listen(volume_threshold=800.0, silence_threshold=15): rate=RATE, input=True, frames_per_buffer=CHUNK, - input_device_index=int(config.get("talk", "device_index")) + input_device_index=int(config.get("talk", "device_index")), ) frames = [] # 存储录制的音频帧 is_speaking = False # 是否在说话 silent_count = 0 # 沉默计数 - speaking_flag = False #录入标志位 不重要 + speaking_flag = False # 录入标志位 不重要 logger.info("[即将开始录音……]") @@ -321,10 +346,19 @@ def audio_listen(volume_threshold=800.0, silence_threshold=15): # 播放中不录音 if config.get("talk", "no_recording_during_playback"): # 存在待合成音频 或 已合成音频还未播放 或 播放中 或 在数据处理中 - if my_handle.is_audio_queue_empty() != 15 or my_handle.is_handle_empty() == 1: - time.sleep(float(config.get("talk", "no_recording_during_playback_sleep_interval"))) + if ( + my_handle.is_audio_queue_empty() != 15 + or my_handle.is_handle_empty() == 1 + ): + time.sleep( + float( + config.get( + "talk", "no_recording_during_playback_sleep_interval" + ) + ) + ) continue - + # 读取音频数据 data = stream.read(CHUNK) audio_data = np.frombuffer(data, dtype=np.short) @@ -348,17 +382,118 @@ def audio_listen(volume_threshold=800.0, silence_threshold=15): logger.info("[语音录入完成]") # 将音频保存为WAV文件 - '''with wave.open(WAVE_OUTPUT_FILENAME, 'wb') as wf: + """with wave.open(WAVE_OUTPUT_FILENAME, 'wb') as wf: wf.setnchannels(CHANNELS) wf.setsampwidth(pyaudio.get_sample_size(FORMAT)) wf.setframerate(RATE) - wf.writeframes(b''.join(frames))''' + wf.writeframes(b''.join(frames))""" return frames - + + # 处理聊天逻辑 + def talk_handle(content: str): + global is_talk_awake + + try: + # 检查并切换聊天唤醒状态 + def check_talk_awake(content: str): + """检查并切换聊天唤醒状态 + + Args: + content (str): 聊天内容 + + Returns: + dict: + ret 是否需要触发 + is_talk_awake 当前唤醒状态 + first 是否是第一次触发 唤醒or睡眠，用于触发首次切换时的特殊提示语 + """ + global is_talk_awake + + # 判断是否启动了 唤醒词功能 + if config.get("talk", "wakeup_sleep", "enable"): + # 判断现在是否是唤醒状态 + if is_talk_awake is False: + # 判断文本内容是否包含唤醒词 + if common.find_substring_in_list( + content, config.get("talk", "wakeup_sleep", "wakeup_word") + ): + is_talk_awake = True + logger.info("[聊天唤醒成功]") + return { + "ret": 0, + "is_talk_awake": is_talk_awake, + "first": True, + } + return { + "ret": -1, + "is_talk_awake": is_talk_awake, + "first": False, + } + else: + # 判断文本内容是否包含睡眠词 + if common.find_substring_in_list( + content, config.get("talk", "wakeup_sleep", "sleep_word") + ): + is_talk_awake = False + logger.info("[聊天睡眠成功]") + return { + "ret": 0, + "is_talk_awake": is_talk_awake, + "first": True, + } + return { + "ret": 0, + "is_talk_awake": is_talk_awake, + "first": False, + } + + return {"ret": 0, "is_talk_awake": True, "first": False} + + # 输出识别结果 + logger.info("识别结果：" + content) + username = config.get("talk", "username") + + data = {"platform": "本地聊天", "username": username, "content": content} + + check_resp = check_talk_awake(content) + if check_resp["ret"] == 0: + if check_resp["is_talk_awake"]: + # 首次触发切换模式 + if check_resp["first"]: + # 随机获取文案 TODO: 如果此功能测试成功，所有的类似功能都将使用此函数简化代码 + resp_json = common.get_random_str_in_list_and_format( + ori_list=config.get( + "talk", "wakeup_sleep", "wakeup_copywriting" + ) + ) + if resp_json["ret"] == 0: + data["content"] = resp_json["content"] + data["insert_index"] = -1 + my_handle.reread_handle(data) + else: + my_handle.process_data(data, "talk") + else: + if check_resp["first"]: + resp_json = common.get_random_str_in_list_and_format( + ori_list=config.get( + "talk", "wakeup_sleep", "sleep_copywriting" + ) + ) + if resp_json["ret"] == 0: + data["content"] = resp_json["content"] + data["insert_index"] = -1 + my_handle.reread_handle(data) + except Exception as e: + logger.error(traceback.format_exc()) # 执行录音、识别&提交 def do_listen_and_comment(status=True): - global stop_do_listen_and_comment_thread_event, faster_whisper_model, sense_voice_model, is_recording + global \ + stop_do_listen_and_comment_thread_event, \ + faster_whisper_model, \ + sense_voice_model, \ + is_recording, \ + is_talk_awake try: is_recording = True @@ -368,31 +503,48 @@ def do_listen_and_comment(status=True): if not config.get("talk", "key_listener_enable"): is_recording = False return - # 针对faster_whisper情况，模型加载一次共用，减少开销 - if "faster_whisper" == config.get("talk", "type") : + if "faster_whisper" == config.get("talk", "type"): from faster_whisper import WhisperModel - + if faster_whisper_model is None: logger.info("faster_whisper 模型加载中，请稍后...") # Run on GPU with FP16 - faster_whisper_model = WhisperModel(model_size_or_path=config.get("talk", "faster_whisper", "model_size"), \ - device=config.get("talk", "faster_whisper", "device"), \ - compute_type=config.get("talk", "faster_whisper", "compute_type"), \ - download_root=config.get("talk", "faster_whisper", "download_root")) + faster_whisper_model = WhisperModel( + model_size_or_path=config.get( + "talk", "faster_whisper", "model_size" + ), + device=config.get("talk", "faster_whisper", "device"), + compute_type=config.get( + "talk", "faster_whisper", "compute_type" + ), + download_root=config.get( + "talk", "faster_whisper", "download_root" + ), + ) logger.info("faster_whisper 模型加载完毕，可以开始说话了喵~") - elif "sensevoice" == config.get("talk", "type") : + elif "sensevoice" == config.get("talk", "type"): from funasr import AutoModel - + logger.info("sensevoice 模型加载中，请稍后...") asr_model_path = config.get("talk", "sensevoice", "asr_model_path") vad_model_path = config.get("talk", "sensevoice", "vad_model_path") if sense_voice_model is None: - sense_voice_model = AutoModel(model=asr_model_path, - vad_model=vad_model_path, - vad_kwargs={"max_single_segment_time": int(config.get("talk", "sensevoice", "vad_max_single_segment_time"))}, - trust_remote_code=True, device=config.get("talk", "sensevoice", "device"), remote_code="./sensevoice/model.py") + sense_voice_model = AutoModel( + model=asr_model_path, + vad_model=vad_model_path, + vad_kwargs={ + "max_single_segment_time": int( + config.get( + "talk", "sensevoice", "vad_max_single_segment_time" + ) + ) + }, + trust_remote_code=True, + device=config.get("talk", "sensevoice", "device"), + remote_code="./sensevoice/model.py", + ) logger.info("sensevoice 模型加载完毕，可以开始说话了喵~") @@ -400,14 +552,18 @@ def do_listen_and_comment(status=True): try: # 检查是否收到停止事件 if stop_do_listen_and_comment_thread_event.is_set(): - logger.info('停止录音~') + logger.info("停止录音~") is_recording = False break - + config = Config(config_path) - + # 根据接入的语音识别类型执行 - if config.get("talk", "type") in ["baidu", "faster_whisper", "sensevoice"]: + if config.get("talk", "type") in [ + "baidu", + "faster_whisper", + "sensevoice", + ]: # 设置音频参数 FORMAT = pyaudio.paInt16 CHANNELS = config.get("talk", "CHANNELS") @@ -416,50 +572,53 @@ def do_listen_and_comment(status=True): audio_out_path = config.get("play_audio", "out_path") if not os.path.isabs(audio_out_path): - if not audio_out_path.startswith('./'): - audio_out_path = './' + audio_out_path - file_name = 'asr_' + common.get_bj_time(4) + '.wav' - WAVE_OUTPUT_FILENAME = common.get_new_audio_path(audio_out_path, file_name) + if not audio_out_path.startswith("./"): + audio_out_path = "./" + audio_out_path + file_name = "asr_" + common.get_bj_time(4) + ".wav" + WAVE_OUTPUT_FILENAME = common.get_new_audio_path( + audio_out_path, file_name + ) # WAVE_OUTPUT_FILENAME = './out/asr_' + common.get_bj_time(4) + '.wav' - frames = audio_listen(config.get("talk", "volume_threshold"), config.get("talk", "silence_threshold")) + frames = audio_listen( + config.get("talk", "volume_threshold"), + config.get("talk", "silence_threshold"), + ) # 将音频保存为WAV文件 - with wave.open(WAVE_OUTPUT_FILENAME, 'wb') as wf: + with wave.open(WAVE_OUTPUT_FILENAME, "wb") as wf: wf.setnchannels(CHANNELS) wf.setsampwidth(pyaudio.get_sample_size(FORMAT)) wf.setframerate(RATE) - wf.writeframes(b''.join(frames)) + wf.writeframes(b"".join(frames)) if config.get("talk", "type") == "baidu": - # 读取音频文件 - with open(WAVE_OUTPUT_FILENAME, 'rb') as fp: + with open(WAVE_OUTPUT_FILENAME, "rb") as fp: audio = fp.read() # 初始化 AipSpeech 对象 - baidu_client = AipSpeech(config.get("talk", "baidu", "app_id"), config.get("talk", "baidu", "api_key"), config.get("talk", "baidu", "secret_key")) + baidu_client = AipSpeech( + config.get("talk", "baidu", "app_id"), + config.get("talk", "baidu", "api_key"), + config.get("talk", "baidu", "secret_key"), + ) # 识别音频文件 - res = baidu_client.asr(audio, 'wav', 16000, { - 'dev_pid': 1536, - }) - if res['err_no'] == 0: - content = res['result'][0] - - # 输出识别结果 - logger.info("识别结果：" + content) - username = config.get("talk", "username") - - data = { - "platform": "本地聊天", - "username": username, - "content": content - } + res = baidu_client.asr( + audio, + "wav", + 16000, + { + "dev_pid": 1536, + }, + ) + if res["err_no"] == 0: + content = res["result"][0] - my_handle.process_data(data, "talk") + talk_handle(content) else: - logger.error(f"百度接口报错：{res}") + logger.error(f"百度接口报错：{res}") elif config.get("talk", "type") == "faster_whisper": logger.debug("faster_whisper模型加载中...") @@ -467,59 +626,54 @@ def do_listen_and_comment(status=True): if language == "自动识别": language = None - segments, info = faster_whisper_model.transcribe(WAVE_OUTPUT_FILENAME, language=language, beam_size=config.get("talk", "faster_whisper", "beam_size")) + segments, info = faster_whisper_model.transcribe( + WAVE_OUTPUT_FILENAME, + language=language, + beam_size=config.get( + "talk", "faster_whisper", "beam_size" + ), + ) - logger.debug("识别语言为：'%s'，概率：%f" % (info.language, info.language_probability)) + logger.debug( + "识别语言为：'%s'，概率：%f" + % (info.language, info.language_probability) + ) content = "" for segment in segments: - logger.info("[%.2fs -> %.2fs] %s" % (segment.start, segment.end, segment.text)) + logger.info( + "[%.2fs -> %.2fs] %s" + % (segment.start, segment.end, segment.text) + ) content += segment.text + "。" - + if content == "": # 恢复录音标志位 is_recording = False return - # 输出识别结果 - logger.info("识别结果：" + content) - username = config.get("talk", "username") - - data = { - "platform": "本地聊天", - "username": username, - "content": content - } - - my_handle.process_data(data, "talk") + talk_handle(content) elif config.get("talk", "type") == "sensevoice": - res = sense_voice_model.generate( input=WAVE_OUTPUT_FILENAME, cache={}, language=config.get("talk", "sensevoice", "language"), text_norm=config.get("talk", "sensevoice", "text_norm"), - batch_size_s=int(config.get("talk", "sensevoice", "batch_size_s")), - batch_size=int(config.get("talk", "sensevoice", "batch_size")) + batch_size_s=int( + config.get("talk", "sensevoice", "batch_size_s") + ), + batch_size=int( + config.get("talk", "sensevoice", "batch_size") + ), ) def remove_angle_brackets_content(input_string: str): # 使用正则表达式来匹配并删除 <> 之间的内容 - return re.sub(r'<.*?>', '', input_string) - - content = remove_angle_brackets_content(res[0]['text']) - - # 输出识别结果 - logger.info("识别结果：" + content) - username = config.get("talk", "username") + return re.sub(r"<.*?>", "", input_string) - data = { - "platform": "本地聊天", - "username": username, - "content": content - } + content = remove_angle_brackets_content(res[0]["text"]) - my_handle.process_data(data, "talk") + talk_handle(content) elif "google" == config.get("talk", "type"): # 创建Recognizer对象 r = sr.Recognizer() @@ -527,30 +681,22 @@ def remove_angle_brackets_content(input_string: str): try: # 打开麦克风进行录音 with sr.Microphone() as source: - logger.info('录音中...') + logger.info("录音中...") # 从麦克风获取音频数据 audio = r.listen(source) logger.info("成功录制") # 进行谷歌实时语音识别 en-US zh-CN ja-JP - content = r.recognize_google(audio, language=config.get("talk", "google", "tgt_lang")) - - # 输出识别结果 - # logger.info("识别结果：" + content) - username = config.get("talk", "username") - - data = { - "platform": "本地聊天", - "username": username, - "content": content - } + content = r.recognize_google( + audio, + language=config.get("talk", "google", "tgt_lang"), + ) - my_handle.process_data(data, "talk") + talk_handle(content) except sr.UnknownValueError: logger.warning("无法识别输入的语音") except sr.RequestError as e: logger.error("请求出错：" + str(e)) - is_recording = False @@ -566,22 +712,24 @@ def remove_angle_brackets_content(input_string: str): return def on_key_press(event): - global do_listen_and_comment_thread, stop_do_listen_and_comment_thread_event, is_recording + global \ + do_listen_and_comment_thread, \ + stop_do_listen_and_comment_thread_event, \ + is_recording # 是否启用按键监听，不启用的话就不用执行了 - if False == config.get("talk", "key_listener_enable"): + if not config.get("talk", "key_listener_enable"): return # if event.name in ['z', 'Z', 'c', 'C'] and keyboard.is_pressed('ctrl'): - # logger.info("退出程序") + # logger.info("退出程序") + + # os._exit(0) - # os._exit(0) - # 按键CD current_time = time.time() if current_time - last_pressed < cooldown: return - """ 触发按键部分的判断 @@ -596,35 +744,39 @@ def on_key_press(event): # stop_trigger_key是字母, 整个小写 if stop_trigger_key.isalpha(): stop_trigger_key_lower = stop_trigger_key.lower() - + if trigger_key_lower: if event.name == trigger_key or event.name == trigger_key_lower: - logger.info(f'检测到单击键盘 {event.name}，即将开始录音~') + logger.info(f"检测到单击键盘 {event.name}，即将开始录音~") elif event.name == stop_trigger_key or event.name == stop_trigger_key_lower: - logger.info(f'检测到单击键盘 {event.name}，即将停止录音~') + logger.info(f"检测到单击键盘 {event.name}，即将停止录音~") stop_do_listen_and_comment_thread_event.set() return else: return else: if event.name == trigger_key: - logger.info(f'检测到单击键盘 {event.name}，即将开始录音~') + logger.info(f"检测到单击键盘 {event.name}，即将开始录音~") elif event.name == stop_trigger_key: - logger.info(f'检测到单击键盘 {event.name}，即将停止录音~') + logger.info(f"检测到单击键盘 {event.name}，即将停止录音~") stop_do_listen_and_comment_thread_event.set() return else: return - if False == is_recording: + if not is_recording: # 是否启用连续对话模式 if config.get("talk", "continuous_talk"): stop_do_listen_and_comment_thread_event.clear() - do_listen_and_comment_thread = threading.Thread(target=do_listen_and_comment, args=(True,)) + do_listen_and_comment_thread = threading.Thread( + target=do_listen_and_comment, args=(True,) + ) do_listen_and_comment_thread.start() else: stop_do_listen_and_comment_thread_event.clear() - do_listen_and_comment_thread = threading.Thread(target=do_listen_and_comment, args=(False,)) + do_listen_and_comment_thread = threading.Thread( + target=do_listen_and_comment, args=(False,) + ) do_listen_and_comment_thread.start() else: logger.warning("正在录音中...请勿重复点击录音捏！") @@ -640,19 +792,19 @@ def key_listener(): except KeyboardInterrupt: os._exit(0) - # 从配置文件中读取触发键的字符串配置 trigger_key = config.get("talk", "trigger_key") stop_trigger_key = config.get("talk", "stop_trigger_key") if config.get("talk", "key_listener_enable"): - logger.info(f'单击键盘 {trigger_key} 按键进行录音喵~ 由于其他任务还要启动，如果按键没有反应，请等待一段时间') + logger.info( + f"单击键盘 {trigger_key} 按键进行录音喵~ 由于其他任务还要启动，如果按键没有反应，请等待一段时间" + ) # 创建并启动按键监听线程 thread = threading.Thread(target=key_listener) thread.start() - # 定时任务 def schedule_task(index): global config, common, my_handle, last_liveroom_data, last_username_list @@ -675,37 +827,34 @@ def schedule_task(index): elif 20 <= hour and hour < 24: time = f"晚上{hour - 12}点{min}分" - # 根据对应索引从列表中随机获取一个值 if len(config.get("schedule")[index]["copy"]) <= 0: return None - + random_copy = random.choice(config.get("schedule")[index]["copy"]) # 假设有多个未知变量，用户可以在此处定义动态变量 variables = { - 'time': time, - 'user_num': "N", - 'last_username': last_username_list[-1], + "time": time, + "user_num": "N", + "last_username": last_username_list[-1], } # 有用户数据情况的平台特殊处理 if platform in ["dy", "tiktok"]: - variables['user_num'] = last_liveroom_data["OnlineUserCount"] + variables["user_num"] = last_liveroom_data["OnlineUserCount"] # 使用字典进行字符串替换 if any(var in random_copy for var in variables): - content = random_copy.format(**{var: value for var, value in variables.items() if var in random_copy}) + content = random_copy.format( + **{var: value for var, value in variables.items() if var in random_copy} + ) else: content = random_copy content = common.brackets_text_randomize(content) - data = { - "platform": platform, - "username": "定时任务", - "content": content - } + data = {"platform": platform, "username": "定时任务", "content": content} logger.info(f"定时任务：{content}") @@ -713,7 +862,6 @@ def schedule_task(index): # schedule.clear(index) - # 启动定时任务 def run_schedule(): global config @@ -733,7 +881,9 @@ def schedule_random_task(index, min_seconds, max_seconds): schedule_task(index) - schedule.every(next_time).seconds.do(schedule_random_task, index, min_seconds, max_seconds).tag(index) + schedule.every(next_time).seconds.do( + schedule_random_task, index, min_seconds, max_seconds + ).tag(index) schedule_random_task(index, min_seconds, max_seconds) except Exception as e: @@ -743,22 +893,20 @@ def schedule_random_task(index, min_seconds, max_seconds): schedule.run_pending() # time.sleep(1) # 控制每次循环的间隔时间，避免过多占用 CPU 资源 - - if any(item['enable'] for item in config.get("schedule")): + if any(item["enable"] for item in config.get("schedule")): # 创建定时任务子线程并启动 schedule_thread = threading.Thread(target=run_schedule) schedule_thread.start() - # 启动动态文案 async def run_trends_copywriting(): global config try: - if False == config.get("trends_copywriting", "enable"): + if not config.get("trends_copywriting", "enable"): return - - logger.info(f"动态文案任务线程运行中...") + + logger.info("动态文案任务线程运行中...") while True: # 文案文件路径列表 @@ -774,37 +922,55 @@ async def run_trends_copywriting(): if config.get("trends_copywriting", "random_play"): random.shuffle(copywriting_file_path_list) - logger.debug(f"copywriting_file_path_list={copywriting_file_path_list}") + logger.debug( + f"copywriting_file_path_list={copywriting_file_path_list}" + ) - # 遍历文案文件路径列表 + # 遍历文案文件路径列表 for copywriting_file_path in copywriting_file_path_list: # 获取文案文件内容 - copywriting_file_content = common.read_file_return_content(copywriting_file_path) + copywriting_file_content = common.read_file_return_content( + copywriting_file_path + ) # 是否启用提示词对文案内容进行转换 if copywriting["prompt_change_enable"]: data_json = { "username": "trends_copywriting", - "content": copywriting["prompt_change_content"] + copywriting_file_content + "content": copywriting["prompt_change_content"] + + copywriting_file_content, } # 调用函数进行LLM处理，以及生成回复内容，进行音频合成，需要好好考虑考虑实现 - data_json["content"] = my_handle.llm_handle(config.get("trends_copywriting", "llm_type"), data_json) + data_json["content"] = my_handle.llm_handle( + config.get("trends_copywriting", "llm_type"), data_json + ) else: - copywriting_file_content = common.brackets_text_randomize(copywriting_file_content) + copywriting_file_content = common.brackets_text_randomize( + copywriting_file_content + ) data_json = { "username": "trends_copywriting", - "content": copywriting_file_content + "content": copywriting_file_content, } - logger.debug(f'copywriting_file_content={copywriting_file_content},content={data_json["content"]}') + logger.debug( + f'copywriting_file_content={copywriting_file_content},content={data_json["content"]}' + ) # 空数据判断 - if data_json["content"] != None and data_json["content"] != "": + if ( + data_json["content"] is not None + and data_json["content"] != "" + ): # 发给直接复读进行处理 - my_handle.reread_handle(data_json, filter=True, type="trends_copywriting") + my_handle.reread_handle( + data_json, filter=True, type="trends_copywriting" + ) - await asyncio.sleep(config.get("trends_copywriting", "play_interval")) + await asyncio.sleep( + config.get("trends_copywriting", "play_interval") + ) except Exception as e: logger.error(traceback.format_exc()) @@ -817,10 +983,10 @@ async def idle_time_task(): global config, global_idle_time, common try: - if False == config.get("idle_time_task", "enable"): + if not config.get("idle_time_task", "enable"): return - - logger.info(f"闲时任务线程运行中...") + + logger.info("闲时任务线程运行中...") # 记录上一次触发的任务类型 last_mode = 0 @@ -831,7 +997,7 @@ async def idle_time_task(): overflow_time_min = int(config.get("idle_time_task", "idle_time_min")) overflow_time_max = int(config.get("idle_time_task", "idle_time_max")) overflow_time = random.randint(overflow_time_min, overflow_time_max) - + logger.info(f"下一个闲时任务将在{overflow_time}秒后执行") def load_data_list(type): @@ -841,7 +1007,7 @@ def load_data_list(type): tmp = config.get("idle_time_task", "comment", "copy") elif type == "local_audio": tmp = config.get("idle_time_task", "local_audio", "path") - + logger.debug(f"type={type}, tmp={tmp}") tmp2 = copy.copy(tmp) return tmp2 @@ -855,7 +1021,12 @@ def load_data_list(type): logger.debug(f"comment_copy_list={comment_copy_list}") logger.debug(f"local_audio_path_list={local_audio_path_list}") - def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list): + def do_task( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ): global global_idle_time # 闲时计数清零 @@ -879,7 +1050,12 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat if copywriting_copy_list != []: copywriting_copy = copywriting_copy_list.pop(0) else: - return last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list + return ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) else: logger.debug(copywriting_copy_list) if copywriting_copy_list != []: @@ -890,7 +1066,12 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat if copywriting_copy_list != []: copywriting_copy = copywriting_copy_list.pop(0) else: - return last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list + return ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) hour, min = common.get_bj_time(6) @@ -908,32 +1089,42 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat time = f"傍晚{hour - 12}点{min}分" elif 20 <= hour and hour < 24: time = f"晚上{hour - 12}点{min}分" - + # 动态变量替换 # 假设有多个未知变量，用户可以在此处定义动态变量 variables = { - 'time': time, - 'user_num': "N", - 'last_username': last_username_list[-1], + "time": time, + "user_num": "N", + "last_username": last_username_list[-1], } # 有用户数据情况的平台特殊处理 if platform in ["dy", "tiktok"]: - variables['user_num'] = last_liveroom_data["OnlineUserCount"] + variables["user_num"] = last_liveroom_data[ + "OnlineUserCount" + ] # 使用字典进行字符串替换 if any(var in copywriting_copy for var in variables): - copywriting_copy = copywriting_copy.format(**{var: value for var, value in variables.items() if var in copywriting_copy}) - + copywriting_copy = copywriting_copy.format( + **{ + var: value + for var, value in variables.items() + if var in copywriting_copy + } + ) + # [1|2]括号语法随机获取一个值，返回取值完成后的字符串 - copywriting_copy = common.brackets_text_randomize(copywriting_copy) + copywriting_copy = common.brackets_text_randomize( + copywriting_copy + ) # 发送给处理函数 data = { "platform": platform, "username": "闲时任务-文案模式", "type": "reread", - "content": copywriting_copy + "content": copywriting_copy, } my_handle.process_data(data, "idle_time_task") @@ -941,10 +1132,17 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat # 模式切换 last_mode = 1 - overflow_time = random.randint(overflow_time_min, overflow_time_max) + overflow_time = random.randint( + overflow_time_min, overflow_time_max + ) logger.info(f"下一个闲时任务将在{overflow_time}秒后执行") - return last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list + return ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) else: last_mode = 1 @@ -987,23 +1185,31 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat time = f"傍晚{hour - 12}点{min}分" elif 20 <= hour and hour < 24: time = f"晚上{hour - 12}点{min}分" - + # 动态变量替换 # 假设有多个未知变量，用户可以在此处定义动态变量 variables = { - 'time': time, - 'user_num': "N", - 'last_username': last_username_list[-1], + "time": time, + "user_num": "N", + "last_username": last_username_list[-1], } # 有用户数据情况的平台特殊处理 if platform in ["dy", "tiktok"]: - variables['user_num'] = last_liveroom_data["OnlineUserCount"] + variables["user_num"] = last_liveroom_data[ + "OnlineUserCount" + ] # 使用字典进行字符串替换 if any(var in comment_copy for var in variables): - comment_copy = comment_copy.format(**{var: value for var, value in variables.items() if var in comment_copy}) - + comment_copy = comment_copy.format( + **{ + var: value + for var, value in variables.items() + if var in comment_copy + } + ) + # [1|2]括号语法随机获取一个值，返回取值完成后的字符串 comment_copy = common.brackets_text_randomize(comment_copy) @@ -1012,7 +1218,7 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat "platform": platform, "username": "闲时任务-弹幕触发LLM模式", "type": "comment", - "content": comment_copy + "content": comment_copy, } my_handle.process_data(data, "idle_time_task") @@ -1020,10 +1226,17 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat # 模式切换 last_mode = 2 - overflow_time = random.randint(overflow_time_min, overflow_time_max) + overflow_time = random.randint( + overflow_time_min, overflow_time_max + ) logger.info(f"下一个闲时任务将在{overflow_time}秒后执行") - return last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list + return ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) else: last_mode = 2 @@ -1052,7 +1265,9 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat local_audio_path = local_audio_path_list.pop(0) # [1|2]括号语法随机获取一个值，返回取值完成后的字符串 - local_audio_path = common.brackets_text_randomize(local_audio_path) + local_audio_path = common.brackets_text_randomize( + local_audio_path + ) logger.debug(f"local_audio_path={local_audio_path}") @@ -1062,7 +1277,7 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat "username": "闲时任务-本地音频模式", "type": "local_audio", "content": common.extract_filename(local_audio_path, False), - "file_path": local_audio_path + "file_path": local_audio_path, } my_handle.process_data(data, "idle_time_task") @@ -1070,14 +1285,26 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat # 模式切换 last_mode = 0 - overflow_time = random.randint(overflow_time_min, overflow_time_max) + overflow_time = random.randint( + overflow_time_min, overflow_time_max + ) logger.info(f"下一个闲时任务将在{overflow_time}秒后执行") - return last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list + return ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) else: last_mode = 0 - return last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list + return ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) while True: # 如果闲时时间范围为0，就睡眠100ms 意思意思 @@ -1091,13 +1318,55 @@ def do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_pat if config.get("idle_time_task", "type") == "直播间无消息更新闲时": # 闲时计数达到指定值，进行闲时任务处理 if global_idle_time >= overflow_time: - last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list = do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list) + ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) = do_task( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) elif config.get("idle_time_task", "type") == "待合成消息队列更新闲时": - if my_handle.is_queue_less_or_greater_than(type="message_queue", less=int(config.get("idle_time_task", "min_msg_queue_len_to_trigger"))): - last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list = do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list) + if my_handle.is_queue_less_or_greater_than( + type="message_queue", + less=int( + config.get("idle_time_task", "min_msg_queue_len_to_trigger") + ), + ): + ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) = do_task( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) elif config.get("idle_time_task", "type") == "待播放音频队列更新闲时": - if my_handle.is_queue_less_or_greater_than(type="voice_tmp_path_queue", less=int(config.get("idle_time_task", "min_audio_queue_len_to_trigger"))): - last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list = do_task(last_mode, copywriting_copy_list, comment_copy_list, local_audio_path_list) + if my_handle.is_queue_less_or_greater_than( + type="voice_tmp_path_queue", + less=int( + config.get( + "idle_time_task", "min_audio_queue_len_to_trigger" + ) + ), + ): + ( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) = do_task( + last_mode, + copywriting_copy_list, + comment_copy_list, + local_audio_path_list, + ) except Exception as e: logger.error(traceback.format_exc()) @@ -1124,9 +1393,8 @@ def idle_time_auto_clear(type: str): global_idle_time = 0 return True - - return False + return False # 图像识别 定时任务 def image_recognition_schedule_task(type: str): @@ -1134,24 +1402,20 @@ def image_recognition_schedule_task(type: str): logger.debug(f"图像识别-{type} 定时任务执行中...") - data = { - "platform": platform, - "username": None, - "content": "", - "type": type - } + data = {"platform": platform, "username": None, "content": "", "type": type} logger.info(f"图像识别-{type} 定时任务触发") my_handle.process_data(data, "image_recognition_schedule") - # 启动图像识别 定时任务 def run_image_recognition_schedule(interval: int, type: str): global config try: - schedule.every(interval).seconds.do(partial(image_recognition_schedule_task, type)) + schedule.every(interval).seconds.do( + partial(image_recognition_schedule_task, type) + ) except Exception as e: logger.error(traceback.format_exc()) @@ -1159,18 +1423,25 @@ def run_image_recognition_schedule(interval: int, type: str): schedule.run_pending() # time.sleep(1) # 控制每次循环的间隔时间，避免过多占用 CPU 资源 - if config.get("image_recognition", "loop_screenshot_enable"): # 创建定时任务子线程并启动 - image_recognition_schedule_thread = threading.Thread(target=lambda: run_image_recognition_schedule(config.get("image_recognition", "loop_screenshot_delay"), "窗口截图")) + image_recognition_schedule_thread = threading.Thread( + target=lambda: run_image_recognition_schedule( + config.get("image_recognition", "loop_screenshot_delay"), "窗口截图" + ) + ) image_recognition_schedule_thread.start() if config.get("image_recognition", "loop_cam_screenshot_enable"): # 创建定时任务子线程并启动 - image_recognition_cam_schedule_thread = threading.Thread(target=lambda: run_image_recognition_schedule(config.get("image_recognition", "loop_cam_screenshot_delay"), "摄像头截图")) + image_recognition_cam_schedule_thread = threading.Thread( + target=lambda: run_image_recognition_schedule( + config.get("image_recognition", "loop_cam_screenshot_delay"), + "摄像头截图", + ) + ) image_recognition_cam_schedule_thread.start() - logger.info(f"当前平台：{platform}") if platform == "bilibili": @@ -1178,8 +1449,12 @@ def run_image_recognition_schedule(interval: int, type: str): try: if config.get("bilibili", "login_type") == "cookie": - logger.info("b站登录后F12抓网络包获取cookie，强烈建议使用小号！有封号风险") - logger.info("b站登录后，F12控制台，输入 window.localStorage.ac_time_value 回车获取(如果没有，请重新登录)") + logger.info( + "b站登录后F12抓网络包获取cookie，强烈建议使用小号！有封号风险" + ) + logger.info( + "b站登录后，F12控制台，输入 window.localStorage.ac_time_value 回车获取(如果没有，请重新登录)" + ) bilibili_cookie = config.get("bilibili", "cookie") bilibili_ac_time_value = config.get("bilibili", "ac_time_value") @@ -1193,11 +1468,11 @@ def run_image_recognition_schedule(interval: int, type: str): # 生成一个 Credential 对象 credential = Credential( - sessdata=common.parse_cookie_data(bilibili_cookie, "SESSDATA"), - bili_jct=common.parse_cookie_data(bilibili_cookie, "bili_jct"), - buvid3=common.parse_cookie_data(bilibili_cookie, "buvid3"), - dedeuserid=common.parse_cookie_data(bilibili_cookie, "DedeUserID"), - ac_time_value=bilibili_ac_time_value + sessdata=common.parse_cookie_data(bilibili_cookie, "SESSDATA"), + bili_jct=common.parse_cookie_data(bilibili_cookie, "bili_jct"), + buvid3=common.parse_cookie_data(bilibili_cookie, "buvid3"), + dedeuserid=common.parse_cookie_data(bilibili_cookie, "DedeUserID"), + ac_time_value=bilibili_ac_time_value, ) elif config.get("bilibili", "login_type") == "手机扫码": credential = login.login_with_qrcode() @@ -1207,7 +1482,9 @@ def run_image_recognition_schedule(interval: int, type: str): bilibili_username = config.get("bilibili", "username") bilibili_password = config.get("bilibili", "password") - credential = login.login_with_password(bilibili_username, bilibili_password) + credential = login.login_with_password( + bilibili_username, bilibili_password + ) elif config.get("bilibili", "login_type") == "不登录": credential = None else: @@ -1245,7 +1522,7 @@ def run_image_recognition_schedule(interval: int, type: str): VERIFICATION_SUCCESSFUL: 认证成功 """ - @room.on('DANMU_MSG') + @room.on("DANMU_MSG") async def _(event): """ 处理直播间弹幕事件 @@ -1254,21 +1531,17 @@ async def _(event): # 闲时计数清零 idle_time_auto_clear("comment") - + content = event["data"]["info"][1] # 获取弹幕内容 username = event["data"]["info"][2][1] # 获取发送弹幕的用户昵称 logger.info(f"[{username}]: {content}") - data = { - "platform": platform, - "username": username, - "content": content - } + data = {"platform": platform, "username": username, "content": content} my_handle.process_data(data, "comment") - @room.on('COMBO_SEND') + @room.on("COMBO_SEND") async def _(event): """ 处理直播间礼物连击事件 @@ -1283,7 +1556,9 @@ async def _(event): # 总金额 combo_total_coin = event["data"]["data"]["combo_total_coin"] - logger.info(f"用户：{username} 赠送 {combo_num} 个 {gift_name}，总计 {combo_total_coin}电池") + logger.info( + f"用户：{username} 赠送 {combo_num} 个 {gift_name}，总计 {combo_total_coin}电池" + ) data = { "platform": platform, @@ -1291,12 +1566,12 @@ async def _(event): "username": username, "num": combo_num, "unit_price": combo_total_coin / combo_num / 1000, - "total_price": combo_total_coin / 1000 + "total_price": combo_total_coin / 1000, } my_handle.process_data(data, "gift") - @room.on('SEND_GIFT') + @room.on("SEND_GIFT") async def _(event): """ 处理直播间礼物事件 @@ -1315,7 +1590,9 @@ async def _(event): # 单个礼物金额 discount_price = event["data"]["data"]["discount_price"] - logger.info(f"用户：{username} 赠送 {num} 个 {gift_name}，单价 {discount_price}电池，总计 {combo_total_coin}电池") + logger.info( + f"用户：{username} 赠送 {num} 个 {gift_name}，单价 {discount_price}电池，总计 {combo_total_coin}电池" + ) data = { "platform": platform, @@ -1323,12 +1600,12 @@ async def _(event): "username": username, "num": num, "unit_price": discount_price / 1000, - "total_price": combo_total_coin / 1000 + "total_price": combo_total_coin / 1000, } my_handle.process_data(data, "gift") - @room.on('GUARD_BUY') + @room.on("GUARD_BUY") async def _(event): """ 处理直播间续费大航海事件 @@ -1337,7 +1614,7 @@ async def _(event): logger.info(event) - @room.on('SUPER_CHAT_MESSAGE') + @room.on("SUPER_CHAT_MESSAGE") async def _(event): """ 处理直播间醒目留言（SC）事件 @@ -1358,15 +1635,14 @@ async def _(event): "num": 1, "unit_price": price, "total_price": price, - "content": message + "content": message, } my_handle.process_data(data, "gift") my_handle.process_data(data, "comment") - - @room.on('INTERACT_WORD') + @room.on("INTERACT_WORD") async def _(event): """ 处理直播间用户进入直播间事件 @@ -1383,11 +1659,7 @@ async def _(event): # 添加用户名到最新的用户名列表 add_username_to_last_username_list(username) - data = { - "platform": platform, - "username": username, - "content": "进入直播间" - } + data = {"platform": platform, "username": username, "content": "进入直播间"} my_handle.process_data(data, "entrance") @@ -1409,14 +1681,13 @@ async def _(event): # logger.info(event) - try: # 启动 Bilibili 直播间连接 sync(room.connect()) except KeyboardInterrupt: - logger.warning('程序被强行退出') + logger.warning("程序被强行退出") finally: - logger.warning('关闭连接...可能是直播间号配置有误或者其他原因导致的') + logger.warning("关闭连接...可能是直播间号配置有误或者其他原因导致的") os._exit(0) elif platform == "bilibili2": import blivedm @@ -1435,11 +1706,15 @@ async def _(event): elif config.get("bilibili", "login_type") == "open_live": # 在开放平台申请的开发者密钥 https://open-live.bilibili.com/open-manage ACCESS_KEY_ID = config.get("bilibili", "open_live", "ACCESS_KEY_ID") - ACCESS_KEY_SECRET = config.get("bilibili", "open_live", "ACCESS_KEY_SECRET") + ACCESS_KEY_SECRET = config.get( + "bilibili", "open_live", "ACCESS_KEY_SECRET" + ) # 在开放平台创建的项目ID APP_ID = config.get("bilibili", "open_live", "APP_ID") # 主播身份码 直播中心获取 - ROOM_OWNER_AUTH_CODE = config.get("bilibili", "open_live", "ROOM_OWNER_AUTH_CODE") + ROOM_OWNER_AUTH_CODE = config.get( + "bilibili", "open_live", "ROOM_OWNER_AUTH_CODE" + ) except Exception as e: logger.error(traceback.format_exc()) @@ -1459,13 +1734,12 @@ async def main_func(): finally: await session.close() - def init_session(): global session, SESSDATA cookies = http.cookies.SimpleCookie() - cookies['SESSDATA'] = SESSDATA - cookies['SESSDATA']['domain'] = 'bilibili.com' + cookies["SESSDATA"] = SESSDATA + cookies["SESSDATA"]["domain"] = "bilibili.com" # logger.info(f"SESSDATA={SESSDATA}") @@ -1475,7 +1749,6 @@ def init_session(): session = aiohttp.ClientSession() session.cookie_jar.update_cookies(cookies) - async def run_single_client(): """ 演示监听一个直播间 @@ -1526,36 +1799,36 @@ async def run_multi_clients(): """ global session - clients = [blivedm.BLiveClient(room_id, session=session) for room_id in TEST_ROOM_IDS] + clients = [ + blivedm.BLiveClient(room_id, session=session) + for room_id in TEST_ROOM_IDS + ] handler = MyHandler() for client in clients: client.set_handler(handler) client.start() try: - await asyncio.gather(*( - client.join() for client in clients - )) + await asyncio.gather(*(client.join() for client in clients)) finally: - await asyncio.gather(*( - client.stop_and_close() for client in clients - )) - + await asyncio.gather(*(client.stop_and_close() for client in clients)) class MyHandler(blivedm.BaseHandler): # 演示如何添加自定义回调 _CMD_CALLBACK_DICT = blivedm.BaseHandler._CMD_CALLBACK_DICT.copy() - + # 入场消息回调 - def __interact_word_callback(self, client: blivedm.BLiveClient, command: dict): + def __interact_word_callback( + self, client: blivedm.BLiveClient, command: dict + ): # logger.info(f"[{client.room_id}] INTERACT_WORD: self_type={type(self).__name__}, room_id={client.room_id}," # f" uname={command['data']['uname']}") - + global last_username_list idle_time_auto_clear("entrance") - username = command['data']['uname'] + username = command["data"]["uname"] logger.info(f"用户：{username} 进入直播间") @@ -1565,17 +1838,21 @@ def __interact_word_callback(self, client: blivedm.BLiveClient, command: dict): data = { "platform": platform, "username": username, - "content": "进入直播间" + "content": "进入直播间", } my_handle.process_data(data, "entrance") - _CMD_CALLBACK_DICT['INTERACT_WORD'] = __interact_word_callback # noqa + _CMD_CALLBACK_DICT["INTERACT_WORD"] = __interact_word_callback # noqa - def _on_heartbeat(self, client: blivedm.BLiveClient, message: web_models.HeartbeatMessage): - logger.debug(f'[{client.room_id}] 心跳') + def _on_heartbeat( + self, client: blivedm.BLiveClient, message: web_models.HeartbeatMessage + ): + logger.debug(f"[{client.room_id}] 心跳") - def _on_danmaku(self, client: blivedm.BLiveClient, message: web_models.DanmakuMessage): + def _on_danmaku( + self, client: blivedm.BLiveClient, message: web_models.DanmakuMessage + ): # 闲时计数清零 idle_time_auto_clear("comment") @@ -1583,7 +1860,7 @@ def _on_danmaku(self, client: blivedm.BLiveClient, message: web_models.DanmakuMe content = message.msg # 获取弹幕内容 username = message.uname # 获取发送弹幕的用户昵称 # 检查是否存在 face 属性 - user_face = message.face if hasattr(message, 'face') else None + user_face = message.face if hasattr(message, "face") else None logger.info(f"[{username}]: {content}") @@ -1591,12 +1868,14 @@ def _on_danmaku(self, client: blivedm.BLiveClient, message: web_models.DanmakuMe "platform": platform, "username": username, "user_face": user_face, - "content": content + "content": content, } my_handle.process_data(data, "comment") - def _on_gift(self, client: blivedm.BLiveClient, message: web_models.GiftMessage): + def _on_gift( + self, client: blivedm.BLiveClient, message: web_models.GiftMessage + ): # logger.info(f'[{client.room_id}] {message.uname} 赠送{message.gift_name}x{message.num}' # f' （{message.coin_type}瓜子x{message.total_coin}）') idle_time_auto_clear("gift") @@ -1604,14 +1883,16 @@ def _on_gift(self, client: blivedm.BLiveClient, message: web_models.GiftMessage) gift_name = message.gift_name username = message.uname # 检查是否存在 face 属性 - user_face = message.face if hasattr(message, 'face') else None + user_face = message.face if hasattr(message, "face") else None # 礼物数量 combo_num = message.num # 总金额 combo_total_coin = message.total_coin - logger.info(f"用户：{username} 赠送 {combo_num} 个 {gift_name}，总计 {combo_total_coin}电池") + logger.info( + f"用户：{username} 赠送 {combo_num} 个 {gift_name}，总计 {combo_total_coin}电池" + ) data = { "platform": platform, @@ -1620,22 +1901,28 @@ def _on_gift(self, client: blivedm.BLiveClient, message: web_models.GiftMessage) "user_face": user_face, "num": combo_num, "unit_price": combo_total_coin / combo_num / 1000, - "total_price": combo_total_coin / 1000 + "total_price": combo_total_coin / 1000, } my_handle.process_data(data, "gift") - def _on_buy_guard(self, client: blivedm.BLiveClient, message: web_models.GuardBuyMessage): - logger.info(f'[{client.room_id}] {message.username} 购买{message.gift_name}') + def _on_buy_guard( + self, client: blivedm.BLiveClient, message: web_models.GuardBuyMessage + ): + logger.info( + f"[{client.room_id}] {message.username} 购买{message.gift_name}" + ) - def _on_super_chat(self, client: blivedm.BLiveClient, message: web_models.SuperChatMessage): + def _on_super_chat( + self, client: blivedm.BLiveClient, message: web_models.SuperChatMessage + ): # logger.info(f'[{client.room_id}] 醒目留言 ¥{message.price} {message.uname}：{message.message}') idle_time_auto_clear("gift") message = message.message uname = message.uname # 检查是否存在 face 属性 - user_face = message.face if hasattr(message, 'face') else None + user_face = message.face if hasattr(message, "face") else None price = message.price logger.info(f"用户：{uname} 发送 {price}元 SC：{message}") @@ -1648,7 +1935,7 @@ def _on_super_chat(self, client: blivedm.BLiveClient, message: web_models.SuperC "num": 1, "unit_price": price, "total_price": price, - "content": message + "content": message, } my_handle.process_data(data, "gift") @@ -1656,10 +1943,16 @@ def _on_super_chat(self, client: blivedm.BLiveClient, message: web_models.SuperC my_handle.process_data(data, "comment") class MyHandler2(blivedm.BaseHandler): - def _on_heartbeat(self, client: blivedm.BLiveClient, message: web_models.HeartbeatMessage): - logger.debug(f'[{client.room_id}] 心跳') + def _on_heartbeat( + self, client: blivedm.BLiveClient, message: web_models.HeartbeatMessage + ): + logger.debug(f"[{client.room_id}] 心跳") - def _on_open_live_danmaku(self, client: blivedm.OpenLiveClient, message: open_models.DanmakuMessage): + def _on_open_live_danmaku( + self, + client: blivedm.OpenLiveClient, + message: open_models.DanmakuMessage, + ): # 闲时计数清零 idle_time_auto_clear("comment") @@ -1667,7 +1960,7 @@ def _on_open_live_danmaku(self, client: blivedm.OpenLiveClient, message: open_mo content = message.msg # 获取弹幕内容 username = message.uname # 获取发送弹幕的用户昵称 # 检查是否存在 face 属性 - user_face = message.face if hasattr(message, 'face') else None + user_face = message.face if hasattr(message, "face") else None logger.debug(f"用户：{username} 头像：{user_face}") @@ -1677,24 +1970,28 @@ def _on_open_live_danmaku(self, client: blivedm.OpenLiveClient, message: open_mo "platform": platform, "username": username, "user_face": user_face, - "content": content + "content": content, } my_handle.process_data(data, "comment") - def _on_open_live_gift(self, client: blivedm.OpenLiveClient, message: open_models.GiftMessage): + def _on_open_live_gift( + self, client: blivedm.OpenLiveClient, message: open_models.GiftMessage + ): idle_time_auto_clear("gift") gift_name = message.gift_name username = message.uname # 检查是否存在 face 属性 - user_face = message.face if hasattr(message, 'face') else None + user_face = message.face if hasattr(message, "face") else None # 礼物数量 combo_num = message.gift_num # 总金额 combo_total_coin = message.price * message.gift_num - logger.info(f"用户：{username} 赠送 {combo_num} 个 {gift_name}，总计 {combo_total_coin}电池") + logger.info( + f"用户：{username} 赠送 {combo_num} 个 {gift_name}，总计 {combo_total_coin}电池" + ) data = { "platform": platform, @@ -1703,26 +2000,35 @@ def _on_open_live_gift(self, client: blivedm.OpenLiveClient, message: open_model "user_face": user_face, "num": combo_num, "unit_price": combo_total_coin / combo_num / 1000, - "total_price": combo_total_coin / 1000 + "total_price": combo_total_coin / 1000, } my_handle.process_data(data, "gift") - - def _on_open_live_buy_guard(self, client: blivedm.OpenLiveClient, message: open_models.GuardBuyMessage): - logger.info(f'[{client.room_id}] {message.user_info.uname} 购买 大航海等级={message.guard_level}') + def _on_open_live_buy_guard( + self, + client: blivedm.OpenLiveClient, + message: open_models.GuardBuyMessage, + ): + logger.info( + f"[{client.room_id}] {message.user_info.uname} 购买 大航海等级={message.guard_level}" + ) def _on_open_live_super_chat( - self, client: blivedm.OpenLiveClient, message: open_models.SuperChatMessage + self, + client: blivedm.OpenLiveClient, + message: open_models.SuperChatMessage, ): idle_time_auto_clear("gift") - logger.info(f'[{message.room_id}] 醒目留言 ¥{message.rmb} {message.uname}：{message.message}') + logger.info( + f"[{message.room_id}] 醒目留言 ¥{message.rmb} {message.uname}：{message.message}" + ) message = message.message uname = message.uname # 检查是否存在 face 属性 - user_face = message.face if hasattr(message, 'face') else None + user_face = message.face if hasattr(message, "face") else None price = message.rmb logger.info(f"用户：{uname} 发送 {price}元 SC：{message}") @@ -1735,7 +2041,7 @@ def _on_open_live_super_chat( "num": 1, "unit_price": price, "total_price": price, - "content": message + "content": message, } my_handle.process_data(data, "gift") @@ -1743,14 +2049,18 @@ def _on_open_live_super_chat( my_handle.process_data(data, "comment") def _on_open_live_super_chat_delete( - self, client: blivedm.OpenLiveClient, message: open_models.SuperChatDeleteMessage + self, + client: blivedm.OpenLiveClient, + message: open_models.SuperChatDeleteMessage, ): - logger.info(f'[直播间 {message.room_id}] 删除醒目留言 message_ids={message.message_ids}') - - def _on_open_live_like(self, client: blivedm.OpenLiveClient, message: open_models.LikeMessage): - logger.info(f'用户：{message.uname} 点了个赞') - + logger.info( + f"[直播间 {message.room_id}] 删除醒目留言 message_ids={message.message_ids}" + ) + def _on_open_live_like( + self, client: blivedm.OpenLiveClient, message: open_models.LikeMessage + ): + logger.info(f"用户：{message.uname} 点了个赞") asyncio.run(main_func()) elif platform == "douyu": @@ -1774,15 +2084,15 @@ async def on_message(websocket, path): username = data_json["username"] content = data_json["content"] - - logger.info(f'[📧直播间弹幕消息] [{username}]：{content}') + + logger.info(f"[📧直播间弹幕消息] [{username}]：{content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } - + my_handle.process_data(data, "comment") # 添加用户名到最新的用户名列表 @@ -1793,7 +2103,6 @@ async def on_message(websocket, path): logger.error("数据解析错误！") my_handle.abnormal_alarm_handle("platform") continue - async def ws_server(): ws_url = "127.0.0.1" @@ -1802,7 +2111,6 @@ async def ws_server(): logger.info(f"WebSocket 服务器已在 {ws_url}:{ws_port} 启动") await server.wait_closed() - asyncio.run(ws_server()) elif platform == "dy": import websocket @@ -1816,22 +2124,22 @@ def on_message(ws, message): if "Type" in message_json: type = message_json["Type"] data_json = json.loads(message_json["Data"]) - + if type == 1: # 闲时计数清零 idle_time_auto_clear("comment") username = data_json["User"]["Nickname"] content = data_json["Content"] - - logger.info(f'[📧直播间弹幕消息] [{username}]：{content}') + + logger.info(f"[📧直播间弹幕消息] [{username}]：{content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } - + my_handle.process_data(data, "comment") pass @@ -1840,19 +2148,19 @@ def on_message(ws, message): username = data_json["User"]["Nickname"] count = data_json["Count"] - logger.info(f'[👍直播间点赞消息] {username} 点了{count}赞') + logger.info(f"[👍直播间点赞消息] {username} 点了{count}赞") elif type == 3: idle_time_auto_clear("entrance") username = data_json["User"]["Nickname"] - logger.info(f'[🚹🚺直播间成员加入消息] 欢迎 {username} 进入直播间') + logger.info(f"[🚹🚺直播间成员加入消息] 欢迎 {username} 进入直播间") data = { "platform": platform, "username": username, - "content": "进入直播间" + "content": "进入直播间", } # 添加用户名到最新的用户名列表 @@ -1865,13 +2173,12 @@ def on_message(ws, message): username = data_json["User"]["Nickname"] - logger.info(f'[➕直播间关注消息] 感谢 {data_json["User"]["Nickname"]} 的关注') + logger.info( + f'[➕直播间关注消息] 感谢 {data_json["User"]["Nickname"]} 的关注' + ) + + data = {"platform": platform, "username": username} - data = { - "platform": platform, - "username": username - } - my_handle.process_data(data, "follow") pass @@ -1899,17 +2206,20 @@ def on_message(ws, message): # 单个礼物金额 需要自己维护礼物价值表 discount_price = data_json[gift_name] else: - logger.warning(f"数据文件：{data_path} 中，没有 {gift_name} 对应的价值，请手动补充数据") + logger.warning( + f"数据文件：{data_path} 中，没有 {gift_name} 对应的价值，请手动补充数据" + ) discount_price = 1 except Exception as e: logger.error(traceback.format_exc()) discount_price = 1 - # 总金额 combo_total_coin = repeat_count * discount_price - logger.info(f'[🎁直播间礼物消息] 用户：{username} 赠送 {num} 个 {gift_name}，单价 {discount_price}抖币，总计 {combo_total_coin}抖币') + logger.info( + f"[🎁直播间礼物消息] 用户：{username} 赠送 {num} 个 {gift_name}，单价 {discount_price}抖币，总计 {combo_total_coin}抖币" + ) data = { "platform": platform, @@ -1917,14 +2227,14 @@ def on_message(ws, message): "username": username, "num": num, "unit_price": discount_price / 10, - "total_price": combo_total_coin / 10 + "total_price": combo_total_coin / 10, } my_handle.process_data(data, "gift") elif type == 6: logger.info(f'[直播间数据] {data_json["Content"]}') - # {'OnlineUserCount': 50, 'TotalUserCount': 22003, 'TotalUserCountStr': '2.2万', 'OnlineUserCountStr': '50', + # {'OnlineUserCount': 50, 'TotalUserCount': 22003, 'TotalUserCountStr': '2.2万', 'OnlineUserCountStr': '50', # 'MsgId': 7260517442466662207, 'User': None, 'Content': '当前直播间人数 50，累计直播间人数 2.2万', 'RoomId': 7260415920948906807} # logger.info(f"data_json={data_json}") @@ -1937,11 +2247,18 @@ def on_message(ws, message): # 是否开启了动态配置功能 if config.get("trends_config", "enable"): for path_config in config.get("trends_config", "path"): - online_num_min = int(path_config["online_num"].split("-")[0]) - online_num_max = int(path_config["online_num"].split("-")[1]) + online_num_min = int( + path_config["online_num"].split("-")[0] + ) + online_num_max = int( + path_config["online_num"].split("-")[1] + ) # 判断在线人数是否在此范围内 - if OnlineUserCount >= online_num_min and OnlineUserCount <= online_num_max: + if ( + OnlineUserCount >= online_num_min + and OnlineUserCount <= online_num_max + ): logger.debug(f"当前配置文件：{path_config['path']}") # 如果配置文件相同，则跳过 if config_path == path_config["path"]: @@ -1961,23 +2278,22 @@ def on_message(ws, message): pass elif type == 8: - logger.info(f'[分享直播间] 感谢 {data_json["User"]["Nickname"]} 分享了直播间') + logger.info( + f'[分享直播间] 感谢 {data_json["User"]["Nickname"]} 分享了直播间' + ) pass def on_error(ws, error): logger.error(f"Error:{error}") - def on_close(ws): logger.debug("WebSocket connection closed") def on_open(ws): logger.debug("WebSocket connection established") - - - try: + try: # WebSocket连接URL ws_url = "ws://127.0.0.1:8888" @@ -1986,18 +2302,22 @@ def on_open(ws): # 不设置日志等级 websocket.enableTrace(False) # 创建WebSocket连接 - ws = websocket.WebSocketApp(ws_url, + ws = websocket.WebSocketApp( + ws_url, on_message=on_message, on_error=on_error, on_close=on_close, - on_open=on_open) + on_open=on_open, + ) # 运行WebSocket连接 ws.run_forever() except KeyboardInterrupt: - logger.warning('程序被强行退出') + logger.warning("程序被强行退出") finally: - logger.warning('关闭ws连接...请确认您是否启动了抖音弹幕监听程序，ws服务正常运行！\n监听程序启动成功后，请重新运行程序进行对接使用！') + logger.warning( + "关闭ws连接...请确认您是否启动了抖音弹幕监听程序，ws服务正常运行！\n监听程序启动成功后，请重新运行程序进行对接使用！" + ) # os._exit(0) # 等待子线程结束 @@ -2009,7 +2329,6 @@ def on_open(ws): import requests import websocket - def generateMsToken(length=107): """ @@ -2017,14 +2336,13 @@ def generateMsToken(length=107): :param length:字符位数 :return:msToken """ - random_str = '' - base_str = string.ascii_letters + string.digits + '=_' + random_str = "" + base_str = string.ascii_letters + string.digits + "=_" _len = len(base_str) - 1 for _ in range(length): random_str += base_str[random.randint(0, _len)] return random_str - def generateTtwid(): """ 产生请求头部cookie中的ttwid字段，访问抖音网页版直播间首页可以获取到响应cookie中的ttwid @@ -2033,7 +2351,7 @@ def generateTtwid(): url = "https://live.douyin.com/" headers = { "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 " - "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36", + "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36", } try: response = requests.get(url, headers=headers) @@ -2041,11 +2359,9 @@ def generateTtwid(): except Exception as err: logger.info("【X】request the live url error: ", err) else: - return response.cookies.get('ttwid') - + return response.cookies.get("ttwid") class DouyinLiveWebFetcher: - def __init__(self, live_id): """ 直播间弹幕抓取对象 @@ -2057,29 +2373,31 @@ def __init__(self, live_id): self.is_connected = None self.live_id = live_id self.live_url = "https://live.douyin.com/" - self.user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " \ - "Chrome/120.0.0.0 Safari/537.36" - + self.user_agent = ( + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " + "Chrome/120.0.0.0 Safari/537.36" + ) + def send_heartbeat(self, ws): import time, threading def heartbeat(): while True: - time.sleep(15)#每15秒发送一次心跳 + time.sleep(15) # 每15秒发送一次心跳 if self.is_connected: - ws.send("hi")#使用实际的心跳消息格式 + ws.send("hi") # 使用实际的心跳消息格式 else: - logger.info( "Connection lost, stopping heartbeat.") + logger.info("Connection lost, stopping heartbeat.") return + threading.Thread(target=heartbeat).start() - def start(self): self._connectWebSocket() - + def stop(self): self.ws.close() - + @property def ttwid(self): """ @@ -2097,9 +2415,9 @@ def ttwid(self): except Exception as err: logger.info("【X】Request the live url error: ", err) else: - self.__ttwid = response.cookies.get('ttwid') + self.__ttwid = response.cookies.get("ttwid") return self.__ttwid - + @property def room_id(self): """ @@ -2122,127 +2440,130 @@ def room_id(self): else: match = re.search(r'roomId\\":\\"(\d+)\\"', response.text) if match is None or len(match.groups()) < 1: - logger.error("【X】无法获取 真 roomId，可能是直播间号配置错了，或者被官方拉黑了") + logger.error( + "【X】无法获取 真 roomId，可能是直播间号配置错了，或者被官方拉黑了" + ) return None self.__room_id = match.group(1) - + return self.__room_id - + def _connectWebSocket(self): """ 连接抖音直播间websocket服务器，请求直播间数据 """ - wss = f"wss://webcast3-ws-web-lq.douyin.com/webcast/im/push/v2/?" \ - f"app_name=douyin_web&version_code=180800&webcast_sdk_version=1.3.0&update_version_code=1.3.0" \ - f"&compress=gzip" \ - f"&internal_ext=internal_src:dim|wss_push_room_id:{self.room_id}|wss_push_did:{self.room_id}" \ - f"|dim_log_id:202302171547011A160A7BAA76660E13ED|fetch_time:1676620021641|seq:1|wss_info:0-1676" \ - f"620021641-0-0|wrds_kvs:WebcastRoomStatsMessage-1676620020691146024_WebcastRoomRankMessage-167661" \ - f"9972726895075_AudienceGiftSyncData-1676619980834317696_HighlightContainerSyncData-2&cursor=t-1676" \ - f"620021641_r-1_d-1_u-1_h-1" \ - f"&host=https://live.douyin.com&aid=6383&live_id=1" \ - f"&did_rule=3&debug=false&endpoint=live_pc&support_wrds=1&" \ - f"im_path=/webcast/im/fetch/&user_unique_id={self.room_id}&" \ - f"device_platform=web&cookie_enabled=true&screen_width=1440&screen_height=900&browser_language=zh&" \ - f"browser_platform=MacIntel&browser_name=Mozilla&" \ - f"browser_version=5.0%20(Macintosh;%20Intel%20Mac%20OS%20X%2010_15_7)%20AppleWebKit/537.36%20(KHTML,%20" \ - f"like%20Gecko)%20Chrome/110.0.0.0%20Safari/537.36&" \ - f"browser_online=true&tz_name=Asia/Shanghai&identity=audience&" \ - f"room_id={self.room_id}&heartbeatDuration=0&signature=00000000" + wss = ( + f"wss://webcast3-ws-web-lq.douyin.com/webcast/im/push/v2/?" + f"app_name=douyin_web&version_code=180800&webcast_sdk_version=1.3.0&update_version_code=1.3.0" + f"&compress=gzip" + f"&internal_ext=internal_src:dim|wss_push_room_id:{self.room_id}|wss_push_did:{self.room_id}" + f"|dim_log_id:202302171547011A160A7BAA76660E13ED|fetch_time:1676620021641|seq:1|wss_info:0-1676" + f"620021641-0-0|wrds_kvs:WebcastRoomStatsMessage-1676620020691146024_WebcastRoomRankMessage-167661" + f"9972726895075_AudienceGiftSyncData-1676619980834317696_HighlightContainerSyncData-2&cursor=t-1676" + f"620021641_r-1_d-1_u-1_h-1" + f"&host=https://live.douyin.com&aid=6383&live_id=1" + f"&did_rule=3&debug=false&endpoint=live_pc&support_wrds=1&" + f"im_path=/webcast/im/fetch/&user_unique_id={self.room_id}&" + f"device_platform=web&cookie_enabled=true&screen_width=1440&screen_height=900&browser_language=zh&" + f"browser_platform=MacIntel&browser_name=Mozilla&" + f"browser_version=5.0%20(Macintosh;%20Intel%20Mac%20OS%20X%2010_15_7)%20AppleWebKit/537.36%20(KHTML,%20" + f"like%20Gecko)%20Chrome/110.0.0.0%20Safari/537.36&" + f"browser_online=true&tz_name=Asia/Shanghai&identity=audience&" + f"room_id={self.room_id}&heartbeatDuration=0&signature=00000000" + ) # 直接从直播间抓包ws，赋值url地址填这，在被官方拉黑的情况下用 # wss = "wss://webcast5-ws-web-lq.douyin.com/webcast/im/push/v2/?app_name=douyin_web&version_code=180800&webcast_sdk_version=1.0.14-beta.0&update_version_code=1.0.14-beta.0&compress=gzip&device_platform=web&cookie_enabled=true&screen_width=2048&screen_height=1152&browser_language=zh-CN&browser_platform=Win32&browser_name=Mozilla&browser_version=5.0%20(Windows%20NT%2010.0;%20Win64;%20x64)%20AppleWebKit/537.36%20(KHTML,%20like%20Gecko)%20Chrome/126.0.0.0%20Safari/537.36%20Edg/126.0.0.0&browser_online=true&tz_name=Etc/GMT-8&cursor=h-7383323426352862262_t-1719063974519_r-1_d-1_u-1&internal_ext=internal_src:dim|wss_push_room_id:7383264938631973686|wss_push_did:7293153952199050788|first_req_ms:1719063974385|fetch_time:1719063974519|seq:1|wss_info:0-1719063974519-0-0|wrds_v:7383323492227230262&host=https://live.douyin.com&aid=6383&live_id=1&did_rule=3&endpoint=live_pc&support_wrds=1&user_unique_id=7293153952199050788&im_path=/webcast/im/fetch/&identity=audience&need_persist_msg_count=15&insert_task_id=&live_reason=&room_id=7383264938631973686&heartbeatDuration=0&signature=6DJMtCOOuubiYZP4" headers = { "cookie": f"ttwid={self.ttwid}", - 'user-agent': self.user_agent, + "user-agent": self.user_agent, } - self.ws = websocket.WebSocketApp(wss, - header=headers, - on_open=self._wsOnOpen, - on_message=self._wsOnMessage, - on_error=self._wsOnError, - on_close=self._wsOnClose) + self.ws = websocket.WebSocketApp( + wss, + header=headers, + on_open=self._wsOnOpen, + on_message=self._wsOnMessage, + on_error=self._wsOnError, + on_close=self._wsOnClose, + ) try: self.ws.run_forever() except Exception: self.stop() raise - + def _wsOnOpen(self, ws): """ 连接建立成功 """ logger.info("WebSocket connected.") self.is_connected = True - + def _wsOnMessage(self, ws, message): """ 接收到数据 :param ws: websocket实例 :param message: 数据 """ - + # 根据proto结构体解析对象 package = PushFrame().parse(message) response = Response().parse(gzip.decompress(package.payload)) - + # 返回直播间服务器链接存活确认消息，便于持续获取数据 if response.need_ack: - ack = PushFrame(log_id=package.log_id, - payload_type='ack', - payload=response.internal_ext.encode('utf-8') - ).SerializeToString() + ack = PushFrame( + log_id=package.log_id, + payload_type="ack", + payload=response.internal_ext.encode("utf-8"), + ).SerializeToString() ws.send(ack, websocket.ABNF.OPCODE_BINARY) - + # 根据消息类别解析消息体 for msg in response.messages_list: method = msg.method try: { - 'WebcastChatMessage': self._parseChatMsg, # 聊天消息 - 'WebcastGiftMessage': self._parseGiftMsg, # 礼物消息 - 'WebcastLikeMessage': self._parseLikeMsg, # 点赞消息 - 'WebcastMemberMessage': self._parseMemberMsg, # 进入直播间消息 - 'WebcastSocialMessage': self._parseSocialMsg, # 关注消息 - 'WebcastRoomUserSeqMessage': self._parseRoomUserSeqMsg, # 直播间统计 - 'WebcastFansclubMessage': self._parseFansclubMsg, # 粉丝团消息 - 'WebcastControlMessage': self._parseControlMsg, # 直播间状态消息 - 'WebcastEmojiChatMessage': self._parseEmojiChatMsg, # 聊天表情包消息 - 'WebcastRoomStatsMessage': self._parseRoomStatsMsg, # 直播间统计信息 - 'WebcastRoomMessage': self._parseRoomMsg, # 直播间信息 - 'WebcastRoomRankMessage': self._parseRankMsg, # 直播间排行榜信息 + "WebcastChatMessage": self._parseChatMsg, # 聊天消息 + "WebcastGiftMessage": self._parseGiftMsg, # 礼物消息 + "WebcastLikeMessage": self._parseLikeMsg, # 点赞消息 + "WebcastMemberMessage": self._parseMemberMsg, # 进入直播间消息 + "WebcastSocialMessage": self._parseSocialMsg, # 关注消息 + "WebcastRoomUserSeqMessage": self._parseRoomUserSeqMsg, # 直播间统计 + "WebcastFansclubMessage": self._parseFansclubMsg, # 粉丝团消息 + "WebcastControlMessage": self._parseControlMsg, # 直播间状态消息 + "WebcastEmojiChatMessage": self._parseEmojiChatMsg, # 聊天表情包消息 + "WebcastRoomStatsMessage": self._parseRoomStatsMsg, # 直播间统计信息 + "WebcastRoomMessage": self._parseRoomMsg, # 直播间信息 + "WebcastRoomRankMessage": self._parseRankMsg, # 直播间排行榜信息 }.get(method)(msg.payload) except Exception: pass - + def _wsOnError(self, ws, error): logger.info("WebSocket error: ", error) self.is_connected = False - + def _wsOnClose(self, ws): logger.info("WebSocket connection closed.") self.is_connected = False - + def _parseChatMsg(self, payload): - '''聊天消息''' + """聊天消息""" message = ChatMessage().parse(payload) username = message.user.nick_name user_id = message.user.id content = message.content logger.info(f"【聊天msg】[{user_id}]{username}: {content}") - data = { - "platform": platform, - "username": username, - "content": content - } - + data = {"platform": platform, "username": username, "content": content} + my_handle.process_data(data, "comment") - + def _parseGiftMsg(self, payload): - '''礼物消息''' + """礼物消息""" message = GiftMessage().parse(payload) username = message.user.nick_name gift_name = message.gift.name @@ -2262,36 +2583,37 @@ def _parseGiftMsg(self, payload): # 单个礼物金额 需要自己维护礼物价值表 discount_price = data_json[gift_name] else: - logger.warning(f"数据文件：{data_path} 中，没有 {gift_name} 对应的价值，请手动补充数据") + logger.warning( + f"数据文件：{data_path} 中，没有 {gift_name} 对应的价值，请手动补充数据" + ) discount_price = 1 except Exception as e: logger.error(traceback.format_exc()) discount_price = 1 - # 总金额 combo_total_coin = num * discount_price - + data = { "platform": platform, "gift_name": gift_name, "username": username, "num": num, "unit_price": discount_price / 10, - "total_price": combo_total_coin / 10 + "total_price": combo_total_coin / 10, } my_handle.process_data(data, "gift") - + def _parseLikeMsg(self, payload): - '''点赞消息''' + """点赞消息""" message = LikeMessage().parse(payload) user_name = message.user.nick_name count = message.count logger.info(f"【点赞msg】{user_name} 点了{count}个赞") - + def _parseMemberMsg(self, payload): - '''进入直播间消息''' + """进入直播间消息""" message = MemberMessage().parse(payload) username = message.user.nick_name user_id = message.user.id @@ -2301,55 +2623,61 @@ def _parseMemberMsg(self, payload): data = { "platform": platform, "username": username, - "content": "进入直播间" + "content": "进入直播间", } # 添加用户名到最新的用户名列表 add_username_to_last_username_list(username) my_handle.process_data(data, "entrance") - + def _parseSocialMsg(self, payload): - '''关注消息''' + """关注消息""" message = SocialMessage().parse(payload) user_name = message.user.nick_name user_id = message.user.id logger.info(f"【关注msg】[{user_id}]{user_name} 关注了主播") - data = { - "platform": platform, - "username": username - } - + data = {"platform": platform, "username": username} + my_handle.process_data(data, "follow") - + def _parseRoomUserSeqMsg(self, payload): - '''直播间统计''' + """直播间统计""" message = RoomUserSeqMessage().parse(payload) OnlineUserCount = message.total total = message.total_pv_for_anchor - logger.info(f"【统计msg】当前观看人数: {OnlineUserCount}, 累计观看人数: {total}") + logger.info( + f"【统计msg】当前观看人数: {OnlineUserCount}, 累计观看人数: {total}" + ) try: global last_liveroom_data - # {'OnlineUserCount': 50, 'TotalUserCount': 22003, 'TotalUserCountStr': '2.2万', 'OnlineUserCountStr': '50', + # {'OnlineUserCount': 50, 'TotalUserCount': 22003, 'TotalUserCountStr': '2.2万', 'OnlineUserCountStr': '50', # 'MsgId': 7260517442466662207, 'User': None, 'Content': '当前直播间人数 50，累计直播间人数 2.2万', 'RoomId': 7260415920948906807} # logger.info(f"data_json={data_json}") last_liveroom_data = { - 'OnlineUserCount': OnlineUserCount, - 'TotalUserCountStr': total + "OnlineUserCount": OnlineUserCount, + "TotalUserCountStr": total, } # 是否开启了动态配置功能 if config.get("trends_config", "enable"): for path_config in config.get("trends_config", "path"): - online_num_min = int(path_config["online_num"].split("-")[0]) - online_num_max = int(path_config["online_num"].split("-")[1]) + online_num_min = int( + path_config["online_num"].split("-")[0] + ) + online_num_max = int( + path_config["online_num"].split("-")[1] + ) # 判断在线人数是否在此范围内 - if OnlineUserCount >= online_num_min and OnlineUserCount <= online_num_max: + if ( + OnlineUserCount >= online_num_min + and OnlineUserCount <= online_num_max + ): logger.debug(f"当前配置文件：{path_config['path']}") # 如果配置文件相同，则跳过 if config_path == path_config["path"]: @@ -2367,47 +2695,48 @@ def _parseRoomUserSeqMsg(self, payload): logger.error(traceback.format_exc()) pass - + def _parseFansclubMsg(self, payload): - '''粉丝团消息''' + """粉丝团消息""" message = FansclubMessage().parse(payload) content = message.content logger.info(f"【粉丝团msg】 {content}") - + def _parseEmojiChatMsg(self, payload): - '''聊天表情包消息''' + """聊天表情包消息""" message = EmojiChatMessage().parse(payload) emoji_id = message.emoji_id user = message.user common = message.common default_content = message.default_content - logger.info(f"【聊天表情包id】 {emoji_id},user：{user},common:{common},default_content:{default_content}") - + logger.info( + f"【聊天表情包id】 {emoji_id},user：{user},common:{common},default_content:{default_content}" + ) + def _parseRoomMsg(self, payload): message = RoomMessage().parse(payload) common = message.common room_id = common.room_id logger.info(f"【直播间msg】直播间id:{room_id}") - + def _parseRoomStatsMsg(self, payload): message = RoomStatsMessage().parse(payload) display_long = message.display_long logger.info(f"【直播间统计msg】{display_long}") - + def _parseRankMsg(self, payload): message = RoomRankMessage().parse(payload) ranks_list = message.ranks_list logger.info(f"【直播间排行榜msg】{ranks_list}") - + def _parseControlMsg(self, payload): - '''直播间状态消息''' + """直播间状态消息""" message = ControlMessage().parse(payload) - + if message.status == 3: logger.info("直播间已结束") self.stop() - config_room_id = my_handle.get_room_id() DouyinLiveWebFetcher(config_room_id).start() @@ -2432,15 +2761,15 @@ async def on_message(websocket, path): username = data_json["username"] content = data_json["content"] - - logger.info(f'[📧直播间弹幕消息] [{username}]：{content}') + + logger.info(f"[📧直播间弹幕消息] [{username}]：{content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } - + my_handle.process_data(data, "comment") # 添加用户名到最新的用户名列表 @@ -2451,7 +2780,6 @@ async def on_message(websocket, path): logger.error("数据解析错误！") my_handle.abnormal_alarm_handle("platform") continue - async def ws_server(): ws_url = "127.0.0.1" @@ -2460,9 +2788,8 @@ async def ws_server(): logger.info(f"WebSocket 服务器已在 {ws_url}:{ws_port} 启动") await server.wait_closed() - asyncio.run(ws_server()) - + elif platform == "ks": from playwright.sync_api import sync_playwright, TimeoutError from google.protobuf.json_format import MessageToDict @@ -2473,10 +2800,10 @@ class kslive(object): def __init__(self): global config, common, my_handle - self.path = os.path.abspath('') + self.path = os.path.abspath("") self.chrome_path = r"\firefox-1419\firefox\firefox.exe" - self.ua = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0' - self.uri = 'https://live.kuaishou.com/u/' + self.ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0" + self.uri = "https://live.kuaishou.com/u/" self.context = None self.browser = None self.page = None @@ -2513,8 +2840,8 @@ def find_file(self, find_path, file_type) -> list: def main(self, lid, semaphore): if not os.path.exists(self.path + "\\cookie"): os.makedirs(self.path + "\\cookie") - - cookie_path=self.path + "\\cookie\\" + self.phone + ".json" + + cookie_path = self.path + "\\cookie\\" + self.phone + ".json" # if not os.path.exists(cookie_path): # with open(cookie_path, 'w') as file: # file.write('{"a":"a"}') @@ -2531,45 +2858,59 @@ def main(self, lid, semaphore): cookie_list = self.find_file("cookie", "json") live_url = self.uri + lid - + if not os.path.exists(cookie_path): - self.context = self.browser.new_context(storage_state=None, user_agent=self.ua) + self.context = self.browser.new_context( + storage_state=None, user_agent=self.ua + ) else: - self.context = self.browser.new_context(storage_state=cookie_list[0], user_agent=self.ua) + self.context = self.browser.new_context( + storage_state=cookie_list[0], user_agent=self.ua + ) self.page = self.context.new_page() - self.page.add_init_script("Object.defineProperties(navigator, {webdriver:{get:()=>undefined}});") + self.page.add_init_script( + "Object.defineProperties(navigator, {webdriver:{get:()=>undefined}});" + ) self.page.goto("https://live.kuaishou.com/") # self.page.goto(live_url) - element = self.page.get_attribute('.no-login', "style") + element = self.page.get_attribute(".no-login", "style") if not element: logger.info("未登录，请先登录~") - self.page.locator('.login').click() - self.page.locator('li.tab-panel:nth-child(2) > h4:nth-child(1)').click() + self.page.locator(".login").click() + self.page.locator( + "li.tab-panel:nth-child(2) > h4:nth-child(1)" + ).click() self.page.locator( - 'div.normal-login-item:nth-child(1) > div:nth-child(1) > input:nth-child(1)').fill( - self.phone) + "div.normal-login-item:nth-child(1) > div:nth-child(1) > input:nth-child(1)" + ).fill(self.phone) try: - self.page.wait_for_selector("#app > section > div.header-placeholder > header > div.header-main > " - "div.right-part > div.user-info > div.tooltip-trigger > span", - timeout=1000 * 60 * 2) + self.page.wait_for_selector( + "#app > section > div.header-placeholder > header > div.header-main > " + "div.right-part > div.user-info > div.tooltip-trigger > span", + timeout=1000 * 60 * 2, + ) if not os.path.exists(self.path + "\\cookie"): os.makedirs(self.path + "\\cookie") self.context.storage_state(path=cookie_path) # 检测是否开播 - selector = "html body div#app div.live-room div.detail div.player " \ - "div.kwai-player.kwai-player-container.kwai-player-rotation-0 " \ - "div.kwai-player-container-video div.kwai-player-plugins div.center-state div.state " \ - "div.no-live-detail div.desc p.tip" # 检测正在直播时下播的选择器 + selector = ( + "html body div#app div.live-room div.detail div.player " + "div.kwai-player.kwai-player-container.kwai-player-rotation-0 " + "div.kwai-player-container-video div.kwai-player-plugins div.center-state div.state " + "div.no-live-detail div.desc p.tip" + ) # 检测正在直播时下播的选择器 try: - msg = self.page.locator(selector).text_content(timeout=3000) + msg = self.page.locator(selector).text_content( + timeout=3000 + ) logger.info("当前%s" % thread_name + "，" + msg) self.context.close() self.browser.close() except Exception as e: logger.info("当前%s，[%s]正在直播" % (thread_name, lid)) - + logger.info(f"跳转直播间：{live_url}") # self.page.goto(live_url) # time.sleep(1) @@ -2579,10 +2920,16 @@ def main(self, lid, semaphore): # 等待一段时间检查是否有验证码弹窗 try: captcha_selector = "html body div.container" # 假设这是验证码弹窗的选择器 - self.page.wait_for_selector(captcha_selector, timeout=5000) # 等待5秒看是否出现验证码 + self.page.wait_for_selector( + captcha_selector, timeout=5000 + ) # 等待5秒看是否出现验证码 logger.info("检测到验证码，处理验证码...") # 等待验证码弹窗从DOM中被完全移除 - self.page.wait_for_selector(captcha_selector, state='detached', timeout=10000) # 假设最长等待10秒验证码验证完成 + self.page.wait_for_selector( + captcha_selector, + state="detached", + timeout=10000, + ) # 假设最长等待10秒验证码验证完成 logger.info("验证码已验证，弹窗已移除") # 弹窗处理逻辑之后等待1秒 time.sleep(1) @@ -2590,7 +2937,7 @@ def main(self, lid, semaphore): # self.page.goto(live_url) except TimeoutError: logger.error("没有检测到验证码，继续执行...") - + logger.info(f"请在10s内手动打开直播间：{live_url}") time.sleep(10) @@ -2598,7 +2945,9 @@ def main(self, lid, semaphore): self.page.on("websocket", self.web_sockets) logger.info(f"24h监听直播间等待下播...") self.page.wait_for_selector(selector, timeout=86400000) - logger.error("当前%s，[%s]的直播结束了" % (thread_name, lid)) + logger.error( + "当前%s，[%s]的直播结束了" % (thread_name, lid) + ) self.context.close() self.browser.close() @@ -2611,7 +2960,7 @@ def web_sockets(self, web_socket): logger.info("web_sockets...") urls = web_socket.url logger.info(urls) - if '/websocket' in urls: + if "/websocket" in urls: logger.info("websocket连接成功，创建监听事件") web_socket.on("close", self.websocket_close) web_socket.on("framereceived", self.handler) @@ -2630,42 +2979,43 @@ def handler(self, websocket): logger.debug(obj) - if obj.get('commentFeeds', ''): - msg_list = obj.get('commentFeeds', '') + if obj.get("commentFeeds", ""): + msg_list = obj.get("commentFeeds", "") for i in msg_list: # 闲时计数清零 idle_time_auto_clear("comment") - username = i['user']['userName'] - pid = i['user']['principalId'] - content = i['content'] + username = i["user"]["userName"] + pid = i["user"]["principalId"] + content = i["content"] logger.info(f"[📧直播间弹幕消息] [{username}]:{content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } - + my_handle.process_data(data, "comment") - if obj.get('giftFeeds', ''): + if obj.get("giftFeeds", ""): idle_time_auto_clear("gift") - msg_list = obj.get('giftFeeds', '') + msg_list = obj.get("giftFeeds", "") for i in msg_list: - username = i['user']['userName'] + username = i["user"]["userName"] # pid = i['user']['principalId'] - giftId = i['giftId'] - comboCount = i['comboCount'] - logger.info(f"[🎁直播间礼物消息] 用户：{username} 赠送礼物Id={giftId} 连击数={comboCount}") - if obj.get('likeFeeds', ''): - msg_list = obj.get('likeFeeds', '') + giftId = i["giftId"] + comboCount = i["comboCount"] + logger.info( + f"[🎁直播间礼物消息] 用户：{username} 赠送礼物Id={giftId} 连击数={comboCount}" + ) + if obj.get("likeFeeds", ""): + msg_list = obj.get("likeFeeds", "") for i in msg_list: - username = i['user']['userName'] - pid = i['user']['principalId'] + username = i["user"]["userName"] + pid = i["user"]["principalId"] logger.info(f"{username}") - class run(kslive): def __init__(self): super().__init__() @@ -2693,7 +3043,9 @@ def run_live(self): for i in self.ids_list: n += 1 - t = threading.Thread(target=kslive().main, args=(i, semaphore), name=f"线程：{n}-{i}") + t = threading.Thread( + target=kslive().main, args=(i, semaphore), name=f"线程：{n}-{i}" + ) t.start() t_list.append(t) for i in t_list: @@ -2721,15 +3073,15 @@ async def on_message(websocket, path): username = data_json["username"] content = data_json["content"] - - logger.info(f'[📧直播间弹幕消息] [{username}]：{content}') + + logger.info(f"[📧直播间弹幕消息] [{username}]：{content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } - + my_handle.process_data(data, "comment") # 添加用户名到最新的用户名列表 @@ -2740,7 +3092,7 @@ async def on_message(websocket, path): logger.error("数据解析错误！") my_handle.abnormal_alarm_handle("platform") continue - + async def ws_server(): ws_url = "127.0.0.1" ws_port = 5000 @@ -2754,7 +3106,14 @@ async def ws_server(): tiktok """ from TikTokLive import TikTokLiveClient - from TikTokLive.events import CommentEvent, ConnectEvent, DisconnectEvent, JoinEvent, GiftEvent, FollowEvent + from TikTokLive.events import ( + CommentEvent, + ConnectEvent, + DisconnectEvent, + JoinEvent, + GiftEvent, + FollowEvent, + ) # from TikTokLive.client.errors import LiveNotFound # 比如直播间是 https://www.tiktok.com/@username/live 那么room_id就是 username，其实就是用户唯一ID @@ -2762,13 +3121,15 @@ async def ws_server(): proxys = { "http://": "http://127.0.0.1:10809", - "https://": "http://127.0.0.1:10809" + "https://": "http://127.0.0.1:10809", } proxys = None - + # 代理软件开启TUN模式进行代理，由于库的ws不走传入的代理参数，只能靠代理软件全代理了 - client: TikTokLiveClient = TikTokLiveClient(unique_id=f"@{room_id}", web_proxy=proxys, ws_proxy=proxys) + client: TikTokLiveClient = TikTokLiveClient( + unique_id=f"@{room_id}", web_proxy=proxys, ws_proxy=proxys + ) def start_client(): # Define how you want to handle specific events via decorator @@ -2789,12 +3150,12 @@ async def on_join(event: JoinEvent): username = event.user.nickname unique_id = event.user.unique_id - logger.info(f'[🚹🚺直播间成员加入消息] 欢迎 {username} 进入直播间') + logger.info(f"[🚹🚺直播间成员加入消息] 欢迎 {username} 进入直播间") data = { "platform": platform, "username": username, - "content": "进入直播间" + "content": "进入直播间", } # 添加用户名到最新的用户名列表 @@ -2810,15 +3171,11 @@ async def on_comment(event: CommentEvent): username = event.user.nickname content = event.comment - - logger.info(f'[📧直播间弹幕消息] [{username}]：{content}') - data = { - "platform": platform, - "username": username, - "content": content - } - + logger.info(f"[📧直播间弹幕消息] [{username}]：{content}") + + data = {"platform": platform, "username": username, "content": content} + my_handle.process_data(data, "comment") @client.on("gift") @@ -2848,7 +3205,6 @@ async def on_gift(event: GiftEvent): username = event.user.nickname # 礼物数量 num = 1 - try: # 暂时是写死的 @@ -2863,17 +3219,20 @@ async def on_gift(event: GiftEvent): # 单个礼物金额 需要自己维护礼物价值表 discount_price = data_json[gift_name] else: - logger.warning(f"数据文件：{data_path} 中，没有 {gift_name} 对应的价值，请手动补充数据") + logger.warning( + f"数据文件：{data_path} 中，没有 {gift_name} 对应的价值，请手动补充数据" + ) discount_price = 1 except Exception as e: logger.error(traceback.format_exc()) discount_price = 1 - # 总金额 combo_total_coin = repeat_count * discount_price - logger.info(f'[🎁直播间礼物消息] 用户：{username} 赠送 {num} 个 {gift_name}，单价 {discount_price}抖币，总计 {combo_total_coin}抖币') + logger.info( + f"[🎁直播间礼物消息] 用户：{username} 赠送 {num} 个 {gift_name}，单价 {discount_price}抖币，总计 {combo_total_coin}抖币" + ) data = { "platform": platform, @@ -2881,7 +3240,7 @@ async def on_gift(event: GiftEvent): "username": username, "num": num, "unit_price": discount_price / 10, - "total_price": combo_total_coin / 10 + "total_price": combo_total_coin / 10, } my_handle.process_data(data, "gift") @@ -2889,16 +3248,13 @@ async def on_gift(event: GiftEvent): @client.on("follow") async def on_follow(event: FollowEvent): idle_time_auto_clear("follow") - + username = event.user.nickname - logger.info(f'[➕直播间关注消息] 感谢 {username} 的关注') + logger.info(f"[➕直播间关注消息] 感谢 {username} 的关注") + + data = {"platform": platform, "username": username} - data = { - "platform": platform, - "username": username - } - my_handle.process_data(data, "follow") try: @@ -2909,23 +3265,28 @@ async def on_follow(event: FollowEvent): except Exception as e: logger.info(f"用户ID: @{client.unique_id} 好像不在线捏, 1分钟后重试...") start_client() - + # 运行客户端 start_client() elif platform == "twitch": import socks from emoji import demojize - try: - server = 'irc.chat.twitch.tv' + server = "irc.chat.twitch.tv" port = 6667 - nickname = '主人' + nickname = "主人" try: - channel = '#' + config.get("room_display_id") # 要从中检索消息的频道，注意#必须携带在头部 The channel you want to retrieve messages from - token = config.get("twitch", "token") # 访问 https://twitchapps.com/tmi/ 获取 - user = config.get("twitch", "user") # 你的Twitch用户名 Your Twitch username + channel = ( + "#" + config.get("room_display_id") + ) # 要从中检索消息的频道，注意#必须携带在头部 The channel you want to retrieve messages from + token = config.get( + "twitch", "token" + ) # 访问 https://twitchapps.com/tmi/ 获取 + user = config.get( + "twitch", "user" + ) # 你的Twitch用户名 Your Twitch username # 代理服务器的地址和端口 proxy_server = config.get("twitch", "proxy_server") proxy_port = int(config.get("twitch", "proxy_port")) @@ -2948,10 +3309,9 @@ async def on_follow(event: FollowEvent): logger.error(f"连接 Twitch IRC server 失败: {e}") my_handle.abnormal_alarm_handle("platform") - - sock.send(f"PASS {token}\n".encode('utf-8')) - sock.send(f"NICK {nickname}\n".encode('utf-8')) - sock.send(f"JOIN {channel}\n".encode('utf-8')) + sock.send(f"PASS {token}\n".encode("utf-8")) + sock.send(f"NICK {nickname}\n".encode("utf-8")) + sock.send(f"JOIN {channel}\n".encode("utf-8")) regex = r":(\w+)!\w+@\w+\.tmi\.twitch\.tv PRIVMSG #\w+ :(.+)" @@ -2960,13 +3320,13 @@ async def on_follow(event: FollowEvent): while True: try: - resp = sock.recv(2048).decode('utf-8') + resp = sock.recv(2048).decode("utf-8") # 输出所有接收到的内容，包括PING/PONG # logger.info(resp) - if resp.startswith('PING'): - sock.send("PONG\n".encode('utf-8')) + if resp.startswith("PING"): + sock.send("PONG\n".encode("utf-8")) elif not user in resp: # 闲时计数清零 @@ -2987,7 +3347,7 @@ async def on_follow(event: FollowEvent): data = { "platform": platform, "username": username, - "content": content + "content": content, } my_handle.process_data(data, "comment") @@ -3000,7 +3360,7 @@ async def on_follow(event: FollowEvent): if retry_count >= 3: logger.error(f"多次重连失败，程序结束！") return - + retry_count += 1 logger.error(f"重试次数: {retry_count}") @@ -3017,9 +3377,9 @@ async def on_follow(event: FollowEvent): except Exception as e: logger.error(f"连接 Twitch IRC server 失败: {e}") - sock.send(f"PASS {token}\n".encode('utf-8')) - sock.send(f"NICK {nickname}\n".encode('utf-8')) - sock.send(f"JOIN {channel}\n".encode('utf-8')) + sock.send(f"PASS {token}\n".encode("utf-8")) + sock.send(f"NICK {nickname}\n".encode("utf-8")) + sock.send(f"JOIN {channel}\n".encode("utf-8")) except Exception as e: logger.error(traceback.format_exc()) logger.error("Error receiving chat: {0}".format(e)) @@ -3056,38 +3416,38 @@ async def wxlive(request: Request): # 这里可以添加代码处理接收到的数据 logger.debug(data) - if data['events'][0]['seq'] in seq_list: + if data["events"][0]["seq"] in seq_list: return CommonResult(code=-1, message="重复数据过滤") # 如果列表长度达到30，移除最旧的元素 if len(seq_list) >= 30: seq_list.pop(0) - + # 添加新元素 - seq_list.append(data['events'][0]['seq']) + seq_list.append(data["events"][0]["seq"]) # 弹幕数据 - if data['events'][0]['decoded_type'] == "comment": + if data["events"][0]["decoded_type"] == "comment": # 闲时计数清零 idle_time_auto_clear("comment") - content = data['events'][0]['content'] # 获取弹幕内容 - username = data['events'][0]['nickname'] # 获取发送弹幕的用户昵称 + content = data["events"][0]["content"] # 获取弹幕内容 + username = data["events"][0]["nickname"] # 获取发送弹幕的用户昵称 logger.info(f"[{username}]: {content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } my_handle.process_data(data, "comment") # 入场数据 - elif data['events'][0]['decoded_type'] == "enter": + elif data["events"][0]["decoded_type"] == "enter": idle_time_auto_clear("entrance") - username = data['events'][0]['nickname'] + username = data["events"][0]["nickname"] logger.info(f"用户：{username} 进入直播间") @@ -3097,7 +3457,7 @@ async def wxlive(request: Request): data = { "platform": platform, "username": username, - "content": "进入直播间" + "content": "进入直播间", } my_handle.process_data(data, "entrance") @@ -3137,7 +3497,7 @@ async def send(msg: SendMessage): except Exception as e: logger.error(f"发送数据失败！{e}") return CommonResult(code=-1, message=f"发送数据失败！{e}") - + @app.post("/llm") async def llm(msg: LLMMessage): global my_handle, config @@ -3146,13 +3506,17 @@ async def llm(msg: LLMMessage): data_json = msg.dict() logger.info(f"API收到数据：{data_json}") - resp_content = my_handle.llm_handle(data_json["type"], data_json, webui_show=False) + resp_content = my_handle.llm_handle( + data_json["type"], data_json, webui_show=False + ) - return CommonResult(code=200, message="成功", data={"content": resp_content}) + return CommonResult( + code=200, message="成功", data={"content": resp_content} + ) except Exception as e: logger.error(f"调用LLM失败！{e}") return CommonResult(code=-1, message=f"调用LLM失败！{e}") - + @app.post("/callback") async def callback(msg: CallbackMessage): global my_handle, config, global_idle_time @@ -3164,11 +3528,17 @@ async def callback(msg: CallbackMessage): # 音频播放完成 if data_json["type"] in ["audio_playback_completed"]: # 如果等待播放的音频数量大于10 - if data_json["data"]["wait_play_audio_num"] > int(config.get("idle_time_task", "wait_play_audio_num_threshold")): - logger.info(f'等待播放的音频数量大于限定值，闲时任务的闲时计时由 {global_idle_time} -> {int(config.get("idle_time_task", "idle_time_reduce_to"))}秒') + if data_json["data"]["wait_play_audio_num"] > int( + config.get("idle_time_task", "wait_play_audio_num_threshold") + ): + logger.info( + f'等待播放的音频数量大于限定值，闲时任务的闲时计时由 {global_idle_time} -> {int(config.get("idle_time_task", "idle_time_reduce_to"))}秒' + ) # 闲时任务的闲时计时 清零 - global_idle_time = int(config.get("idle_time_task", "idle_time_reduce_to")) - + global_idle_time = int( + config.get("idle_time_task", "idle_time_reduce_to") + ) + return CommonResult(code=200, message="callback处理成功！") except Exception as e: logger.error(f"callback处理失败！{e}") @@ -3192,9 +3562,9 @@ def process_chat(live): try: for c in live.get().sync_items(): # 过滤表情包 - chat_raw = re.sub(r':[^\s]+:', '', c.message) - chat_raw = chat_raw.replace('#', '') - if chat_raw != '': + chat_raw = re.sub(r":[^\s]+:", "", c.message) + chat_raw = chat_raw.replace("#", "") + if chat_raw != "": # 闲时计数清零 idle_time_auto_clear("comment") @@ -3206,11 +3576,11 @@ def process_chat(live): data = { "platform": platform, "username": username, - "content": content + "content": content, } my_handle.process_data(data, "comment") - + # time.sleep(1) except Exception as e: logger.error(traceback.format_exc()) @@ -3235,20 +3605,22 @@ def process_chat(live): if last_reconnect_time and (current_time - last_reconnect_time < 30): reconnect_attempts += 1 if reconnect_attempts >= 3: - logger.error('重连失败次数已达上限，退出程序...') + logger.error("重连失败次数已达上限，退出程序...") break - logger.warning(f'连接已关闭，间隔小于30秒，尝试重新连接 ({reconnect_attempts}/3)...') + logger.warning( + f"连接已关闭，间隔小于30秒，尝试重新连接 ({reconnect_attempts}/3)..." + ) else: reconnect_attempts = 0 # 重置重连次数 - logger.warning('连接已关闭，尝试重新连接...') + logger.warning("连接已关闭，尝试重新连接...") last_reconnect_time = current_time except KeyboardInterrupt: - logger.warning('程序被强行退出') + logger.warning("程序被强行退出") finally: - logger.warning('关闭连接...') + logger.warning("关闭连接...") os._exit(0) elif platform == "hntv": import requests @@ -3258,24 +3630,24 @@ def process_chat(live): def fetch_comments(): try: - url = f'https://pubmod.hntv.tv/dx-bridge/get-comment-with-article-super-v2?limit=40&typeId=1&appFusionId=1390195608019869697&page=1&objectId={my_handle.get_room_id()}' + url = f"https://pubmod.hntv.tv/dx-bridge/get-comment-with-article-super-v2?limit=40&typeId=1&appFusionId=1390195608019869697&page=1&objectId={my_handle.get_room_id()}" response = requests.get(url) if response.status_code == 200: data = response.json() - items = data.get('result', {}).get('items', []) + items = data.get("result", {}).get("items", []) for item in items: - comment_id = item.get('commentId') + comment_id = item.get("commentId") if comment_id not in comment_set: comment_set.add(comment_id) - username = item.get('commentUserNickname', '') - content = item.get('content', '') - + username = item.get("commentUserNickname", "") + content = item.get("content", "") + logger.info(f"[{username}]: {content}") data = { "platform": platform, "username": username, - "content": content + "content": content, } my_handle.process_data(data, "comment") @@ -3297,7 +3669,7 @@ def exit_handler(signum, frame): logger.info("收到信号:", signum) -if __name__ == '__main__': +if __name__ == "__main__": common = Common() config = Config(config_path) # 日志文件路径 @@ -3310,7 +3682,7 @@ def exit_handler(signum, frame): from typing import Optional # 这里填一个已登录账号的cookie。不填cookie也可以连接，但是收到弹幕的用户名会打码，UID会变成0 - SESSDATA = '' + SESSDATA = "" session: Optional[aiohttp.ClientSession] = None elif platform == "dy2": @@ -3324,6 +3696,8 @@ def exit_handler(signum, frame): sense_voice_model = None # 正在录音中 标志位 is_recording = False + # 聊天是否唤醒 + is_talk_awake = False # 信号特殊处理 signal.signal(signal.SIGINT, exit_handler) diff --git a/tests/test_sensevoice/demo.py b/tests/test_sensevoice/demo.py index 366c7b6e..09838e22 100644 --- a/tests/test_sensevoice/demo.py +++ b/tests/test_sensevoice/demo.py @@ -1,4 +1,7 @@ from funasr import AutoModel +import sys +sys.path.insert(1, "../../sensevoice") + asr_model_path = "./models/iic/SenseVoiceSmall" vad_model_path = "./models/iic/speech_fsmn_vad_zh-cn-16k-common-pytorch" diff --git a/utils/common.py b/utils/common.py index 36d31e15..6ab13f33 100644 --- a/utils/common.py +++ b/utils/common.py @@ -535,17 +535,17 @@ def find_best_match(self, substring, string_list, similarity=0.5): return best_match - # 在字符串列表中查找是否存在作为待查询字符串子串的字符串。 + # 检查 query_string 是否包含 string_list 列表中的任意一个子字符串 def find_substring_in_list(self, query_string, string_list): """ - 在字符串列表中查找是否存在作为待查询字符串子串的字符串。 + 检查 query_string 是否包含 string_list 列表中的任意一个子字符串 Args: - query_string (str): 待查询的字符串。 - string_list (list of str): 被查询的字符串列表。 + query_string (str): 待查询的字符串。 + string_list (list of str): 被查询的字符串列表。 Returns: - str or None: 如果找到子串，则返回该子串；否则返回 None。 + str or None: 如果找到子串，则返回该子串；否则返回 None。 """ for string in string_list: if string in query_string: @@ -644,7 +644,7 @@ def parse_cookie_data(self, data_str, field_name): # 动态变量替换 - def dynamic_variable_replacement(self, template, data_json): + def dynamic_variable_replacement(self, template: str, data_json: dict=None): """动态变量替换 Args: @@ -654,19 +654,26 @@ def dynamic_variable_replacement(self, template, data_json): Returns: str: 替换完成后的字符串 """ - pattern = r"{(\w+)}" - var_names = re.findall(pattern, template) + try: + if data_json is None: + return template - for var_name in var_names: - if var_name in data_json: - template = template.replace("{"+var_name+"}", str(data_json[var_name])) - else: - # 变量不存在,保留原样 - pass + pattern = r"{(\w+)}" + var_names = re.findall(pattern, template) - logger.debug(f"template={template}") + for var_name in var_names: + if var_name in data_json: + template = template.replace("{"+var_name+"}", str(data_json[var_name])) + else: + # 变量不存在,保留原样 + pass - return template + logger.debug(f"template={template}") + + return template + except Exception as e: + logger.error(traceback.format_exc()) + return None # [1|2]括号语法随机获取一个值，返回取值完成后的字符串 @@ -692,6 +699,36 @@ def brackets_text_randomize(self, text: str): return text + # 从列表中随机获取一个字符串，并进行变量语法转换。如果列表为空，使用单个字符串进行转换。 + def get_random_str_in_list_and_format(self, ori_content: str = None, ori_list: list = None, var_json: dict = None) -> dict: + """ + 从列表中随机获取一个字符串，并进行变量语法转换。如果列表为空，使用单个字符串进行转换。 + + 参数: + ori_content (str): 单个待处理的字符串。 + ori_list (list of str): 待处理字符串的列表。 + var_json (dict): 动态变量替换所需的键值对。 + + 返回: + dict: 包含转换后内容的字典和返回码。成功时返回 {"ret": 0, "content": content}，失败时返回 {"ret": -1, "content": None}。 + """ + + # 检查并处理字符串列表 + if ori_list: + content = random.choice(ori_list) + elif ori_content: + content = ori_content + else: + return {"ret": -1, "content": None} + + # [1|2]括号语法随机获取一个值，返回取值完成后的字符串 + content = self.brackets_text_randomize(content) + + # 动态变量替换 + content = self.dynamic_variable_replacement(content, var_json) + + return {"ret": 0, "content": content} + """ .@@@ @@@ @@^ =@@@@@@@@ /@@ /@@ =@@@@@*,@@\]]]] ,@@@@@@@@@@@@* .@@@ @@/.\]`@@@ =@@\]]]]]]] =@@..@@@@@@@@@ =@@\ /@@^ diff --git a/utils/my_handle.py b/utils/my_handle.py index 833f6ecf..8e2cd14a 100644 --- a/utils/my_handle.py +++ b/utils/my_handle.py @@ -2432,7 +2432,7 @@ def comment_handle(self, data): if self.blacklist_handle(data): return None - if My_handle.config.get("talk", "show_chat_log") == True: + if My_handle.config.get("talk", "show_chat_log"): if "ori_username" not in data: data["ori_username"] = data["username"] if "ori_content" not in data: @@ -3289,7 +3289,7 @@ def talk_handle(self, data): # 输出当前用户发送的弹幕消息 logger.debug(f"[{username}]: {content}") - if My_handle.config.get("talk", "show_chat_log") == True: + if My_handle.config.get("talk", "show_chat_log"): if "ori_username" not in data: data["ori_username"] = data["username"] if "ori_content" not in data: diff --git a/webui.py b/webui.py index 4d8d6aac..bfb71cb0 100644 --- a/webui.py +++ b/webui.py @@ -2575,6 +2575,13 @@ def common_textarea_handle(content): config_data["talk"]["CHANNELS"] = int(input_talk_silence_CHANNELS.value) config_data["talk"]["RATE"] = int(input_talk_silence_RATE.value) config_data["talk"]["show_chat_log"] = switch_talk_show_chat_log.value + + config_data["talk"]["wakeup_sleep"]["enable"] = switch_talk_wakeup_sleep_enable.value + config_data["talk"]["wakeup_sleep"]["wakeup_word"] = common_textarea_handle(textarea_talk_wakeup_sleep_wakeup_word.value) + config_data["talk"]["wakeup_sleep"]["sleep_word"] = common_textarea_handle(textarea_talk_wakeup_sleep_sleep_word.value) + config_data["talk"]["wakeup_sleep"]["wakeup_copywriting"] = common_textarea_handle(textarea_talk_wakeup_sleep_wakeup_copywriting.value) + config_data["talk"]["wakeup_sleep"]["sleep_copywriting"] = common_textarea_handle(textarea_talk_wakeup_sleep_sleep_copywriting.value) + config_data["talk"]["type"] = select_talk_type.value config_data["talk"]["google"]["tgt_lang"] = select_talk_google_tgt_lang.value config_data["talk"]["baidu"]["app_id"] = input_talk_baidu_app_id.value @@ -5685,7 +5692,15 @@ async def fish_speech_load_model(data): input_talk_silence_CHANNELS = ui.input(label='CHANNELS', value=config.get("talk", "CHANNELS"), placeholder='录音用的参数').style("width:100px;") input_talk_silence_RATE = ui.input(label='RATE', value=config.get("talk", "RATE"), placeholder='录音用的参数').style("width:100px;") switch_talk_show_chat_log = ui.switch('聊天记录', value=config.get("talk", "show_chat_log")).style(switch_internal_css) - + + with ui.expansion('语音唤醒与睡眠', icon="settings", value=True).classes('w-2/3'): + with ui.row(): + switch_talk_wakeup_sleep_enable = ui.switch('启用', value=config.get("talk", "wakeup_sleep", "enable")).style(switch_internal_css) + textarea_talk_wakeup_sleep_wakeup_word = ui.textarea(label='唤醒词', placeholder='如：管家 多个请换行分隔', value=textarea_data_change(config.get("talk", "wakeup_sleep", "wakeup_word"))).style("width:200px;") + textarea_talk_wakeup_sleep_sleep_word = ui.textarea(label='睡眠词', placeholder='如：关机 多个请换行分隔', value=textarea_data_change(config.get("talk", "wakeup_sleep", "sleep_word"))).style("width:200px;") + textarea_talk_wakeup_sleep_wakeup_copywriting = ui.textarea(label='唤醒提示语', placeholder='如：在的 多个请换行分隔', value=textarea_data_change(config.get("talk", "wakeup_sleep", "wakeup_copywriting"))).style("width:300px;") + textarea_talk_wakeup_sleep_sleep_copywriting = ui.textarea(label='睡眠提示语', placeholder='如：晚安 多个请换行分隔', value=textarea_data_change(config.get("talk", "wakeup_sleep", "sleep_copywriting"))).style("width:300px;") + with ui.expansion('谷歌', icon="settings", value=False).classes('w-2/3'): with ui.grid(columns=1): data_json = {}