Skip to content

Commit 83653bb

Browse files
authored
refactor: remove legacy session and task services (#2598)
1 parent 66c5de7 commit 83653bb

73 files changed

Lines changed: 35 additions & 8638 deletions

File tree

Some content is hidden

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

go/adk/pkg/controllerclient/client.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ type Client struct {
3939
maxMessageBytes int
4040
agentName string
4141
tokenProvider TokenProvider
42-
sessionService apiv1alpha1.SessionServiceClient
43-
taskService apiv1alpha1.TaskStoreServiceClient
4442
memoryService apiv1alpha1.MemoryServiceClient
4543
closeOnce sync.Once
4644
closeErr error
@@ -80,20 +78,10 @@ func New(config Config) (*Client, error) {
8078
maxMessageBytes: config.MaxMessageBytes,
8179
agentName: config.AgentName,
8280
tokenProvider: config.TokenProvider,
83-
sessionService: apiv1alpha1.NewSessionServiceClient(connection),
84-
taskService: apiv1alpha1.NewTaskStoreServiceClient(connection),
8581
memoryService: apiv1alpha1.NewMemoryServiceClient(connection),
8682
}, nil
8783
}
8884

89-
func (client *Client) SessionService() apiv1alpha1.SessionServiceClient {
90-
return client.sessionService
91-
}
92-
93-
func (client *Client) TaskService() apiv1alpha1.TaskStoreServiceClient {
94-
return client.taskService
95-
}
96-
9785
func (client *Client) MemoryService() apiv1alpha1.MemoryServiceClient {
9886
return client.memoryService
9987
}

go/adk/pkg/controllerclient/client_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@ func (provider *mutableTokenProvider) set(token string) {
3333
provider.token = token
3434
}
3535

36-
type metadataSessionServer struct {
37-
apiv1alpha1.UnimplementedSessionServiceServer
36+
type metadataMemoryServer struct {
37+
apiv1alpha1.UnimplementedMemoryServiceServer
3838
metadata []metadata.MD
3939
deadlines []bool
4040
}
4141

42-
func (server *metadataSessionServer) ListSessions(ctx context.Context, _ *apiv1alpha1.ListSessionsRequest) (*apiv1alpha1.ListSessionsResponse, error) {
42+
func (server *metadataMemoryServer) List(ctx context.Context, _ *apiv1alpha1.MemoryServiceListRequest) (*apiv1alpha1.MemoryServiceListResponse, error) {
4343
values, _ := metadata.FromIncomingContext(ctx)
4444
_, hasDeadline := ctx.Deadline()
4545
server.metadata = append(server.metadata, values)
4646
server.deadlines = append(server.deadlines, hasDeadline)
47-
return &apiv1alpha1.ListSessionsResponse{}, nil
47+
return &apiv1alpha1.MemoryServiceListResponse{}, nil
4848
}
4949

5050
func TestClientAddsDynamicMetadataAndDeadlines(t *testing.T) {
5151
listener := bufconn.Listen(1024 * 1024)
52-
service := &metadataSessionServer{}
52+
service := &metadataMemoryServer{}
5353
grpcServer := grpc.NewServer()
54-
apiv1alpha1.RegisterSessionServiceServer(grpcServer, service)
54+
apiv1alpha1.RegisterMemoryServiceServer(grpcServer, service)
5555
go func() { _ = grpcServer.Serve(listener) }()
5656
t.Cleanup(func() {
5757
grpcServer.Stop()
@@ -71,13 +71,13 @@ func TestClientAddsDynamicMetadataAndDeadlines(t *testing.T) {
7171
t.Cleanup(func() { require.NoError(t, client.Close()) })
7272

7373
ctx, cancel := client.CallContext(auth.WithUserID(t.Context(), "context-user"), "")
74-
_, err = client.SessionService().ListSessions(ctx, &apiv1alpha1.ListSessionsRequest{})
74+
_, err = client.MemoryService().List(ctx, &apiv1alpha1.MemoryServiceListRequest{})
7575
cancel()
7676
require.NoError(t, err)
7777

7878
tokens.set("second-token")
7979
ctx, cancel = client.CallContext(t.Context(), "explicit-user")
80-
_, err = client.SessionService().ListSessions(ctx, &apiv1alpha1.ListSessionsRequest{})
80+
_, err = client.MemoryService().List(ctx, &apiv1alpha1.MemoryServiceListRequest{})
8181
cancel()
8282
require.NoError(t, err)
8383

go/adk/pkg/runner/adapter.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/kagent-dev/kagent/go/adk/pkg/controllerclient"
1212
kagentmemory "github.com/kagent-dev/kagent/go/adk/pkg/memory"
1313
"github.com/kagent-dev/kagent/go/adk/pkg/sts"
14-
"github.com/kagent-dev/kagent/go/adk/pkg/tools"
1514
"github.com/kagent-dev/kagent/go/api/adk"
1615
adkmemory "google.golang.org/adk/v2/memory"
1716
adkplugin "google.golang.org/adk/v2/plugin"
@@ -48,23 +47,6 @@ func CreateRunnerConfig(
4847
extraTools = append(extraTools, saveTool)
4948
}
5049

51-
if agentConfig.ShareTools != nil && *agentConfig.ShareTools && controllerClient != nil {
52-
createTool, err := tools.NewCreateShareLinkTool(controllerClient, appName)
53-
if err != nil {
54-
return runner.Config{}, fmt.Errorf("failed to create create_share_link tool: %w", err)
55-
}
56-
listTool, err := tools.NewListShareLinksTool(controllerClient, appName)
57-
if err != nil {
58-
return runner.Config{}, fmt.Errorf("failed to create list_share_links tool: %w", err)
59-
}
60-
deleteTool, err := tools.NewDeleteShareLinkTool(controllerClient, appName)
61-
if err != nil {
62-
return runner.Config{}, fmt.Errorf("failed to create delete_share_link tool: %w", err)
63-
}
64-
extraTools = append(extraTools, createTool, listTool, deleteTool)
65-
log.Info("Share link tools enabled")
66-
}
67-
6850
stsPlugin, err := buildTokenPropagationPlugin(ctx, log)
6951
if err != nil {
7052
return runner.Config{}, err

go/adk/pkg/session/local_session.go

Lines changed: 0 additions & 182 deletions
This file was deleted.

0 commit comments

Comments
 (0)