diff --git a/config.json b/config.json index 311502aa..02037586 100644 --- a/config.json +++ b/config.json @@ -119,7 +119,7 @@ "idle_time_task_forget_reserve_num": 1, "image_recognition_schedule_forget_duration": 0.1, "image_recognition_schedule_forget_reserve_num": 1, - "message_queue_max_len": 10, + "message_queue_max_len": 50, "priority_mapping": { "copywriting": 1, "abnormal_alarm": 1, diff --git a/config.json.bak b/config.json.bak index 311502aa..02037586 100644 --- a/config.json.bak +++ b/config.json.bak @@ -119,7 +119,7 @@ "idle_time_task_forget_reserve_num": 1, "image_recognition_schedule_forget_duration": 0.1, "image_recognition_schedule_forget_reserve_num": 1, - "message_queue_max_len": 10, + "message_queue_max_len": 50, "priority_mapping": { "copywriting": 1, "abnormal_alarm": 1, diff --git a/main.py b/main.py index 35ebf27f..78398f3c 100644 --- a/main.py +++ b/main.py @@ -106,7 +106,7 @@ def send(): logging.info(f"API收到数据:{data_json}") if data_json["type"] in ["reread", "reread_top_priority"]: - my_handle.reread_handle(data_json) + my_handle.reread_handle(data_json, type=data_json["type"]) elif data_json["type"] == "comment": my_handle.process_data(data_json, "comment") elif data_json["type"] == "tuning": diff --git a/utils/audio.py b/utils/audio.py index 2540811a..b03288a5 100644 --- a/utils/audio.py +++ b/utils/audio.py @@ -425,7 +425,7 @@ def get_priority_level(audio_json): # 查找插入位置 new_data_priority = get_priority_level(audio_json) - logging.debug(f"优先级: {new_data_priority}") + logging.info(f"优先级: {new_data_priority}") # 如果新数据没有 'type' 键或其类型不在 priority_mapping 中,直接插入到末尾 if new_data_priority is None: @@ -441,9 +441,11 @@ def get_priority_level(audio_json): insert_position = i + 1 break + logging.info(f"insert_position={insert_position}") + # 数据队列数据量超长判断,插入位置索引大于最大数,则说明优先级低与队列中已存在数据,丢弃数据 if insert_position >= int(self.config.get("filter", "message_queue_max_len")): - logging.info(f"message_queue 已满,数据丢弃") + logging.info(f"message_queue 已满,数据丢弃:【{audio_json['content']}】") return {"code": 1, "msg": f"message_queue 已满,数据丢弃:【{audio_json['content']}】"} # 获取线程锁,避免同时操作 diff --git a/webui.py b/webui.py index 970a600e..6360ecd6 100644 --- a/webui.py +++ b/webui.py @@ -4773,13 +4773,6 @@ def talk_chat_box_reread(insert_index=-1, type="reread"): "content": content } else: - # 重载一下配置 - tmp_config = Config(config_path) - - # 判断下播放器类型 - if tmp_config.get("play_audio", "player") != "audio_player_v2": - ui.notify(position="top", type="warning", message="插队功能仅在音频播放器为audio_player_v2的情况下可用") - return data = { "type": type,