fix(cli): align stream/list interfaces with client ResourceURLOptions
Client methods gained optional ...ResourceURLOptions, which broke CLI service interfaces used for compile-time Client assignability and caused `go build ./...` to fail on main. Update interfaces and fakes so ChatService/ListService/AskService/ResumeService/ViewService/MCP match the SDK again.main
parent
8ec5388655
commit
c4f3a6a2c6
|
|
@ -61,7 +61,7 @@ type Options struct {
|
|||
// of this file.
|
||||
type ChatService interface {
|
||||
CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error)
|
||||
KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error
|
||||
KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error
|
||||
}
|
||||
|
||||
// NewCmd builds `weknora chat <text>`.
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ func (f *fakeChatService) CreateSession(_ context.Context, req *sdk.CreateSessio
|
|||
return &sdk.Session{ID: "sess_auto", Title: req.Title}, nil
|
||||
}
|
||||
|
||||
func (f *fakeChatService) KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error {
|
||||
func (f *fakeChatService) KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error {
|
||||
f.streamCalled = true
|
||||
f.gotSessionID = sessionID
|
||||
f.gotRequest = req
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ type ListOptions struct {
|
|||
|
||||
// ListService is the narrow SDK surface this command depends on.
|
||||
type ListService interface {
|
||||
LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time) ([]sdk.Message, error)
|
||||
LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error)
|
||||
}
|
||||
|
||||
// NewCmdList builds `weknora message list --session <id>`.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ type fakeListSvc struct {
|
|||
gotBefore *time.Time
|
||||
}
|
||||
|
||||
func (s *fakeListSvc) LoadMessages(_ context.Context, sessionID string, limit int, before *time.Time) ([]sdk.Message, error) {
|
||||
func (s *fakeListSvc) LoadMessages(_ context.Context, sessionID string, limit int, before *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error) {
|
||||
s.gotSessID, s.gotLimit, s.gotBefore = sessionID, limit, before
|
||||
return s.items, s.err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ type AskOptions struct {
|
|||
// agent / KB-chat invocations.
|
||||
type AskService interface {
|
||||
CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error)
|
||||
AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error
|
||||
AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error
|
||||
}
|
||||
|
||||
// NewCmdAsk builds `weknora session ask --agent <agent-id> "<text>"`.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ func (s *scriptedAskSvc) CreateSession(_ context.Context, req *sdk.CreateSession
|
|||
return s.createResp, s.createErr
|
||||
}
|
||||
|
||||
func (s *scriptedAskSvc) AgentQAStreamWithRequest(_ context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error {
|
||||
func (s *scriptedAskSvc) AgentQAStreamWithRequest(_ context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error {
|
||||
s.got.sessionID = sessionID
|
||||
s.got.req = req
|
||||
for _, e := range s.events {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ type ResumeOptions struct {
|
|||
// *sdk.Client satisfies it; tests substitute a fake. Compile-time check
|
||||
// at the bottom of this file.
|
||||
type ResumeService interface {
|
||||
ContinueStream(ctx context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error) error
|
||||
ContinueStream(ctx context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error
|
||||
}
|
||||
|
||||
// NewCmdResume builds `weknora session resume <session-id> --message <id>`.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ type scriptedResumeSvc struct {
|
|||
}
|
||||
}
|
||||
|
||||
func (s *scriptedResumeSvc) ContinueStream(_ context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error) error {
|
||||
func (s *scriptedResumeSvc) ContinueStream(_ context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error {
|
||||
s.got.sessionID = sessionID
|
||||
s.got.messageID = messageID
|
||||
for _, e := range s.events {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ type ViewOptions struct {
|
|||
// dependency surface stays minimal.
|
||||
type ViewService interface {
|
||||
GetSession(ctx context.Context, id string) (*sdk.Session, error)
|
||||
LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time) ([]sdk.Message, error)
|
||||
LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error)
|
||||
}
|
||||
|
||||
// NewCmdView builds `weknora session view <id>`. Renders session metadata
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ func (f *fakeViewService) GetSession(_ context.Context, id string) (*sdk.Session
|
|||
return f.s, f.err
|
||||
}
|
||||
|
||||
func (f *fakeViewService) LoadMessages(_ context.Context, sessionID string, limit int, _ *time.Time) ([]sdk.Message, error) {
|
||||
func (f *fakeViewService) LoadMessages(_ context.Context, sessionID string, limit int, _ *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error) {
|
||||
f.loadCall.called = true
|
||||
f.loadCall.sessionID = sessionID
|
||||
f.loadCall.limit = limit
|
||||
|
|
|
|||
|
|
@ -91,13 +91,13 @@ type knowledgeService interface {
|
|||
|
||||
type chatService interface {
|
||||
CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error)
|
||||
KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error
|
||||
KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error
|
||||
}
|
||||
|
||||
type agentService interface {
|
||||
ListAgents(ctx context.Context) ([]sdk.Agent, error)
|
||||
GetAgent(ctx context.Context, agentID string) (*sdk.Agent, error)
|
||||
AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error
|
||||
AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error
|
||||
}
|
||||
|
||||
// chunkListService is the narrow surface chunk_list depends on. Kept
|
||||
|
|
@ -114,7 +114,7 @@ type chunkListService interface {
|
|||
// four domain interfaces - also satisfies it.
|
||||
type sessionAskService interface {
|
||||
CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error)
|
||||
AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error
|
||||
AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error
|
||||
}
|
||||
|
||||
// registerTools wires the curated 10 tools onto server. Adding a tool here
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ func (f *fakeSvc) CreateSession(_ context.Context, req *sdk.CreateSessionRequest
|
|||
}
|
||||
return f.createSess, f.createSessErr
|
||||
}
|
||||
func (f *fakeSvc) KnowledgeQAStream(_ context.Context, sess string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error {
|
||||
func (f *fakeSvc) KnowledgeQAStream(_ context.Context, sess string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error {
|
||||
f.calls.kbQASess, f.calls.kbQAReq = sess, req
|
||||
for _, e := range f.kbStreamEvents {
|
||||
if err := cb(e); err != nil {
|
||||
|
|
@ -119,7 +119,7 @@ func (f *fakeSvc) GetAgent(_ context.Context, id string) (*sdk.Agent, error) {
|
|||
f.calls.agentViewID = id
|
||||
return f.agent, f.agentErr
|
||||
}
|
||||
func (f *fakeSvc) AgentQAStreamWithRequest(_ context.Context, sess string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error {
|
||||
func (f *fakeSvc) AgentQAStreamWithRequest(_ context.Context, sess string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error {
|
||||
f.calls.agentSess, f.calls.agentReq = sess, req
|
||||
for _, e := range f.agentEvents {
|
||||
if err := cb(e); err != nil {
|
||||
|
|
|
|||
Loading…
Reference in New Issue