fix: Improve bot mention detection and add error logging in dispatch …

…rules
lss233 · Feb 19, 2025 · 9840cfb · 9840cfb
1 parent 5dbd3fb
commit 9840cfb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/framework/im/sender.py b/framework/im/sender.py
@@ -64,6 +64,7 @@ def __str__(self) -> str:
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, ChatSender):
+            print(self.user_id, other.user_id)
             return self.user_id == other.user_id and \
                 self.chat_type == other.chat_type and \
                 self.group_id == other.group_id

diff --git a/framework/workflow/core/dispatch/models/dispatch_rules.py b/framework/workflow/core/dispatch/models/dispatch_rules.py
@@ -4,9 +4,11 @@
 
 from framework.im.message import IMMessage
 from framework.ioc.container import DependencyContainer
+from framework.logger import get_logger
 from framework.workflow.core.workflow import Workflow
 from framework.workflow.core.workflow.registry import WorkflowRegistry
 
+logger = get_logger("DispatchRule")
 
 class SimpleDispatchRule(BaseModel):
     """简单规则，包含规则类型和配置"""
@@ -56,6 +58,7 @@ def match(self, message: IMMessage, workflow_registry: WorkflowRegistry) -> bool
                     rule_results.append(rule_instance.match(message))
                 except Exception as e:
                     # 如果规则创建或匹配过程出错，视为不匹配
+                    logger.error(f"Rule {rule.type} from config {rule.config} creation or matching failed: {e}")
                     continue
 
             # 根据操作符确定组的匹配结果

diff --git a/framework/workflow/core/dispatch/rules/message_rules.py b/framework/workflow/core/dispatch/rules/message_rules.py
@@ -3,7 +3,7 @@
 
 from pydantic import Field
 
-from framework.im.message import IMMessage
+from framework.im.message import IMMessage, MentionElement
 from framework.im.sender import ChatSender
 from framework.workflow.core.workflow.registry import WorkflowRegistry
 
@@ -90,7 +90,7 @@ def __init__(self, workflow_registry: WorkflowRegistry, workflow_id: str):
 
     def match(self, message: IMMessage) -> bool:
         bot_sender = ChatSender.get_bot_sender()
-        return any(element.type == "mention" and element.target == bot_sender for element in message.message_elements)
+        return any(isinstance(element, MentionElement) and element.target == bot_sender for element in message.message_elements)
 
     def get_config(self) -> RuleConfig: 
         return RuleConfig()