git.iko.soy/crush
on main help sign in
chore: small fixes
eef3fefKujtim Hoxha
internal/agent/agent.go−6
compare with main
unifiedsplit
@@ -3,7 +3,6 @@ package agent
3import (
3import (
4 "context"
4 "context"
5 _ "embed"
5 _ "embed"
6− "encoding/json"
7 "errors"
6 "errors"
8 "fmt"
7 "fmt"
9 "log/slog"
8 "log/slog"
@@ -619,14 +618,9 @@ func (a *sessionAgent) generateTitle(ctx context.Context, session *session.Sessi
619 return
618 return
620 }
619 }
621
620
622− data, _ := json.Marshal(resp)
623−
624− slog.Info("Title Response")
625− slog.Info(string(data))
626 title := resp.Response.Content.Text()
621 title := resp.Response.Content.Text()
627
622
628 title = strings.ReplaceAll(title, "\n", " ")
623 title = strings.ReplaceAll(title, "\n", " ")
629− slog.Info(title)
630
624
631 // remove thinking tags if present
625 // remove thinking tags if present
632 if idx := strings.Index(title, "</think>"); idx > 0 {
626 if idx := strings.Index(title, "</think>"); idx > 0 {
internal/agent/coordinator.go+12−5
@@ -1,10 +1,12 @@
1package agent
1package agent
2
2
3import (
3import (
4+ "bytes"
4 "cmp"
5 "cmp"
5 "context"
6 "context"
6 "encoding/json"
7 "encoding/json"
7 "errors"
8 "errors"
9+ "io"
8 "log/slog"
10 "log/slog"
9 "slices"
11 "slices"
10 "strings"
12 "strings"
@@ -126,24 +128,29 @@ func (c *coordinator) Run(ctx context.Context, sessionID string, prompt string,
126func getProviderOptions(model Model) ai.ProviderOptions {
128func getProviderOptions(model Model) ai.ProviderOptions {
127 options := ai.ProviderOptions{}
129 options := ai.ProviderOptions{}
128
130
129− cfgOpts := "{}"
131+ cfgOpts := []byte("{}")
130− catwalkOpts := "{}"
132+ catwalkOpts := []byte("{}")
131
133
132 if model.ModelCfg.ProviderOptions != nil {
134 if model.ModelCfg.ProviderOptions != nil {
133 data, err := json.Marshal(model.ModelCfg.ProviderOptions)
135 data, err := json.Marshal(model.ModelCfg.ProviderOptions)
134 if err == nil {
136 if err == nil {
135− cfgOpts = string(data)
137+ cfgOpts = data
136 }
138 }
137 }
139 }
138
140
139 if model.CatwalkCfg.Options.ProviderOptions != nil {
141 if model.CatwalkCfg.Options.ProviderOptions != nil {
140 data, err := json.Marshal(model.CatwalkCfg.Options.ProviderOptions)
142 data, err := json.Marshal(model.CatwalkCfg.Options.ProviderOptions)
141 if err == nil {
143 if err == nil {
142− catwalkOpts = string(data)
144+ catwalkOpts = data
143 }
145 }
144 }
146 }
145
147
146− got, err := jsons.Merge([]string{catwalkOpts, cfgOpts})
148+ readers := []io.Reader{
149+ bytes.NewReader(catwalkOpts),
150+ bytes.NewReader(cfgOpts),
151+ }
152+
153+ got, err := jsons.Merge(readers)
147 if err != nil {
154 if err != nil {
148 slog.Error("Could not merge call config", "err", err)
155 slog.Error("Could not merge call config", "err", err)
149 return options
156 return options