fix(singleagent): error no (#1920)

main
junwen-lee 2 months ago committed by GitHub
parent 305f1cb62f
commit 47d3bc03a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      backend/application/conversation/openapi_agent_run.go
  2. 3
      backend/crossdomain/impl/singleagent/single_agent.go
  3. 12
      backend/domain/conversation/agentrun/internal/agent_info.go
  4. 2
      backend/domain/conversation/agentrun/internal/run.go

@ -127,7 +127,7 @@ func (a *OpenapiAgentRunApplication) checkAgent(ctx context.Context, ar *run.Cha
} }
if agentInfo == nil { if agentInfo == nil {
return nil, errors.New("agent info is nil") return nil, errorx.New(errno.ErrAgentNotExists)
} }
return agentInfo, nil return agentInfo, nil
} }

@ -97,5 +97,8 @@ func (c *impl) ObtainAgentByIdentity(ctx context.Context, identity *model.AgentI
if err != nil { if err != nil {
return nil, err return nil, err
} }
if agentInfo == nil {
return nil, nil
}
return agentInfo.SingleAgent, nil return agentInfo.SingleAgent, nil
} }

@ -21,7 +21,9 @@ import (
"github.com/coze-dev/coze-studio/backend/api/model/crossdomain/singleagent" "github.com/coze-dev/coze-studio/backend/api/model/crossdomain/singleagent"
crossagent "github.com/coze-dev/coze-studio/backend/crossdomain/contract/agent" crossagent "github.com/coze-dev/coze-studio/backend/crossdomain/contract/agent"
"github.com/coze-dev/coze-studio/backend/domain/conversation/agentrun/entity" "github.com/coze-dev/coze-studio/backend/domain/conversation/agentrun/entity"
"github.com/coze-dev/coze-studio/backend/pkg/errorx"
"github.com/coze-dev/coze-studio/backend/pkg/lang/ptr" "github.com/coze-dev/coze-studio/backend/pkg/lang/ptr"
"github.com/coze-dev/coze-studio/backend/types/errno"
) )
func getAgentHistoryRounds(agentInfo *singleagent.SingleAgent) int32 { func getAgentHistoryRounds(agentInfo *singleagent.SingleAgent) int32 {
@ -32,14 +34,18 @@ func getAgentHistoryRounds(agentInfo *singleagent.SingleAgent) int32 {
return conversationTurns return conversationTurns
} }
func getAgentInfo(ctx context.Context, agentID int64, isDraft bool) (*singleagent.SingleAgent, error) { func getAgentInfo(ctx context.Context, agentID int64, isDraft bool, connID int64) (*singleagent.SingleAgent, error) {
agentInfo, err := crossagent.DefaultSVC().ObtainAgentByIdentity(ctx, &singleagent.AgentIdentity{ agentInfo, err := crossagent.DefaultSVC().ObtainAgentByIdentity(ctx, &singleagent.AgentIdentity{
AgentID: agentID, AgentID: agentID,
IsDraft: isDraft, IsDraft: isDraft,
ConnectorID: connID,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
if agentInfo == nil {
return nil, errorx.New(errno.ErrAgentNotExists)
}
return agentInfo, nil return agentInfo, nil
} }

@ -107,7 +107,7 @@ func (rd *AgentRuntime) GetHistory() []*msgEntity.Message {
func (art *AgentRuntime) Run(ctx context.Context) (err error) { func (art *AgentRuntime) Run(ctx context.Context) (err error) {
agentInfo, err := getAgentInfo(ctx, art.GetRunMeta().AgentID, art.GetRunMeta().IsDraft) agentInfo, err := getAgentInfo(ctx, art.GetRunMeta().AgentID, art.GetRunMeta().IsDraft, art.GetRunMeta().ConnectorID)
if err != nil { if err != nil {
return return
} }

Loading…
Cancel
Save