hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-12 05:30:48 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: root-package imports (svc/runtime/interfaces) and fix PYTHONPATH

Browse source 
- Rename platform/ to svc/ to avoid shadowing stdlib platform.
- Replace from oclaw.* with from svc/runtime/interfaces; update -m CLI paths.
- tests/conftest: prepend repo root to sys.path (no parent-folder package name).
- CI: paths and offline_eval script under repo root.
- Ops scripts: PYTHONPATH must be repo root for python -m runtime.* (fixes gateway/WhatsApp sidecar startup).
- Fix default oclaw.json path in tabular/file attachment limits; stabilize attachment test config.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-05-13 14:51:17 +08:00
parent 7941b27f58
commit 420abac9f1
405 changed files with 1316 additions and 1345 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/test_tool_wire_policy.py
View file

@ -5,7 +5,7 @@ import unittest
from datetime import datetime, timedelta, timezone
from unittest.mock import patch
from oclaw.platform.llm.tool_wire_policy import (
from svc.llm.tool_wire_policy import (
SETTINGS_KEY_PENALTY_STATE,
migrate_legacy_penalty_store,
prepare_openai_tools_for_llm_api,
@ -71,7 +71,7 @@ class ToolWirePolicyTests(unittest.TestCase):
}
tools = [_fn("read_file"), _fn("mcp__rank__1"), _fn("mcp__rank__2"), _fn("mcp__rank__3"), _fn("mcp__srv__x")]
st = FakeToolStore(usage)
with patch("oclaw.platform.llm.tool_wire_policy._utc_now", return_value=datetime(2026, 1, 5, 12, 0, 0, tzinfo=timezone.utc)):
with patch("svc.llm.tool_wire_policy._utc_now", return_value=datetime(2026, 1, 5, 12, 0, 0, tzinfo=timezone.utc)):
with patch.dict("os.environ", {"OPS_MCP_WIRE_TOP_N_FULL": "3"}, clear=False):
out = prepare_openai_tools_for_llm_api(
tools,
@ -94,7 +94,7 @@ class ToolWirePolicyTests(unittest.TestCase):
tools = [_fn("mcp__p__a"), _fn("mcp__p__b"), _fn("mcp__p__c"), _fn("mcp__p__d")]
st = FakeToolStore(usage)
fixed = datetime(2026, 1, 5, 12, 0, 0, tzinfo=timezone.utc)
with patch("oclaw.platform.llm.tool_wire_policy._utc_now", return_value=fixed):
with patch("svc.llm.tool_wire_policy._utc_now", return_value=fixed):
with patch.dict(
"os.environ",
{
@ -144,7 +144,7 @@ class ToolWirePolicyTests(unittest.TestCase):
{"OPS_MCP_WIRE_STALE_HOURS": "3", "OPS_MCP_WIRE_TOP_N_FULL": "3"},
clear=False,
):
with patch("oclaw.platform.llm.tool_wire_policy._utc_now", return_value=t0):
with patch("svc.llm.tool_wire_policy._utc_now", return_value=t0):
out1 = prepare_openai_tools_for_llm_api(
tools,
base_url="https://dashscope.aliyuncs.com/compatible-mode/v1",
@ -157,7 +157,7 @@ class ToolWirePolicyTests(unittest.TestCase):
self.assertEqual(pen["mcp__st__old"]["phase"], "active")
t_late = t0 + timedelta(minutes=31)
with patch("oclaw.platform.llm.tool_wire_policy._utc_now", return_value=t_late):
with patch("svc.llm.tool_wire_policy._utc_now", return_value=t_late):
out2 = prepare_openai_tools_for_llm_api(
tools,
base_url="https://dashscope.aliyuncs.com/compatible-mode/v1",
@ -186,7 +186,7 @@ class ToolWirePolicyTests(unittest.TestCase):
{"OPS_MCP_WIRE_STALE_HOURS": "3", "OPS_MCP_WIRE_TOP_N_FULL": "3"},
clear=False,
):
with patch("oclaw.platform.llm.tool_wire_policy._utc_now", return_value=t0):
with patch("svc.llm.tool_wire_policy._utc_now", return_value=t0):
out = prepare_openai_tools_for_llm_api(
tools,
base_url="https://dashscope.aliyuncs.com/compatible-mode/v1",