Skip to content

refactor: refactor sandbox module #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chickenlj merged 10 commits into from
Jan 12, 2026
Merged

refactor: refactor sandbox module #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
96bb993
refactor: refactor sandbox module
xuehuitian45 Jan 6, 2026
2845b9f
fix: add missing licenses
xuehuitian45 Jan 6, 2026
55c69ed
fix: fix remote mode
xuehuitian45 Jan 7, 2026
eca6873
fix: fix remote mode
xuehuitian45 Jan 7, 2026
57f7113
fix: fix remote mode & merge oss-extension into sandbox-core
xuehuitian45 Jan 7, 2026
33581ab
fix: add agentbay sandbox and fix cookbooks
xuehuitian45 Jan 8, 2026
727b477
fix: add map for agentbay sandbox & fix sandbox lazy initialize bug
xuehuitian45 Jan 8, 2026
d939435
fix: add mobile sandbox cookbook
xuehuitian45 Jan 8, 2026
0c1aa50
fix: remove unused dependency
xuehuitian45 Jan 9, 2026
10b6bc2
fix: add container name conflict check before creating
xuehuitian45 Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agents/agentscope/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependencies>
<dependency>
<groupId>io.agentscope</groupId>
<artifactId>agentscope-runtime-core</artifactId>
<artifactId>agentscope-runtime-engine</artifactId>
<version>1.0.1</version>
</dependency>

Expand Down
59 changes: 29 additions & 30 deletions ...scope/src/main/java/io/agentscope/runtime/engine/agents/agentscope/tools/ToolkitInit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
import io.agentscope.runtime.engine.agents.agentscope.tools.fs.*;
import io.agentscope.runtime.engine.agents.agentscope.tools.mcp.AsMCPTool;
import io.agentscope.runtime.sandbox.box.Sandbox;
import io.agentscope.runtime.sandbox.manager.SandboxManager;
import io.agentscope.runtime.sandbox.manager.model.container.SandboxType;
import io.agentscope.runtime.sandbox.manager.SandboxService;
import io.agentscope.runtime.sandbox.tools.MCPTool;
import io.agentscope.runtime.sandbox.tools.McpConfigConverter;
import org.slf4j.Logger;
Expand Down Expand Up @@ -299,26 +298,26 @@ public static AgentTool SearchFilesTool(Sandbox sandbox) {
}

public static List<AgentTool> getMcpTools(String serverConfigs,
SandboxType sandboxType,
SandboxManager sandboxManager) {
return getMcpTools(serverConfigs, sandboxType, sandboxManager, null, null);
String sandboxType,
SandboxService sandboxService) {
return getMcpTools(serverConfigs, sandboxType, sandboxService, null, null);
}

public static List<AgentTool> getMcpTools(Map<String, Object> serverConfigs,
SandboxType sandboxType,
SandboxManager sandboxManager) {
return getMcpTools(serverConfigs, sandboxType, sandboxManager, null, null);
String sandboxType,
SandboxService sandboxService) {
return getMcpTools(serverConfigs, sandboxType, sandboxService, null, null);
}

