Skip to content

Commit e0c09d1

Browse files
zcheezchee
authored
all: run golangci-lint fmt happy (#308)
* golangci-lint: add gofumpt formatters and settings Signed-off-by: Koichi Shiraishi <[email protected]> * all: run golangci-lint fmt happy $ go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest fmt Signed-off-by: Koichi Shiraishi <[email protected]> --------- Signed-off-by: Koichi Shiraishi <[email protected]>
1 parent a09263b commit e0c09d1

File tree

129 files changed

+388
-246
lines changed

Some content is hidden

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

129 files changed

+388
-246
lines changed

‎.golangci.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ version: "2"
33
formatters:
44
enable:
55
- goimports
6+
- gofumpt
7+
8+
settings:
9+
goimports:
10+
local-prefixes:
11+
- google.golang.org/adk
12+
gofumpt:
13+
extra-rules: true
14+
module-path: google.golang.org/adk
615

716
linters:
817
enable:
@@ -52,4 +61,3 @@ linters:
5261
- goheader
5362
- errcheck
5463
- staticcheck
55-

‎agent/agent.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ import (
1919
"fmt"
2020
"iter"
2121

22+
"google.golang.org/genai"
23+
2224
"google.golang.org/adk/artifact"
2325
agentinternal "google.golang.org/adk/internal/agent"
2426
"google.golang.org/adk/memory"
2527
"google.golang.org/adk/model"
2628
"google.golang.org/adk/session"
27-
"google.golang.org/genai"
2829
)
2930

3031
// Agent is the base interface which all agents must implement.

‎agent/agent_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020

2121
"github.com/google/go-cmp/cmp"
2222
"github.com/google/go-cmp/cmp/cmpopts"
23+
"google.golang.org/genai"
24+
2325
"google.golang.org/adk/model"
2426
"google.golang.org/adk/session"
25-
"google.golang.org/genai"
2627
)
2728

