chore(vocero): remove the legacy ApiPilot integration (#3)
Vocero now retrieves AquaPortal content through authenticated MCP. This removes the obsolete ApiPilot integration from the API and browser while preserving the separately deployed speech pipeline. Release notes: - Removed ApiPilot endpoints, configuration, credential overrides, and HTTP/realtime tool execution. - Removed browser ApiPilot catalog loading and prompt generation while retaining authenticated MCP discovery. - Updated regression coverage and operating documentation for the retired routes and settings. Reviewed-on: AquaPortal/s2s#3
This commit is contained in:
@@ -137,50 +137,6 @@ OPENAI_BASE_URL = os.environ.get("OPENAI_BASE_URL", "https://api.openai.com/v1")
|
||||
OPENAI_REASONING_MODEL = os.environ.get("OPENAI_REASONING_MODEL", "gpt-4.1-mini").strip()
|
||||
OPENAI_ORGANIZATION = os.environ.get("OPENAI_ORGANIZATION", "").strip()
|
||||
OPENAI_PROJECT = os.environ.get("OPENAI_PROJECT", "").strip()
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
# APIPILOT — Backend AquaPortal dynamic-tool bridge (docs/client/tool-calling.md)
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
# Base URL for ApiPilot dynamic tool discovery and execution. When configured,
|
||||
# the proxy sends GET <url>/tools with include_unauthorized=true (guide §2.1)
|
||||
# to discover tools, and POST <url>/execute (§2.2) to invoke one. The trailing
|
||||
# slash is optional; the proxy normalizes it with rstrip("/") below.
|
||||
#
|
||||
# Example: S2S_APIPILOT_TOOLS_URL=https://aquachile.azurianlab.com/api/v1/apipilot
|
||||
S2S_APIPILOT_TOOLS_URL = os.environ.get("S2S_APIPILOT_TOOLS_URL", "").strip().rstrip("/")
|
||||
# Explicit execution URL override (guide §2.2). When set, it takes precedence
|
||||
# over S2S_APIPILOT_TOOLS_URL for POST execution calls. Remove trailing slashes
|
||||
# and append "/execute" only if the URL does not already end with that suffix.
|
||||
# Example 1 (base): S2S_APIPILOT_TOOLS_EXECUTE_URL=https://aquachile.azurianlab.com/api/v1/apipilot
|
||||
# → POST https://aquachile.azurianlab.com/api/v1/apipilot/execute
|
||||
# Example 2: S2S_APIPILOT_TOOLS_EXECUTE_URL=https://aquachile.azurianlab.com/api/v1/apipilot/tools
|
||||
# → POST https://aquachile.azurianlab.com/api/v1/apipilot/tools/execute
|
||||
S2S_APIPILOT_TOOLS_EXECUTE_URL = os.environ.get("S2S_APIPILOT_TOOLS_EXECUTE_URL", "").strip().rstrip("/")
|
||||
# Optional fixed bearer token, used only when the caller supplies no session
|
||||
# token (Authorization / x-demo-session). Useful for staging service tokens.
|
||||
S2S_APIPILOT_SERVICE_TOKEN = os.environ.get("S2S_APIPILOT_SERVICE_TOKEN", "").strip()
|
||||
# 2026-09-25 SUPER API KEY (TEMPORARY AQUAPORTAL AUTHENTICATION BYPASS).
|
||||
# When set, send all three header forms for maximum compatibility:
|
||||
# 1) X-API-Key: <key>
|
||||
# 2) Authorization: Bearer <key>
|
||||
# 3) x-demo-session: <key>
|
||||
# Highest priority; completely disables the unnecessary login_by_phone call.
|
||||
# Clear the value to restore standard login.
|
||||
S2S_APIPILOT_API_KEY = os.environ.get("S2S_APIPILOT_API_KEY", "").strip().strip("\"'")
|
||||
# Tool discovery cache TTL in seconds. The guide recommends a five-minute
|
||||
# client cache; the server uses the same default: 300 seconds.
|
||||
try:
|
||||
_APIPILOT_TTL_RAW = int((os.environ.get("S2S_APIPILOT_TTL_SEC", "") or "300").strip())
|
||||
except Exception:
|
||||
_APIPILOT_TTL_RAW = 300
|
||||
APIPILOT_CACHE_TTL_SEC = max(15, min(3600, _APIPILOT_TTL_RAW))
|
||||
del _APIPILOT_TTL_RAW
|
||||
# HTTP timeout for ApiPilot discovery and execution calls, in seconds.
|
||||
try:
|
||||
_APIPILOT_TO_RAW = float((os.environ.get("S2S_APIPILOT_TIMEOUT_SEC", "") or "15.0").strip())
|
||||
except Exception:
|
||||
_APIPILOT_TO_RAW = 15.0
|
||||
APIPILOT_HTTP_TIMEOUT = max(1.0, min(120.0, _APIPILOT_TO_RAW))
|
||||
del _APIPILOT_TO_RAW
|
||||
|
||||
|
||||
# Speech-to-speech load balancer URL. When set, the browser POSTs /api/session
|
||||
|
||||
@@ -3,23 +3,8 @@ from __future__ import annotations
|
||||
from vocero_api.core import config as settings
|
||||
from vocero_api.core import logging as app_logging
|
||||
|
||||
|
||||
# Resolve the execution URL for the startup banner using the same normalization
|
||||
# as _apipilot_resolve_execute_url.
|
||||
def _resolve_exec_url_for_startup_banner() -> str:
|
||||
base = (settings.S2S_APIPILOT_TOOLS_EXECUTE_URL or settings.S2S_APIPILOT_TOOLS_URL).strip().rstrip("/")
|
||||
if not base:
|
||||
return ""
|
||||
if base.lower().endswith("/execute"):
|
||||
return base
|
||||
return f"{base}/execute"
|
||||
|
||||
|
||||
_STARTUP_APIPILOT_EXEC_URL = _resolve_exec_url_for_startup_banner()
|
||||
del _resolve_exec_url_for_startup_banner
|
||||
|
||||
app_logging.logger.info(
|
||||
"[STARTUP] Other externals — reasoning=%s serper=%s lb=%s s2sProxy=%s s2sDirect=%s userAuth=%s reportsApi=%s injectReports=%s reportsHintMax=%d reportsInjectMode=%s injectToday=%s summaryApi=%s summaryText=%s loginApi=%s injectProfile=%s debugPrompt=%s startSessionMode=%s theme=%s apipilotToolsUrl=%s apipilotExecuteUrlOverride=%s apipilotServiceToken=%s apipilotTtl=%ds apipilotTimeout=%.1fs apipilotReasoningPass2=%s apipilotApiKeyBypass=%s",
|
||||
"[STARTUP] Other externals — reasoning=%s serper=%s lb=%s s2sProxy=%s s2sDirect=%s userAuth=%s reportsApi=%s injectReports=%s reportsHintMax=%d reportsInjectMode=%s injectToday=%s summaryApi=%s summaryText=%s loginApi=%s injectProfile=%s debugPrompt=%s startSessionMode=%s theme=%s",
|
||||
settings.S2S_REASONING_TYPE,
|
||||
bool(settings.SERPER_KEY),
|
||||
bool(settings.LOAD_BALANCER_URL),
|
||||
@@ -38,27 +23,7 @@ app_logging.logger.info(
|
||||
settings.S2S_DEBUG_PROMPT,
|
||||
settings.S2S_START_SESSION_MODE or "-",
|
||||
settings.S2S_THEME or "-",
|
||||
settings.S2S_APIPILOT_TOOLS_URL or "-",
|
||||
(settings.S2S_APIPILOT_TOOLS_EXECUTE_URL + f"(resolved:{_STARTUP_APIPILOT_EXEC_URL})")
|
||||
if settings.S2S_APIPILOT_TOOLS_EXECUTE_URL
|
||||
else "-",
|
||||
"Y" if bool(settings.S2S_APIPILOT_SERVICE_TOKEN) else "-",
|
||||
settings.APIPILOT_CACHE_TTL_SEC,
|
||||
settings.APIPILOT_HTTP_TIMEOUT,
|
||||
"Y" if (bool(settings.S2S_APIPILOT_TOOLS_URL) or bool(settings.S2S_APIPILOT_TOOLS_EXECUTE_URL)) else "-",
|
||||
(
|
||||
"YES head="
|
||||
+ (
|
||||
settings.S2S_APIPILOT_API_KEY[:6] + "..."
|
||||
if len(settings.S2S_APIPILOT_API_KEY) > 6
|
||||
else settings.S2S_APIPILOT_API_KEY
|
||||
)
|
||||
+ " (3 FORMS!)"
|
||||
)
|
||||
if settings.S2S_APIPILOT_API_KEY
|
||||
else "-",
|
||||
)
|
||||
del _STARTUP_APIPILOT_EXEC_URL
|
||||
|
||||
if settings.S2S_MCP_URL:
|
||||
app_logging.logger.info(
|
||||
|
||||
Reference in New Issue
Block a user