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

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

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

cli_dolibarr-3.32.3/cli_dolibarr/dolibarr/__init__.py

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

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

@@ -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.3}/cli_dolibarr/dolibarr/tests/test_mcp_tiering.py

@@ -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.3}/cli_dolibarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-dolibarr
-Version: 3.32.2
+Version: 3.32.3
 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.3}/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()