d105376b21
* refactor(tools): discovery also scans tools/<pkg>/tool.py
A tool family that is a whole package had no way to register: discovery
globbed tools/*.py only and derived the module name from the filename.
Now the candidate list is tools/*.py plus tools/*/tool.py, merged and
sorted once so import order does not depend on depth (register() lets a
same-name duplicate overwrite silently), and the module name comes from
the path relative to tools/. Only tool.py is scanned inside a package,
so its siblings are libraries by construction. A package without an
__init__.py is skipped with a warning rather than registering from a
checkout and vanishing from the installed wheel.
The AST prefilter and the (mtime, size) disk cache are per absolute path
and work unchanged. The two hand-rolled tools/*.py enumerators in tests
now use the same candidate helper.
* refactor(connectors): one package for the connector domain, tools/connectors/
The connector code was spread across six flat files and a root-level
module that was a sibling of model_tools.py only by address:
tools/connections_tool.py -> tools/connectors/tool.py (schema, register, dispatcher)
tools/connectors/managed.py (the managed leg, split out)
tools/connections_tool_mcp.py -> tools/connectors/mcp.py (validation split out ->)
tools/connectors/targets.py (normalize_targets, validate_action)
tools/connections_tool_operation.py -> tools/connectors/operation.py
tools/connector_search.py -> tools/connectors/search.py
model_tools_connectors.py -> tools/connectors/dispatch.py
tools/tool_gateway/ -> tools/connectors/gateway/
Move only; every function body is unchanged. tools/connectors/__init__.py
is the door: nine names, the whole cross-package surface. model_tools and
tool_search deep-import a few helpers past it on purpose and the docstring
says so. The two split files make the import graph one-directional
(tool -> mcp -> targets, tool -> managed) where the old layout had
connections_tool importing validation out of the MCP file.
One behaviour-neutral seam change: the _connectors_available try/except
wrapper is gone. connectors_available() already fails closed, and both
the registry handler and the inline executor now read it as a module
attribute (gateway.config.connectors_available), so tests patch it in
one place instead of two. _default_client lives in managed.py, the only
module that calls it.
tools/managed_tool_gateway.py and tools/managed_gateway_auth.py stay:
they are gateway identity shared by tts, transcription, image and modal.
Test files follow their modules. No docs referenced the old paths; no
compat pointer is added (in-tree moves get none).
* ci: retrigger (zero-job dispatch on 142466de6b)
87 lines
3.6 KiB
Python
87 lines
3.6 KiB
Python
"""Connector capabilities follow session grants, not process-wide credentials."""
|
|
|
|
import json
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.mark.parametrize("enabled,disabled,allowed", [
|
|
([], [], False),
|
|
(["safe"], [], False),
|
|
(["hermes-webhook"], [], False),
|
|
(["connections"], [], True),
|
|
(["hermes-cli"], ["connections"], False),
|
|
(["safe"], ["connections"], False),
|
|
(None, ["connections"], False),
|
|
(None, [], True),
|
|
])
|
|
def test_connector_scope_controls_schema_discovery_and_execution(monkeypatch, enabled, disabled, allowed):
|
|
import model_tools
|
|
from tools.connectors import managed
|
|
from tools.connectors.gateway import bridge, config
|
|
|
|
monkeypatch.setattr(config, "connectors_available", lambda: True)
|
|
monkeypatch.setattr(bridge, "connectors_available", lambda: True)
|
|
from tools.registry import invalidate_check_fn_cache
|
|
invalidate_check_fn_cache()
|
|
remote = []
|
|
name = "connectors__gmail__SEND_EMAIL"
|
|
|
|
class Client:
|
|
def search(self, queries):
|
|
remote.append("search")
|
|
return {"results": [{"tools": ["GMAIL_SEND_EMAIL"]}], "schemas": {
|
|
"GMAIL_SEND_EMAIL": {"connector": "gmail", "description": "Send mail", "input_schema": {}}}}
|
|
|
|
def schemas(self, names):
|
|
remote.append("describe")
|
|
return {"schemas": {"GMAIL_SEND_EMAIL": {"description": "Send mail", "input_schema": {}}}}
|
|
|
|
def execute(self, planned):
|
|
remote.append("execute")
|
|
return [{"data": "sent", "error": None} for _ in planned]
|
|
|
|
def list_connectors(self):
|
|
remote.append("status")
|
|
return []
|
|
|
|
monkeypatch.setattr(bridge, "_default_client_factory", Client)
|
|
monkeypatch.setattr(managed, "_default_client", Client)
|
|
scope = {"enabled_toolsets": enabled, "disabled_toolsets": disabled}
|
|
defs = model_tools.get_tool_definitions(**scope, quiet_mode=True, skip_tool_search_assembly=True)
|
|
assert ("manage_connections" in {td["function"]["name"] for td in defs}) is allowed
|
|
if enabled == []:
|
|
assert model_tools.get_tool_definitions(**scope, quiet_mode=True) == []
|
|
|
|
def call(tool, args):
|
|
return json.loads(model_tools.handle_function_call(tool, args, **scope))
|
|
|
|
assert (name in call("tool_search", {"queries": ["send mail"]})["tools"]) is allowed
|
|
assert (name in call("tool_describe", {"names": [name]})["tools"]) is allowed
|
|
result = call("tool_call", {"calls": [{"name": name, "arguments": {}}]})
|
|
direct = call(name, {})
|
|
status = call("manage_connections", {"action": "status"})
|
|
if allowed:
|
|
assert result["results"][0]["response"] == "sent"
|
|
assert "error" not in status
|
|
assert direct["response"] == "sent"
|
|
assert remote == ["search", "describe", "execute", "execute", "status"]
|
|
else:
|
|
assert "not available in this session" in json.dumps(result)
|
|
assert "not available in this session" in json.dumps(status)
|
|
assert "not available in this session" in json.dumps(direct)
|
|
assert remote == []
|
|
|
|
|
|
def test_ordinary_platform_defaults_grant_connections_without_widening_webhook():
|
|
from hermes_cli.tools_config import _get_platform_tools
|
|
from toolsets import resolve_toolset
|
|
|
|
for platform in ("cli", "telegram"):
|
|
enabled = _get_platform_tools({}, platform)
|
|
assert "connections" in enabled
|
|
assert "manage_connections" in {name for ts in enabled for name in resolve_toolset(ts)}
|
|
assert "connections" not in _get_platform_tools({}, "webhook")
|
|
for selection in ([], ["safe"], ["file"]):
|
|
assert "connections" not in _get_platform_tools({"platform_toolsets": {"cli": selection}}, "cli")
|