Merge branch 'Mai-with-u:dev' into dev

Author: A-Dawn

dashboard/src/routes/resource/jargon/index.tsx

@@ -1,5 +1,5 @@
 import { Check, MessageCircle, Plus, Search, Trash2, X } from 'lucide-react'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -46,6 +46,7 @@ export function JargonManagementPage() {
   const [page, setPage] = useState(1)
   const [pageSize, setPageSize] = useState(20)
   const [search, setSearch] = useState('')
+  const [debouncedSearch, setDebouncedSearch] = useState('')
   const [scopeFilter, setScopeFilter] = useState<'all' | 'global' | 'local'>('all')
   const [filterChatId, setFilterChatId] = useState<string>('all')
   const [filterIsJargon, setFilterIsJargon] = useState<string>('all')
@@ -68,30 +69,41 @@ export function JargonManagementPage() {
   })
   const [chatList, setChatList] = useState<JargonChatInfo[]>([])
   const [formChatList, setFormChatList] = useState<JargonChatInfo[]>([])
+  const jargonListRequestSeqRef = useRef(0)
   const { toast } = useToast()
 
   // 加载黑话列表
   const loadJargons = async () => {
+    const requestSeq = jargonListRequestSeqRef.current + 1
+    jargonListRequestSeqRef.current = requestSeq
     try {
       setLoading(true)
       const response = await getJargonList({
         page,
         page_size: pageSize,
-        search: search || undefined,
+        search: debouncedSearch || undefined,
         session_id: scopeFilter !== 'global' && filterChatId !== 'all' ? filterChatId : undefined,
         is_jargon: filterIsJargon === 'all' ? undefined : filterIsJargon === 'true' ? true : filterIsJargon === 'false' ? false : undefined,
         is_global: scopeFilter === 'all' ? undefined : scopeFilter === 'global',
       })
+      if (requestSeq !== jargonListRequestSeqRef.current) {
+        return
+      }
       setJargons(response.data)
       setTotal(response.total)
     } catch (error) {
+      if (requestSeq !== jargonListRequestSeqRef.current) {
+        return
+      }
       toast({
         title: '加载失败',
         description: error instanceof Error ? error.message : '无法加载黑话列表',
         variant: 'destructive',
       })
     } finally {
-      setLoading(false)
+      if (requestSeq === jargonListRequestSeqRef.current) {
+        setLoading(false)
+      }
     }
   }
 
@@ -125,12 +137,27 @@ export function JargonManagementPage() {
     }
   }
 
