Skip to content

Commit 123b3a5

Browse files
201430098137201430098137
committed
fix:change email package and complete code
1 parent 3ad38fe commit 123b3a5

File tree

7 files changed

+151
-115
lines changed

7 files changed

+151
-115
lines changed

‎examples/go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module trpc.group/trpc-go/trpc-agent-go/examples
22

3-
go 1.23.0
3+
go 1.24.0
4+
5+
toolchain go1.24.10
46

57
replace (
68
trpc.group/trpc-go/trpc-agent-go => ../
@@ -92,6 +94,7 @@ require (
9294
github.com/tidwall/match v1.1.1 // indirect
9395
github.com/tidwall/pretty v1.2.1 // indirect
9496
github.com/tidwall/sjson v1.2.5 // indirect
97+
github.com/wneessen/go-mail v0.7.2 // indirect
9598
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
9699
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
97100
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
@@ -108,14 +111,12 @@ require (
108111
golang.org/x/crypto v0.32.0 // indirect
109112
golang.org/x/net v0.34.0 // indirect
110113
golang.org/x/oauth2 v0.26.0 // indirect
111-
golang.org/x/sync v0.10.0 // indirect
114+
golang.org/x/sync v0.17.0 // indirect
112115
golang.org/x/sys v0.35.0 // indirect
113-
golang.org/x/text v0.21.0 // indirect
116+
golang.org/x/text v0.29.0 // indirect
114117
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
115118
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
116119
google.golang.org/grpc v1.67.0 // indirect
117120
google.golang.org/protobuf v1.34.2 // indirect
118-
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
119-
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
120121
gopkg.in/yaml.v3 v3.0.1 // indirect
121122
)

‎examples/go.sum‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
158158
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
159159
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
160160
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
161+
github.com/wneessen/go-mail v0.7.2 h1:xxPnhZ6IZLSgxShebmZ6DPKh1b6OJcoHfzy7UjOkzS8=
162+
github.com/wneessen/go-mail v0.7.2/go.mod h1:+TkW6QP3EVkgTEqHtVmnAE/1MRhmzb8Y9/W3pweuS+k=
161163
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
162164
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
163165
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
@@ -201,16 +203,16 @@ golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
201203
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
202204
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
203205
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
204-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
205-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
206+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
207+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
206208
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
207209
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
208210
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
209211
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
210212
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
211213
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
212-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
213-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
214+
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
215+
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
214216
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
215217
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
216218
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd h1:BBOTEWLuuEGQy9n1y9MhVJ9Qt0BDu21X8qZs71/uPZo=
@@ -221,13 +223,9 @@ google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
221223
google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
222224
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
223225
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
224-
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
225-
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
226226
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
227227
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
228228
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
229-
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
230-
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
231229
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
232230
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
233231
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎go.mod‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module trpc.group/trpc-go/trpc-agent-go
22

3-
go 1.21
3+
go 1.24.0
4+
5+
toolchain go1.24.10
46

57
require (
68
github.com/bmatcuk/doublestar/v4 v4.9.1
@@ -30,8 +32,8 @@ require (
3032
go.opentelemetry.io/otel/trace v1.29.0
3133
go.opentelemetry.io/proto/otlp v1.3.1
3234
go.uber.org/zap v1.27.0
33-
golang.org/x/sync v0.10.0
34-
golang.org/x/text v0.21.0
35+
golang.org/x/sync v0.17.0
36+
golang.org/x/text v0.29.0
3537
google.golang.org/grpc v1.65.0
3638
google.golang.org/protobuf v1.34.2
3739
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -74,6 +76,7 @@ require (
7476
github.com/tidwall/match v1.1.1 // indirect
7577
github.com/tidwall/pretty v1.2.1 // indirect
7678
github.com/tidwall/sjson v1.2.5 // indirect
79+
github.com/wneessen/go-mail v0.7.2 // indirect
7780
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
7881
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
7982
go.uber.org/multierr v1.10.0 // indirect

‎go.sum‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
124124
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
125125
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
126126
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
127+
github.com/wneessen/go-mail v0.7.2 h1:xxPnhZ6IZLSgxShebmZ6DPKh1b6OJcoHfzy7UjOkzS8=
128+
github.com/wneessen/go-mail v0.7.2/go.mod h1:+TkW6QP3EVkgTEqHtVmnAE/1MRhmzb8Y9/W3pweuS+k=
127129
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
128130
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
129131
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
@@ -168,10 +170,13 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
168170
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
169171
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
170172
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
173+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
171174
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
172175
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
173176
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
174177
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
178+
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
179+
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
175180
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd h1:BBOTEWLuuEGQy9n1y9MhVJ9Qt0BDu21X8qZs71/uPZo=
176181
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g=
177182
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd h1:6TEm2ZxXoQmFWFlt1vNxvVOa1Q0dXFQD1m/rYjXmS0E=

‎tool/email/email.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,10 @@ func WithSendEmailEnabled(enabled bool) Option {
6464
}
6565
}
6666

67-
// WithName sets the name of the email tool set.
68-
func WithName(name string) Option {
69-
return func(f *emailToolSet) {
70-
f.name = name
71-
}
72-
}
73-
7467
// emailToolSet implements the ToolSet interface for file operations.
7568
type emailToolSet struct {
7669
sendEmailEnabled bool
7770
tools []tool.Tool
78-
name string
7971
}
8072

8173
// Tools implements the ToolSet interface.
@@ -85,7 +77,7 @@ func (e *emailToolSet) Tools(_ context.Context) []tool.Tool {
8577

8678
// Name implements the ToolSet interface.
8779
func (e *emailToolSet) Name() string {
88-
return e.name
80+
return "email"
8981
}
9082

9183
// Close implements the ToolSet interface.
@@ -99,7 +91,6 @@ func NewToolSet(opts ...Option) (tool.ToolSet, error) {
9991
emailToolSet := &emailToolSet{
10092
sendEmailEnabled: true,
10193
tools: nil,
102-
name: defaultName,
10394
}
10495

10596
// Apply user-provided options.

‎tool/email/email_test.go‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,58 +22,9 @@ func TestWithSendEmailEnabled(t *testing.T) {
2222
})
2323
}
2424

25-
func TestWithName(t *testing.T) {
26-
type args struct {
27-
name string
28-
}
29-
tests := []struct {
30-
name string
31-
args args
32-
check func(*emailToolSet)
33-
}{
34-
{
35-
name: "normal name",
36-
args: args{name: "aFrqvjeXQ"},
37-
check: func(e *emailToolSet) {
38-
assert.Equal(t, "aFrqvjeXQ", e.name)
39-
},
40-
},
41-
{
42-
name: "empty name",
43-
args: args{name: ""},
44-
check: func(e *emailToolSet) {
45-
assert.Equal(t, "", e.name)
46-
},
47-
},
48-
{
49-
name: "unicode name",
50-
args: args{name: "测试邮箱"},
51-
check: func(e *emailToolSet) {
52-
assert.Equal(t, "测试邮箱", e.name)
53-
},
54-
},
55-
{
56-
name: "very long name",
57-
args: args{name: string(make([]byte, 1024))},
58-
check: func(e *emailToolSet) {
59-
assert.Len(t, e.name, 1024)
60-
},
61-
},
62-
}
63-
for _, tt := range tests {
64-
t.Run(tt.name, func(t *testing.T) {
65-
e := &emailToolSet{}
66-
opt := WithName(tt.args.name)
67-
opt(e)
68-
tt.check(e)
69-
})
70-
}
71-
}
72-
7325
func TestNewToolSet_Default(t *testing.T) {
7426
set, err := NewToolSet()
7527
assert.NoError(t, err)
7628
ets := set.(*emailToolSet)
7729
assert.Equal(t, true, ets.sendEmailEnabled)
78-
assert.Equal(t, defaultName, ets.name)
7930
}

0 commit comments

Comments
 (0)