Skip to content

Commit f024925

Browse files
Merge remote-tracking branch 'upstream/v2' into feat/intent-node/config-output-reason
# Conflicts: # ui/src/workflow/nodes/ai-chat-node/index.vue
2 parents 19cb98f + 2eaa067 commit f024925

3 files changed

Lines changed: 21 additions & 15 deletions

File tree

apps/application/serializers/application_chat.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ def to_row(row: Dict):
193193
def reset_value(value):
194194
if isinstance(value, str):
195195
value = re.sub(ILLEGAL_CHARACTERS_RE, '', value)
196+
if value.startswith(('=', '+', '-', '@')):
197+
value = "'" + value
196198
if isinstance(value, datetime.datetime):
197199
eastern = pytz.timezone(TIME_ZONE)
198200
c = datetime.timezone(eastern._utcoffset)

ui/src/components/execution-detail-card/index.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<el-card class="mb-8" shadow="never" style="--el-card-padding: 12px 16px">
2+
<el-card class="mb-8 execution-detail-card" shadow="never" style="--el-card-padding: 12px 16px">
33
<div class="flex-between cursor" @click="data['show'] = !data['show']">
44
<div class="flex align-center">
55
<el-icon class="mr-8 arrow-icon" :class="data['show'] ? 'rotate-90' : ''">
@@ -1313,4 +1313,10 @@ const currentLoopNode = ref(0)
13131313
const currentParagraph = ref(0)
13141314
const currentWriteContent = ref(0)
13151315
</script>
1316-
<style lang="scss" scoped></style>
1316+
<style lang="scss" scoped>
1317+
.execution-detail-card {
1318+
:deep(.md-editor-previewOnly) {
1319+
background: none !important;
1320+
}
1321+
}
1322+
</style>

ui/src/workflow/nodes/ai-chat-node/index.vue

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,17 @@
4444
</div>
4545
</template>
4646
<div class="flex-between w-full" v-if="chat_data.model_id_type !== 'reference'">
47-
<div class="w-full">
48-
<ModelSelect
49-
@change="model_change"
50-
@wheel="wheel"
51-
:teleported="false"
52-
v-model="chat_data.model_id"
53-
:placeholder="$t('views.application.form.aiModel.placeholder')"
54-
:options="modelOptions"
55-
@submitModel="getSelectModel"
56-
showFooter
57-
:model-type="'LLM'"
58-
></ModelSelect>
59-
</div>
47+
<ModelSelect
48+
@change="model_change"
49+
@wheel="wheel"
50+
:teleported="false"
51+
v-model="chat_data.model_id"
52+
:placeholder="$t('views.application.form.aiModel.placeholder')"
53+
:options="modelOptions"
54+
@submitModel="getSelectModel"
55+
showFooter
56+
:model-type="'LLM'"
57+
></ModelSelect>
6058
<div class="ml-8">
6159
<el-button
6260
:disabled="!chat_data.model_id"

0 commit comments

Comments
 (0)