cli-dolibarr 3.32.2__tar.gz → 3.32.4__tar.gz

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-dolibarr
-Version: 3.32.2
+Version: 3.32.4
 Summary: CLI tool for Dolibarr ERP/CRM REST API management
 Author: CLI Anything
 License-Expression: MIT

cli_dolibarr-3.32.4/cli_dolibarr/dolibarr/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.32.4"

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/cli_dolibarr/dolibarr/mcp_server/search_actions.py

@@ -8,20 +8,29 @@ from __future__ import annotations
 import json
 from typing import Any, Dict, Optional
 
+from . import tiering as _tiering
+
 SEARCH_ACTIONS_NAME = "search_actions"
 HOST_DOMAIN = "erp_system"
 MAX_RESULTS = 50
-PARAMS_SPEC = {"q": "str,可选 关键词(动作名/摘要子串,大小写不敏感)",
+PARAMS_SPEC = {"q": "str,可选 关键词(动作名/摘要/域中文名子串,大小写不敏感)",
                "domain": "str,可选 限定 erp_* 域工具名"}
 
 
-def _match(q: str, domain: str, name: str, tool: str, summary: str) -> bool:
+def _match(q: str, domain: str, name: str, tool: str, summary: str, label: str = "") -> bool:
+    """关键词匹配：动作名 / 摘要 / **域中文名**。
+
+    为什么必须带域中文名：485 条摘要里仅 42 条含中文（其余是英文自动生成），中文查询
+    基本搜不到；域中文名（如「采购/供应商单据」）是手写的，中文只能靠它。
+    """
     if domain and tool != domain:
         return False
     if not q:
         return True
     needle = q.casefold()
-    return needle in name.casefold() or needle in (summary or "").casefold()
+    return (needle in name.casefold()
+            or needle in (summary or "").casefold()
+            or needle in (label or "").casefold())
 
 
 def execute(registry: Any, params: Optional[dict] = None) -> Dict[str, Any]:
@@ -31,19 +40,22 @@ def execute(registry: Any, params: Optional[dict] = None) -> Dict[str, Any]:
     domain = str(p.get("domain") or "")
     unknown = sorted(set(p) - set(PARAMS_SPEC))
     results = []
+    from .registry import DOMAIN_TOOLS
+    labels = {d: str(s.get("label") or "") for d, s in DOMAIN_TOOLS.items()}
     for tool in sorted(registry.domain_actions):
         index = set(registry.index_actions.get(tool, ()))
         for name in registry.domain_actions[tool]:
             meta = registry.actions.get(name)
             summary = getattr(meta, "summary", "") if meta else ""
-            if not _match(q, domain, name, tool, summary):
+            if not _match(q, domain, name, tool, summary, labels.get(tool, "")):
                 continue
             results.append({
                 "action": name,
                 "domain": tool,
                 "summary": summary,
                 "in_index": name in index,
-                "calls": int(registry.usage_counts.get(name, 0)),
+                "calls": _tiering.usage_count(
+                    getattr(registry, "usage_counts", None) or {}, tool, name),
             })
     results.sort(key=lambda r: (r["domain"], r["action"]))
     payload: Dict[str, Any] = {

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/cli_dolibarr/dolibarr/mcp_server/tiering.py

@@ -21,7 +21,7 @@ HOT_COUNT_KEY = "__hot_count__"
 INDEX_PATH = Path(__file__).resolve().parent / "action_index.json"
 # spec A 原文固定一行（体积恒定：仅 N 为 1-3 位变量）。
 COLD_LINE_FMT = ('本域另有 {n} 个低频动作（可用但未列出）；'
-                 '用 search_actions 查（如 search_actions("对账")）')
+                 '用 search_actions 查（如 search_actions("采购")）')
 COLD_LINE_PREFIX = "本域另有"
 
 
@@ -98,7 +98,10 @@ def load_index(path: Optional[Path] = None):
 
 
 def load_usage_counts(path: Optional[Path] = None) -> Dict[str, int]:
-    """渲染/搜索用的 {动作: 调用数}；种子/真源计数由 harvest 写入此处。"""
+    """渲染/搜索用的 {域|动作: 调用数}；真源＝本机 Hermes 会话统计（refresh_tiers.py 远端写入）。
+
+    键必须带域：动作名跨 17 域不唯一（实测 11 组同名），只按动作名查会互相覆盖。
+    """
     p = INDEX_PATH if path is None else path
     try:
         raw = json.loads(p.read_text(encoding="utf-8"))

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/cli_dolibarr/dolibarr/tests/test_mcp_search_actions.py

@@ -81,3 +81,28 @@ class SearchActionsTest(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+
+class SearchActionsChineseTest(unittest.TestCase):
+    """中文可搜（域中文名）+ calls 按「域|动作」取值（2026-09-18 实测两缺陷的守卫）。"""
+
+    @classmethod
+    def setUpClass(cls):
+        cls.reg = MCPRegistry()
+
+    def test_chinese_domain_label_hit(self):
+        out = search_actions.execute(self.reg, {"q": "采购"})
+        self.assertGreater(out["total"], 0)
+        self.assertIn("erp_purchasing", {r["domain"] for r in out["results"]})
+
+    def test_cold_line_example_actually_hits(self):
+        """提示行举例必须真能查到（曾经举例 "对账" 返回 0 条）。"""
+        out = search_actions.execute(self.reg, {"q": "采购"})
+        self.assertGreater(out["total"], 0)
+
+    def test_calls_from_per_domain_usage_key(self):
+        reg = MCPRegistry()
+        reg.usage_counts = {"erp_partners|list_thirdparty": 101}
+        out = search_actions.execute(reg, {"q": "list_thirdparty", "domain": "erp_partners"})
+        hit = next(r for r in out["results"] if r["action"] == "list_thirdparty")
+        self.assertEqual(hit["calls"], 101)

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/cli_dolibarr/dolibarr/tests/test_mcp_tiering.py

@@ -72,7 +72,7 @@ class RenderLineTest(unittest.TestCase):
         self.assertEqual("", tiering.render_cold_line(0))
         line = tiering.render_cold_line(12)
         self.assertIn("本域另有 12 个低频动作", line)
-        self.assertIn('search_actions("对账")', line)
+        self.assertIn('search_actions("采购")', line)
 
 
 class RegistryTierRenderTest(unittest.TestCase):
@@ -119,3 +119,18 @@ class RegistryTierRenderTest(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+
+class UsageCountTest(unittest.TestCase):
+    """同名动作跨域不能互相覆盖（2026-09-18 实测事故回归守卫）。"""
+
+    def test_prefers_per_domain_key(self):
+        usage = {"erp_partners|list_thirdparty": 101, "erp_thirdparty|list_thirdparty": 1}
+        self.assertEqual(tiering.usage_count(usage, "erp_partners", "list_thirdparty"), 101)
+
+    def test_falls_back_to_bare_action_key(self):
+        self.assertEqual(
+            tiering.usage_count({"list_product": 5}, "erp_products", "list_product"), 5)
+
+    def test_missing_returns_zero(self):
+        self.assertEqual(tiering.usage_count({}, "erp_products", "list_product"), 0)

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/cli_dolibarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-dolibarr
-Version: 3.32.2
+Version: 3.32.4
 Summary: CLI tool for Dolibarr ERP/CRM REST API management
 Author: CLI Anything
 License-Expression: MIT

{cli_dolibarr-3.32.2 → cli_dolibarr-3.32.4}/cli_dolibarr.egg-info/SOURCES.txt

@@ -120,7 +120,6 @@ cli_dolibarr/dolibarr/tests/test_invoices.py
 cli_dolibarr/dolibarr/tests/test_mcp_auth.py
 cli_dolibarr/dolibarr/tests/test_mcp_error_guidance.py
 cli_dolibarr/dolibarr/tests/test_mcp_field_hints.py
-cli_dolibarr/dolibarr/tests/test_mcp_harvest_args.py
 cli_dolibarr/dolibarr/tests/test_mcp_leak_audit.py
 cli_dolibarr/dolibarr/tests/test_mcp_list_document_id_ref_guidance.py
 cli_dolibarr/dolibarr/tests/test_mcp_makeorder_date_backfill.py
@@ -132,7 +131,6 @@ cli_dolibarr/dolibarr/tests/test_mcp_search_actions.py
 cli_dolibarr/dolibarr/tests/test_mcp_server.py
 cli_dolibarr/dolibarr/tests/test_mcp_tiering.py
 cli_dolibarr/dolibarr/tests/test_mcp_transport.py
-cli_dolibarr/dolibarr/tests/test_mcp_usage_db.py
 cli_dolibarr/dolibarr/tests/test_mobilehubapi_aidoc.py
 cli_dolibarr/dolibarr/tests/test_mobilehubapi_stockin_queued.py
 cli_dolibarr/dolibarr/tests/test_mos.py

cli_dolibarr-3.32.2/cli_dolibarr/dolibarr/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.32.2"

cli_dolibarr-3.32.2/cli_dolibarr/dolibarr/tests/test_mcp_harvest_args.py

@@ -1,84 +0,0 @@
-"""S2 harvest.py 单测：args_of 三形状 + SELF_NOISE + 播种幂等（plan S2）。"""
-import sqlite3
-import sys
-import unittest
-from pathlib import Path
-
-REPO_ROOT = str(Path(__file__).resolve().parents[3])
-if REPO_ROOT not in sys.path:
-    sys.path.insert(0, REPO_ROOT)
-
-import harvest  # noqa: E402
-
-
-class ArgsOfTest(unittest.TestCase):
-    def test_direct_erp_tool(self):
-        rec = {"type": "tool", "tool": "erp_products",
-               "state": {"status": "completed",
-                         "input": {"action": "list_product"}}}
-        self.assertEqual(("erp_products", "list_product"),
-                         harvest.args_of(rec)[:2])
-
-    def test_meta_tool_call_shape(self):
-        rec = {"type": "tool", "tool": "skill_mcp",
-               "state": {"status": "completed",
-                         "input": {"mcp_name": "cli-dolibarr",
-                                   "tool_name": "erp_system",
-                                   "arguments": "{\"action\": \"list_status\"}"}}}
-        self.assertEqual(("erp_system", "list_status"),
-                         harvest.args_of(rec)[:2])
-
-    def test_openai_function_shape(self):
-        rec = {"tool_calls": [{"function": {
-            "name": "erp_invoices",
-            "arguments": "{\"action\": \"list_invoice\"}"}}]}
-        self.assertEqual(("erp_invoices", "list_invoice"),
-                         harvest.args_of(rec)[:2])
-
-    def test_self_noise_and_unknown_ignored(self):
-        self.assertIsNone(harvest.args_of(
-            {"type": "tool", "tool": "bash",
-             "state": {"status": "completed", "input": {}}}))
-        self.assertIsNone(harvest.args_of({"type": "text", "text": "hi"}))
-        self.assertIsNone(harvest.args_of("not-a-dict"))
-
-    def test_incomplete_call_ignored(self):
-        rec = {"type": "tool", "tool": "erp_products",
-               "state": {"status": "running", "input": {}}}
-        self.assertIsNone(harvest.args_of(rec))
-
-
-class SeedAndAggregateTest(unittest.TestCase):
-    def setUp(self):
-        import tempfile
-        self.tmp = tempfile.TemporaryDirectory()
-        self.db_path = str(Path(self.tmp.name) / "u.db")
-
-    def tearDown(self):
-        self.tmp.cleanup()
-
-    def test_aggregate_counts_and_last_ts(self):
-        rows = [("erp_products", "list_product", 100),
-                ("erp_products", "list_product", 200),
-                ("erp_products", "get_product", 150)]
-        agg = harvest.aggregate(rows)
-        self.assertEqual(2, agg["list_product"]["calls"])
-        self.assertEqual(200, agg["list_product"]["last_ts"])
-        self.assertEqual("erp_products", agg["list_product"]["domain"])
-
-    def test_seed_spec_idempotent(self):
-        import db
-        db.init_db(self.db_path)
-        n1 = harvest.seed_spec(db_path=self.db_path)
-        n2 = harvest.seed_spec(db_path=self.db_path)
-        self.assertGreaterEqual(n1, 5)
-        self.assertEqual(n1, n2)
-        con = sqlite3.connect(self.db_path)
-        rows = con.execute(
-            "SELECT count(*) FROM action_usage WHERE seeded=1").fetchone()[0]
-        con.close()
-        self.assertEqual(n1, rows)
-
-
-if __name__ == "__main__":
-    unittest.main()

cli_dolibarr-3.32.2/cli_dolibarr/dolibarr/tests/test_mcp_usage_db.py

@@ -1,76 +0,0 @@
-"""S1 台账 db.py 单测（plan S1）。运行前提：仓根 db.py 存在。"""
-import sqlite3
-import sys
-import unittest
-from pathlib import Path
-
-REPO_ROOT = str(Path(__file__).resolve().parents[3])
-if REPO_ROOT not in sys.path:
-    sys.path.insert(0, REPO_ROOT)
-
-import db  # noqa: E402
-
-
-class UsageDbTest(unittest.TestCase):
-    def setUp(self):
-        import tempfile
-        self.tmp = tempfile.TemporaryDirectory()
-        self.db_path = str(Path(self.tmp.name) / "usage.db")
-
-    def tearDown(self):
-        self.tmp.cleanup()
-
-    def test_init_creates_tables(self):
-        db.init_db(self.db_path)
-        con = sqlite3.connect(self.db_path)
-        names = {r[0] for r in con.execute(
-            "SELECT name FROM sqlite_master WHERE type='table'")}
-        con.close()
-        self.assertIn("action_usage", names)
-        self.assertIn("nightly_runs", names)
-
-    def test_upsert_idempotent(self):
-        db.init_db(self.db_path)
-        row = {"action": "list_product", "domain": "erp_products",
-               "calls": 2, "last_ts": 1700000000, "window_days": 90}
-        db.upsert_usage([row], self.db_path)
-        row2 = dict(row, calls=5)
-        db.upsert_usage([row2], self.db_path)
-        con = sqlite3.connect(self.db_path)
-        n = con.execute("SELECT count(*) FROM action_usage").fetchone()[0]
-        calls = con.execute(
-            "SELECT calls FROM action_usage WHERE action='list_product'"
-        ).fetchone()[0]
-        con.close()
-        self.assertEqual(1, n)
-        self.assertEqual(5, calls)
-
-    def test_get_usage_roundtrip(self):
-        db.init_db(self.db_path)
-        rows = [
-            {"action": "list_product", "domain": "erp_products", "calls": 3,
-             "last_ts": 1700000000, "window_days": 90},
-            {"action": "list_warehouse", "domain": "erp_logistics", "calls": 1,
-             "last_ts": 1700000100, "window_days": 90},
-        ]
-        db.upsert_usage(rows, self.db_path)
-        got = db.get_usage(self.db_path)
-        self.assertEqual(2, len(got))
-        self.assertEqual("erp_products", got["list_product"]["domain"])
-        self.assertEqual(3, got["list_product"]["calls"])
-        self.assertEqual(1, got["list_warehouse"]["calls"])
-
-    def test_record_run(self):
-        db.init_db(self.db_path)
-        db.record_run(stage="toolface_budget", status="ok", note="dry-run",
-                      path=self.db_path)
-        con = sqlite3.connect(self.db_path)
-        row = con.execute(
-            "SELECT stage, status, note FROM nightly_runs "
-            "ORDER BY id DESC LIMIT 1").fetchone()
-        con.close()
-        self.assertEqual(("toolface_budget", "ok", "dry-run"), tuple(row))
-
-
-if __name__ == "__main__":
-    unittest.main()