public static List<AgentTool> getMcpTools(String serverConfigs,
SandboxType sandboxType,
SandboxManager sandboxManager,
String sandboxType,
SandboxService sandboxService,
Set<String> whitelist,
Set<String> blacklist) {
McpConfigConverter converter = McpConfigConverter.builder()
.serverConfigs(serverConfigs)
.sandboxType(sandboxType)
.sandboxManager(sandboxManager)
.sandboxService(sandboxService)
.whitelist(whitelist)
.blacklist(blacklist)
.build();
Expand All @@ -327,14 +326,14 @@ public static List<AgentTool> getMcpTools(String serverConfigs,
}

public static List<AgentTool> getMcpTools(Map<String, Object> serverConfigs,
SandboxType sandboxType,
SandboxManager sandboxManager,
String sandboxType,
SandboxService sandboxService,
Set<String> whitelist,
Set<String> blacklist) {
McpConfigConverter converter = McpConfigConverter.builder()
.serverConfigs(serverConfigs)
.sandboxType(sandboxType)
.sandboxManager(sandboxManager)
.sandboxService(sandboxService)
.whitelist(whitelist)
.blacklist(blacklist)
.build();
Expand All @@ -343,23 +342,23 @@ public static List<AgentTool> getMcpTools(Map<String, Object> serverConfigs,
}

public static List<AgentTool> getMcpTools(String serverConfigs,
SandboxManager sandboxManager) {
return getMcpTools(serverConfigs, null, sandboxManager, null, null);
SandboxService sandboxService) {
return getMcpTools(serverConfigs, null, sandboxService, null, null);
}

public static List<AgentTool> getMcpTools(Map<String, Object> serverConfigs,
SandboxManager sandboxManager) {
return getMcpTools(serverConfigs, null, sandboxManager, null, null);
SandboxService sandboxService) {
return getMcpTools(serverConfigs, null, sandboxService, null, null);
}

// public static List<AgentTool> getAllToolsWithMcp(String mcpServerConfigs,
// SandboxType sandboxType,
// SandboxManager sandboxManager) {
// String sandboxType,
// SandboxService sandboxService) {
// List<AgentTool> allTools = new ArrayList<>(getAllTools());
//
// if (mcpServerConfigs != null && !mcpServerConfigs.trim().isEmpty()) {
// try {
// List<AgentTool> mcpTools = getMcpTools(mcpServerConfigs, sandboxType, sandboxManager);
// List<AgentTool> mcpTools = getMcpTools(mcpServerConfigs, sandboxType, sandboxService);
// allTools.addAll(mcpTools);
// logger.info(String.format("Added %d MCP tools to the toolkit", mcpTools.size()));
// } catch (Exception e) {
Expand All @@ -371,13 +370,13 @@ public static List<AgentTool> getMcpTools(Map<String, Object> serverConfigs,
// }

// public static List<AgentTool> getAllToolsWithMcp(Map<String, Object> mcpServerConfigs,
// SandboxType sandboxType,
// SandboxManager sandboxManager) {
// String sandboxType,
// SandboxService sandboxService) {
// List<AgentTool> allTools = new ArrayList<>(getAllTools());
//
// if (mcpServerConfigs != null && !mcpServerConfigs.isEmpty()) {
// try {
// List<AgentTool> mcpTools = getMcpTools(mcpServerConfigs, sandboxType, sandboxManager);
// List<AgentTool> mcpTools = getMcpTools(mcpServerConfigs, sandboxType, sandboxService);
// allTools.addAll(mcpTools);
// logger.info(String.format("Added %d MCP tools to the toolkit", mcpTools.size()));
// } catch (Exception e) {
Expand All @@ -389,24 +388,24 @@ public static List<AgentTool> getMcpTools(Map<String, Object> serverConfigs,
// }

public static List<MCPTool> createMcpToolInstances(String serverConfigs,
SandboxType sandboxType,
SandboxManager sandboxManager) {
String sandboxType,
SandboxService sandboxService) {
McpConfigConverter converter = McpConfigConverter.builder()
.serverConfigs(serverConfigs)
.sandboxType(sandboxType)
.sandboxManager(sandboxManager)
.sandboxService(sandboxService)
.build();

return converter.toBuiltinTools();
}

public static List<MCPTool> createMcpToolInstances(Map<String, Object> serverConfigs,
SandboxType sandboxType,
SandboxManager sandboxManager) {
String sandboxType,
SandboxService sandboxService) {
McpConfigConverter converter = McpConfigConverter.builder()
.serverConfigs(serverConfigs)
.sandboxType(sandboxType)
.sandboxManager(sandboxManager)
.sandboxService(sandboxService)
.build();

return converter.toBuiltinTools();
Expand Down
7 changes: 3 additions & 4 deletions ...ope/src/main/java/io/agentscope/runtime/engine/agents/agentscope/tools/mcp/AsMCPTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

import io.agentscope.core.message.ToolResultBlock;
import io.agentscope.runtime.engine.agents.agentscope.tools.AgentScopeSandboxAwareTool;
import io.agentscope.runtime.sandbox.manager.SandboxManager;
import io.agentscope.runtime.sandbox.manager.model.container.SandboxType;
import io.agentscope.runtime.sandbox.manager.SandboxService;
import io.agentscope.runtime.sandbox.tools.MCPTool;
import reactor.core.publisher.Mono;

Expand All @@ -29,14 +28,14 @@
public class AsMCPTool extends AgentScopeSandboxAwareTool<MCPTool> {
public AsMCPTool(String name, String toolType, String description,
Map<String, Object> schema, Map<String, Object> serverConfigs,
SandboxType sandboxType, SandboxManager sandboxManager) {
String sandboxType, SandboxService sandboxService) {
super(new MCPTool(name,
toolType,
description,
schema,
serverConfigs,
sandboxType,
sandboxManager));
sandboxService));
}

public AsMCPTool(MCPTool mcpTool) {
Expand Down
20 changes: 9 additions & 11 deletions cookbook/en/deployment/agent_app.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,9 @@ import io.agentscope.runtime.app.AgentApp;
import io.agentscope.runtime.engine.services.agent_state.InMemoryStateService;
import io.agentscope.runtime.engine.services.memory.persistence.memory.service.InMemoryMemoryService;
import io.agentscope.runtime.engine.services.memory.persistence.session.InMemorySessionHistoryService;
import io.agentscope.runtime.engine.services.sandbox.SandboxService;
import io.agentscope.runtime.sandbox.manager.SandboxManager;
import io.agentscope.runtime.sandbox.manager.client.config.KubernetesClientConfig;
import io.agentscope.runtime.sandbox.manager.model.ManagerConfig;
import io.agentscope.runtime.sandbox.manager.ManagerConfig;
import io.agentscope.runtime.sandbox.manager.SandboxService;
import io.agentscope.runtime.sandbox.manager.client.container.docker.DockerClientStarter;
import org.jetbrains.annotations.NotNull;

/**
Expand All @@ -364,7 +363,7 @@ import org.jetbrains.annotations.NotNull;
* <ul>
* <li>Session state management (in-memory storage)</li>
* <li>Short-term memory (session history) and long-term memory (user-level memory store)</li>
* <li>Python sandbox tool support (isolated execution environment via Kubernetes)</li>
* <li>Python sandbox tool support (isolated execution environment via Docker)</li>
* <li>Streaming agent inference service via HTTP interface</li>
* </ul>
*
Expand Down Expand Up @@ -403,19 +402,18 @@ public class AgentScopeDeployExample {
}

/**
* Build sandbox service instance, using Kubernetes client configuration by default.
* Build sandbox service instance, using Docker client configuration by default.
*
* @return Configured SandboxService instance
*/
@NotNull
private static SandboxService buildSandboxService() {
// Use default Kubernetes configuration (can be replaced with actual cluster configuration for deployment)
var clientConfig = KubernetesClientConfig.builder().build();
var clientConfig = DockerClientStarter.builder().build();
var managerConfig = ManagerConfig.builder()
.containerDeployment(clientConfig)
.build();
.clientStarter(clientConfig)
.build();

return new SandboxService(new SandboxManager(managerConfig));
return new SandboxService(managerConfig);
}
}
```
Expand Down
Loading
Loading