feat(agent): implement LLM call timeout and transient error handling

- Introduced a configurable LLM call timeout with a default value, allowing for better control over LLM call durations.
- Added logic to retry transient errors (e.g., timeouts, rate limits) up to a specified maximum number of retries, improving robustness in error handling.
- Implemented parameter casting for tool arguments to ensure correct types are used, addressing common LLM quirks.
- Enhanced tool execution error messages with guidance for retrying with different approaches.
- Added validation for configuration values to prevent runtime errors.
This commit is contained in:
wizardchen
2026-03-19 20:39:38 +08:00
committed by lyingbug
parent 00ac14aabb
commit e936e0b347
9 changed files with 408 additions and 49 deletions
+127
View File
@@ -0,0 +1,127 @@
package tools
import (
"encoding/json"
"strconv"
"strings"
)
// CastParams performs schema-driven type casting on tool arguments.
// LLMs sometimes return incorrect types (e.g., "true" instead of true, "123" instead of 123).
// This function attempts safe conversions based on the JSON Schema definition of the tool's parameters.
//
// If the schema is nil or cannot be parsed, the original args are returned unchanged.
func CastParams(args json.RawMessage, schema json.RawMessage) json.RawMessage {
if len(schema) == 0 || len(args) == 0 {
return args
}
var schemaDef map[string]interface{}
if err := json.Unmarshal(schema, &schemaDef); err != nil {
return args
}
properties, ok := schemaDef["properties"].(map[string]interface{})
if !ok || len(properties) == 0 {
return args
}
var argsMap map[string]interface{}
if err := json.Unmarshal(args, &argsMap); err != nil {
return args
}
changed := false
for key, val := range argsMap {
propDef, exists := properties[key]
if !exists {
continue
}
prop, ok := propDef.(map[string]interface{})
if !ok {
continue
}
targetType, _ := prop["type"].(string)
if targetType == "" {
continue
}
newVal, didCast := castValue(val, targetType)
if didCast {
argsMap[key] = newVal
changed = true
}
}
if !changed {
return args
}
result, err := json.Marshal(argsMap)
if err != nil {
return args
}
return result
}
// castValue attempts to convert val to the expected targetType.
// Returns (newValue, true) if a conversion was made, (val, false) otherwise.
func castValue(val interface{}, targetType string) (interface{}, bool) {
switch targetType {
case "boolean":
if s, ok := val.(string); ok {
lower := strings.ToLower(s)
switch lower {
case "true", "1", "yes":
return true, true
case "false", "0", "no":
return false, true
}
}
// JSON number 0/1 -> bool
if n, ok := val.(float64); ok {
if n == 0 {
return false, true
}
if n == 1 {
return true, true
}
}
case "integer":
if s, ok := val.(string); ok {
if i, err := strconv.ParseInt(s, 10, 64); err == nil {
return i, true
}
}
// JSON numbers are float64 in Go; convert to int if it's a whole number
if f, ok := val.(float64); ok {
if f == float64(int64(f)) {
return int64(f), true
}
}
case "number":
if s, ok := val.(string); ok {
if f, err := strconv.ParseFloat(s, 64); err == nil {
return f, true
}
}
case "string":
// Non-string values -> string (e.g., number or bool passed as non-string)
switch v := val.(type) {
case bool:
if v {
return "true", true
}
return "false", true
case float64:
return strconv.FormatFloat(v, 'f', -1, 64), true
case int64:
return strconv.FormatInt(v, 10), true
}
}
return val, false
}
+81
View File
@@ -0,0 +1,81 @@
package tools
import (
"encoding/json"
"testing"
)
func TestCastParams_StringToBool(t *testing.T) {
schema := json.RawMessage(`{"type":"object","properties":{"enabled":{"type":"boolean"}}}`)
args := json.RawMessage(`{"enabled":"true"}`)
result := CastParams(args, schema)
var parsed map[string]interface{}
if err := json.Unmarshal(result, &parsed); err != nil {
t.Fatal(err)
}
if parsed["enabled"] != true {
t.Errorf("expected true, got %v (%T)", parsed["enabled"], parsed["enabled"])
}
}
func TestCastParams_StringToInt(t *testing.T) {
schema := json.RawMessage(`{"type":"object","properties":{"count":{"type":"integer"}}}`)
args := json.RawMessage(`{"count":"42"}`)
result := CastParams(args, schema)
var parsed map[string]interface{}
if err := json.Unmarshal(result, &parsed); err != nil {
t.Fatal(err)
}
// JSON numbers are float64 in Go
if parsed["count"] != float64(42) {
t.Errorf("expected 42, got %v (%T)", parsed["count"], parsed["count"])
}
}
func TestCastParams_StringToFloat(t *testing.T) {
schema := json.RawMessage(`{"type":"object","properties":{"score":{"type":"number"}}}`)
args := json.RawMessage(`{"score":"3.14"}`)
result := CastParams(args, schema)
var parsed map[string]interface{}
if err := json.Unmarshal(result, &parsed); err != nil {
t.Fatal(err)
}
if parsed["score"] != 3.14 {
t.Errorf("expected 3.14, got %v", parsed["score"])
}
}
func TestCastParams_NoChangeNeeded(t *testing.T) {
schema := json.RawMessage(`{"type":"object","properties":{"name":{"type":"string"}}}`)
args := json.RawMessage(`{"name":"hello"}`)
result := CastParams(args, schema)
if string(result) != string(args) {
t.Errorf("expected no change, got %s", result)
}
}
func TestCastParams_NilSchema(t *testing.T) {
args := json.RawMessage(`{"foo":"bar"}`)
result := CastParams(args, nil)
if string(result) != string(args) {
t.Errorf("expected no change with nil schema")
}
}
func TestCastParams_BoolFalseString(t *testing.T) {
schema := json.RawMessage(`{"type":"object","properties":{"flag":{"type":"boolean"}}}`)
args := json.RawMessage(`{"flag":"false"}`)
result := CastParams(args, schema)
var parsed map[string]interface{}
if err := json.Unmarshal(result, &parsed); err != nil {
t.Fatal(err)
}
if parsed["flag"] != false {
t.Errorf("expected false, got %v (%T)", parsed["flag"], parsed["flag"])
}
}
+21 -6
View File
@@ -6,9 +6,13 @@ import (
"fmt"
"github.com/Tencent/WeKnora/internal/common"
"github.com/Tencent/WeKnora/internal/logger"
"github.com/Tencent/WeKnora/internal/types"
)
// toolErrorHint is appended to tool error messages to guide the LLM to retry with a different approach.
const toolErrorHint = "\n\n[Analyze the error above and try a different approach.]"
// ToolRegistry manages the registration and retrieval of tools
type ToolRegistry struct {
tools map[string]types.Tool
@@ -27,6 +31,8 @@ func NewToolRegistry() *ToolRegistry {
func (r *ToolRegistry) RegisterTool(tool types.Tool) {
name := tool.Name()
if _, exists := r.tools[name]; exists {
logger.Warnf(context.Background(),
"[ToolRegistry] Duplicate tool registration rejected: %s (first-wins policy)", name)
return
}
r.tools[name] = tool
@@ -81,10 +87,14 @@ func (r *ToolRegistry) ExecuteTool(
})
return &types.ToolResult{
Success: false,
Error: err.Error(),
Error: err.Error() + toolErrorHint,
}, err
}
// Cast parameters to match expected schema types before execution.
// This handles common LLM quirks like returning "true" instead of true.
args = CastParams(args, tool.Parameters())
result, execErr := tool.Execute(ctx, args)
fields := map[string]interface{}{
"tool": name,
@@ -100,6 +110,10 @@ func (r *ToolRegistry) ExecuteTool(
fields["error"] = execErr.Error()
common.PipelineError(ctx, "AgentTool", "execute_done", fields)
} else if result != nil && !result.Success {
// Append error hint to guide LLM to retry with a different approach
if result.Error != "" {
result.Error = result.Error + toolErrorHint
}
common.PipelineWarn(ctx, "AgentTool", "execute_done", fields)
} else {
common.PipelineInfo(ctx, "AgentTool", "execute_done", fields)
@@ -108,12 +122,13 @@ func (r *ToolRegistry) ExecuteTool(
return result, execErr
}
// Cleanup cleans up all registered tools that implement the Cleanup method
// Cleanup cleans up all registered tools that implement the types.Cleanable interface.
// This is called at the end of agent sessions to release tool-specific resources.
func (r *ToolRegistry) Cleanup(ctx context.Context) {
// Check specifically for DataAnalysisTool
if tool, exists := r.tools[ToolDataAnalysis]; exists {
if dataAnalysisTool, ok := tool.(*DataAnalysisTool); ok {
dataAnalysisTool.Cleanup(ctx)
for name, tool := range r.tools {
if cleanable, ok := tool.(types.Cleanable); ok {
logger.Infof(ctx, "[ToolRegistry] Cleaning up tool: %s", name)
cleanable.Cleanup(ctx)
}
}
}