Fix sandbox delete and inference routing
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
import { NextResponse } from "next/server"
|
||||
import { execFile } from "node:child_process"
|
||||
import { mkdir, readFile, writeFile } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
import { promisify } from "node:util"
|
||||
import { resolveSandboxRef } from "@/app/lib/openshellHost"
|
||||
import { NEMOCLAW_BIN, NEMOCLAW_CWD, OPENSHELL_BIN, hostCommandEnv } from "@/app/lib/hostCommands"
|
||||
import { OPENSHELL_BIN, hostCommandEnv } from "@/app/lib/hostCommands"
|
||||
|
||||
const execFileAsync = promisify(execFile)
|
||||
|
||||
@@ -82,56 +84,46 @@ function isGatewayRecoverable(output: string) {
|
||||
return /Unknown gateway|Deploy it first|transport error|tcp connect error|Connection refused|invalid peer certificate|BadSignature/i.test(output)
|
||||
}
|
||||
|
||||
function isValidNemoClawSandboxName(value: string) {
|
||||
return /^[a-z][a-z0-9-]*[a-z0-9]$|^[a-z]$/.test(value)
|
||||
}
|
||||
|
||||
function isNemoClawSandboxNotRegistered(output: string, sandboxName: string) {
|
||||
return new RegExp(`Unknown command:\\s*${sandboxName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "i").test(output)
|
||||
}
|
||||
const NEMOCLAW_REGISTRY_PATH = path.join(process.env.HOME || "/tmp", ".nemoclaw", "sandboxes.json")
|
||||
|
||||
async function cleanupNemoClawSandbox(sandboxName: string) {
|
||||
if (!isValidNemoClawSandboxName(sandboxName)) {
|
||||
try {
|
||||
const raw = await readFile(NEMOCLAW_REGISTRY_PATH, "utf8")
|
||||
const registry = JSON.parse(raw)
|
||||
const sandboxes = registry && typeof registry === "object" && registry.sandboxes && typeof registry.sandboxes === "object"
|
||||
? registry.sandboxes
|
||||
: {}
|
||||
const existed = Object.prototype.hasOwnProperty.call(sandboxes, sandboxName)
|
||||
if (existed) delete sandboxes[sandboxName]
|
||||
const remaining = Object.keys(sandboxes)
|
||||
const defaultSandbox = registry.defaultSandbox === sandboxName
|
||||
? remaining[0] || null
|
||||
: (registry.defaultSandbox && sandboxes[registry.defaultSandbox] ? registry.defaultSandbox : remaining[0] || null)
|
||||
const next = { ...registry, sandboxes, defaultSandbox }
|
||||
await mkdir(path.dirname(NEMOCLAW_REGISTRY_PATH), { recursive: true, mode: 0o700 })
|
||||
await writeFile(NEMOCLAW_REGISTRY_PATH, `${JSON.stringify(next, null, 2)}\n`, { mode: 0o600 })
|
||||
return {
|
||||
ok: true as const,
|
||||
stdout: "",
|
||||
stderr: "",
|
||||
note: "Skipped NemoClaw registry cleanup because the target is not a valid NemoClaw sandbox name.",
|
||||
note: existed
|
||||
? "Pruned NemoClaw registry entry without destroying the shared OpenShell gateway."
|
||||
: "NemoClaw registry already had no matching sandbox entry.",
|
||||
}
|
||||
}
|
||||
|
||||
const startedAt = Date.now()
|
||||
console.log(`[sandbox/delete] nemoclaw-cleanup:start sandbox=${sandboxName}`)
|
||||
try {
|
||||
const { stdout, stderr } = await execFileAsync(NEMOCLAW_BIN, [sandboxName, "destroy", "--yes"], {
|
||||
cwd: NEMOCLAW_CWD,
|
||||
env: hostCommandEnv({
|
||||
OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY || "nemoclaw",
|
||||
}),
|
||||
timeout: 90000,
|
||||
maxBuffer: 20 * 1024 * 1024,
|
||||
})
|
||||
console.log(`[sandbox/delete] nemoclaw-cleanup:done sandbox=${sandboxName} elapsedMs=${elapsedMs(startedAt)}`)
|
||||
return { ok: true as const, stdout: String(stdout).trim(), stderr: String(stderr).trim() }
|
||||
} catch (error: any) {
|
||||
const message = error instanceof Error ? error.message : String(error ?? "NemoClaw cleanup failed")
|
||||
const stdout = String(error?.stdout || "").trim()
|
||||
const stderr = String(error?.stderr || "").trim()
|
||||
const output = [message, stdout, stderr].filter(Boolean).join("\n")
|
||||
if (isNemoClawSandboxNotRegistered(output, sandboxName)) {
|
||||
console.log(`[sandbox/delete] nemoclaw-cleanup:already-gone sandbox=${sandboxName} elapsedMs=${elapsedMs(startedAt)}`)
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error ?? "NemoClaw registry cleanup failed")
|
||||
if (/ENOENT/.test(message)) {
|
||||
return {
|
||||
ok: true as const,
|
||||
stdout,
|
||||
stderr,
|
||||
note: "NemoClaw registry already had no matching sandbox.",
|
||||
stdout: "",
|
||||
stderr: "",
|
||||
note: "NemoClaw registry file does not exist; skipped registry cleanup.",
|
||||
}
|
||||
}
|
||||
console.log(`[sandbox/delete] nemoclaw-cleanup:error sandbox=${sandboxName} elapsedMs=${elapsedMs(startedAt)} message=${message}`)
|
||||
return {
|
||||
ok: false as const,
|
||||
stdout,
|
||||
stderr,
|
||||
stdout: "",
|
||||
stderr: "",
|
||||
error: message,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ export default function InferenceEndpointPanel() {
|
||||
const [system, setSystem] = useState<InferenceRoute>(emptyRoute)
|
||||
const [name, setName] = useState("vllm-local")
|
||||
const [type, setType] = useState("openai")
|
||||
const [model, setModel] = useState("nvidia/NVIDIA-Nemotron-3-Super-120B-A12B-NVFP4")
|
||||
const [model, setModel] = useState("vllm-local")
|
||||
const [baseUrl, setBaseUrl] = useState("http://host.docker.internal:8000/v1")
|
||||
const [credentialKey, setCredentialKey] = useState("OPENAI_API_KEY")
|
||||
const [apiKey, setApiKey] = useState("")
|
||||
@@ -143,7 +143,7 @@ export default function InferenceEndpointPanel() {
|
||||
function useVllmPreset() {
|
||||
setName("vllm-local")
|
||||
setType("openai")
|
||||
setModel("nvidia/NVIDIA-Nemotron-3-Super-120B-A12B-NVFP4")
|
||||
setModel("vllm-local")
|
||||
setBaseUrl("http://host.docker.internal:8000/v1")
|
||||
setCredentialKey("OPENAI_API_KEY")
|
||||
setApiKey("")
|
||||
|
||||
@@ -7,11 +7,11 @@ const execFileAsync = promisify(execFile)
|
||||
const DOCKER_BIN = process.env.DOCKER_BIN || "docker"
|
||||
const OPENSHELL_CLUSTER_CONTAINER = process.env.OPENSHELL_CLUSTER_CONTAINER || "openshell-cluster-nemoclaw"
|
||||
|
||||
function modelEntry(route: SandboxInferenceRoute, compat: Record<string, unknown> | null) {
|
||||
function modelEntry(modelId: string, modelName: string, compat: Record<string, unknown> | null) {
|
||||
return {
|
||||
...(compat ? { compat } : {}),
|
||||
id: route.model,
|
||||
name: route.model,
|
||||
id: modelId,
|
||||
name: modelName,
|
||||
reasoning: false,
|
||||
input: ["text"],
|
||||
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
||||
@@ -20,11 +20,31 @@ function modelEntry(route: SandboxInferenceRoute, compat: Record<string, unknown
|
||||
}
|
||||
}
|
||||
|
||||
function resolveInferenceModelIdentity(route: SandboxInferenceRoute) {
|
||||
const nvidiaModel = route.model.match(/^nvidia\/(.+)$/i)
|
||||
if (nvidiaModel) {
|
||||
return {
|
||||
providerKey: "nvidia",
|
||||
modelId: nvidiaModel[1],
|
||||
modelName: route.model,
|
||||
modelRef: route.model,
|
||||
}
|
||||
}
|
||||
return {
|
||||
providerKey: "inference",
|
||||
modelId: route.model,
|
||||
modelName: route.model,
|
||||
modelRef: `inference/${route.model}`,
|
||||
}
|
||||
}
|
||||
|
||||
function resolveOpenClawRoute(route: SandboxInferenceRoute) {
|
||||
switch (route.provider) {
|
||||
case "openai-api":
|
||||
return {
|
||||
providerKey: "openai",
|
||||
modelId: route.model,
|
||||
modelName: route.model,
|
||||
modelRef: `openai/${route.model}`,
|
||||
baseUrl: "https://inference.local/v1",
|
||||
api: "openai-completions",
|
||||
@@ -34,6 +54,8 @@ function resolveOpenClawRoute(route: SandboxInferenceRoute) {
|
||||
case "compatible-anthropic-endpoint":
|
||||
return {
|
||||
providerKey: "anthropic",
|
||||
modelId: route.model,
|
||||
modelName: route.model,
|
||||
modelRef: `anthropic/${route.model}`,
|
||||
baseUrl: "https://inference.local",
|
||||
api: "anthropic-messages",
|
||||
@@ -41,26 +63,28 @@ function resolveOpenClawRoute(route: SandboxInferenceRoute) {
|
||||
}
|
||||
case "bedrock":
|
||||
case "compatible-endpoint":
|
||||
case "gemini-api":
|
||||
case "gemini-api": {
|
||||
const identity = resolveInferenceModelIdentity(route)
|
||||
return {
|
||||
providerKey: "inference",
|
||||
modelRef: `inference/${route.model}`,
|
||||
...identity,
|
||||
baseUrl: "https://inference.local/v1",
|
||||
api: "openai-completions",
|
||||
compat: { supportsStore: false },
|
||||
}
|
||||
}
|
||||
case "nvidia-prod":
|
||||
case "nvidia-nim":
|
||||
case "ollama-local":
|
||||
case "vllm-local":
|
||||
default:
|
||||
default: {
|
||||
const identity = resolveInferenceModelIdentity(route)
|
||||
return {
|
||||
providerKey: "inference",
|
||||
modelRef: `inference/${route.model}`,
|
||||
...identity,
|
||||
baseUrl: "https://inference.local/v1",
|
||||
api: "openai-completions",
|
||||
compat: null,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +102,7 @@ function buildOpenClawConfig(current: any, routes: SandboxInferenceRoute[], prim
|
||||
api: resolved.api,
|
||||
models: [],
|
||||
}
|
||||
providers[resolved.providerKey].models.push(modelEntry(route, resolved.compat))
|
||||
providers[resolved.providerKey].models.push(modelEntry(resolved.modelId, resolved.modelName, resolved.compat))
|
||||
if (route.id === primary.id) primaryModelRef = resolved.modelRef
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user