refactor: support combined dispatch rules

Author: lss233

framework/llm/llm_manager.py

@@ -57,13 +57,13 @@ def load_backend(self, backend_name: str):
         with self.container.scoped() as scoped_container:
             scoped_container.register(config_class, config_class(**backend.config))
             adapter = Inject(scoped_container).create(adapter_class)()
+            self.backends[backend_name] = adapter
 
             # 注册到每个支持的模型
             for model in backend.models:
                 if model not in self.active_backends:
                     self.active_backends[model] = []
                 self.active_backends[model].append(adapter)
-                self.backends[backend_name] = adapter
 
         self.logger.info(f"Backend {backend_name} loaded successfully")
 

framework/plugin_manager/plugin_loader.py

@@ -294,6 +294,7 @@ async def disable_plugin(self, plugin_name: str) -> bool:
             # 找到并停止插件实例
             if plugin_name in self.plugins:
                 plugin = self.plugins[plugin_name]
+                print(isinstance(plugin, Plugin))
                 plugin.on_stop()
                 del self.plugins[plugin_name]
 
@@ -302,6 +303,7 @@ async def disable_plugin(self, plugin_name: str) -> bool:
                 self.config.plugins.enable.remove(plugin_name)
 
             plugin_info.is_enabled = False
+            self.plugin_infos[plugin_name] = plugin_info
 
             self.logger.info(f"Plugin {plugin_name} disabled")
             return True

framework/web/api/dispatch/README.md

@@ -20,16 +20,33 @@ GET/backend-api/api/dispatch/rules
       "rule_id": "chat_normal",
       "name": "普通聊天",
       "description": "普通聊天，使用默认参数",
-      "pattern": "/chat",
-      "priority": 5,
       "workflow_id": "chat:normal",
+      "priority": 5,
       "enabled": true,
+      "rule_groups": [
+        {
+          "operator": "or",
+          "rules": [
+            {
+              "type": "prefix",
+              "config": {
+                "prefix": "/chat"
+              }
+            },
+            {
+              "type": "keyword",
+              "config": {
+                "keywords": ["聊天", "对话"]
+              }
+            }
+          ]
+        }
+      ],
       "metadata": {
         "category": "chat",
         "permission": "user",
         "temperature": 0.7
-      },
-      "is_active": true
+      }
     }
   ]
 }
@@ -57,11 +74,28 @@ POST/backend-api/api/dispatch/rules
   "rule_id": "chat_creative",
   "name": "创意聊天",
   "description": "创意聊天，使用更高的温度参数",
-  "type": "keyword",
   "workflow_id": "chat:creative",
-  "keywords": ["创意", "发散", "brainstorm"],
   "priority": 5,
   "enabled": true,
