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

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

20
tests/test_catalog_expert_role_loading.py
View file

@ -2,8 +2,8 @@ from __future__ import annotations
from unittest.mock import patch
from oclaw.runtime.tools.base import ToolSpec
from oclaw.runtime.tools.catalog import materialize_tool_specs
from runtime.tools.base import ToolSpec
from runtime.tools.catalog import materialize_tool_specs
def _mk_spec(name: str) -> ToolSpec:
@ -29,10 +29,10 @@ def _mk_spec_with_risk(name: str, *, risk: str, tags: set[str] | None = None) ->
def test_catalog_loads_role_scoped_expert_tools() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
"runtime.tools.catalog.materialize_tools_for_expert",
return_value=[_mk_spec("custom_tool_a"), _mk_spec("custom_tool_b")],
):
with patch("oclaw.runtime.tools.catalog.materialize_public_tools", return_value=[_mk_spec("system_time")]):
with patch("runtime.tools.catalog.materialize_public_tools", return_value=[_mk_spec("system_time")]):
specs = materialize_tool_specs(expert="generalist")
names = {x.name for x in specs}
assert "system_time" in names
@ -42,10 +42,10 @@ def test_catalog_loads_role_scoped_expert_tools() -> None:
def test_catalog_deduplicates_same_tool_name() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
"runtime.tools.catalog.materialize_tools_for_expert",
return_value=[_mk_spec("system_time"), _mk_spec("custom_tool_a")],
):
with patch("oclaw.runtime.tools.catalog.materialize_public_tools", return_value=[_mk_spec("system_time")]):
with patch("runtime.tools.catalog.materialize_public_tools", return_value=[_mk_spec("system_time")]):
specs = materialize_tool_specs(expert="generalist")
names = [x.name for x in specs]
assert names.count("system_time") == 1
@ -54,11 +54,11 @@ def test_catalog_deduplicates_same_tool_name() -> None:
def test_catalog_prefers_lower_risk_on_name_conflict() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
"runtime.tools.catalog.materialize_tools_for_expert",
return_value=[_mk_spec_with_risk("dup_tool", risk="high")],
):
with patch(
"oclaw.runtime.tools.catalog.materialize_public_tools",
"runtime.tools.catalog.materialize_public_tools",
return_value=[_mk_spec_with_risk("dup_tool", risk="low")],
):
specs = materialize_tool_specs(expert="generalist")
@ -69,11 +69,11 @@ def test_catalog_prefers_lower_risk_on_name_conflict() -> None:
def test_catalog_prefers_expert_when_risk_equal() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
"runtime.tools.catalog.materialize_tools_for_expert",
return_value=[_mk_spec_with_risk("dup_tool", risk="low", tags={"expert"})],
):
with patch(
"oclaw.runtime.tools.catalog.materialize_public_tools",
"runtime.tools.catalog.materialize_public_tools",
return_value=[_mk_spec_with_risk("dup_tool", risk="low", tags={"public"})],
):
specs = materialize_tool_specs(expert="generalist")