2829
func TestAgentCallbacks(t *testing.T) {
@@ -99,7 +100,6 @@ func TestAgentCallbacks(t *testing.T) {
99100
}
100101
for _, tt := range tests {
101102
t.Run(tt.name, func(t *testing.T) {
102-
103103
custom := &customAgent{}
104104

105105
testAgent, err := New(Config{

‎agent/context.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ package agent
1717
import (
1818
"context"
1919

20-
"google.golang.org/adk/session"
2120
"google.golang.org/genai"
21+
22+
"google.golang.org/adk/session"
2223
)
2324

2425
/*

‎agent/llmagent/llmagent.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ import (
1919
"iter"
2020
"strings"
2121

22+
"google.golang.org/genai"
23+
2224
"google.golang.org/adk/agent"
2325
agentinternal "google.golang.org/adk/internal/agent"
2426
icontext "google.golang.org/adk/internal/context"
2527
"google.golang.org/adk/internal/llminternal"
2628
"google.golang.org/adk/model"
2729
"google.golang.org/adk/session"
2830
"google.golang.org/adk/tool"
29-
"google.golang.org/genai"
3031
)
3132

3233
// New is a constructor for LLMAgent.
@@ -285,7 +286,7 @@ type BeforeToolCallback func(ctx tool.Context, tool tool.Tool, args map[string]a
285286
// - args: The arguments originally passed to the tool.
286287
// - result: The result returned by the tool's Run method.
287288
// - err: The error returned by the tool's Run method.
288-
type AfterToolCallback func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error)
289+
type AfterToolCallback func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error)
289290

290291
// IncludeContents controls what parts of prior conversation history is received by llmagent.
291292
type IncludeContents string

‎agent/llmagent/llmagent_saveoutput_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import (
1818
"reflect"
1919
"testing"
2020

21+
"google.golang.org/genai"
22+
2123
"google.golang.org/adk/model"
2224
"google.golang.org/adk/session"
23-
"google.golang.org/genai"
2425
)
2526

2627
type MockOutputSchema struct {
@@ -104,7 +105,7 @@ func TestLlmAgent_MaybeSaveOutputToState(t *testing.T) {
104105
event: createTestEvent("testagent", "Test response", true),
105106
wantStateDelta: map[string]any{},
106107
},
107-
//TODO tests with OutputSchema
108+
// TODO tests with OutputSchema
108109
}
109110

110111
// Iterate over the test cases

‎agent/llmagent/llmagent_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ import (
2424
"testing"
2525

2626
"github.com/google/go-cmp/cmp"
27+
"google.golang.org/genai"
28+
2729
"google.golang.org/adk/agent"
2830
"google.golang.org/adk/agent/llmagent"
2931
"google.golang.org/adk/internal/httprr"
3032
"google.golang.org/adk/internal/testutil"
31-
"google.golang.org/adk/tool/functiontool"
32-
3333
"google.golang.org/adk/model"
3434
"google.golang.org/adk/model/gemini"
3535
"google.golang.org/adk/session"
3636
"google.golang.org/adk/tool"
37-
"google.golang.org/genai"
37+
"google.golang.org/adk/tool/functiontool"
3838
)
3939

4040
const modelName = "gemini-2.0-flash"
@@ -400,10 +400,10 @@ func TestToolCallback(t *testing.T) {
400400
DisallowTransferToPeers: true,
401401
Tools: []tool.Tool{rand},
402402
AfterToolCallbacks: []llmagent.AfterToolCallback{
403-
func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
403+
func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
404404
return nil, nil
405405
},
406-
func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
406+
func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
407407
return map[string]any{"number": "7"}, nil
408408
},
409409
},
@@ -435,10 +435,10 @@ func TestToolCallback(t *testing.T) {
435435
Tools: []tool.Tool{rand},
436436
AfterToolCallbacks: []llmagent.AfterToolCallback{
437437
// Since it retursn non nil, the next callback won't be executed.
438-
func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
438+
func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
439439
return map[string]any{"number": "3"}, nil
440440
},
441-
func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
441+
func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
442442
return map[string]any{"number": "7"}, nil
443443
},
444444
},
@@ -474,7 +474,7 @@ func TestToolCallback(t *testing.T) {
474474
},
475475
},
476476
AfterToolCallbacks: []llmagent.AfterToolCallback{
477-
func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
477+
func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
478478
return map[string]any{"number": "7"}, nil
479479
},
480480
},
@@ -510,7 +510,7 @@ func TestToolCallback(t *testing.T) {
510510
},
511511
},
512512
AfterToolCallbacks: []llmagent.AfterToolCallback{
513-
func(ctx tool.Context, tool tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
513+
func(ctx tool.Context, tool tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
514514
return nil, nil
515515
},
516516
},

‎agent/llmagent/state_agent_test.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ import (
2525
"testing"
2626
"time"
2727

28+
"google.golang.org/genai"
29+
2830
"google.golang.org/adk/agent"
2931
"google.golang.org/adk/agent/llmagent"
3032
"google.golang.org/adk/model"
3133
"google.golang.org/adk/runner"
3234
"google.golang.org/adk/session"
3335
"google.golang.org/adk/tool"
3436
"google.golang.org/adk/tool/functiontool"
35-
"google.golang.org/genai"
3637
)
3738

3839
// FakeLLM is a mock implementation of model.LLM for testing.
@@ -117,7 +118,8 @@ func beforeAgentCallback(t *testing.T) agent.BeforeAgentCallback {
117118
title: "In before_agent_callback",
118119
keysInCtxSession: []string{"before_agent_callback_state_key"},
119120
keysInServiceSession: []string{},
120-
keysNotInServiceSession: []string{"before_agent_callback_state_key"}},
121+
keysNotInServiceSession: []string{"before_agent_callback_state_key"},
122+
},
121123
)
122124
return nil, nil
123125
}
@@ -132,7 +134,8 @@ func beforeModelCallback(t *testing.T) func(ctx agent.CallbackContext, llmReques
132134
title: "In before_model_callback",
133135
keysInCtxSession: []string{"before_agent_callback_state_key", "before_model_callback_state_key"},
134136
keysInServiceSession: []string{"before_agent_callback_state_key"},
135-
keysNotInServiceSession: []string{"before_model_callback_state_key"}},
137+
keysNotInServiceSession: []string{"before_model_callback_state_key"},
138+
},
136139
)
137140
return nil, nil
138141
}
@@ -147,7 +150,8 @@ func afterModelCallback(t *testing.T) func(ctx agent.CallbackContext, llmRespons
147150
title: "In after_model_callback",
148151
keysInCtxSession: []string{"before_agent_callback_state_key", "before_model_callback_state_key", "after_model_callback_state_key"},
149152
keysInServiceSession: []string{"before_agent_callback_state_key"},
150-
keysNotInServiceSession: []string{"before_model_callback_state_key", "after_model_callback_state_key"}},
153+
keysNotInServiceSession: []string{"before_model_callback_state_key", "after_model_callback_state_key"},
154+
},
151155
)
152156
return nil, nil
153157
}
@@ -162,7 +166,8 @@ func afterAgentCallback(t *testing.T) agent.AfterAgentCallback {
162166
title: "In after_agent_callback",
163167
keysInCtxSession: []string{"before_agent_callback_state_key", "before_model_callback_state_key", "after_model_callback_state_key", "after_agent_callback_state_key"},
164168
keysInServiceSession: []string{"before_agent_callback_state_key", "before_model_callback_state_key", "after_model_callback_state_key"},
165-
keysNotInServiceSession: []string{"after_agent_callback_state_key"}},
169+
keysNotInServiceSession: []string{"after_agent_callback_state_key"},
170+
},
166171
)
167172
return nil, nil
168173
}
@@ -424,7 +429,7 @@ func beforeToolValidationCallback(ctx tool.Context, t tool.Tool, args map[string
424429

425430
// --- After Tool Callbacks ---
426431

427-
func afterToolEnhancementCallback(ctx tool.Context, t tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
432+
func afterToolEnhancementCallback(ctx tool.Context, t tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
428433
if err != nil {
429434
return result, err // Don't enhance if there was an error
430435
}
@@ -438,7 +443,7 @@ func afterToolEnhancementCallback(ctx tool.Context, t tool.Tool, args map[string
438443
return enhancedResponse, nil
439444
}
440445

441-
func afterToolAsyncCallback(ctx tool.Context, t tool.Tool, args map[string]any, result map[string]any, err error) (map[string]any, error) {
446+
func afterToolAsyncCallback(ctx tool.Context, t tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
442447
if err != nil {
443448
return result, err
444449
}

‎agent/loader_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func (a *testAgent) Description() string {
3838
func (a *testAgent) Run(InvocationContext) iter.Seq2[*session.Event, error] {
3939
panic("not implemented")
4040
}
41+
4142
func (a *testAgent) SubAgents() []Agent {
4243
panic("not implemented")
4344
}
@@ -101,5 +102,4 @@ func TestDuplicateName(t *testing.T) {
101102
t.Errorf("NewMultiLoader() name=%v, error = %v, wantErr %v", tt.name, err, tt.wantErr)
102103
}
103104
}
104-
105105
}

‎agent/remoteagent/a2a_agent.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/a2aproject/a2a-go/a2a"
2626
"github.com/a2aproject/a2a-go/a2aclient"
2727
"github.com/a2aproject/a2a-go/a2aclient/agentcard"
28+
2829
"google.golang.org/adk/agent"
2930
"google.golang.org/adk/internal/converters"
3031
"google.golang.org/adk/server/adka2a"

0 commit comments

Comments
 (0)