refac

Author: tjbck

backend/open_webui/routers/configs.py

@@ -229,6 +229,11 @@ class TerminalServerConnection(BaseModel):
 
     config: Optional[dict] = None
 
+    # Orchestrator policy fields
+    server_type: Optional[str] = None  # "orchestrator", "terminal"
+    policy_id: Optional[str] = None
+    policy: Optional[dict] = None  # cached policy data
+
     model_config = ConfigDict(extra="allow")
 
 

backend/open_webui/routers/terminals.py

@@ -75,6 +75,12 @@ async def proxy_terminal(
         )
 
     target_url = f"{base_url}/{path}"
+
+    # Route through orchestrator policy endpoint if policy_id is set
+    policy_id = connection.get("policy_id")
+    if policy_id:
+        target_url = f"{base_url}/p/{policy_id}/{path}"
+
     if request.query_params:
         target_url += f"?{request.query_params}"
 
@@ -236,14 +242,18 @@ async def ws_terminal(
     # Build upstream WebSocket URL (no token in URL)
     ws_base = base_url.replace("https://", "wss://").replace("http://", "ws://")
 
-    auth_type = connection.get("auth_type", "bearer")
+    # Route through orchestrator policy endpoint if policy_id is set
+    policy_id = connection.get("policy_id")
     upstream_params = {}
     # For orchestrator-backed servers, pass user_id
     upstream_params["user_id"] = user.id
 
     import urllib.parse
 
-    upstream_url = f"{ws_base}/api/terminals/{session_id}"
+    if policy_id:
+        upstream_url = f"{ws_base}/p/{policy_id}/api/terminals/{session_id}"
+    else:
+        upstream_url = f"{ws_base}/api/terminals/{session_id}"
     if upstream_params:
         upstream_url += f"?{urllib.parse.urlencode(upstream_params)}"
 

backend/open_webui/utils/tools.py

@@ -914,9 +914,17 @@ async def set_terminal_servers(request: Request):
 
         enabled = connection.get("enabled", True)
 
+        base_url = connection.get("url", "").rstrip("/")
+        policy_id = connection.get("policy_id", "")
+
+        # Orchestrator connections route through /p/{policy_id}/ — the
+        # OpenAPI spec lives on the proxied terminal, not the orchestrator.
+        if connection.get("server_type") == "orchestrator" and policy_id:
+            base_url = f"{base_url}/p/{policy_id}"
+
         server_configs.append(
             {
-                "url": connection.get("url", ""),
+                "url": base_url,
                 "key": connection.get("key", ""),
                 "auth_type": connection.get("auth_type", "bearer"),
                 "path": connection.get("path", "/openapi.json"),

src/lib/apis/configs/index.ts

@@ -229,6 +229,85 @@ export const setTerminalServerConnections = async (token: string, connections: o
 	return res;
 };
 
+/**
+ * Detect whether a terminal server URL points to an Orchestrator or a direct
+ * Open Terminal instance.
+ *
+ * - GET {url}/api/v1/policies → 200 → "orchestrator"
+ * - GET {url}/api/config      → 200 → "terminal"
+ * - Neither                         → null
+ */
+export const detectTerminalServerType = async (
+	url: string,
+	key: string
+): Promise<'orchestrator' | 'terminal' | null> => {
+	const baseUrl = url.replace(/\/$/, '');
+	const headers: Record<string, string> = {};
+	if (key) {
+		headers['Authorization'] = `Bearer ${key}`;
+	}
+
+	// Orchestrators expose a policies API; plain terminals don't.
+	try {
+		const res = await fetch(`${baseUrl}/api/v1/policies`, { headers });
+		if (res.ok) return 'orchestrator';
+	} catch {
+		// ignore
+	}
+
+	// Fall back to open-terminal config endpoint.
+	try {
+		const res = await fetch(`${baseUrl}/api/config`, { headers });
+		if (res.ok) return 'terminal';
+	} catch {
+		// ignore
+	}
+
+	return null;
+};
+
+/**
+ * Create or update a policy on the orchestrator.
+ * PUT {url}/api/v1/policies/{policyId}
+ */
+export const putOrchestratorPolicy = async (
+	url: string,
+	key: string,
+	policyId: string,
+	policyData: object
+): Promise<object | null> => {
+	let error = null;
+
+	const baseUrl = url.replace(/\/$/, '');
+	const headers: Record<string, string> = {
+		'Content-Type': 'application/json'
+	};
+	if (key) {
+		headers['Authorization'] = `Bearer ${key}`;
+	}
+
+	const res = await fetch(`${baseUrl}/api/v1/policies/${encodeURIComponent(policyId)}`, {
+		method: 'PUT',
+		headers,
+		body: JSON.stringify(policyData)
+	})
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			console.error(err);
+			error = err.detail;
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
 export const verifyToolServerConnection = async (token: string, connection: object) => {
 	let error = null;