youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-28 06:28:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: refactor prompt template processing logic

Browse Source
This commit is contained in:
zhsama
2026-01-15 01:14:46 +08:00
parent 56e537786f
commit 04145b19a1
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web/app/components/sub-graph/index.tsx
View File

@ -106,18 +106,20 @@ const SubGraphContent: FC<SubGraphProps> = (props) => {
if (!Array.isArray(template))
return applyPromptText(template as PromptItem)
const promptItems = template.filter((item): item is PromptItem => !isPromptMessageContext(item))
const userIndex = promptItems.findIndex(item => item.role === PromptRole.user)
const userIndex = template.findIndex(
item => !isPromptMessageContext(item) && (item as PromptItem).role === PromptRole.user,
)
if (userIndex >= 0) {
return promptItems.map((item, index) => {
return template.map((item, index) => {
if (index !== userIndex)
return item
return applyPromptText(item)
return applyPromptText(item as PromptItem)
}) as PromptTemplateItem[]
}
const useJinja = promptItems.some((item: PromptItem) => item.edition_type === EditionType.jinja2)
const useJinja = template.some(
item => !isPromptMessageContext(item) && (item as PromptItem).edition_type === EditionType.jinja2,
)
const defaultUserPrompt: PromptItem = useJinja
? {
role: PromptRole.user,
@ -126,13 +128,7 @@ const SubGraphContent: FC<SubGraphProps> = (props) => {
edition_type: EditionType.jinja2,
}
: { role: PromptRole.user, text: promptText }
const systemIndex = promptItems.findIndex(item => item.role === PromptRole.system)
const nextTemplate = [...promptItems]
if (systemIndex >= 0)
nextTemplate.splice(systemIndex + 1, 0, defaultUserPrompt)
else
nextTemplate.unshift(defaultUserPrompt)
return nextTemplate as PromptTemplateItem[]
return [...template, defaultUserPrompt] as PromptTemplateItem[]
})()
return {