feat: Simple application version (#3479)

Author: shaohuzhang1

apps/application/api/application_version.py

@@ -55,7 +55,7 @@ class ApplicationVersionOperateAPI(APIMixin):
     def get_parameters():
         return [
             OpenApiParameter(
-                name="work_flow_version_id",
+                name="application_version_id",
                 description="工作流版本id",
                 type=OpenApiTypes.STR,
                 location='path',

apps/application/migrations/0004_application_publish_time_applicationversion_and_more.py

@@ -0,0 +1,66 @@
+# Generated by Django 5.2.3 on 2025-07-04 03:18
+
+import application.models.application
+import django.db.models.deletion
+import uuid_utils.compat
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0003_chat_asker_chat_meta_and_more'),
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='application',
+            name='publish_time',
+            field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='发布时间'),
+        ),
+        migrations.CreateModel(
+            name='ApplicationVersion',
+            fields=[
+                ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
+                ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id')),
+                ('name', models.CharField(default='', max_length=128, verbose_name='版本名称')),
+                ('publish_user_id', models.UUIDField(default=None, null=True, verbose_name='发布者id')),
+                ('publish_user_name', models.CharField(default='', max_length=128, verbose_name='发布者名称')),
+                ('workspace_id', models.CharField(db_index=True, default='default', max_length=64, verbose_name='工作空间id')),
+                ('application_name', models.CharField(max_length=128, verbose_name='应用名称')),
+                ('desc', models.CharField(default='', max_length=512, verbose_name='引用描述')),
+                ('prologue', models.CharField(default='', max_length=40960, verbose_name='开场白')),
+                ('dialogue_number', models.IntegerField(default=0, verbose_name='会话数量')),
+                ('model_id', models.UUIDField(blank=True, null=True, verbose_name='大语言模型')),
+                ('knowledge_setting', models.JSONField(default=application.models.application.get_dataset_setting_dict, verbose_name='数据集参数设置')),
+                ('model_setting', models.JSONField(default=application.models.application.get_model_setting_dict, verbose_name='模型参数相关设置')),
+                ('model_params_setting', models.JSONField(default=dict, verbose_name='模型参数相关设置')),
+                ('tts_model_params_setting', models.JSONField(default=dict, verbose_name='模型参数相关设置')),
+                ('problem_optimization', models.BooleanField(default=False, verbose_name='问题优化')),
+                ('icon', models.CharField(default='./favicon.ico', max_length=256, verbose_name='应用icon')),
+                ('work_flow', models.JSONField(default=dict, verbose_name='工作流数据')),
+                ('type', models.CharField(choices=[('SIMPLE', '简易'), ('WORK_FLOW', '工作流')], default='SIMPLE', max_length=256, verbose_name='应用类型')),
+                ('problem_optimization_prompt', models.CharField(blank=True, default='()里面是用户问题,根据上下文回答揣测用户问题({question}) 要求: 输出一个补全问题,并且放在<data></data>标签中', max_length=102400, null=True, verbose_name='问题优化提示词')),
+                ('tts_model_id', models.UUIDField(blank=True, null=True, verbose_name='文本转语音模型id')),
+                ('stt_model_id', models.UUIDField(blank=True, null=True, verbose_name='语音转文本模型id')),
+                ('tts_model_enable', models.BooleanField(default=False, verbose_name='语音合成模型是否启用')),
+                ('stt_model_enable', models.BooleanField(default=False, verbose_name='语音识别模型是否启用')),
+                ('tts_type', models.CharField(default='BROWSER', max_length=20, verbose_name='语音播放类型')),
+                ('tts_autoplay', models.BooleanField(default=False, verbose_name='自动播放')),
+                ('stt_autosend', models.BooleanField(default=False, verbose_name='自动发送')),
+                ('clean_time', models.IntegerField(default=180, verbose_name='清理时间')),
+                ('file_upload_enable', models.BooleanField(default=False, verbose_name='文件上传是否启用')),
+                ('file_upload_setting', models.JSONField(default=dict, verbose_name='文件上传相关设置')),
+                ('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='application.application')),
+                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to='users.user')),
+            ],
+            options={
+                'db_table': 'application_version',
+            },
+        ),
+        migrations.DeleteModel(
+            name='WorkFlowVersion',
+        ),
+    ]