+  useEffect(() => {
+    const timerId = window.setTimeout(() => {
+      const normalizedSearch = search.trim()
+      setDebouncedSearch((current) => (current === normalizedSearch ? current : normalizedSearch))
+      setPage((current) => (current === 1 ? current : 1))
+      setSelectedIds((current) => (current.size === 0 ? current : new Set<number>()))
+    }, 300)
+
+    return () => window.clearTimeout(timerId)
+  }, [search])
+
   useEffect(() => {
     loadJargons()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [page, pageSize, debouncedSearch, scopeFilter, filterChatId, filterIsJargon])
+
+  useEffect(() => {
     loadStats()
     loadChatList()
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [page, pageSize, search, scopeFilter, filterChatId, filterIsJargon])
+  }, [])
 
   // 查看详情
   const handleViewDetail = async (jargon: Jargon) => {
@@ -332,7 +359,7 @@ export function JargonManagementPage() {
                   <Search className="absolute left-2.5 top-2 h-4 w-4 text-muted-foreground" />
                   <Input
                     id="search"
-                    placeholder="搜索内容、含义..."
+                    placeholder="搜索黑话内容..."
                     value={search}
                     onChange={(e) => setSearch(e.target.value)}
                     className="h-8 pl-9"

pytests/webui/test_jargon_routes.py

@@ -162,20 +162,25 @@ def test_list_jargons_with_pagination(client: TestClient, sample_jargons):
 
 
 def test_list_jargons_with_search(client: TestClient, sample_jargons):
-    """测试 GET /jargon/list?search=xxx 搜索功能"""
+    """测试 GET /jargon/list?search=xxx 只按黑话内容搜索。"""
     response = client.get("/api/webui/jargon/list?search=yyds")
     assert response.status_code == 200
 
     data = response.json()
     assert data["total"] == 1
     assert data["data"][0]["content"] == "yyds"
 
-    # 测试搜索 meaning
+    # meaning 不参与搜索
     response = client.get("/api/webui/jargon/list?search=你好")
     assert response.status_code == 200
     data = response.json()
-    assert data["total"] == 1
-    assert data["data"][0]["content"] == "hello"
+    assert data["total"] == 0
+
+    # raw_content 不参与搜索
+    response = client.get("/api/webui/jargon/list?search=永远")
+    assert response.status_code == 200
+    data = response.json()
+    assert data["total"] == 0
 
 
 def test_list_jargons_with_session_id_filter(client: TestClient, sample_jargons, sample_chat_session: ChatSession):
@@ -193,6 +198,36 @@ def test_list_jargons_with_session_id_filter(client: TestClient, sample_jargons,
     assert data["total"] == 0
 
 
+def test_list_jargons_with_session_id_filter_matches_exact_json_key(client: TestClient, session: Session):
+    """session_id 筛选应按 session_id_dict 的 JSON key 精确匹配。"""
+    session.add(
+        Jargon(
+            id=201,
+            content="exact",
+            meaning="exact match",
+            session_id_dict=json.dumps({"stream_1": 1}),
+            count=2,
+        )
+    )
+    session.add(
+        Jargon(
+            id=202,
+            content="prefix",
+            meaning="prefix only",
+            session_id_dict=json.dumps({"stream_10": 1}),
+            count=1,
+        )
+    )
+    session.commit()
+
+    response = client.get("/api/webui/jargon/list?session_id=stream_1")
+    assert response.status_code == 200
+
+    data = response.json()
+    assert data["total"] == 1
+    assert data["data"][0]["content"] == "exact"
+
+
 def test_list_jargons_with_is_jargon_filter(client: TestClient, sample_jargons):
     """测试按 is_jargon 筛选"""
     response = client.get("/api/webui/jargon/list?is_jargon=true")
@@ -651,7 +686,7 @@ def test_update_jargon_partial_fields(client: TestClient, sample_jargons):
 
 def test_list_jargons_multiple_filters(client: TestClient, sample_jargons, sample_chat_session: ChatSession):
     """测试组合多个过滤条件"""
-    response = client.get(f"/api/webui/jargon/list?search=永远&session_id={sample_chat_session.session_id}&is_jargon=true")
+    response = client.get(f"/api/webui/jargon/list?search=yyds&session_id={sample_chat_session.session_id}&is_jargon=true")
     assert response.status_code == 200
 
     data = response.json()

src/config/config.py

@@ -58,9 +58,9 @@
 MODEL_CONFIG_PATH: Path = (CONFIG_DIR / "model_config.toml").resolve().absolute()
 LEGACY_ENV_PATH: Path = (PROJECT_ROOT / ".env").resolve().absolute()
 A_MEMORIX_LEGACY_CONFIG_PATH: Path = (CONFIG_DIR / "a_memorix.toml").resolve().absolute()
-MMC_VERSION: str = "1.0.0-pre.24"
+MMC_VERSION: str = "1.0.0-rc.1"
 CONFIG_VERSION: str = "8.12.17"
-MODEL_CONFIG_VERSION: str = "1.17.1"
+MODEL_CONFIG_VERSION: str = "1.17.2"
 
 logger = get_logger("config")
 

src/config/model_configs.py

@@ -431,6 +431,19 @@ class TaskConfig(ConfigBase):
     """任务硬超时（秒），到点未返回则取消请求并尝试切换下一个模型；防止上游代理静默排队导致主循环饥饿"""
 
 
+def _default_timing_gate_task_config() -> TaskConfig:
+    """创建 Timing Gate 任务默认配置。"""
+
+    return TaskConfig(
+        model_list=[],
+        max_tokens=1024,
+        temperature=0.3,
+        slow_threshold=12.0,
+        selection_strategy="random",
+        hard_timeout=120.0,
+    )
+
+
 class ModelTaskConfig(ConfigBase):
     """模型配置类"""
 
@@ -452,6 +465,16 @@ class ModelTaskConfig(ConfigBase):
     )
     """规划模型配置"""
 
+    timing_gate: TaskConfig = Field(
+        default_factory=_default_timing_gate_task_config,
+        json_schema_extra={
+            "x-widget": "custom",
+            "x-icon": "timer",
+            "advanced": True,
+        },
+    )
+    """Timing Gate 节奏控制模型配置；留空时自动继用 planner 模型"""
+
     memory: TaskConfig = Field(
         default_factory=TaskConfig,
         json_schema_extra={

src/llm_models/utils_model.py

@@ -60,6 +60,11 @@
 )
 DATA_URI_RETRY_MARGIN_BYTES = 128 * 1024
 MIN_COMPRESSED_IMAGE_TARGET_SIZE_BYTES = 512 * 1024
+EMPTY_TASK_FALLBACKS = {
+    "learner": "utils",
+    "mid_memory": "planner",
+    "timing_gate": "planner",
+}
 
 
 class RequestType(Enum):
@@ -113,12 +118,7 @@ def _get_task_config_or_raise(self) -> TaskConfig:
         if not isinstance(task_config, TaskConfig):
             raise ValueError(f"未找到名为 '{self.task_name}' 的任务配置")
         if not any(str(model_name).strip() for model_name in task_config.model_list):
-            fallback_task_name = ""
-            if self.task_name == "learner":
-                fallback_task_name = "utils"
-            elif self.task_name == "mid_memory":
-                fallback_task_name = "planner"
-
+            fallback_task_name = EMPTY_TASK_FALLBACKS.get(self.task_name, "")
             if fallback_task_name:
                 fallback_task_config = getattr(model_task_config, fallback_task_name, None)
                 if isinstance(fallback_task_config, TaskConfig):

src/maisaka/chat_loop_service.py

@@ -51,6 +51,9 @@
     "planner": "maisaka_planner",
     "timing_gate": "maisaka_timing_gate",
 }
+MODEL_TASK_NAME_BY_REQUEST_KIND = {
+    "timing_gate": "timing_gate",
+}
 PROMPT_PREVIEW_CATEGORY_BY_REQUEST_KIND = {
     "planner": "planner",
     "timing_gate": "timing_gate",
@@ -524,15 +527,22 @@ def _resolve_prompt_preview_category(request_kind: str) -> str:
             return "planner"
         return PROMPT_PREVIEW_CATEGORY_BY_REQUEST_KIND.get(normalized_request_kind, normalized_request_kind)
 
+    def _resolve_model_task_name(self, request_kind: str) -> str:
+        """根据请求类型解析模型任务配置名。"""
+
+        normalized_request_kind = str(request_kind or "").strip().lower()
+        return MODEL_TASK_NAME_BY_REQUEST_KIND.get(normalized_request_kind, self._model_task_name)
+
     def _get_llm_chat_client(self, request_kind: str) -> LLMServiceClient:
         """获取当前请求类型对应的 LLM 客户端。"""
 
         request_type = self._resolve_llm_request_type(request_kind)
-        client_key = f"{self._model_task_name}:{request_type}"
+        model_task_name = self._resolve_model_task_name(request_kind)
+        client_key = f"{model_task_name}:{request_type}"
         llm_client = self._llm_chat_clients.get(client_key)
         if llm_client is None:
             llm_client = LLMServiceClient(
-                task_name=self._model_task_name,
+                task_name=model_task_name,
                 request_type=request_type,
                 session_id=self._session_id,
             )