Skip to content

fix: fix the run_code and mcp_router configs #17

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
sjy3 merged 1 commit into from
Jan 5, 2026
Merged

fix: fix the run_code and mcp_router configs #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion configs/configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ func SetupVeADKConfig() error {
Image: &CommonModelConfig{},
Video: &CommonModelConfig{},
},
Tool: &BuiltinToolConfigs{},
Tool: &BuiltinToolConfigs{
MCPRouter: &MCPRouter{},
RunCode: &RunCode{},
},
PromptPilot: &PromptPilotConfig{},
TlsConfig: &TLSConfig{},
Veidentity: &VeIdentityConfig{},
Expand All @@ -78,6 +81,7 @@ func SetupVeADKConfig() error {
},
}
globalConfig.Model.MapEnvToConfig()
globalConfig.Tool.MapEnvToConfig()
globalConfig.LOGGING.MapEnvToConfig()
globalConfig.Database.MapEnvToConfig()
globalConfig.Volcengine.MapEnvToConfig()
Expand Down
37 changes: 36 additions & 1 deletion configs/tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,41 @@

package configs

import (
"github.com/volcengine/veadk-go/common"
"github.com/volcengine/veadk-go/utils"
)

type BuiltinToolConfigs struct {
// 根据实际字段补充
MCPRouter *MCPRouter `yaml:"mcp_router"`
RunCode *RunCode `yaml:"run_code"`
}

func (b *BuiltinToolConfigs) MapEnvToConfig() {
b.MCPRouter.MapEnvToConfig()
b.RunCode.MapEnvToConfig()
}

type MCPRouter struct {
Url string `yaml:"url"`
ApiKey string `yaml:"api_key"`
}

func (m *MCPRouter) MapEnvToConfig() {
m.Url = utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_URL)
m.ApiKey = utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_API_KEY)
}

type RunCode struct {
ToolID string `yaml:"tool_id"`
Host string `yaml:"host"`
ServiceCode string `yaml:"service_code"`
Region string `yaml:"region"`
}

func (r *RunCode) MapEnvToConfig() {
r.ToolID = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_ID)
r.Host = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_HOST)
r.ServiceCode = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_SERVICE_CODE)
r.Region = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_REGION)
}
5 changes: 3 additions & 2 deletions tool/builtin_tools/mcp_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (

"github.com/modelcontextprotocol/go-sdk/mcp"
"github.com/volcengine/veadk-go/common"
"github.com/volcengine/veadk-go/configs"
"github.com/volcengine/veadk-go/utils"
"golang.org/x/oauth2"
"google.golang.org/adk/tool"
Expand All @@ -27,10 +28,10 @@ import (

func agentkitMCPTransport(ctx context.Context) mcp.Transport {
ts := oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_API_KEY)},
&oauth2.Token{AccessToken: utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_API_KEY, configs.GetGlobalConfig().Tool.MCPRouter.ApiKey)},
)
return &mcp.StreamableClientTransport{
Endpoint: utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_URL),
Endpoint: utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_URL, configs.GetGlobalConfig().Tool.MCPRouter.Url),
HTTPClient: oauth2.NewClient(ctx, ts),
}
}
Expand Down
8 changes: 4 additions & 4 deletions tool/builtin_tools/run_code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ type RunCodeArgs struct {
func runCodeHandler(ctx tool.Context, args RunCodeArgs) (map[string]any, error) {
var result = make(map[string]any)

toolID := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_ID)
toolID := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_ID, configs.GetGlobalConfig().Tool.RunCode.ToolID)
if toolID == "" {
return result, ErrInvalidToolID
}
service := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_SERVICE_CODE, common.DEFAULT_AGENTKIT_TOOL_SERVICE_CODE)
region := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_REGION, common.DEFAULT_AGENTKIT_TOOL_REGION)
host := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_HOST, fmt.Sprintf("%s.%s.volces.com", service, region))
service := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_SERVICE_CODE, configs.GetGlobalConfig().Tool.RunCode.ServiceCode, common.DEFAULT_AGENTKIT_TOOL_SERVICE_CODE)
region := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_REGION, configs.GetGlobalConfig().Tool.RunCode.Region, common.DEFAULT_AGENTKIT_TOOL_REGION)
host := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_HOST, configs.GetGlobalConfig().Tool.RunCode.Host, fmt.Sprintf("%s.%s.volces.com", service, region))

var ak string
var sk string
Expand Down