Merge pull request #922 from SuanmoSuanyangTechnology/feature/model_json_zy

Feature/model json zy
2026-04-17 10:12:30 +08:00
parent cada860a16 b302a94620
commit fd90a4c2ad
9 changed files with 92 additions and 38 deletions
--- a/web/src/components/ModelSelect/index.tsx
+++ b/web/src/components/ModelSelect/index.tsx
@@ -2,9 +2,9 @@
 * @Author: ZhaoYing 
 * @Date: 2026-03-07 16:49:59 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-03-25 11:21:59
+ * @Last Modified time: 2026-04-17 10:11:54
 */
-import { useEffect, useState, type FC } from 'react';
+import { type FC, useEffect, useState } from 'react';
 import { Select, Flex, Space } from 'antd';
 import type { SelectProps } from 'antd/es/select';
 import { useTranslation } from 'react-i18next';
@@ -22,16 +22,10 @@ interface ModelSelectProps extends SelectProps {
  fontClassName?: string;
  isAutoFetch?: boolean;
  initialData?: Model[];
+  updateOptions?: (options: Model[]) => void;
 }

-const ModelSelect: FC<ModelSelectProps> = ({
-  params,
-  placeholder,
-  fontClassName,
-  isAutoFetch = true,
-  initialData = [],
-  ...props
-}) => {
+const ModelSelect: FC<ModelSelectProps> = ({ params, placeholder, fontClassName, isAutoFetch = true, initialData = [], updateOptions, ...props }) => {
  const { t } = useTranslation();
  const [options, setOptions] = useState<Model[]>([]);

@@ -60,6 +54,10 @@ const ModelSelect: FC<ModelSelectProps> = ({
    );
  };

+  useEffect(() => {
+    if (updateOptions) updateOptions([...options, ...initialData]);
+  }, [options, initialData])
+
  return (
    <Select
      placeholder={placeholder ?? t('common.pleaseSelect')}
--- a/web/src/i18n/en.ts
+++ b/web/src/i18n/en.ts
@@ -629,6 +629,7 @@ export const en = {
      video: 'Video',
      thinking: 'Deep Thinking',
      is_thinking: 'Deep Thinking Support',
+      json_output: 'Support JSON formatted output',
    },
    knowledgeBase: {
      home: 'Home',
@@ -1524,6 +1525,7 @@ export const en = {
 }`,
      uploadCover: 'Import and Overwrite',
      refresh: 'Refresh Current Page',
+      json_output: 'Support JSON formatted output',
    },
    userMemory: {
      userMemory: 'User Memory',
@@ -2287,6 +2289,7 @@ Memory Bear: After the rebellion, regional warlordism intensified for several re
          messagesPlaceholder: 'Write prompts here, type "{" to insert variables, type "insert" to insert',
          vision: 'Vision',
          parameterSettings: 'Parameter Settings',
+          json_output: 'Support JSON formatted output',
        },
        start: {
          variables: 'Input Fields',
--- a/web/src/i18n/zh.ts
+++ b/web/src/i18n/zh.ts
@@ -859,6 +859,7 @@ export const zh = {
 }`,
      uploadCover: '导入并覆盖',
      refresh: '刷新当前页',
+      json_output: '支持JSON格式化输出',
    },
    table: {
      totalRecords: '共 {{total}} 条记录'
@@ -1307,6 +1308,7 @@ export const zh = {
      video: '视频',
      thinking: '深度思考',
      is_thinking: '支持深度思考',
+      json_output: '支持JSON格式化输出',
    },
    timezones: {
      'Asia/Shanghai': '中国标准时间 (UTC+8)',
@@ -2248,6 +2250,7 @@ export const zh = {
          messagesPlaceholder: '在此处编写提示，输入“{”插入变量，输入“insert”插入',
          vision: '视觉',
          parameterSettings: '参数设置',
+          json_output: '支持JSON格式化输出',
        },
        start: {
          variables: '输入字段',
--- a/web/src/views/ApplicationConfig/components/ModelConfigModal.tsx
+++ b/web/src/views/ApplicationConfig/components/ModelConfigModal.tsx
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 16:28:07 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-03-31 16:56:57
+ * @Last Modified time: 2026-04-16 18:51:01
 */
 /**
 * Model Configuration Modal
@@ -102,14 +102,15 @@ const ModelConfigModal = forwardRef<ModelConfigModalRef, ModelConfigModalProps>(
  }
  /** Handle model selection change */
  const handleChange: SelectProps['onChange'] = (_value, option) => {
-    if (source === 'chat') {
-      form.setFieldValue('label', (option as Model).name)
-    }
-
-    form.setFieldsValue({
+    const newValues: ModelConfig = {
      capability: (option as Model).capability,
      deep_thinking: false,
-    })
+      json_output: false
+    }
+    if (source === 'chat') {
+      newValues.label = (option as Model).name
+    }
+    form.setFieldsValue(newValues)
  }

  /** Expose methods to parent component */
@@ -119,12 +120,10 @@ const ModelConfigModal = forwardRef<ModelConfigModalRef, ModelConfigModalProps>(
  }));

  useEffect(() => {
-    const { deep_thinking: _, ...rest } = data?.model_parameters || {}
+    const { deep_thinking: _, json_output: __, ...rest } = data?.model_parameters || {}
    form.setFieldsValue(rest)
  }, [values?.default_model_config_id])

-
-  console.log('handleChange values', values)
  return (
    <RbModal
      title={t('application.modelConfig')}
@@ -159,6 +158,9 @@ const ModelConfigModal = forwardRef<ModelConfigModalRef, ModelConfigModalProps>(
        <FormItem name="deep_thinking" valuePropName="checked" hidden={!['model', 'chat'].includes(source) || !(values?.deep_thinking || values?.capability?.includes('thinking'))}>
          <Checkbox>{t('application.deep_thinking')}</Checkbox>
        </FormItem>
+        <FormItem name="json_output" valuePropName="checked" hidden={!(values?.capability?.includes('json_output'))}>
+          <Checkbox>{t('application.json_output')}</Checkbox>
+        </FormItem>
        {source === 'chat' && <FormItem name="label" hidden />}


--- a/web/src/views/ApplicationConfig/types.ts
+++ b/web/src/views/ApplicationConfig/types.ts
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 16:29:49 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-04-07 15:46:19
+ * @Last Modified time: 2026-04-16 18:20:14
 */
 import type { KnowledgeConfig } from './components/Knowledge/types'
 import type { Variable } from './components/VariableList/types'
@@ -24,20 +24,21 @@ export interface ModelConfig {
  default_model_config_id?: string;
  capability?: Capability[];
  /** Temperature for response randomness (0-2) */
-  temperature: number;
+  temperature?: number;
  /** Maximum tokens in response */
-  max_tokens: number;
+  max_tokens?: number;
  /** Top-p sampling parameter */
-  top_p: number;
+  top_p?: number;
  /** Frequency penalty */
-  frequency_penalty: number;
+  frequency_penalty?: number;
  /** Presence penalty */
-  presence_penalty: number;
+  presence_penalty?: number;
  /** Number of completions to generate */
-  n: number;
+  n?: number;
  /** Stop sequences */
  stop?: string;
  deep_thinking?: boolean;
+  json_output?: boolean;
 }

 /**
--- a/web/src/views/ModelManagement/components/CustomModelModal.tsx
+++ b/web/src/views/ModelManagement/components/CustomModelModal.tsx
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 16:49:28 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-03-31 13:56:18
+ * @Last Modified time: 2026-04-16 18:03:53
 */
 /**
 * Custom Model Modal
@@ -14,7 +14,7 @@ import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { Form, Input, App, Checkbox, Button, Row, Col } from 'antd';
 import { useTranslation } from 'react-i18next';

-import type { CustomModelForm, ModelListItem, CustomModelModalRef, CustomModelModalProps } from '../types';
+import type { CustomModelForm, ModelListItem, CustomModelModalRef, CustomModelModalProps, Capability } from '../types';
 import RbModal from '@/components/RbModal'
 import CustomSelect from '@/components/CustomSelect'
 import UploadImages from '@/components/Upload/UploadImages'
@@ -73,6 +73,7 @@ const CustomModelModal = forwardRef<CustomModelModalRef, CustomModelModalProps>(
        is_video: capability?.includes('video') || false,
        is_audio: capability?.includes('audio') || false,
        is_thinking: capability?.includes('thinking') || false,
+        json_output: capability?.includes('json_output') || false,
      });
    } else {
      setIsEdit(false);
@@ -102,13 +103,13 @@ const CustomModelModal = forwardRef<CustomModelModalRef, CustomModelModalProps>(
    form
      .validateFields()
      .then((values) => {
-        const { logo, type, is_vision, is_video, is_audio, is_omni, is_thinking, ...rest } = values;
+        const { logo, type, is_vision, is_video, is_audio, is_omni, is_thinking, json_output, ...rest } = values;
        const formData: CustomModelForm = {
          ...rest,
          type,
        }
        if (!['embedding', 'rerank'].includes(type as string)) {
-          let capability = is_omni ? ["vision", "audio", 'video'] : []
+          let capability: Capability[] = is_omni ? ["vision", "audio", 'video'] : []

          if (!is_omni) {
            if (is_vision) {
@@ -124,6 +125,9 @@ const CustomModelModal = forwardRef<CustomModelModalRef, CustomModelModalProps>(
          if (is_thinking) {
            capability.push('thinking')
          }
+          if (json_output) {
+            capability.push('json_output')
+          }

          formData.capability = capability
          formData.is_omni = is_omni
@@ -269,6 +273,11 @@ const CustomModelModal = forwardRef<CustomModelModalRef, CustomModelModalProps>(
                <Checkbox>{t('modelNew.is_thinking')}</Checkbox>
              </Form.Item>
            </Col>
+            <Col span={24}>
+              <Form.Item name="json_output" valuePropName="checked" className="rb:mb-0!">
+                <Checkbox>{t('modelNew.json_output')}</Checkbox>
+              </Form.Item>
+            </Col>
          </Row>
        }
      </Form>
--- a/web/src/views/ModelManagement/types.ts
+++ b/web/src/views/ModelManagement/types.ts
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 16:50:18 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-03-31 15:48:02
+ * @Last Modified time: 2026-04-16 18:04:46
 */
 /**
 * Type definitions for Model Management
@@ -296,6 +296,7 @@ export interface CustomModelForm {
  is_audio?: boolean;
  is_omni?: boolean;
  is_thinking?: boolean;
+  json_output?: boolean;
  capability?: Capability[];
 }

@@ -325,7 +326,7 @@ export interface BaseRef {
  modelListDetailRefresh?: () => void;
 }

-export type Capability = 'vision' | 'audio' | 'video' | 'thinking';
+export type Capability = 'vision' | 'audio' | 'video' | 'thinking' | 'json_output';
 export interface Model {
  name: string;
  type: string;
--- a/web/src/views/Workflow/components/Properties/ModelConfig/index.tsx
+++ b/web/src/views/Workflow/components/Properties/ModelConfig/index.tsx
@@ -1,16 +1,38 @@
-import { type FC } from "react";
+/*
+ * @Author: ZhaoYing 
+ * @Date: 2026-03-07 14:55:04 
+ * @Last Modified by:   ZhaoYing 
+ * @Last Modified time: 2026-04-17 10:05:32 
+ */
+import { type FC, useEffect, useState } from "react";
 import { useTranslation } from 'react-i18next'
-import { Form } from 'antd'
+import { Form, Switch } from 'antd'

 import RbSlider from '@/components/RbSlider'
 import RbCard from '@/components/RbCard/Card'
 import ModelSelect from '@/components/ModelSelect'
+import type { Model } from '@/views/ModelManagement/types';

 const ModelConfig: FC = () => {
  const { t } = useTranslation()
  const form = Form.useFormInstance()
  const model_id = Form.useWatch(['model_id'], form)
-  console.log('ModelConfig', model_id)
+  const [selectedModel, setSelectedModel] = useState<Model | null>(null)
+  const [options, setOptions] = useState<Model[]>([])
+
+  const updateOptions = (options: Model[]) => {
+    setOptions(options)
+  }
+
+  useEffect(() => {
+    if (model_id && options) {
+      const model = options.find(item => item.id === model_id)
+      setSelectedModel(model || null)
+      form.setFieldValue('json_output', false)
+    } else {
+      setSelectedModel(null)
+    }
+  }, [model_id, options])

  return (
    <>
@@ -25,6 +47,7 @@ const ModelConfig: FC = () => {
          params={{ type: 'llm,chat' }}
          className="rb:w-full!"
          size="small"
+          updateOptions={updateOptions}
        />
      </Form.Item>
      {model_id && (
@@ -52,7 +75,7 @@ const ModelConfig: FC = () => {
          <Form.Item
            name="max_tokens"
            label={t('workflow.config.llm.max_tokens')}
-            className="rb:mb-0!"
+            className="rb:mb-1.5!"
          >
            <RbSlider 
              min={256}
@@ -63,6 +86,16 @@ const ModelConfig: FC = () => {
              className="rb:-mt-2!"
            />
          </Form.Item>
+          <Form.Item
+            name="json_output"
+            valuePropName="checked"
+            label={t('workflow.config.llm.json_output')}
+            layout="horizontal"
+            className="rb:mb-0!"
+            hidden={!(selectedModel?.capability?.includes('json_output'))}
+          >
+            <Switch />
+          </Form.Item>
        </RbCard>
      )}
    </>
--- a/web/src/views/Workflow/constant.ts
+++ b/web/src/views/Workflow/constant.ts
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 15:06:18 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-04-07 19:56:56
+ * @Last Modified time: 2026-04-16 17:52:30
 */
 import LoopNode from './components/Nodes/LoopNode';
 import NormalNode from './components/Nodes/NormalNode';
@@ -101,6 +101,10 @@ export const nodeLibrary: NodeLibrary[] = [
            step: 1, 
            defaultValue: 2000 
          },
+          json_output: {
+            type: 'define',
+            defaultValue: false
+          },
          context: {
            type: 'variableList',
            placeholder: 'workflow.config.llm.contextPlaceholder'