Skip to content

Commit d06c264

Browse files
dpasiukevichdpasiukevich
authored
refactor: update memory req/resp names (#671)
BREAKING CHANGE
1 parent 9f0d476 commit d06c264

File tree

13 files changed

+40
-40
lines changed

13 files changed

+40
-40
lines changed

‎agent/agent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ type Artifacts interface {
117117
// sessions of the current user_id.
118118
type Memory interface {
119119
AddSessionToMemory(context.Context, session.Session) error
120-
SearchMemory(ctx context.Context, query string) (*memory.SearchMemoryResponse, error)
120+
SearchMemory(ctx context.Context, query string) (*memory.SearchResponse, error)
121121
}
122122

123123
// BeforeAgentCallback is a function that is called before the agent starts

‎internal/configurable/conformance/replayplugin/replay_plugin_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ func (m *MockToolContext) InvocationID() string { return m.invoc
440440
func (m *MockToolContext) AgentName() string { return m.agentName }
441441
func (m *MockToolContext) FunctionCallID() string { return "mock-function-call-id" }
442442
func (m *MockToolContext) Actions() *session.EventActions { return nil }
443-
func (m *MockToolContext) SearchMemory(ctx context.Context, query string) (*memory.SearchMemoryResponse, error) {
443+
func (m *MockToolContext) SearchMemory(ctx context.Context, query string) (*memory.SearchResponse, error) {
444444
return nil, nil
445445
}
446446
func (m *MockToolContext) ToolConfirmation() *toolconfirmation.ToolConfirmation { return nil }

‎internal/memory/memory.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func (a *Memory) AddSessionToMemory(ctx context.Context, session session.Session
3232
return a.Service.AddSessionToMemory(ctx, session)
3333
}
3434

35-
func (a *Memory) SearchMemory(ctx context.Context, query string) (*memory.SearchMemoryResponse, error) {
36-
return a.Service.SearchMemory(ctx, &memory.SearchMemoryRequest{
35+
func (a *Memory) SearchMemory(ctx context.Context, query string) (*memory.SearchResponse, error) {
36+
return a.Service.SearchMemory(ctx, &memory.SearchRequest{
3737
AppName: a.AppName,
3838
UserID: a.UserID,
3939
Query: query,

‎internal/memory/memory_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,45 +91,45 @@ func TestMemory_AddAndSearch(t *testing.T) {
9191
tests := []struct {
9292
name string
9393
query string
94-
want *memory.SearchMemoryResponse
94+
want *memory.SearchResponse
9595
}{
9696
{
9797
name: "match first entry",
9898
query: "fox",
99-
want: &memory.SearchMemoryResponse{
99+
want: &memory.SearchResponse{
100100
Memories: []memory.Entry{entry1},
101101
},
102102
},
103103
{
104104
name: "match second entry",
105105
query: "DOG", // Search should be case-insensitive
106-
want: &memory.SearchMemoryResponse{
106+
want: &memory.SearchResponse{
107107
Memories: []memory.Entry{entry2},
108108
},
109109
},
110110
{
111111
name: "match both entries (any word)",
112112
query: "quick dog",
113-
want: &memory.SearchMemoryResponse{
113+
want: &memory.SearchResponse{
114114
Memories: []memory.Entry{entry1, entry2},
115115
},
116116
},
117117
{
118118
name: "match word in both",
119119
query: "the",
120-
want: &memory.SearchMemoryResponse{
120+
want: &memory.SearchResponse{
121121
Memories: []memory.Entry{entry1, entry2},
122122
},
123123
},
124124
{
125125
name: "no match",
126126
query: "unrelated",
127-
want: &memory.SearchMemoryResponse{},
127+
want: &memory.SearchResponse{},
128128
},
129129
{
130130
name: "empty query",
131131
query: "",
132-
want: &memory.SearchMemoryResponse{},
132+
want: &memory.SearchResponse{},
133133
},
134134
}
135135

‎internal/toolinternal/context.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (c *toolContext) AgentName() string {
103103
return c.invocationContext.Agent().Name()
104104
}
105105

106-
func (c *toolContext) SearchMemory(ctx context.Context, query string) (*memory.SearchMemoryResponse, error) {
106+
func (c *toolContext) SearchMemory(ctx context.Context, query string) (*memory.SearchResponse, error) {
107107
if c.invocationContext.Memory() == nil {
108108
return nil, fmt.Errorf("memory service is not set")
109109
}

‎memory/inmemory.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (s *inMemoryService) AddSessionToMemory(ctx context.Context, curSession ses
106106
return nil
107107
}
108108

109-
func (s *inMemoryService) SearchMemory(ctx context.Context, req *SearchMemoryRequest) (*SearchMemoryResponse, error) {
109+
func (s *inMemoryService) SearchMemory(ctx context.Context, req *SearchRequest) (*SearchResponse, error) {
110110
queryWords := extractWords(req.Query)
111111

112112
k := key{
@@ -118,10 +118,10 @@ func (s *inMemoryService) SearchMemory(ctx context.Context, req *SearchMemoryReq
118118
values, ok := s.store[k]
119119
s.mu.RUnlock()
120120
if !ok {
121-
return &SearchMemoryResponse{}, nil
121+
return &SearchResponse{}, nil
122122
}
123123

124-
res := &SearchMemoryResponse{}
124+
res := &SearchResponse{}
125125

126126
for _, events := range values {
127127
for _, e := range events {

‎memory/inmemory_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func Test_inMemoryService_SearchMemory(t *testing.T) {
3232
tests := []struct {
3333
name string
3434
initSessions []session.Session
35-
req *memory.SearchMemoryRequest
36-
wantResp *memory.SearchMemoryResponse
35+
req *memory.SearchRequest
36+
wantResp *memory.SearchResponse
3737
wantErr bool
3838
}{
3939
{
@@ -66,12 +66,12 @@ func Test_inMemoryService_SearchMemory(t *testing.T) {
6666
{LLMResponse: model.LLMResponse{Content: genai.NewContentFromText("test text", genai.RoleUser)}},
6767
}),
6868
},
69-
req: &memory.SearchMemoryRequest{
69+
req: &memory.SearchRequest{
7070
AppName: "app1",
7171
UserID: "user1",
7272
Query: "quick hello",
7373
},
74-
wantResp: &memory.SearchMemoryResponse{
74+
wantResp: &memory.SearchResponse{
7575
Memories: []memory.Entry{
7676
{
7777
ID: "event1",
@@ -95,12 +95,12 @@ func Test_inMemoryService_SearchMemory(t *testing.T) {
9595
{LLMResponse: model.LLMResponse{Content: genai.NewContentFromText("test text", genai.RoleUser)}},
9696
}),
9797
},
98-
req: &memory.SearchMemoryRequest{
98+
req: &memory.SearchRequest{
9999
AppName: "other_app",
100100
UserID: "user1",
101101
Query: "test text",
102102
},
103-
wantResp: &memory.SearchMemoryResponse{},
103+
wantResp: &memory.SearchResponse{},
104104
},
105105
{
106106
name: "no leakage for different user",
@@ -109,12 +109,12 @@ func Test_inMemoryService_SearchMemory(t *testing.T) {
109109
{LLMResponse: model.LLMResponse{Content: genai.NewContentFromText("test text", genai.RoleUser)}},
110110
}),
111111
},
112-
req: &memory.SearchMemoryRequest{
112+
req: &memory.SearchRequest{
113113
AppName: "app1",
114114
UserID: "test_user",
115115
Query: "test text",
116116
},
117-
wantResp: &memory.SearchMemoryResponse{},
117+
wantResp: &memory.SearchResponse{},
118118
},
119119
{
120120
name: "no matches",
@@ -123,21 +123,21 @@ func Test_inMemoryService_SearchMemory(t *testing.T) {
123123
{LLMResponse: model.LLMResponse{Content: genai.NewContentFromText("test text", genai.RoleUser)}},
124124
}),
125125
},
126-
req: &memory.SearchMemoryRequest{
126+
req: &memory.SearchRequest{
127127
AppName: "app1",
128128
UserID: "test_user",
129129
Query: "something different",
130130
},
131-
wantResp: &memory.SearchMemoryResponse{},
131+
wantResp: &memory.SearchResponse{},
132132
},
133133
{
134134
name: "lookup on empty store",
135-
req: &memory.SearchMemoryRequest{
135+
req: &memory.SearchRequest{
136136
AppName: "app1",
137137
UserID: "test_user",
138138
Query: "something different",
139139
},
140-
wantResp: &memory.SearchMemoryResponse{},
140+
wantResp: &memory.SearchResponse{},
141141
},
142142
}
143143
for _, tt := range tests {
@@ -172,7 +172,7 @@ func makeSession(t *testing.T, appName, userID, sessionID string, events []*sess
172172
}
173173
}
174174

175-
var sortMemories = cmp.Transformer("Sort", func(in *memory.SearchMemoryResponse) *memory.SearchMemoryResponse {
175+
var sortMemories = cmp.Transformer("Sort", func(in *memory.SearchResponse) *memory.SearchResponse {
176176
slices.SortFunc(in.Memories, func(m1, m2 memory.Entry) int {
177177
return m1.Timestamp.Compare(m2.Timestamp)
178178
})

‎memory/service.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ type Service interface {
3535
AddSessionToMemory(ctx context.Context, s session.Session) error
3636
// SearchMemory returns memory entries relevant to the given query.
3737
// Empty slice is returned if there are no matches.
38-
SearchMemory(ctx context.Context, req *SearchMemoryRequest) (*SearchMemoryResponse, error)
38+
SearchMemory(ctx context.Context, req *SearchRequest) (*SearchResponse, error)
3939
}
4040

41-
// SearchMemoryRequest represents a request for memory search.
42-
type SearchMemoryRequest struct {
41+
// SearchRequest represents a request for memory search.
42+
type SearchRequest struct {
4343
Query string
4444
UserID string
4545
AppName string
4646
}
4747

48-
// SearchMemoryResponse represents the response from a memory search.
49-
type SearchMemoryResponse struct {
48+
// SearchResponse represents the response from a memory search.
49+
type SearchResponse struct {
5050
Memories []Entry
5151
}
5252

‎tool/exampletool/tool_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (m *mockToolContext) Actions() *session.EventActions {
4747
return &session.EventActions{}
4848
}
4949

50-
func (m *mockToolContext) SearchMemory(ctx context.Context, query string) (*memory.SearchMemoryResponse, error) {
50+
func (m *mockToolContext) SearchMemory(ctx context.Context, query string) (*memory.SearchResponse, error) {
5151
return nil, nil
5252
}
5353
func (m *mockToolContext) ToolConfirmation() *toolconfirmation.ToolConfirmation { return nil }

‎tool/loadmemorytool/tool_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ func (m *mockMemory) AddSessionToMemory(ctx context.Context, s session.Session)
4040
return nil
4141
}
4242

43-
func (m *mockMemory) SearchMemory(ctx context.Context, query string) (*memory.SearchMemoryResponse, error) {
43+
func (m *mockMemory) SearchMemory(ctx context.Context, query string) (*memory.SearchResponse, error) {
4444
if m.err != nil {
4545
return nil, m.err
4646
}
47-
return &memory.SearchMemoryResponse{Memories: m.memories}, nil
47+
return &memory.SearchResponse{Memories: m.memories}, nil
4848
}
4949

5050
func TestLoadMemoryTool_BasicProperties(t *testing.T) {

0 commit comments

Comments
 (0)