@blaxel/core 0.2.49-dev.213 → 0.2.49-dev1

package/dist/esm/sandbox/interpreter.js

@@ -0,0 +1,396 @@
+import { logger } from "../common/logger.js";
+import { settings } from "../common/settings.js";
+import { SandboxInstance } from "./sandbox.js";
+export class CodeInterpreter extends SandboxInstance {
+    static DEFAULT_IMAGE = "blaxel/jupyter-server";
+    static DEFAULT_PORTS = [
+        { name: "jupyter", target: 8888, protocol: "HTTP" },
+    ];
+    static DEFAULT_LIFECYCLE = {
+        expirationPolicies: [{ type: "ttl-idle", value: "30m", action: "delete" }],
+    };
+    _sandboxConfig;
+    constructor(sandbox) {
+        super(sandbox);
+        this._sandboxConfig = sandbox;
+    }
+    static async get(sandboxName) {
+        const base = await SandboxInstance.get(sandboxName);
+        // Create a minimal config - the base instance already has the sandbox data
+        // We'll rely on the process property for URL/headers access
+        const config = {
+            metadata: base.metadata,
+            spec: base.spec,
+            status: base.status,
+            events: base.events,
+        };
+        return new CodeInterpreter(config);
+    }
+    static async create(sandbox, { safe = true } = {}) {
+        const payload = {
+            image: CodeInterpreter.DEFAULT_IMAGE,
+            ports: CodeInterpreter.DEFAULT_PORTS,
+            lifecycle: CodeInterpreter.DEFAULT_LIFECYCLE,
+        };
+        const allowedCopyKeys = new Set(["name", "envs", "memory", "region", "headers"]);
+        if (sandbox && typeof sandbox === "object") {
+            if (Array.isArray(sandbox)) {
+                // Skip arrays
+            }
+            else if ("metadata" in sandbox || "spec" in sandbox) {
+                // It's a Sandbox object
+                const sandboxObj = sandbox;
+                if (sandboxObj.metadata?.name) {
+                    payload["name"] = sandboxObj.metadata.name;
+                }
+                if (sandboxObj.spec?.runtime) {
+                    if (sandboxObj.spec.runtime.envs) {
+                        payload["envs"] = sandboxObj.spec.runtime.envs;
+                    }
+                    if (sandboxObj.spec.runtime.memory) {
+                        payload["memory"] = sandboxObj.spec.runtime.memory;
+                    }
+                }
+                if (sandboxObj.spec?.region) {
+                    payload["region"] = sandboxObj.spec.region;
+                }
+            }
+            else if ("name" in sandbox || "image" in sandbox || "memory" in sandbox) {
+                // It's a SandboxCreateConfiguration or dict-like object
+                const sandboxDict = sandbox;
+                for (const k of allowedCopyKeys) {
+                    const value = sandboxDict[k];
+                    if (value !== null && value !== undefined) {
+                        payload[k] = value;
+                    }
+                }
+            }
+        }
+        const baseInstance = await SandboxInstance.create(payload, { safe });
+        // Create config from the instance - preserve any forceUrl/headers if provided in input
+        const config = {
+            metadata: baseInstance.metadata,
+            spec: baseInstance.spec,
+            status: baseInstance.status,
+            events: baseInstance.events,
+        };
+        // Preserve forceUrl and headers from input if it was a dict-like object
+        if (sandbox && typeof sandbox === "object" && !Array.isArray(sandbox)) {
+            if ("forceUrl" in sandbox && typeof sandbox.forceUrl === "string") {
+                config.forceUrl = sandbox.forceUrl;
+            }
+            if ("headers" in sandbox && typeof sandbox.headers === "object") {
+                config.headers = sandbox.headers;
+            }
+            if ("params" in sandbox && typeof sandbox.params === "object") {
+                config.params = sandbox.params;
+            }
+        }
+        return new CodeInterpreter(config);
+    }
+    get _jupyterUrl() {
+        return this.process.url;
+    }
+    static OutputMessage = class {
+        text;
+        timestamp;
+        isStderr;
+        constructor(text, timestamp, isStderr) {
+            this.text = text;
+            this.timestamp = timestamp;
+            this.isStderr = isStderr;
+        }
+    };
+    static Result = class {
+        constructor(kwargs = {}) {
+            for (const [k, v] of Object.entries(kwargs)) {
+                this[k] = v;
+            }
+        }
+    };
+    static ExecutionError = class {
+        name;
+        value;
+        traceback;
+        constructor(name, value, traceback) {
+            this.name = name;
+            this.value = value;
+            this.traceback = traceback;
+        }
+    };
+    static Logs = class {
+        stdout = [];
+        stderr = [];
+    };
+    static Execution = class {
+        results = [];
+        logs = new CodeInterpreter.Logs();
+        error = null;
+        executionCount = null;
+    };
+    static Context = class {
+        id;
+        constructor(id) {
+            this.id = id;
+        }
+        static fromJson(data) {
+            return new CodeInterpreter.Context(String(data.id || data.context_id || ""));
+        }
+    };
+    _parseOutput(execution, output, onStdout, onStderr, onResult, onError) {
+        let data;
+        try {
+            data = JSON.parse(output);
+        }
+        catch {
+            // Fallback: treat as stdout text-only message
+            execution.logs.stdout.push(output);
+            if (onStdout) {
+                return onStdout(new CodeInterpreter.OutputMessage(output, null, false));
+            }
+            return null;
+        }
+        let dataType = "";
+        if (typeof data.type === "string") {
+            dataType = data.type;
+        }
+        else if (data.type !== null &&
+            data.type !== undefined &&
+            typeof data.type !== "object") {
+            const typeValue = data.type;
+            dataType = String(typeValue);
+        }
+        const restData = { ...data };
+        delete restData.type;
+        if (dataType === "result") {
+            const result = new CodeInterpreter.Result(restData);
+            execution.results.push(result);
+            if (onResult) {
+                return onResult(result);
+            }
+        }
+        else if (dataType === "stdout") {
+            let text = "";
+            if (typeof data.text === "string") {
+                text = data.text;
+            }
+            else if (data.text !== null &&
+                data.text !== undefined &&
+                typeof data.text !== "object") {
+                const textValue = data.text;
+                text = String(textValue);
+            }
+            execution.logs.stdout.push(text);
+            if (onStdout) {
+                return onStdout(new CodeInterpreter.OutputMessage(text, typeof data.timestamp === "number" ? data.timestamp : null, false));
+            }
+        }
+        else if (dataType === "stderr") {
+            let text = "";
+            if (typeof data.text === "string") {
+                text = data.text;
+            }
+            else if (data.text !== null &&
+                data.text !== undefined &&
+                typeof data.text !== "object") {
+                const textValue = data.text;
+                text = String(textValue);
+            }
+            execution.logs.stderr.push(text);
+            if (onStderr) {
+                return onStderr(new CodeInterpreter.OutputMessage(text, typeof data.timestamp === "number" ? data.timestamp : null, true));
+            }
+        }
+        else if (dataType === "error") {
+            let errorName = "";
+            if (typeof data.name === "string") {
+                errorName = data.name;
+            }
+            else if (data.name !== null &&
+                data.name !== undefined &&
+                typeof data.name !== "object") {
+                const nameValue = data.name;
+                errorName = String(nameValue);
+            }
+            execution.error = new CodeInterpreter.ExecutionError(errorName, data.value, data.traceback);
+            if (onError) {
+                return onError(execution.error);
+            }
+        }
+        else if (dataType === "number_of_executions") {
+            execution.executionCount =
+                typeof data.execution_count === "number" ? data.execution_count : null;
+        }
+        return null;
+    }
+    async runCode(code, options = {}) {
+        const { language = null, context = null, onStdout, onStderr, onResult, onError, envs = null, timeout = null, } = options;
+        const DEFAULT_TIMEOUT = 60.0;
+        if (language && context) {
+            throw new Error("You can provide context or language, but not both at the same time.");
+        }
+        const readTimeout = timeout === 0 ? null : timeout ?? DEFAULT_TIMEOUT;
+        const contextId = context?.id ?? null;
+        const body = {
+            code,
+            context_id: contextId,
+            language,
+            env_vars: envs,
+        };
+        const execution = new CodeInterpreter.Execution();
+        const headers = this._sandboxConfig.forceUrl
+            ? this._sandboxConfig.headers
+            : settings.headers;
+        const controller = new AbortController();
+        let timeoutId = null;
+        // Set up timeout
+        if (readTimeout !== null) {
+            timeoutId = setTimeout(() => {
+                controller.abort();
+            }, readTimeout * 1000);
+        }
+        try {
+            const response = await fetch(`${this._jupyterUrl}/port/8888/execute`, {
+                method: "POST",
+                headers: {
+                    ...headers,
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify(body),
+                signal: controller.signal,
+            });
+            if (response.status >= 400) {
+                let bodyText = "<unavailable>";
+                try {
+                    bodyText = await response.text();
+                }
+                catch {
+                    // Ignore errors
+                }
+                const method = "POST";
+                const url = `${this._jupyterUrl}/port/8888/execute`;
+                const reason = response.statusText;
+                const details = "Execution failed\n" +
+                    `- method: ${method}\n- url: ${url}\n- status: ${response.status} ${reason}\n` +
+                    `- response-headers: ${JSON.stringify(Object.fromEntries(response.headers.entries()))}\n- body:\n${bodyText}`;
+                logger.debug(details);
+                throw new Error(details);
+            }
+            if (!response.body) {
+                throw new Error("No response body");
+            }
+            const reader = response.body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            try {
+                while (true) {
+                    const result = await reader.read();
+                    if (result.done)
+                        break;
+                    const value = result.value;
+                    if (value instanceof Uint8Array) {
+                        buffer += decoder.decode(value, { stream: true });
+                        const lines = buffer.split(/\r?\n/);
+                        buffer = lines.pop() || "";
+                        for (const line of lines) {
+                            if (!line)
+                                continue;
+                            try {
+                                this._parseOutput(execution, line, onStdout, onStderr, onResult, onError);
+                            }
+                            catch {
+                                // Fallback: treat as stdout text-only message
+                                execution.logs.stdout.push(line);
+                                if (onStdout) {
+                                    onStdout(new CodeInterpreter.OutputMessage(line, null, false));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            finally {
+                reader.releaseLock();
+            }
+        }
+        catch (error) {
+            if (error &&
+                typeof error === "object" &&
+                "name" in error &&
+                error.name === "AbortError") {
+                throw new Error("Request timeout");
+            }
+            throw error;
+        }
+        finally {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+        }
+        return execution;
+    }
+    async createCodeContext(options = {}) {
+        const { cwd = null, language = null, requestTimeout = null } = options;
+        const data = {};
+        if (language) {
+            data.language = language;
+        }
+        if (cwd) {
+            data.cwd = cwd;
+        }
+        const headers = this._sandboxConfig.forceUrl
+            ? this._sandboxConfig.headers
+            : settings.headers;
+        const controller = new AbortController();
+        let timeoutId = null;
+        if (requestTimeout !== null) {
+            timeoutId = setTimeout(() => {
+                controller.abort();
+            }, requestTimeout * 1000);
+        }
+        try {
+            const response = await fetch(`${this._jupyterUrl}/port/8888/contexts`, {
+                method: "POST",
+                headers: {
+                    ...headers,
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify(data),
+                signal: controller.signal,
+            });
+            if (response.status >= 400) {
+                let bodyText = "<unavailable>";
+                try {
+                    bodyText = await response.text();
+                }
+                catch {
+                    // Ignore errors
+                }
+                const method = "POST";
+                const url = `${this._jupyterUrl}/port/8888/contexts`;
+                const reason = response.statusText;
+                const details = "Create context failed\n" +
+                    `- method: ${method}\n- url: ${url}\n- status: ${response.status} ${reason}\n` +
+                    `- response-headers: ${JSON.stringify(Object.fromEntries(response.headers.entries()))}\n- body:\n${bodyText}`;
+                logger.debug(details);
+                throw new Error(details);
+            }
+            const responseData = (await response.json());
+            return CodeInterpreter.Context.fromJson(responseData);
+        }
+        catch (error) {
+            if (error &&
+                typeof error === "object" &&
+                "name" in error &&
+                error.name === "AbortError") {
+                throw new Error("Request timeout");
+            }
+            throw error;
+        }
+        finally {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+        }
+    }
+}

package/dist/esm/sandbox/sandbox.js

@@ -2,16 +2,11 @@ import { v4 as uuidv4 } from "uuid";
 import { createSandbox, deleteSandbox, getSandbox, listSandboxes, updateSandbox } from "../client/index.js";
 import { logger } from "../common/logger.js";
 import { SandboxFileSystem } from "./filesystem/index.js";
-import { SandboxFileSystemWebSocket } from "./filesystem/filesystem-ws.js";
 import { SandboxNetwork } from "./network/index.js";
-import { SandboxNetworkWebSocket } from "./network/network-ws.js";
 import { SandboxPreviews } from "./preview.js";
 import { SandboxProcess } from "./process/index.js";
-import { SandboxProcessWebSocket } from "./process/process-ws.js";
 import { SandboxCodegen } from "./codegen/index.js";
-import { SandboxCodegenWebSocket } from "./codegen/codegen-ws.js";
 import { SandboxSessions } from "./session.js";
-import { WebSocketClient } from "./websocket/index.js";
 import { normalizeEnvs, normalizePorts, normalizeVolumes } from "./types.js";
 export class SandboxInstance {
     sandbox;
@@ -21,32 +16,14 @@ export class SandboxInstance {
     previews;
     sessions;
     codegen;
-    wsClient;
     constructor(sandbox) {
         this.sandbox = sandbox;
-        // If connection type is websocket, initialize WebSocket client and use WebSocket transport layers
-        if (sandbox.connectionType === "websocket") {
-            const url = sandbox.forceUrl || sandbox.metadata?.url || "";
-            this.wsClient = new WebSocketClient({
-                url,
-                headers: sandbox.headers,
-            });
-            // Initialize WebSocket-based action handlers
-            this.process = new SandboxProcessWebSocket(sandbox, this.wsClient);
-            this.fs = new SandboxFileSystemWebSocket(sandbox, this.process, this.wsClient);
-            this.network = new SandboxNetworkWebSocket(sandbox, this.wsClient);
-            this.codegen = new SandboxCodegenWebSocket(sandbox, this.wsClient);
-        }
-        else {
-            // Default to HTTP-based action handlers
-            this.process = new SandboxProcess(sandbox);
-            this.fs = new SandboxFileSystem(sandbox, this.process);
-            this.network = new SandboxNetwork(sandbox);
-            this.codegen = new SandboxCodegen(sandbox);
-        }
-        // These are always HTTP-based
+        this.process = new SandboxProcess(sandbox);
+        this.fs = new SandboxFileSystem(sandbox, this.process);
+        this.network = new SandboxNetwork(sandbox);
         this.previews = new SandboxPreviews(sandbox);
         this.sessions = new SandboxSessions(sandbox);
+        this.codegen = new SandboxCodegen(sandbox);
     }
     get metadata() {
         return this.sandbox.metadata;
@@ -65,17 +42,10 @@ export class SandboxInstance {
         logger.warn("⚠️  Warning: sandbox.wait() is deprecated. You don't need to wait for the sandbox to be deployed anymore.");
         return this;
     }
-    closeConnection() {
-        if (this.wsClient) {
-            this.wsClient.close();
-        }
-    }
     static async create(sandbox, { safe = true } = {}) {
         const defaultName = `sandbox-${uuidv4().replace(/-/g, '').substring(0, 8)}`;
         const defaultImage = `blaxel/base-image:latest`;
         const defaultMemory = 4096;
-        // Store connection type if provided
-        let connectionType;
         // Handle SandboxCreateConfiguration or simple dict with name/image/memory/ports/envs/volumes keys
         if (!sandbox ||
             'name' in sandbox ||
@@ -85,8 +55,7 @@ export class SandboxInstance {
             'envs' in sandbox ||
             'volumes' in sandbox ||
             'lifecycle' in sandbox ||
-            'snapshotEnabled' in sandbox ||
-            'connectionType' in sandbox) {
+            'snapshotEnabled' in sandbox) {
             if (!sandbox)
                 sandbox = {};
             if (!sandbox.name)
@@ -95,7 +64,6 @@ export class SandboxInstance {
                 sandbox.image = defaultImage;
             if (!sandbox.memory)
                 sandbox.memory = defaultMemory;
-            connectionType = sandbox.connectionType;
             const ports = normalizePorts(sandbox.ports);
             const envs = normalizeEnvs(sandbox.envs);
             const volumes = normalizeVolumes(sandbox.volumes);
@@ -144,16 +112,7 @@ export class SandboxInstance {
             body: sandbox,
             throwOnError: true,
         });
-        // Add connection type to configuration
-        const config = {
-            ...data,
-            connectionType: connectionType || "http",
-        };
-        const instance = new SandboxInstance(config);
-        // Connect WebSocket if needed
-        if (connectionType === "websocket" && instance.wsClient) {
-            await instance.wsClient.connect();
-        }
+        const instance = new SandboxInstance(data);
         // TODO remove this part once we have a better way to handle this
         if (safe) {
             try {
@@ -163,34 +122,20 @@ export class SandboxInstance {
         }
         return instance;
     }
-    static async get(sandboxName, connectionType) {
+    static async get(sandboxName) {
         const { data } = await getSandbox({
             path: {
                 sandboxName,
             },
             throwOnError: true,
         });
-        // Add connection type to configuration
-        const config = {
-            ...data,
-            connectionType: connectionType || "http",
-        };
-        const instance = new SandboxInstance(config);
-        // Connect WebSocket if needed
-        if (connectionType === "websocket" && instance.wsClient) {
-            await instance.wsClient.connect();
-        }
-        return instance;
+        return new SandboxInstance(data);
     }
     static async list() {
         const { data } = await listSandboxes({ throwOnError: true });
         return data.map((sandbox) => new SandboxInstance(sandbox));
     }
-    static async delete(sandboxName, instance) {
-        // Close WebSocket connection if instance is provided
-        if (instance && instance.wsClient) {
-            instance.closeConnection();
-        }
+    static async delete(sandboxName) {
         const { data } = await deleteSandbox({
             path: {
                 sandboxName,
@@ -220,10 +165,8 @@ export class SandboxInstance {
                 if (!name) {
                     throw new Error("Sandbox name is required");
                 }
-                // Get connection type if specified
-                const connectionType = 'connectionType' in sandbox ? sandbox.connectionType : undefined;
                 // Get the existing sandbox to check its status
-                const sandboxInstance = await SandboxInstance.get(name, connectionType);
+                const sandboxInstance = await SandboxInstance.get(name);
                 // If the sandbox is TERMINATED, treat it as not existing
                 if (sandboxInstance.status === "TERMINATED") {
                     // Create a new sandbox - backend will handle cleanup of the terminated one

package/dist/esm/tools/mcpTool.js

@@ -1,6 +1,6 @@
 import { Client as ModelContextProtocolClient } from "@modelcontextprotocol/sdk/client/index.js";
 import { env } from "../common/env.js";
-import { generateInternalUrl, getForcedUrl } from "../common/internal.js";
+import { getForcedUrl, getGlobalUniqueHash } from "../common/internal.js";
 import { logger } from "../common/logger.js";
 import { settings } from "../common/settings.js";
 import { authenticate } from "../index.js";
@@ -39,10 +39,6 @@ export class McpTool {
         this.client = new ModelContextProtocolClient({
             name: this.name,
             version: "1.0.0",
-        }, {
-            capabilities: {
-                tools: {},
-            },
         });
     }
     get fallbackUrl() {
@@ -55,8 +51,8 @@ export class McpTool {
         return new URL(`${settings.runUrl}/${settings.workspace}/${this.pluralType}/${this.name}`);
     }
     get internalUrl() {
-        const url = generateInternalUrl(settings.workspace, this.type, this.name, settings.env, settings.runInternalProtocol, settings.runInternalHostname, settings.blCloud, settings.workspaceId);
-        return new URL(url);
+        const hash = getGlobalUniqueHash(settings.workspace, this.type, this.name);
+        return new URL(`${settings.runInternalProtocol}://bl-${settings.env}-${hash}.${settings.runInternalHostname}`);
     }
     get forcedUrl() {
         return getForcedUrl(this.type, this.name);