feat: Support variable assign dict array value config

Author: liuruibin

apps/application/flow/step_node/variable_assign/impl/base_variable_assign_node.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import json
 from typing import List
 
 from application.flow.i_step_node import NodeResult
@@ -18,18 +19,25 @@ def execute(self, variable_list, stream, **kwargs) -> NodeResult:
                 continue
             if 'global' == variable['fields'][0]:
                 result = {
-                    'name': variable['fields'][1],
+                    'name': variable['name'],
                     'input_value': self.get_reference_content(variable['fields']),
                 }
                 if variable['source'] == 'custom':
-                    self.workflow_manage.context[variable['fields'][1]] = variable['value']
-                    result['output_value'] = variable['value']
+                    if variable['type'] in ['dict', 'array']:
+                        if isinstance(variable['value'], dict) or isinstance(variable['value'], list):
+                            val = variable['value']
+                        else:
+                            val = json.loads(variable['value'])
+                        self.workflow_manage.context[variable['fields'][1]] = val
+                        result['output_value'] = variable['value'] = val
+                    else:
+                        self.workflow_manage.context[variable['fields'][1]] = variable['value']
+                        result['output_value'] = variable['value']
                 else:
                     reference = self.get_reference_content(variable['reference'])
                     self.workflow_manage.context[variable['fields'][1]] = reference
                     result['output_value'] = reference
                 result_list.append(result)
-        print(result_list)
 
         return NodeResult({'variable_list': variable_list, 'result_list': result_list}, {})
 

ui/src/components/ai-chat/ExecutionDetailDialog.vue

@@ -615,7 +615,7 @@
                         {{ $t('common.param.inputParam') }}
                       </h5>
                       <div class="p-8-12 border-t-dashed lighter">
-                        <div v-for="(f, i) in item.variable_list" :key="i" class="mb-8">
+                        <div v-for="(f, i) in item.result_list" :key="i" class="mb-8">
                           <span class="color-secondary">{{ f.name }}:</span> {{ f.input_value }}
                         </div>
                       </div>
@@ -625,7 +625,7 @@
                         {{ $t('common.param.outputParam') }}
                       </h5>
                       <div class="p-8-12 border-t-dashed lighter">
-                        <div v-for="(f, i) in item.variable_list" :key="i" class="mb-8">
+                        <div v-for="(f, i) in item.result_list" :key="i" class="mb-8">
                           <span class="color-secondary">{{ f.name }}:</span> {{ f.output_value }}
                         </div>
                       </div>

ui/src/workflow/nodes/variable-assign-node/index.vue

@@ -31,14 +31,15 @@
               :placeholder="$t('views.applicationWorkflow.variable.placeholder')"
               v-model="item.fields"
               :global="true"
+              @change="variableChange(item)"
             />
           </el-form-item>
           <el-form-item>
             <template #label>
               <div class="flex-between">
                 <div>
                   <span
-                    >{{ $t('views.applicationWorkflow.nodes.variableAssignNode.assign')
+                  >{{ $t('views.applicationWorkflow.nodes.variableAssignNode.assign')
                     }}<span class="danger">*</span></span
                   >
                 </div>
@@ -116,7 +117,15 @@ const wheel = (e: any) => {
 }
 const form = {
   variable_list: [
-    { id: randomId(), fields: [], value: null, reference: [], type: 'string', source: 'custom' }
+    {
+      id: randomId(),
+      fields: [],
+      value: null,
+      reference: [],
+      type: 'string',
+      source: 'custom',
+      name: ''
+    }
   ]
 }
 
@@ -154,10 +163,10 @@ function addVariable() {
     value: null,
     reference: [],
     type: 'string',
-    source: 'custom'
+    source: 'custom',
+    name: ''
   }
   list.push(obj)
-  console.log(list)
   set(props.nodeModel.properties.node_data, 'variable_list', list)
 }
 
@@ -167,6 +176,18 @@ function deleteVariable(index: number) {
   set(props.nodeModel.properties.node_data, 'variable_list', list)
 }
 
+function variableChange(item: any) {
+  props.nodeModel.graphModel.nodes.map((node: any) => {
+    if (node.id === 'start-node') {
+      node.properties.config.globalFields.forEach((field: any) => {
+        if (field.value === item.fields[1]) {
+          item.name = field.label
+        }
+      })
+    }
+  })
+}
+
 onMounted(() => {
   if (typeof props.nodeModel.properties.node_data?.is_result === 'undefined') {
     if (isLastNode(props.nodeModel)) {