Skip to content

Commit 3ce1bc2

Browse files
wooruiCopilot
woorui
and
Copilot
authored
fix: openai tool call has extra content && cache request extra content (#1186)
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
1 parent 4a99284 commit 3ce1bc2

49 files changed

Lines changed: 211 additions & 70 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ai/model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Package ai contains the model for LLM Function Calling features
22
package ai
33

4-
import "github.com/sashabaranov/go-openai"
4+
import "github.com/yomorun/go-openai"
55

66
// ErrorResponse is the response for error
77
type ErrorResponse struct {

‎ai/openai.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ai
33
import (
44
"encoding/json"
55

6-
"github.com/sashabaranov/go-openai"
6+
"github.com/yomorun/go-openai"
77
)
88

99
// DecodeChatCompletionRequest decodes openai.ChatCompletionRequest from JSON data.

‎ai/openai_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/sashabaranov/go-openai"
87
"github.com/stretchr/testify/assert"
8+
"github.com/yomorun/go-openai"
99
)
1010

1111
func TestDecodeChatCompletionRequest(t *testing.T) {

‎ai/register.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ai
33
import (
44
"sync"
55

6-
"github.com/sashabaranov/go-openai"
6+
"github.com/yomorun/go-openai"
77
"github.com/yomorun/yomo/core/metadata"
88
)
99

‎cli/test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"strings"
2828
"time"
2929

30-
"github.com/sashabaranov/go-openai"
3130
"github.com/shirou/gopsutil/v3/process"
3231
"github.com/spf13/cobra"
32+
"github.com/yomorun/go-openai"
3333
"github.com/yomorun/yomo/ai"
3434
"github.com/yomorun/yomo/cli/serverless"
3535
"github.com/yomorun/yomo/pkg/log"

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/yomorun/yomo
22

3-
go 1.25
3+
go 1.25.0
44

55
require (
66
github.com/anthropics/anthropic-sdk-go v1.18.1
@@ -15,13 +15,13 @@ require (
1515
github.com/modelcontextprotocol/go-sdk v1.1.0
1616
github.com/quic-go/quic-go v0.57.1
1717
github.com/robfig/cron/v3 v3.0.1
18-
github.com/sashabaranov/go-openai v1.40.5
1918
github.com/shirou/gopsutil/v3 v3.24.5
2019
github.com/spf13/cobra v1.9.1
2120
github.com/spf13/pflag v1.0.10
2221
github.com/spf13/viper v1.21.0
2322
github.com/stretchr/testify v1.11.1
2423
github.com/vmihailenco/msgpack/v5 v5.4.1
24+
github.com/yomorun/go-openai v1.50.0
2525
github.com/yomorun/y3 v1.0.5
2626
go.opentelemetry.io/otel v1.37.0
2727
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0
@@ -89,7 +89,7 @@ require (
8989
go.yaml.in/yaml/v3 v3.0.4 // indirect
9090
golang.org/x/crypto v0.41.0 // indirect
9191
golang.org/x/net v0.43.0 // indirect
92-
golang.org/x/oauth2 v0.30.0 // indirect
92+
golang.org/x/oauth2 v0.34.0 // indirect
9393
golang.org/x/sync v0.16.0 // indirect
9494
golang.org/x/sys v0.35.0 // indirect
9595
golang.org/x/term v0.34.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
9898
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
9999
github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
100100
github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
101-
github.com/sashabaranov/go-openai v1.40.5 h1:SwIlNdWflzR1Rxd1gv3pUg6pwPc6cQ2uMoHs8ai+/NY=
102-
github.com/sashabaranov/go-openai v1.40.5/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
103101
github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
104102
github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
105103
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -145,6 +143,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh
145143
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
146144
github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
147145
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
146+
github.com/yomorun/go-openai v1.50.0 h1:JmjL8HSkdW57BfMWOju1bB/b/v+BeEVwcWsJNaXUOSc=
147+
github.com/yomorun/go-openai v1.50.0/go.mod h1:QeD1hg1h/pCEOVce9fRP6wHzomo5+U86Tu8bVPOwMrI=
148148
github.com/yomorun/y3 v1.0.5 h1:1qoZrDX+47hgU2pVJgoCEpeeXEOqml/do5oHjF9Wef4=
149149
github.com/yomorun/y3 v1.0.5/go.mod h1:+zwvZrKHe8D3fTMXNTsUsZXuI+kYxv3LRA2fSJEoWbo=
150150
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
@@ -185,8 +185,8 @@ golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
185185
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
186186
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
187187
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
188-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
189-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
188+
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
189+
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
190190
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
191191
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
192192
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎pkg/bridge/ai/caller/call_syncer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log/slog"
66
"time"
77

8-
openai "github.com/sashabaranov/go-openai"
8+
openai "github.com/yomorun/go-openai"
99
"github.com/yomorun/yomo/ai"
1010
"github.com/yomorun/yomo/pkg/id"
1111
"go.opentelemetry.io/otel/trace"

‎pkg/bridge/ai/caller/call_syncer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9-
openai "github.com/sashabaranov/go-openai"
109
"github.com/stretchr/testify/assert"
10+
openai "github.com/yomorun/go-openai"
1111
"github.com/yomorun/yomo/ai"
1212
"github.com/yomorun/yomo/pkg/bridge/mock"
1313
"go.opentelemetry.io/otel/trace/noop"

‎pkg/bridge/ai/caller/caller.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,10 @@ type promptOperation struct {
120120
type SystemPromptOp int
121121

122122
const (
123-
SystemPromptOpOverwrite SystemPromptOp = 0
124-
SystemPromptOpDisabled SystemPromptOp = 1
125-
SystemPromptOpPrefix SystemPromptOp = 2
123+
SystemPromptOpOverwrite SystemPromptOp = 0
124+
SystemPromptOpDisabled SystemPromptOp = 1
125+
SystemPromptOpPrefix SystemPromptOp = 2
126+
SystemPromptOpClientPreferred SystemPromptOp = 3
126127
)
127128

128129
// SetSystemPrompt sets the system prompt

0 commit comments

Comments
 (0)