[eric] tools_lib: leading-_ -> p_/public across tools_lib/mcp_config/mcp_discovery/oauth_tokens/tool_taxonomy; promote cross-file public (load_all_tools/sanitize_server_name/discover_mcp_tools_*), fix re-export + attr test refs

This commit is contained in:
ciregenz
2026-06-23 20:30:14 -07:00
parent deeab52ed4
commit 71b2b33fae
16 changed files with 187 additions and 187 deletions
+2 -2
View File
@@ -13,8 +13,8 @@ from backend.apps.agents.core.models import (
from backend.apps.agents.core.ws_manager import ws_manager
from backend.apps.settings.settings import load_settings
from backend.apps.tools_lib.tools_lib import (
_load_all as load_all_tools,
_sanitize_server_name as sanitize_server_name,
load_all_tools as load_all_tools,
sanitize_server_name as sanitize_server_name,
load_builtin_permissions,
)
from backend.apps.agents.core.error_classify import (
+4 -4
View File
@@ -11,8 +11,8 @@ from typing import Any
from backend.apps.agents.providers.registry import resolve_aux_model
from backend.apps.settings.credentials import get_anthropic_client_for_model
from backend.apps.settings.settings import load_settings
from backend.apps.tools_lib.tools_lib import _load_all as load_all_tools
from backend.apps.tools_lib.mcp_config import _sanitize_server_name
from backend.apps.tools_lib.tools_lib import load_all_tools as load_all_tools
from backend.apps.tools_lib.mcp_config import sanitize_server_name
logger = logging.getLogger(__name__)
@@ -156,9 +156,9 @@ def offer_for_gated_server(server_name: str, settings) -> CuratedEntry | None:
return None
# The hot-path hands us a sanitized slug ("google-workspace"); curated ids are display names
# ("Google Workspace"). Match on the slug of both sides so neither form is a load-bearing string.
slug = _sanitize_server_name(server_name)
slug = sanitize_server_name(server_name)
entry = next(
(e for e in p_build_available_shortlist(settings) if _sanitize_server_name(e["id"]) == slug),
(e for e in p_build_available_shortlist(settings) if sanitize_server_name(e["id"]) == slug),
None,
)
if entry is None:
@@ -26,8 +26,8 @@ from backend.apps.agents.manager.prompt.attachments import (
resolve_context_paths,
)
from backend.apps.tools_lib.tools_lib import (
_load_all as load_all_tools,
_sanitize_server_name as sanitize_server_name,
load_all_tools as load_all_tools,
sanitize_server_name as sanitize_server_name,
derive_mcp_config,
refresh_airtable_token,
refresh_google_token,
@@ -17,8 +17,8 @@ from backend.apps.agents.core.ws_manager import ws_manager
from backend.apps.agents.manager.permissions import path_gate
from backend.apps.agents.manager.permissions.ApprovalDecision import ApprovalDecision
from backend.apps.tools_lib.tools_lib import (
_load_all as load_all_tools,
_save as save_tool,
load_all_tools as load_all_tools,
save as save_tool,
load_builtin_permissions,
load_trusted_sensitive_paths,
resolve_policy_slot,
@@ -14,8 +14,8 @@ from backend.apps.agents.manager.prompt.tool_catalog import (
get_denied_tool_names,
)
from backend.apps.tools_lib.tools_lib import (
_load_all as load_all_tools,
_sanitize_server_name as sanitize_server_name,
load_all_tools as load_all_tools,
sanitize_server_name as sanitize_server_name,
)
@@ -4,8 +4,8 @@ from typeguard import typechecked
from backend.apps.modes.modes import load_mode
from backend.apps.tools_lib.tools_lib import (
_load_all as load_all_tools,
_sanitize_server_name as sanitize_server_name,
load_all_tools as load_all_tools,
sanitize_server_name as sanitize_server_name,
)
from backend.apps.agents.manager.prompt.tool_catalog import is_fully_denied
@@ -5,8 +5,8 @@ from typeguard import typechecked
from backend.apps.tools_lib.models import ToolDefinition
from backend.apps.tools_lib.tools_lib import (
_load_all as load_all_tools,
_sanitize_server_name as sanitize_server_name,
load_all_tools as load_all_tools,
sanitize_server_name as sanitize_server_name,
load_builtin_permissions,
)