Merge branch 'v2' into pr@v2@feat_chat_auth

Author: shaohuzhang1

apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py

@@ -9,7 +9,7 @@
 from application.flow.step_node.document_extract_node.i_document_extract_node import IDocumentExtractNode
 from knowledge.models import File
 from knowledge.serializers.document import split_handles, parse_table_handle_list, FileBufferHandle
-from knowledge.serializers.file import FileSerializer
+from oss.serializers.file import FileSerializer
 
 
 def bytes_to_uploaded_file(file_bytes, file_name="file.txt"):

apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py

@@ -8,7 +8,7 @@
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.image_generate_step_node.i_image_generate_node import IImageGenerateNode
 from common.utils.common import bytes_to_uploaded_file
-from knowledge.serializers.file import FileSerializer
+from oss.serializers.file import FileSerializer
 from models_provider.tools import get_model_instance_by_model_user_id
 
 

apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py

@@ -130,7 +130,7 @@ def generate_history_human_message_for_details(self, chat_record):
                 file_id_list = [image.get('file_id') for image in image_list]
                 return HumanMessage(content=[
                     {'type': 'text', 'text': data['question']},
-                    *[{'type': 'image_url', 'image_url': {'url': f'/api/file/{file_id}'}} for file_id in file_id_list]
+                    *[{'type': 'image_url', 'image_url': {'url': f'/oss/file/{file_id}'}} for file_id in file_id_list]
 
                 ])
         return HumanMessage(content=chat_record.problem_text)

apps/application/flow/step_node/text_to_speech_step_node/impl/base_text_to_speech_node.py

@@ -6,7 +6,7 @@
 
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.text_to_speech_step_node.i_text_to_speech_node import ITextToSpeechNode
-from knowledge.serializers.file import FileSerializer
+from oss.serializers.file import FileSerializer
 from models_provider.tools import get_model_instance_by_model_user_id
 
 

apps/application/models/application_access_token.py

@@ -26,6 +26,7 @@ class ApplicationAccessToken(AppModelMixin):
                             base_field=models.CharField(max_length=128, blank=True)
                             , default=list)
     show_source = models.BooleanField(default=False, verbose_name="是否显示知识来源")
+    show_exec = models.BooleanField(default=False, verbose_name="是否显示执行详情")
 
     language = models.CharField(max_length=10, verbose_name="语言", default=None, null=True)
 

apps/application/views/application.py

