From eef3fef8b3cc9ecd0f5c35314ec004f7926054ed Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Mon, 13 Oct 2025 14:03:29 +0200 Subject: [PATCH] chore: small fixes --- internal/agent/agent.go | 6 ------ internal/agent/coordinator.go | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 3b2f39fc11ad17a2af2e1e51f3275073734ad589..a90e3c6038de9d677d84ecc90bafae3ff2e756c9 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -3,7 +3,6 @@ package agent import ( "context" _ "embed" - "encoding/json" "errors" "fmt" "log/slog" @@ -619,14 +618,9 @@ func (a *sessionAgent) generateTitle(ctx context.Context, session *session.Sessi return } - data, _ := json.Marshal(resp) - - slog.Info("Title Response") - slog.Info(string(data)) title := resp.Response.Content.Text() title = strings.ReplaceAll(title, "\n", " ") - slog.Info(title) // remove thinking tags if present if idx := strings.Index(title, ""); idx > 0 { diff --git a/internal/agent/coordinator.go b/internal/agent/coordinator.go index a353ab1680484a6fd37216c4f9b47fef427e1737..bf242931fb882cc9b764ee9858833ba371ed1281 100644 --- a/internal/agent/coordinator.go +++ b/internal/agent/coordinator.go @@ -1,10 +1,12 @@ package agent import ( + "bytes" "cmp" "context" "encoding/json" "errors" + "io" "log/slog" "slices" "strings" @@ -126,24 +128,29 @@ func (c *coordinator) Run(ctx context.Context, sessionID string, prompt string, func getProviderOptions(model Model) ai.ProviderOptions { options := ai.ProviderOptions{} - cfgOpts := "{}" - catwalkOpts := "{}" + cfgOpts := []byte("{}") + catwalkOpts := []byte("{}") if model.ModelCfg.ProviderOptions != nil { data, err := json.Marshal(model.ModelCfg.ProviderOptions) if err == nil { - cfgOpts = string(data) + cfgOpts = data } } if model.CatwalkCfg.Options.ProviderOptions != nil { data, err := json.Marshal(model.CatwalkCfg.Options.ProviderOptions) if err == nil { - catwalkOpts = string(data) + catwalkOpts = data } } - got, err := jsons.Merge([]string{catwalkOpts, cfgOpts}) + readers := []io.Reader{ + bytes.NewReader(catwalkOpts), + bytes.NewReader(cfgOpts), + } + + got, err := jsons.Merge(readers) if err != nil { slog.Error("Could not merge call config", "err", err) return options