+  "rule_groups": [
+    {
+      "operator": "and",
+      "rules": [
+        {
+          "type": "prefix",
+          "config": {
+            "prefix": "/creative"
+          }
+        },
+        {
+          "type": "keyword",
+          "config": {
+            "keywords": ["创意", "发散"]
+          }
+        }
+      ]
+    }
+  ],
   "metadata": {
     "category": "chat",
     "permission": "user",
@@ -104,32 +138,82 @@ POST/backend-api/api/dispatch/rules/{rule_id}/disable
 
 ## 数据模型
 
-### DispatchRuleConfig
+### SimpleRule
+- `type`: 规则类型 (prefix/keyword/regex)
+- `config`: 规则类型特定的配置
+
+### RuleGroup
+- `operator`: 组合操作符 (and/or)
+- `rules`: 规则列表
+
+### CombinedDispatchRule
 - `rule_id`: 规则唯一标识符
 - `name`: 规则名称
 - `description`: 规则描述
-- `type`: 规则类型 (prefix/keyword/regex)
 - `workflow_id`: 关联的工作流ID
-- `pattern`/`prefix`/`keywords`: 匹配规则(根据类型不同)
 - `priority`: 优先级(数字越大优先级越高)
 - `enabled`: 是否启用
+- `rule_groups`: 规则组列表（组之间是 AND 关系）
 - `metadata`: 元数据(可选)
 
-### DispatchRuleStatus
-继承自 DispatchRuleConfig，额外包含：
-- `is_active`: 规则是否处于活动状态
-
 ## 规则类型
 
 ### 前缀匹配 (prefix)
 根据消息前缀进行匹配，例如 "/help"。
 
+配置参数：
+- `prefix`: 要匹配的前缀
+
 ### 关键词匹配 (keyword)
 检查消息中是否包含指定关键词。
 
+配置参数：
+- `keywords`: 关键词列表
+
 ### 正则匹配 (regex)
 使用正则表达式进行匹配，提供最灵活的匹配方式。
 
+配置参数：
+- `pattern`: 正则表达式模式
+
+## 组合规则说明
+
+新版本的调度规则系统支持复杂的条件组合：
+
+1. 每个规则可以包含多个规则组（RuleGroup）
+2. 规则组之间是 AND 关系，即所有规则组都满足时才会触发
+3. 每个规则组内可以包含多个简单规则（SimpleRule）
+4. 规则组内的规则可以选择 AND 或 OR 关系
+5. 每个简单规则都有自己的类型和配置
+
+例如，可以创建如下规则：
+
+```json
+{
+  "rule_groups": [
+    {
+      "operator": "or",
+      "rules": [
+        { "type": "prefix", "config": { "prefix": "/creative" } },
+        { "type": "keyword", "config": { "keywords": ["创意", "发散"] } }
+      ]
+    },
+    {
+      "operator": "and",
+      "rules": [
+        { "type": "regex", "config": { "pattern": ".*问题.*" } },
+        { "type": "keyword", "config": { "keywords": ["帮我", "请问"] } }
+      ]
+    }
+  ]
+}
+```
+
+这个规则表示：
+- 当消息以 "/creative" 开头 或 包含 "创意"/"发散" 关键词
+- 且 消息包含 "问题" 且 包含 "帮我"/"请问" 中的任一关键词
+时触发。
+
 ## 相关代码
 
 - [调度规则定义](../../../workflow/core/dispatch/rule.py)
@@ -155,19 +239,36 @@ POST/backend-api/api/dispatch/rules/{rule_id}/disable
 
 ## 使用示例
 
-### 创建新规则
+### 创建组合规则
 ```python
 import requests
 
 rule_data = {
     "rule_id": "chat_creative",
     "name": "创意聊天",
     "description": "创意聊天模式",
-    "type": "keyword",
     "workflow_id": "chat:creative",
-    "keywords": ["创意", "发散"],
     "priority": 5,
-    "enabled": True
+    "enabled": True,
+    "rule_groups": [
+        {
+            "operator": "or",
+            "rules": [
+                {
+                    "type": "prefix",
+                    "config": {
+                        "prefix": "/creative"
+                    }
+                },
+                {
+                    "type": "keyword",
+                    "config": {
+                        "keywords": ["创意", "发散"]
+                    }
+                }
+            ]
+        }
+    ]
 }
 
 response = requests.post(

framework/web/api/dispatch/models.py

@@ -1,35 +1,20 @@
-from typing import Dict, Any, List, Optional
-from pydantic import BaseModel
-
-class DispatchRuleConfig(BaseModel):
-    """调度规则配置"""
-    rule_id: str
-    name: str
-    description: str = ""
+from typing import Dict, Any, List, Optional, Union, Literal
+from pydantic import BaseModel, Field
+from framework.workflow.core.dispatch.rule import CombinedDispatchRule
+class SimpleRule(BaseModel):
+    """简单调度规则（单一条件）"""
     type: str
-    priority: int = 5
-    workflow_id: str
-    enabled: bool = True
-    config: Dict[str, Any] = {}  # 用于存储规则类型特定的配置
-    metadata: Dict[str, Any] = {}  # 用于存储其他元数据
+    config: Dict[str, Any] = {}  # 规则类型特定的配置
 
-class DispatchRuleStatus(BaseModel):
-    """调度规则状态"""
-    rule_id: str
-    name: str
-    description: str
-    type: str  # 规则类型
-    priority: int
-    workflow_id: str
-    enabled: bool
-    config: Dict[str, Any]  # 规则类型特定的配置
-    metadata: Dict[str, Any]
-    is_active: bool
+class RuleGroup(BaseModel):
+    """规则组"""
+    operator: Literal["and", "or"] = "or"
+    rules: List[SimpleRule]
 
 class DispatchRuleList(BaseModel):
     """调度规则列表"""
-    rules: List[DispatchRuleStatus]
+    rules: List[CombinedDispatchRule]
 
 class DispatchRuleResponse(BaseModel):
     """调度规则响应"""
-    rule: DispatchRuleStatus 
+    rule: CombinedDispatchRule