remove:移除tool_use模型,修复Jargon提取问题,修改统计为tool统计

This commit is contained in:
SengokuCola
2026-03-29 16:26:34 +08:00
parent 868438e3c1
commit 82bbf0fd52
25 changed files with 906 additions and 311 deletions

View File

@@ -56,8 +56,8 @@ CONFIG_DIR: Path = PROJECT_ROOT / "config"
BOT_CONFIG_PATH: Path = (CONFIG_DIR / "bot_config.toml").resolve().absolute()
MODEL_CONFIG_PATH: Path = (CONFIG_DIR / "model_config.toml").resolve().absolute()
MMC_VERSION: str = "1.0.0"
CONFIG_VERSION: str = "8.1.10"
MODEL_CONFIG_VERSION: str = "1.12.0"
CONFIG_VERSION: str = "8.1.11"
MODEL_CONFIG_VERSION: str = "1.13.1"
logger = get_logger("config")

View File

@@ -402,6 +402,15 @@ class ModelTaskConfig(ConfigBase):
},
)
"""首要回复模型配置, 还用于表达器和表达方式学习"""
planner: TaskConfig = Field(
default_factory=TaskConfig,
json_schema_extra={
"x-widget": "custom",
"x-icon": "map",
},
)
"""规划模型配置"""
vlm: TaskConfig = Field(
default_factory=TaskConfig,
@@ -421,24 +430,6 @@ class ModelTaskConfig(ConfigBase):
)
"""语音识别模型配置"""
tool_use: TaskConfig = Field(
default_factory=TaskConfig,
json_schema_extra={
"x-widget": "custom",
"x-icon": "tools",
},
)
"""工具使用模型配置, 需要使用支持工具调用的模型"""
planner: TaskConfig = Field(
default_factory=TaskConfig,
json_schema_extra={
"x-widget": "custom",
"x-icon": "map",
},
)
"""规划模型配置"""
embedding: TaskConfig = Field(
default_factory=TaskConfig,
json_schema_extra={
@@ -446,22 +437,4 @@ class ModelTaskConfig(ConfigBase):
"x-icon": "database",
},
)
"""嵌入模型配置"""
lpmm_entity_extract: TaskConfig = Field(
default_factory=TaskConfig,
json_schema_extra={
"x-widget": "custom",
"x-icon": "filter",
},
)
"""LPMM实体提取模型配置"""
lpmm_rdf_build: TaskConfig = Field(
default_factory=TaskConfig,
json_schema_extra={
"x-widget": "custom",
"x-icon": "network",
},
)
"""LPMM RDF构建模型配置"""
"""嵌入模型配置"""

View File

@@ -234,17 +234,6 @@ class ChatConfig(ConfigBase):
)
"""上下文长度"""
planner_smooth: float = Field(
default=3,
ge=0,
json_schema_extra={
"x-widget": "slider",
"x-icon": "gauge",
"step": 0.5,
},
)
"""规划器平滑增大数值会减小planner负荷略微降低反应速度推荐1-50为关闭必须大于等于0"""
think_mode: Literal["classic", "deep", "dynamic"] = Field(
default="dynamic",
json_schema_extra={
@@ -659,21 +648,6 @@ class ExpressionConfig(ConfigBase):
)
"""是否在回复前尝试对上下文中的黑话进行解释关闭可减少一次LLM调用仅影响回复前的黑话匹配与解释不影响黑话学习"""
jargon_mode: Literal["context", "planner"] = Field(
default="planner",
json_schema_extra={
"x-widget": "select",
"x-icon": "settings",
},
)
"""
黑话解释来源模式
可选:
- "context":使用上下文自动匹配黑话
- "planner"仅使用Planner在reply动作中给出的unknown_words列表
"""
class ToolConfig(ConfigBase):
"""工具配置类"""
@@ -1544,7 +1518,7 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "brain",
},
)
"""鏄惁鍦?CLI 涓樉绀哄唴蹇冩€濊€冨拰瀹屾暣 Prompt"""
"""是否显示MaiSaka思考过程"""
user_name: str = Field(
default="用户",
@@ -1553,7 +1527,7 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "user",
},
)
"""MaiSaka 涓敤鎴风殑鏄剧ず鍚嶇О"""
"""MaiSaka 使用的用户名称"""
direct_image_input: bool = Field(
default=True,
@@ -1562,7 +1536,7 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "image",
},
)
"""是否将图片直接作为多模态消息传入 Maisaka 主循环,而不是仅使用转译文本"""
"""是否直接输入图片"""
merge_user_messages: bool = Field(
default=True,
@@ -1571,7 +1545,7 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "merge",
},
)
"""Whether Maisaka should merge newly received user utterances into a single user message per round"""
"""是否将新接收的用户发言合并为单个用户消息"""
max_internal_rounds: int = Field(
default=6,
@@ -1581,7 +1555,7 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "repeat",
},
)
"""Maximum number of internal planning rounds per inbound message."""
"""每个入站消息的最大内部规划轮数"""
terminal_image_preview: bool = Field(
default=False,
@@ -1590,7 +1564,7 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "image",
},
)
"""Whether Maisaka should render a low-resolution terminal preview for images in prompt display"""
"""是否渲染低分辨率终端预览图片"""
terminal_image_preview_width: int = Field(
default=24,
@@ -1600,16 +1574,8 @@ class MaiSakaConfig(ConfigBase):
"x-icon": "columns",
},
)
"""Character width for Maisaka terminal image previews"""
"""Maisaka终端图片预览的字符宽度"""
take_over_hfc: bool = Field(
default=False,
json_schema_extra={
"x-widget": "switch",
"x-icon": "git-branch",
},
)
"""Enable Maisaka takeover for the Heart Flow Chat planner and reply pipeline"""
class PluginRuntimeConfig(ConfigBase):
"""插件运行时配置类"""