apps/application/models/application.py

@@ -90,6 +90,7 @@ class Application(AppModelMixin):
     tts_autoplay = models.BooleanField(verbose_name="自动播放", default=False)
     stt_autosend = models.BooleanField(verbose_name="自动发送", default=False)
     clean_time = models.IntegerField(verbose_name="清理时间", default=180)
+    publish_time = models.DateTimeField(verbose_name="发布时间", default=None, null=True, blank=True)
     file_upload_enable = models.BooleanField(verbose_name="文件上传是否启用", default=False)
     file_upload_setting = models.JSONField(verbose_name="文件上传相关设置", default=dict)
 
@@ -120,14 +121,43 @@ class Meta:
         db_table = "application_knowledge_mapping"
 
 
-class WorkFlowVersion(AppModelMixin):
+class ApplicationVersion(AppModelMixin):
     id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
     application = models.ForeignKey(Application, on_delete=models.CASCADE)
-    workspace_id = models.CharField(max_length=64, verbose_name="工作空间id", default="default", db_index=True)
     name = models.CharField(verbose_name="版本名称", max_length=128, default="")
     publish_user_id = models.UUIDField(verbose_name="发布者id", max_length=128, default=None, null=True)
     publish_user_name = models.CharField(verbose_name="发布者名称", max_length=128, default="")
+    workspace_id = models.CharField(max_length=64, verbose_name="工作空间id", default="default", db_index=True)
+    application_name = models.CharField(max_length=128, verbose_name="应用名称")
+    desc = models.CharField(max_length=512, verbose_name="引用描述", default="")
+    prologue = models.CharField(max_length=40960, verbose_name="开场白", default="")
+    dialogue_number = models.IntegerField(default=0, verbose_name="会话数量")
+    user = models.ForeignKey(User, on_delete=models.SET_NULL, db_constraint=False, blank=True, null=True)
+    model_id = models.UUIDField(verbose_name="大语言模型", blank=True, null=True)
+    knowledge_setting = models.JSONField(verbose_name="数据集参数设置", default=get_dataset_setting_dict)
+    model_setting = models.JSONField(verbose_name="模型参数相关设置", default=get_model_setting_dict)
+    model_params_setting = models.JSONField(verbose_name="模型参数相关设置", default=dict)
+    tts_model_params_setting = models.JSONField(verbose_name="模型参数相关设置", default=dict)
+    problem_optimization = models.BooleanField(verbose_name="问题优化", default=False)
+    icon = models.CharField(max_length=256, verbose_name="应用icon", default="./favicon.ico")
     work_flow = models.JSONField(verbose_name="工作流数据", default=dict)
+    type = models.CharField(verbose_name="应用类型", choices=ApplicationTypeChoices.choices,
+                            default=ApplicationTypeChoices.SIMPLE, max_length=256)
+    problem_optimization_prompt = models.CharField(verbose_name="问题优化提示词", max_length=102400, blank=True,
+                                                   null=True,
+                                                   default="()里面是用户问题,根据上下文回答揣测用户问题({question}) 要求: 输出一个补全问题,并且放在<data></data>标签中")
+    tts_model_id = models.UUIDField(verbose_name="文本转语音模型id",
+                                    blank=True, null=True)
+    stt_model_id = models.UUIDField(verbose_name="语音转文本模型id",
+                                    blank=True, null=True)
+    tts_model_enable = models.BooleanField(verbose_name="语音合成模型是否启用", default=False)
+    stt_model_enable = models.BooleanField(verbose_name="语音识别模型是否启用", default=False)
+    tts_type = models.CharField(verbose_name="语音播放类型", max_length=20, default="BROWSER")
+    tts_autoplay = models.BooleanField(verbose_name="自动播放", default=False)
+    stt_autosend = models.BooleanField(verbose_name="自动发送", default=False)
+    clean_time = models.IntegerField(verbose_name="清理时间", default=180)
+    file_upload_enable = models.BooleanField(verbose_name="文件上传是否启用", default=False)
+    file_upload_setting = models.JSONField(verbose_name="文件上传相关设置", default=dict)
 
     class Meta:
-        db_table = "application_work_flow_version"
+        db_table = "application_version"

