feat: Enhance chat type handling and rule formatting in dispatch system

Author: lss233

framework/im/sender.py

@@ -7,6 +7,20 @@ class ChatType(Enum):
     C2C = "c2c"
     GROUP = "group"
 
+    @classmethod
+    def from_str(cls, value: str) -> "ChatType":
+        if value == "c2c" or value == "私聊":
+            return cls.C2C
+        elif value == "group" or value == "群聊":
+            return cls.GROUP
+        raise ValueError(f"Invalid chat type: {value}")
+    
+    def to_str(self) -> str:
+        if self == self.C2C:
+            return "私聊"
+        elif self == self.GROUP:
+            return "群聊"
+        raise ValueError(f"Invalid chat type: {self}")
 
 @dataclass
 class ChatSender:

framework/web/api/dispatch/models.py

@@ -1,24 +1,10 @@
-from typing import Any, Dict, List, Literal
+from typing import List
 
 from pydantic import BaseModel
 
 from framework.workflow.core.dispatch import CombinedDispatchRule
 
 
-class SimpleRule(BaseModel):
-    """简单调度规则（单一条件）"""
-
-    type: str
-    config: Dict[str, Any] = {}  # 规则类型特定的配置
-
-
-class RuleGroup(BaseModel):
-    """规则组"""
-
-    operator: Literal["and", "or"] = "or"
-    rules: List[SimpleRule]
-
-
 class DispatchRuleList(BaseModel):
     """调度规则列表"""
 

framework/workflow/core/dispatch/rules/sender_rules.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Literal, Optional
 
 from pydantic import Field
 
@@ -88,13 +88,13 @@ def from_config(
         workflow_registry: WorkflowRegistry,
         workflow_id: str,
     ) -> "ChatSenderMismatchRule":
-        return cls(config.sender_id, config.sender_group, workflow_registry, workflow_id) 
-    
-    
+        return cls(config.sender_id, config.sender_group, workflow_registry, workflow_id)
+
+
 class ChatTypeMatchRuleConfig(RuleConfig):
     """聊天类型规则配置"""
-    chat_type: ChatType = Field(title="聊天类型", description="聊天类型")
-    
+    chat_type: Literal["私聊", "群聊"] = Field(title="聊天类型", description="聊天类型")
+
 class ChatTypeMatchRule(DispatchRule):
     """根据聊天类型匹配的规则"""
     config_class = ChatTypeMatchRuleConfig
@@ -106,11 +106,12 @@ def __init__(self, chat_type: ChatType, workflow_registry: WorkflowRegistry, wor
 
     def match(self, message: IMMessage) -> bool:
         return message.sender.chat_type == self.chat_type
-    
+
     def get_config(self) -> ChatTypeMatchRuleConfig:
         return ChatTypeMatchRuleConfig(chat_type=self.chat_type)
 
     @classmethod
     def from_config(cls, config: ChatTypeMatchRuleConfig, workflow_registry: WorkflowRegistry, workflow_id: str) -> "ChatTypeMatchRule":
-        return cls(config.chat_type, workflow_registry, workflow_id)
-    
+        chat_type = ChatType.from_str(config.chat_type)
+        return cls(chat_type, workflow_registry, workflow_id)
+

framework/workflow/implementations/blocks/system/help.py

@@ -4,9 +4,40 @@
 from framework.im.sender import ChatSender
 from framework.ioc.container import DependencyContainer
 from framework.workflow.core.block import Block, Output
+from framework.workflow.core.dispatch.models.dispatch_rules import RuleGroup
 from framework.workflow.core.dispatch.registry import DispatchRuleRegistry
 
 
+def _format_rule_condition(rule_type: str, config: Dict[str, Any]) -> str:
+    """格式化单个规则的条件描述"""
+    if rule_type == "prefix":
+        return f"输入以 {config['prefix']} 开头"
+    elif rule_type == "keyword":
+        keywords = config.get("keywords", [])
+        return f"输入包含 {' 或 '.join(keywords)}"
+    elif rule_type == "regex":
+        return f"输入匹配正则 {config['pattern']}"
+    elif rule_type == "fallback":
+        return "任意输入"
+    elif rule_type == "bot_mention":
+        return f"@我"
+    elif rule_type == "chat_type":
+        return f"使用 {config['chat_type']} 聊天类型"
+    return f"使用 {rule_type} 规则"
+
+
+def _format_rule_group(group: RuleGroup) -> str:
+    """格式化规则组的条件描述"""
+    rule_conditions = []
+    for rule in group.rules:
+        rule_conditions.append(
+            _format_rule_condition(rule.type, rule.config)
+        )
+
+    operator = " 且 " if group.operator == "and" else " 或 "
+    return operator.join(rule_conditions)
+
+
 class GenerateHelp(Block):
     """生成帮助信息 block"""
 
@@ -15,30 +46,6 @@ class GenerateHelp(Block):
     outputs = {"response": Output("response", "帮助信息", IMMessage, "帮助信息")}
     container: DependencyContainer
 
-    def _format_rule_condition(self, rule_type: str, config: Dict[str, Any]) -> str:
-        """格式化单个规则的条件描述"""
-        if rule_type == "prefix":
-            return f"输入以 {config['prefix']} 开头"
-        elif rule_type == "keyword":
-            keywords = config.get("keywords", [])
-            return f"输入包含 {' 或 '.join(keywords)}"
-        elif rule_type == "regex":
-            return f"输入匹配正则 {config['pattern']}"
-        elif rule_type == "fallback":
-            return "任意输入"
-        return f"使用 {rule_type} 规则"
-
-    def _format_rule_group(self, group: Dict[str, Any]) -> str:
-        """格式化规则组的条件描述"""
-        rule_conditions = []
-        for rule in group["rules"]:
-            rule_conditions.append(
-                self._format_rule_condition(rule["type"], rule["config"])
-            )
-
-        operator = " 且 " if group["operator"] == "and" else " 或 "
-        return operator.join(rule_conditions)
-
     def execute(self) -> Dict[str, Any]:
         # 从容器获取调度规则注册表
         registry = self.container.resolve(DispatchRuleRegistry)
@@ -55,7 +62,7 @@ def execute(self) -> Dict[str, Any]:
             # 格式化规则组条件
             conditions = []
             for group in rule.rule_groups:
-                conditions.append(self._format_rule_group(group.model_dump()))
+                conditions.append(_format_rule_group(group))
 
             # 组合所有条件（规则组之间是 AND 关系）
             rule_format = " 并且 ".join(f"({condition})" for condition in conditions)