0xallam
d8881498ee
The SDK harness is the only path now; legacy host-side code is gone. File names no longer carry the ``sdk_`` distinction. Deleted legacy host-side modules: - strix/agents/StrixAgent/ (template moved to strix/agents/prompts/) - strix/agents/base_agent.py, state.py - strix/llm/llm.py, config.py - strix/runtime/docker_runtime.py, runtime.py - strix/tools/executor.py, agents_graph/agents_graph_actions.py - strix/interface/sdk_dispatch.py + the env-flag dispatch in cli.py Renamed (drop ``sdk_`` prefix): - strix/sdk_entry.py → strix/entry.py - strix/agents/sdk_factory.py → strix/agents/factory.py - strix/agents/sdk_prompt.py → strix/agents/prompt.py - strix/tools/<x>/<x>_sdk_tool[s].py → strix/tools/<x>/tool[s].py - strix/tools/_legacy_adapter.py → strix/tools/_state_adapter.py - ``_legacy`` aliases inside the wrappers → ``_impl`` CLI + TUI now call ``run_strix_scan`` directly — they build the sandbox image / sources_path locally and rely on ``session_manager.cleanup`` (called inside ``run_strix_scan``'s finally) for teardown. Three TUI handlers that reached into legacy multi-agent globals (``_agent_instances``, ``send_user_message_to_agent``, ``stop_agent``) are now no-ops with a TODO; reconnecting them to the ``AgentMessageBus`` is a follow-up. Tracer.get_total_llm_stats no longer reaches into the deleted ``agents_graph_actions`` globals — the orchestration hooks now feed the tracer via ``Tracer.record_llm_usage`` (live + completed buckets). finish_scan's ``_check_active_agents`` and load_skill's runtime ``_agent_instances`` reach-in are no-op stubs; the ``AgentMessageBus`` is the source of truth post-migration. llm/utils.py rewritten to keep only the streaming-parser helpers (``normalize_tool_format``, ``parse_tool_invocations``, ``fix_incomplete_tool_call``, ``format_tool_call``, ``clean_content``). ``STRIX_MODEL_MAP`` moved to ``llm/multi_provider_setup.py`` (its only remaining caller). Per-file ruff ignores added for legacy interface modules (TUI / main / CLI / utils / streaming_parser / tool_components) and tracer.py — pre-existing PLC0415/BLE001/PLR0915 patterns are out of scope. Tests: 287/287 passing. Renamed test files to drop ``sdk_`` prefix. ``test_tracer.py::test_get_total_llm_stats_aggregates_live_and_completed`` rewritten to feed ``Tracer.record_llm_usage`` instead of legacy globals. Test file annotations added so pre-commit's strict mypy passes. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
100 lines
3.3 KiB
Python
100 lines
3.3 KiB
Python
import importlib
|
|
import sys
|
|
from types import ModuleType
|
|
from typing import Any
|
|
|
|
from strix.config import Config
|
|
from strix.tools.registry import clear_registry
|
|
|
|
|
|
def _empty_config_load(_cls: type[Config]) -> dict[str, dict[str, str]]:
|
|
return {"env": {}}
|
|
|
|
|
|
def _reload_tools_module() -> ModuleType:
|
|
clear_registry()
|
|
|
|
for name in list(sys.modules):
|
|
if name == "strix.tools" or name.startswith("strix.tools."):
|
|
sys.modules.pop(name, None)
|
|
|
|
return importlib.import_module("strix.tools")
|
|
|
|
|
|
def test_non_sandbox_skips_browser_and_web_search_when_disabled(
|
|
monkeypatch: Any,
|
|
) -> None:
|
|
"""Browser registration is gated on STRIX_DISABLE_BROWSER and
|
|
web_search on PERPLEXITY_API_KEY; both should stay out of the
|
|
in-container ``register_tool`` registry when their gates are off.
|
|
Agents_graph is no longer in this registry — those tools are SDK
|
|
function tools (host-side only), not in-container tools.
|
|
"""
|
|
monkeypatch.setenv("STRIX_SANDBOX_MODE", "false")
|
|
monkeypatch.setenv("STRIX_DISABLE_BROWSER", "true")
|
|
monkeypatch.delenv("PERPLEXITY_API_KEY", raising=False)
|
|
monkeypatch.setattr(Config, "load", classmethod(_empty_config_load))
|
|
|
|
tools = _reload_tools_module()
|
|
names = set(tools.get_tool_names())
|
|
|
|
assert "browser_action" not in names
|
|
assert "web_search" not in names
|
|
|
|
|
|
def test_sandbox_registers_sandbox_tools_but_not_non_sandbox_tools(
|
|
monkeypatch: Any,
|
|
) -> None:
|
|
monkeypatch.setenv("STRIX_SANDBOX_MODE", "true")
|
|
monkeypatch.setenv("STRIX_DISABLE_BROWSER", "true")
|
|
monkeypatch.delenv("PERPLEXITY_API_KEY", raising=False)
|
|
monkeypatch.setattr(Config, "load", classmethod(_empty_config_load))
|
|
|
|
tools = _reload_tools_module()
|
|
names = set(tools.get_tool_names())
|
|
|
|
assert "terminal_execute" in names
|
|
assert "python_action" in names
|
|
assert "list_requests" in names
|
|
assert "create_agent" not in names
|
|
assert "finish_scan" not in names
|
|
assert "load_skill" not in names
|
|
assert "browser_action" not in names
|
|
assert "web_search" not in names
|
|
|
|
|
|
def test_load_skill_import_does_not_register_create_agent_in_sandbox(
|
|
monkeypatch: Any,
|
|
) -> None:
|
|
monkeypatch.setenv("STRIX_SANDBOX_MODE", "true")
|
|
monkeypatch.setenv("STRIX_DISABLE_BROWSER", "true")
|
|
monkeypatch.delenv("PERPLEXITY_API_KEY", raising=False)
|
|
monkeypatch.setattr(Config, "load", classmethod(_empty_config_load))
|
|
|
|
clear_registry()
|
|
for name in list(sys.modules):
|
|
if name == "strix.tools" or name.startswith("strix.tools."):
|
|
sys.modules.pop(name, None)
|
|
|
|
load_skill_module = importlib.import_module("strix.tools.load_skill.load_skill_actions")
|
|
registry = importlib.import_module("strix.tools.registry")
|
|
|
|
names_before = set(registry.get_tool_names())
|
|
assert "load_skill" not in names_before
|
|
assert "create_agent" not in names_before
|
|
|
|
state_type = type(
|
|
"DummyState",
|
|
(),
|
|
{
|
|
"agent_id": "agent_test",
|
|
"context": {},
|
|
"update_context": lambda self, key, value: self.context.__setitem__(key, value),
|
|
},
|
|
)
|
|
result = load_skill_module.load_skill(state_type(), "nmap")
|
|
|
|
names_after = set(registry.get_tool_names())
|
|
assert "create_agent" not in names_after
|
|
assert result["success"] is False
|