gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ruff

Browse Source
This commit is contained in:
SengokuCola
2025-03-25 22:56:39 +08:00
parent 0ea57c4a58
commit 83ee182bfe
7 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/chat/config.py
View File

@@ -213,7 +213,8 @@ class BotConfig:
schedule_config = parent["schedule"]
config.ENABLE_SCHEDULE_GEN = schedule_config.get("enable_schedule_gen", config.ENABLE_SCHEDULE_GEN)
config.PROMPT_SCHEDULE_GEN = schedule_config.get("prompt_schedule_gen", config.PROMPT_SCHEDULE_GEN)
logger.info(f"载入自定义日程prompt:{schedule_config.get('prompt_schedule_gen', config.PROMPT_SCHEDULE_GEN)}")
logger.info(
f"载入自定义日程prompt:{schedule_config.get('prompt_schedule_gen', config.PROMPT_SCHEDULE_GEN)}")
def emoji(parent: dict):
emoji_config = parent["emoji"]
@@ -247,10 +248,13 @@ class BotConfig:
config.willing_mode = willing_config.get("willing_mode", config.willing_mode)
if config.INNER_VERSION in SpecifierSet(">=0.0.11"):
config.response_willing_amplifier = willing_config.get("response_willing_amplifier", config.response_willing_amplifier)
config.response_interested_rate_amplifier = willing_config.get("response_interested_rate_amplifier", config.response_interested_rate_amplifier)
config.response_willing_amplifier = willing_config.get(
"response_willing_amplifier", config.response_willing_amplifier)
config.response_interested_rate_amplifier = willing_config.get(
"response_interested_rate_amplifier", config.response_interested_rate_amplifier)
config.down_frequency_rate = willing_config.get("down_frequency_rate", config.down_frequency_rate)
config.emoji_response_penalty = willing_config.get("emoji_response_penalty", config.emoji_response_penalty)
config.emoji_response_penalty = willing_config.get(
"emoji_response_penalty", config.emoji_response_penalty)
def model(parent: dict):
# 加载模型配置
@@ -392,9 +396,11 @@ class BotConfig:
def response_spliter(parent: dict):
response_spliter_config = parent["response_spliter"]
config.enable_response_spliter = response_spliter_config.get("enable_response_spliter", config.enable_response_spliter)
config.enable_response_spliter = response_spliter_config.get(
"enable_response_spliter", config.enable_response_spliter)
config.response_max_length = response_spliter_config.get("response_max_length", config.response_max_length)
config.response_max_sentence_num = response_spliter_config.get("response_max_sentence_num", config.response_max_sentence_num)
config.response_max_sentence_num = response_spliter_config.get(
"response_max_sentence_num", config.response_max_sentence_num)
def groups(parent: dict):
groups_config = parent["groups"]
@@ -405,7 +411,8 @@ class BotConfig:
def experimental(parent: dict):
experimental_config = parent["experimental"]
config.enable_friend_chat = experimental_config.get("enable_friend_chat", config.enable_friend_chat)
config.enable_think_flow = experimental_config.get("enable_think_flow", config.enable_think_flow)
# 版本表达式：>=1.0.0,<2.0.0
# 允许字段：func: method, support: str, notice: str, necessary: bool
# 如果使用 notice 字段，在该组配置加载时，会展示该字段对用户的警示

7
src/plugins/chat/prompt_builder.py
View File

@@ -13,7 +13,6 @@ from .relationship_manager import relationship_manager
from src.common.logger import get_module_logger
from src.think_flow_demo.heartflow import subheartflow_manager
from src.think_flow_demo.outer_world import outer_world
logger = get_module_logger("prompt")
@@ -58,9 +57,9 @@ class PromptBuilder:
mood_prompt = mood_manager.get_prompt()
# 日程构建
current_date = time.strftime("%Y-%m-%d", time.localtime())
current_time = time.strftime("%H:%M:%S", time.localtime())
bot_schedule_now_time, bot_schedule_now_activity = bot_schedule.get_current_task()
# current_date = time.strftime("%Y-%m-%d", time.localtime())
# current_time = time.strftime("%H:%M:%S", time.localtime())
# bot_schedule_now_time, bot_schedule_now_activity = bot_schedule.get_current_task()
# 获取聊天上下文
chat_in_group = True

5
src/plugins/chat/relationship_manager.py
View File

@@ -122,11 +122,12 @@ class RelationshipManager:
relationship.relationship_value = float(relationship.relationship_value.to_decimal())
else:
relationship.relationship_value = float(relationship.relationship_value)
logger.info(f"[关系管理] 用户 {user_id}({platform}) 的关系值已转换为double类型: {relationship.relationship_value}")
logger.info(
f"[关系管理] 用户 {user_id}({platform}) 的关系值已转换为double类型: {relationship.relationship_value}") # noqa: E501
except (ValueError, TypeError):
# 如果不能解析/强转则将relationship.relationship_value设置为double类型的0
relationship.relationship_value = 0.0
logger.warning(f"[关系管理] 用户 {user_id}({platform}) 的关系值无法转换为double类型，已设置为0")
logger.warning(f"[关系管理] 用户 {user_id}({platform}) 的无法转换为double类型，已设置为0")
relationship.relationship_value += value
await self.storage_relationship(relationship)
relationship.saved = True