feat: add outputs field to message model and enhance advanced chat task pipeline

- Introduced `outputs` field in the Message model to store output data.
- Updated `generate_task_pipeline.py` to handle and print outputs during task processing.
- Enhanced the answer node components to utilize the new outputs field, including filtering and displaying output variables.
- Added necessary adjustments in the TypeScript types for better integration with the new outputs functionality.
pull/20921/head
GuanMu 11 months ago
parent db83bfc53a
commit a36533a5ec

@ -165,7 +165,7 @@ class AdvancedChatAppGenerateTaskPipeline:
)
generator = self._wrapper_process_stream_response(trace_manager=self._application_generate_entity.trace_manager)
print(f"generator: {generator}")
if self._base_task_pipeline._stream:
return self._to_stream_response(generator)
else:
@ -183,12 +183,13 @@ class AdvancedChatAppGenerateTaskPipeline:
extras = {}
if stream_response.metadata:
extras["metadata"] = stream_response.metadata
print(f"stream_response: {stream_response}")
return ChatbotAppBlockingResponse(
task_id=stream_response.task_id,
data=ChatbotAppBlockingResponse.Data(
id=self._message_id,
mode=self._conversation_mode,
outputs=stream_response.data.outputs,
conversation_id=self._conversation_id,
message_id=self._message_id,
answer=self._task_state.answer,
@ -209,6 +210,7 @@ class AdvancedChatAppGenerateTaskPipeline:
:return:
"""
for stream_response in generator:
print(f"stream_response: {stream_response}")
yield ChatbotAppStreamResponse(
conversation_id=self._conversation_id,
message_id=self._message_id,
@ -501,13 +503,12 @@ class AdvancedChatAppGenerateTaskPipeline:
conversation_id=self._conversation_id,
trace_manager=trace_manager,
)
workflow_finish_resp = self._workflow_response_converter.workflow_finish_to_stream_response(
session=session,
task_id=self._application_generate_entity.task_id,
workflow_execution=workflow_execution,
)
print(f"workflow_finish_resp: {workflow_finish_resp}")
yield workflow_finish_resp
self._base_task_pipeline._queue_manager.publish(
QueueAdvancedChatMessageEndEvent(), PublishFrom.TASK_PIPELINE

@ -45,6 +45,7 @@ message_fields = {
"conversation_id": fields.String,
"parent_message_id": fields.String,
"inputs": FilesContainedField,
"outputs": fields.Raw(attribute="outputs_dict"),
"query": fields.String,
"answer": fields.String(attribute="re_sign_file_url_answer"),
"feedback": fields.Nested(feedback_fields, attribute="user_feedback", allow_null=True),

@ -0,0 +1,33 @@
"""Update Message table outputs column to text and add outputs_dict property
Revision ID: 83f1262d3f22
Revises: 2adcbe1f5dfb
Create Date: 2025-06-03 12:29:08.619582
"""
from alembic import op
import models as models
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '83f1262d3f22'
down_revision = '2adcbe1f5dfb'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('messages', schema=None) as batch_op:
batch_op.add_column(sa.Column('outputs', sa.Text(), server_default=sa.text("'{}'::text"), nullable=True))
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('messages', schema=None) as batch_op:
batch_op.drop_column('outputs')
# ### end Alembic commands ###

@ -898,6 +898,7 @@ class Message(Base):
message_unit_price = db.Column(db.Numeric(10, 4), nullable=False)
message_price_unit = db.Column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
answer: Mapped[str] = db.Column(db.Text, nullable=False)
outputs: Mapped[Optional[str]] = mapped_column("outputs", db.Text, nullable=True, server_default=db.text("'{}'::text"))
answer_tokens = db.Column(db.Integer, nullable=False, server_default=db.text("0"))
answer_unit_price = db.Column(db.Numeric(10, 4), nullable=False)
answer_price_unit = db.Column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
@ -1086,6 +1087,14 @@ class Message(Base):
def message_metadata_dict(self) -> dict:
return json.loads(self.message_metadata) if self.message_metadata else {}
@property
def outputs_dict(self) -> dict:
return json.loads(self.outputs) if self.outputs else {}
@outputs_dict.setter
def outputs_dict(self, value: Mapping[str, Any]):
self.outputs = json.dumps(value, ensure_ascii=False) if value else "{}"
@property
def agent_thoughts(self):
return (
@ -1180,6 +1189,7 @@ class Message(Base):
"model_id": self.model_id,
"inputs": self.inputs,
"query": self.query,
"outputs": self.outputs_dict,
"total_price": self.total_price,
"message": self.message,
"answer": self.answer,

@ -4,12 +4,44 @@ import { useTranslation } from 'react-i18next'
import InfoPanel from '../_base/components/info-panel'
import ReadonlyInputWithSelectVar from '../_base/components/readonly-input-with-select-var'
import type { AnswerNodeType } from './types'
import type { NodeProps } from '@/app/components/workflow/types'
import {
useIsChatMode,
useWorkflow,
useWorkflowVariables,
} from '@/app/components/workflow/hooks'
import { BlockEnum } from '@/app/components/workflow/types'
import type { NodeProps, Variable } from '@/app/components/workflow/types'
import { isConversationVar, isENV, isSystemVar } from '@/app/components/workflow/nodes/_base/components/variable/utils'
import { VarBlockIcon } from '@/app/components/workflow/block-icon'
import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
import { BubbleX, Env } from '@/app/components/base/icons/src/vender/line/others'
import { Line3 } from '@/app/components/base/icons/src/public/common'
import cn from 'classnames'
const Node: FC<NodeProps<AnswerNodeType>> = ({
id,
data,
}) => {
const { t } = useTranslation()
const { getBeforeNodesInSameBranch } = useWorkflow()
const availableNodes = getBeforeNodesInSameBranch(id)
const { getCurrentVariableType } = useWorkflowVariables()
const isChatMode = useIsChatMode()
const startNode = availableNodes.find((node: any) => {
return node.data.type === BlockEnum.Start
})
const getNode = (id: string) => {
return availableNodes.find(node => node.id === id) || startNode
}
const { outputs = [] } = data
const filteredOutputs = (outputs as Variable[]).filter(({ value_selector }) => value_selector.length > 0)
console.log('filteredOutputs', filteredOutputs)
if (!filteredOutputs.length)
return null
return (
<div className='mb-1 px-3 py-1'>
@ -19,7 +51,52 @@ const Node: FC<NodeProps<AnswerNodeType>> = ({
nodeId={id}
/>
} />
<div className='mb-1 space-y-0.5 py-1'>
{filteredOutputs.map(({ value_selector }, index) => {
const node = getNode(value_selector[0])
const isSystem = isSystemVar(value_selector)
const isEnv = isENV(value_selector)
const isChatVar = isConversationVar(value_selector)
const varName = isSystem ? `sys.${value_selector[value_selector.length - 1]}` : value_selector[value_selector.length - 1]
const varType = getCurrentVariableType({
valueSelector: value_selector,
availableNodes,
isChatMode,
})
return (
<div key={index} className='flex h-6 items-center justify-between space-x-1 rounded-md bg-workflow-block-parma-bg px-1 text-xs font-normal text-text-secondary'>
<div className='flex items-center text-xs font-medium text-text-tertiary'>
{!isEnv && (
<>
<div className='p-[1px]'>
<VarBlockIcon
className='!text-text-primary'
type={node?.data.type || BlockEnum.Start}
/>
</div>
<div className='max-w-[75px] truncate'>{node?.data.title}</div>
<Line3 className='mr-0.5'></Line3>
</>
)}
<div className='flex items-center text-text-accent'>
{!isEnv && !isChatVar && <Variable02 className='h-3.5 w-3.5 shrink-0 text-text-accent' />}
{isEnv && <Env className='h-3.5 w-3.5 shrink-0 text-util-colors-violet-violet-600' />}
{isChatVar && <BubbleX className='h-3.5 w-3.5 text-util-colors-teal-teal-700' />}
<div className={cn('ml-0.5 max-w-[50px] truncate text-xs font-medium', (isEnv || isChatVar) && '!max-w-[70px] text-text-primary')}>{varName}</div>
</div>
</div>
<div className='text-xs font-normal text-text-secondary'>
<div className='ml-0.5 max-w-[42px] truncate text-xs font-normal capitalize text-text-tertiary' title={varType}>{varType}</div>
</div>
</div>
)
})}
</div>
</div>
)
}

@ -19,8 +19,12 @@ const Panel: FC<NodePanelProps<AnswerNodeType>> = ({
inputs,
handleAnswerChange,
filterVar,
handleVarListChange,
handleAddVariable,
} = useConfig(id, data)
const outputs = inputs.outputs
const { availableVars, availableNodesWithParent } = useAvailableVarList(id, {
onlyLeafNodeVar: false,
hideChatVar: false,
@ -29,17 +33,34 @@ const Panel: FC<NodePanelProps<AnswerNodeType>> = ({
})
return (
<div className='mb-2 mt-2 space-y-4 px-4'>
<Editor
readOnly={readOnly}
justVar
title={t(`${i18nPrefix}.answer`)!}
value={inputs.answer}
onChange={handleAnswerChange}
nodesOutputVars={availableVars}
availableNodes={availableNodesWithParent}
isSupportFileVar
/>
<div className='mt-2'>
<div className='mb-2 mt-2 space-y-4 px-4'>
<Editor
readOnly={readOnly}
justVar
title={t(`${i18nPrefix}.answer`)!}
value={inputs.answer}
onChange={handleAnswerChange}
nodesOutputVars={availableVars}
availableNodes={availableNodesWithParent}
isSupportFileVar
/>
</div>
{/* <div className='space-y-4 px-4 pb-4'>
<Field
title={t(`${i18nPrefix}.outputVars`)}
operations={
!readOnly ? <AddButton onClick={handleAddVariable} /> : undefined
}
>
<VarList
nodeId={id}
readonly={readOnly}
list={outputs}
onChange={handleVarListChange}
/>
</Field>
</div> */}
</div>
)
}

@ -1,6 +1,7 @@
import type { CommonNodeType, Variable } from '@/app/components/workflow/types'
export type AnswerNodeType = CommonNodeType & {
outputs: Variable[]
variables: Variable[]
answer: string
}

Loading…
Cancel
Save