youngkingdom/coze-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rebase chatflow code to main

Browse Source
This commit is contained in:
lvxinyu.1117
2025-08-05 22:06:22 +08:00
committed by zhuangjie.1125
parent 25ded3eb27
commit 61595e73b7
6 changed files with 2 additions and 4825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/application/workflow/workflow.go
View File

@ -195,11 +195,8 @@ func (w *ApplicationService) CreateWorkflow(ctx context.Context, req *workflow.C
if !req.IsSetProjectID() || mustParseInt64(req.GetProjectID()) == 0 || !createConversation {
conversationName = "Default"
}
<<<<<<< HEAD
wf.InitCanvasSchema = vo.GetDefaultInitCanvasJsonSchemaChat(i18n.GetLocale(ctx), conversationName)
=======
wf.InitCanvasSchema = entity.GetDefaultInitCanvasJsonSchemaChat(i18n.GetLocale(ctx), conversationName)
>>>>>>> a86ea8d1 (feat(backend):workflow support conversation manager & add conversation/message nodes)
}
id, err := GetWorkflowDomainSVC().Create(ctx, wf)
@ -3921,15 +3918,12 @@ func (w *ApplicationService) GetChatFlowRole(ctx context.Context, req *workflow.
var version string
if wf.Meta.AppID != nil {
<<<<<<< HEAD
if vl, err := GetWorkflowDomainSVC().GetWorkflowVersionsByConnector(ctx, mustParseInt64(req.GetConnectorID()), wf.ID, 1); err != nil {
return nil, err
} else if len(vl) > 0 {
version = vl[0]
}
=======
version = "" // TODO : search version from DB using AppID
>>>>>>> a86ea8d1 (feat(backend):workflow support conversation manager & add conversation/message nodes)
}
role, err := GetWorkflowDomainSVC().GetChatFlowRole(ctx, mustParseInt64(req.WorkflowID), version)
@ -4101,5 +4095,3 @@ func (w *ApplicationService) OpenAPIGetWorkflowInfo(ctx context.Context, req *wo
},
}, nil
}
=======
>>>>>>> a86ea8d1 (feat(backend):workflow support conversation manager & add conversation/message nodes)