apps/application/serializers/application.py

@@ -27,7 +27,7 @@
 
 from application.flow.common import Workflow
 from application.models.application import Application, ApplicationTypeChoices, ApplicationKnowledgeMapping, \
-    ApplicationFolder, WorkFlowVersion
+    ApplicationFolder, ApplicationVersion
 from application.models.application_access_token import ApplicationAccessToken
 from common import result
 from common.database_model_manage.database_model_manage import DatabaseModelManage
@@ -614,6 +614,8 @@ def get_mcp_servers(self, instance, with_valid=True):
     def delete(self, with_valid=True):
         if with_valid:
             self.is_valid()
+        QuerySet(ApplicationVersion).filter(application_id=self.data.get('application_id')).delete()
+        QuerySet(ApplicationKnowledgeMapping).filter(application_id=self.data.get('application_id')).delete()
         QuerySet(Application).filter(id=self.data.get('application_id')).delete()
         return True
 
@@ -644,6 +646,27 @@ def export(self, with_valid=True):
         except Exception as e:
             return result.error(str(e), response_status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
+    @staticmethod
+    def reset_application_version(application_version, application):
+        update_field_dict = {
+            'application_name': 'name', 'desc': 'desc', 'prologue': 'prologue', 'dialogue_number': 'dialogue_number',
+            'user_id': 'user_id', 'model_id': 'model_id', 'knowledge_setting': 'knowledge_setting',
+            'model_setting': 'model_setting', 'model_params_setting': 'model_params_setting',
+            'tts_model_params_setting': 'tts_model_params_setting',
+            'problem_optimization': 'problem_optimization', 'icon': 'icon', 'work_flow': 'work_flow',
+            'problem_optimization_prompt': 'problem_optimization_prompt', 'tts_model_id': 'tts_model_id',
+            'stt_model_id': 'stt_model_id', 'tts_model_enable': 'tts_model_enable',
+            'stt_model_enable': 'stt_model_enable', 'tts_type': 'tts_type',
+            'tts_autoplay': 'tts_autoplay', 'stt_autosend': 'stt_autosend', 'file_upload_enable': 'file_upload_enable',
+            'file_upload_setting': 'file_upload_setting',
+            'type': 'type'
+        }
+
+        for (version_field, app_field) in update_field_dict.items():
+            _v = getattr(application, app_field)
+            if _v:
+                setattr(application_version, version_field, _v)
+
     @transaction.atomic
     def publish(self, instance, with_valid=True):
         if with_valid:
@@ -653,25 +676,28 @@ def publish(self, instance, with_valid=True):
         user = QuerySet(User).filter(id=user_id).first()
         application = QuerySet(Application).filter(id=self.data.get("application_id"),
                                                    workspace_id=workspace_id).first()
-        work_flow = instance.get('work_flow')
-        if work_flow is None:
-            raise AppApiException(500, _("work_flow is a required field"))
-        Workflow.new_instance(work_flow).is_valid()
-        base_node = get_base_node_work_flow(work_flow)
-        if base_node is not None:
-            node_data = base_node.get('properties').get('node_data')
-            if node_data is not None:
-                application.name = node_data.get('name')
-                application.desc = node_data.get('desc')
-                application.prologue = node_data.get('prologue')
-        application.work_flow = work_flow
+        if application.type == ApplicationTypeChoices.WORK_FLOW:
+            work_flow = application.work_flow
+            if work_flow is None:
+                raise AppApiException(500, _("work_flow is a required field"))
+            Workflow.new_instance(work_flow).is_valid()
+            base_node = get_base_node_work_flow(work_flow)
+            if base_node is not None:
+                node_data = base_node.get('properties').get('node_data')
+                if node_data is not None:
+                    application.name = node_data.get('name')
+                    application.desc = node_data.get('desc')
+                    application.prologue = node_data.get('prologue')
+            application.work_flow = work_flow
+        application.publish_time = datetime.datetime.now()
         application.is_publish = True
         application.save()
-        work_flow_version = WorkFlowVersion(work_flow=work_flow, application=application,
-                                            name=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-                                            publish_user_id=user_id,
-                                            publish_user_name=user.username,
-                                            workspace_id=workspace_id)
+        work_flow_version = ApplicationVersion(work_flow=application.work_flow, application=application,
+                                               name=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
+                                               publish_user_id=user_id,
+                                               publish_user_name=user.username,
+                                               workspace_id=workspace_id)
+        self.reset_application_version(work_flow_version, application)
         work_flow_version.save()
         return self.one(with_valid=False)
 

apps/application/serializers/application_version.py

@@ -12,7 +12,7 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from application.models import WorkFlowVersion, Application
+from application.models import Application, ApplicationVersion
 from common.db.search import page_search
 from common.exception.app_exception import AppApiException
 
@@ -25,7 +25,7 @@ class ApplicationVersionQuerySerializer(serializers.Serializer):
 
 class ApplicationVersionModelSerializer(serializers.ModelSerializer):
     class Meta:
-        model = WorkFlowVersion
+        model = ApplicationVersion
         fields = ['id', 'name', 'workspace_id', 'application_id', 'work_flow', 'publish_user_id', 'publish_user_name',
                   'create_time',
                   'update_time']
@@ -43,11 +43,11 @@ class Query(serializers.Serializer):
         workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Workspace ID"))
 
         def get_query_set(self, query):
-            query_set = QuerySet(WorkFlowVersion).filter(application_id=query.get('application_id'))
+            query_set = QuerySet(ApplicationVersion).filter(application_id=query.get('application_id'))
             if 'name' in query and query.get('name') is not None:
                 query_set = query_set.filter(name__contains=query.get('name'))
             if 'workspace_id' in self.data and self.data.get('workspace_id') is not None:
-                query_set = query_set.filter(workspace_id=self.data.get('workspace_id').get('name'))
+                query_set = query_set.filter(workspace_id=self.data.get('workspace_id'))
             return query_set.order_by("-create_time")
 
         def list(self, query, with_valid=True):
@@ -67,8 +67,8 @@ def page(self, query, current_page, page_size, with_valid=True):
     class Operate(serializers.Serializer):
         workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Workspace ID"))
         application_id = serializers.UUIDField(required=True, label=_("Application ID"))
-        work_flow_version_id = serializers.UUIDField(required=True,
-                                                     label=_("Workflow version id"))
+        application_version_id = serializers.UUIDField(required=True,
+                                                       label=_("Application version ID"))
 
         def is_valid(self, *, raise_exception=False):
             super().is_valid(raise_exception=True)
@@ -82,24 +82,26 @@ def is_valid(self, *, raise_exception=False):
         def one(self, with_valid=True):
             if with_valid:
                 self.is_valid(raise_exception=True)
-            work_flow_version = QuerySet(WorkFlowVersion).filter(application_id=self.data.get('application_id'),
-                                                                 id=self.data.get('work_flow_version_id')).first()
-            if work_flow_version is not None:
-                return ApplicationVersionModelSerializer(work_flow_version).data
+            application_version = QuerySet(ApplicationVersion).filter(application_id=self.data.get('application_id'),
+                                                                      id=self.data.get(
+                                                                          'application_version_id')).first()
+            if application_version is not None:
+                return ApplicationVersionModelSerializer(application_version).data
             else:
                 raise AppApiException(500, _('Workflow version does not exist'))
 
         def edit(self, instance: Dict, with_valid=True):
             if with_valid:
                 self.is_valid(raise_exception=True)
                 ApplicationVersionEditSerializer(data=instance).is_valid(raise_exception=True)
-            work_flow_version = QuerySet(WorkFlowVersion).filter(application_id=self.data.get('application_id'),
-                                                                 id=self.data.get('work_flow_version_id')).first()
-            if work_flow_version is not None:
+            application_version = QuerySet(ApplicationVersion).filter(application_id=self.data.get('application_id'),
+                                                                      id=self.data.get(
+                                                                          'application_version_id')).first()
+            if application_version is not None:
                 name = instance.get('name', None)
                 if name is not None and len(name) > 0:
-                    work_flow_version.name = name
-                work_flow_version.save()
-                return ApplicationVersionModelSerializer(work_flow_version).data
+                    application_version.name = name
+                application_version.save()
+                return ApplicationVersionModelSerializer(application_version).data
             else:
                 raise AppApiException(500, _('Workflow version does not exist'))