@@ -6,6 +6,7 @@
     @date：2025/5/26 16:51
     @desc:
 """
+from django.db.models import QuerySet
 from django.utils.translation import gettext_lazy as _
 from drf_spectacular.utils import extend_schema
 from rest_framework.parsers import MultiPartParser
@@ -14,11 +15,22 @@
 
 from application.api.application_api import ApplicationCreateAPI, ApplicationQueryAPI, ApplicationImportAPI, \
     ApplicationExportAPI, ApplicationOperateAPI, ApplicationEditAPI
+from application.models import Application
 from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer
 from common import result
 from common.auth import TokenAuth
 from common.auth.authentication import has_permissions
 from common.constants.permission_constants import PermissionConstants
+from common.log.log import log
+
+
+def get_application_operation_object(application_id):
+    application_model = QuerySet(model=Application).filter(id=application_id).first()
+    if application_model is not None:
+        return {
+            'name': application_model.name
+        }
+    return {}
 
 
 class Application(APIView):
@@ -35,6 +47,8 @@ class Application(APIView):
         tags=[_('Application')]  # type: ignore
     )
     @has_permissions(PermissionConstants.APPLICATION_READ.get_workspace_permission())
+    @log(menu='Application', operate='Create an application',
+         get_operation_object=lambda r, k: {'name': r.data.get('name')})
     def post(self, request: Request, workspace_id: str):
         return result.success(
             ApplicationSerializer(data={'workspace_id': workspace_id, 'user_id': request.user.id}).insert(request.data))
@@ -85,6 +99,7 @@ class Import(APIView):
             tags=[_('Application')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_READ)
+        @log(menu='Application', operate="Import Application")
         def post(self, request: Request, workspace_id: str):
             return result.success(ApplicationSerializer(
                 data={'user_id': request.user.id, 'workspace_id': workspace_id,
@@ -104,6 +119,8 @@ class Export(APIView):
             tags=[_('Application')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_EXPORT.get_workspace_application_permission())
+        @log(menu='Application', operate="Export Application",
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')))
         def post(self, request: Request, workspace_id: str, application_id: str):
             return ApplicationOperateSerializer(
                 data={'application_id': application_id,
@@ -122,6 +139,9 @@ class Operate(APIView):
             tags=[_('Application')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_DELETE.get_workspace_application_permission())
+        @log(menu='Application', operate='Deleting application',
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id'))
+             )
         def delete(self, request: Request, workspace_id: str, application_id: str):
             return result.success(ApplicationOperateSerializer(
                 data={'application_id': application_id, 'user_id': request.user.id}).delete(
@@ -138,6 +158,8 @@ def delete(self, request: Request, workspace_id: str, application_id: str):
             tags=[_('Application')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission())
+        @log(menu='Application', operate="Modify the application",
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')))
         def put(self, request: Request, workspace_id: str, application_id: str):
             return result.success(
                 ApplicationOperateSerializer(
@@ -172,6 +194,9 @@ class Publish(APIView):
             responses=result.DefaultResultSerializer,
             tags=[_('Application')]  # type: ignore
         )
+        @log(menu='Application', operate='Publishing an application',
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id'))
+             )
         def put(self, request: Request, application_id: str):
             return result.success(
                 ApplicationOperateSerializer(

apps/application/views/application_api_key.py

@@ -1,14 +1,28 @@
+from django.db.models import QuerySet
 from drf_spectacular.utils import extend_schema
 from rest_framework.request import Request
 from rest_framework.views import APIView
 from django.utils.translation import gettext_lazy as _
 
 from application.api.application_api_key import ApplicationKeyCreateAPI
+from application.models import ApplicationApiKey
 from application.serializers.application_api_key import ApplicationKeySerializer
 from common.auth import TokenAuth
+from common.auth.authentication import has_permissions
+from common.constants.permission_constants import PermissionConstants
+from common.log.log import log
 from common.result import result, success
 
 
+def get_application_operation_object(application_api_key_id):
+    application_api_key_model = QuerySet(model=ApplicationApiKey).filter(id=application_api_key_id).first()
+    if application_api_key_model is not None:
+        return {
+            "name": application_api_key_model.name
+        }
+    return {}
+
+
 class ApplicationKey(APIView):
     authentication_classes = [TokenAuth]
 
@@ -20,6 +34,10 @@ class ApplicationKey(APIView):
         parameters=ApplicationKeyCreateAPI.get_parameters(),
         tags=[_('Application Api Key')]  # type: ignore
     )
+
+    @log(menu='Application', operate="Add ApiKey",
+         get_operation_object=lambda r, k: get_application_operation_object(k.get('application_api_key_id')))
+    @has_permissions(PermissionConstants.APPLICATION_OVERVIEW_API_KEY.get_workspace_application_permission())
     def post(self, request: Request, workspace_id: str, application_id: str):
         return result.success(ApplicationKeySerializer(
             data={'application_id': application_id, 'user_id': request.user.id,
@@ -33,7 +51,8 @@ def post(self, request: Request, workspace_id: str, application_id: str):
         parameters=ApplicationKeyCreateAPI.get_parameters(),
         tags=[_('Application Api Key')]  # type: ignore
     )
-    def get(self, request: Request, workspace_id: str, application_id: str, ):
+    @has_permissions(PermissionConstants.APPLICATION_OVERVIEW_API_KEY.get_workspace_application_permission())
+    def get(self, request: Request, workspace_id: str, application_id: str ):
         return result, success(ApplicationKeySerializer(
             data={'application_id': application_id, 'user_id': request.user.id,
                   'workspace_id': workspace_id}).list())
@@ -49,8 +68,6 @@ class Operate(APIView):
             parameters=ApplicationKeyCreateAPI.get_parameters(),
             tags=[_('Application Api Key')]  # type: ignore
         )
-        def put(self, request: Request, workspace_id: str, application_id: str):
-            return result.success(ApplicationKeySerializer.Operate(
-
-            )
-            )
+        @has_permissions(PermissionConstants.APPLICATION_OVERVIEW_API_KEY.get_workspace_application_permission())
+        def put(self, request: Request, application_id: str, workspace_id: str):
+            return result.success(ApplicationKeySerializer.Operate())

apps/application/views/application_version.py

@@ -14,10 +14,12 @@
 from application.api.application_version import ApplicationVersionListAPI, ApplicationVersionPageAPI, \
     ApplicationVersionOperateAPI
 from application.serializers.application_version import ApplicationVersionSerializer
+from application.views import get_application_operation_object
 from common import result
 from common.auth import TokenAuth
 from common.auth.authentication import has_permissions
 from common.constants.permission_constants import PermissionConstants
+from common.log.log import log
 
 
 class ApplicationVersionView(APIView):
@@ -89,6 +91,8 @@ def get(self, request: Request, workspace_id: str, application_id: str, work_flo
             tags=[_('Application/Version')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission())
+        @log(menu='Application', operate="Modify application version information",
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')))
         def put(self, request: Request, workspace_id: str, application_id: str, work_flow_version_id: str):
             return result.success(
                 ApplicationVersionSerializer.Operate(