feat(config): add timeout configuration for metadata extraction

This commit is contained in:
Hein
2026-03-27 16:01:02 +02:00
parent 4f3d027f9e
commit 2bca9791cb
4 changed files with 24 additions and 14 deletions

View File

@@ -129,7 +129,7 @@ func routes(logger *slog.Logger, cfg *config.Config, db *store.DB, provider ai.P
mux := http.NewServeMux()
toolSet := mcpserver.ToolSet{
Capture: tools.NewCaptureTool(db, provider, cfg.Capture, activeProjects, logger),
Capture: tools.NewCaptureTool(db, provider, cfg.Capture, cfg.AI.Metadata.Timeout, activeProjects, logger),
Search: tools.NewSearchTool(db, provider, cfg.Search, activeProjects),
List: tools.NewListTool(db, cfg.Search, activeProjects),
Stats: tools.NewStatsTool(db),

View File

@@ -89,6 +89,7 @@ type AIMetadataConfig struct {
FallbackModel string `yaml:"fallback_model"` // legacy single fallback
Temperature float64 `yaml:"temperature"`
LogConversations bool `yaml:"log_conversations"`
Timeout time.Duration `yaml:"timeout"`
}
type LiteLLMConfig struct {

View File

@@ -73,6 +73,7 @@ func defaultConfig() Config {
Metadata: AIMetadataConfig{
Model: "gpt-4o-mini",
Temperature: 0.1,
Timeout: 10 * time.Second,
},
Ollama: OllamaConfig{
BaseURL: "http://localhost:11434/v1",

View File

@@ -4,6 +4,7 @@ import (
"context"
"log/slog"
"strings"
"time"
"github.com/modelcontextprotocol/go-sdk/mcp"
"golang.org/x/sync/errgroup"
@@ -21,6 +22,7 @@ type CaptureTool struct {
provider ai.Provider
capture config.CaptureConfig
sessions *session.ActiveProjects
metadataTimeout time.Duration
log *slog.Logger
}
@@ -33,8 +35,8 @@ type CaptureOutput struct {
Thought thoughttypes.Thought `json:"thought"`
}
func NewCaptureTool(db *store.DB, provider ai.Provider, capture config.CaptureConfig, sessions *session.ActiveProjects, log *slog.Logger) *CaptureTool {
return &CaptureTool{store: db, provider: provider, capture: capture, sessions: sessions, log: log}
func NewCaptureTool(db *store.DB, provider ai.Provider, capture config.CaptureConfig, metadataTimeout time.Duration, sessions *session.ActiveProjects, log *slog.Logger) *CaptureTool {
return &CaptureTool{store: db, provider: provider, capture: capture, sessions: sessions, metadataTimeout: metadataTimeout, log: log}
}
func (t *CaptureTool) Handle(ctx context.Context, req *mcp.CallToolRequest, in CaptureInput) (*mcp.CallToolResult, CaptureOutput, error) {
@@ -61,7 +63,13 @@ func (t *CaptureTool) Handle(ctx context.Context, req *mcp.CallToolRequest, in C
return nil
})
group.Go(func() error {
extracted, err := t.provider.ExtractMetadata(groupCtx, content)
metaCtx := groupCtx
if t.metadataTimeout > 0 {
var cancel context.CancelFunc
metaCtx, cancel = context.WithTimeout(groupCtx, t.metadataTimeout)
defer cancel()
}
extracted, err := t.provider.ExtractMetadata(metaCtx, content)
if err != nil {
t.log.Warn("metadata extraction failed, using fallback", slog.String("provider", t.provider.Name()), slog.String("error", err.Error()))
return nil