Merge remote-tracking branch 'origin/main'

Author: XiaJunjie2020

apps/application/views/application_version_views.py

@@ -16,6 +16,7 @@
 from common.auth import has_permissions, TokenAuth
 from common.constants.permission_constants import PermissionConstants, CompareConstants, ViewPermission, RoleConstants, \
     Permission, Group, Operate
+from common.log.log import log
 from common.response import result
 from django.utils.translation import gettext_lazy as _
 
@@ -30,6 +31,7 @@ class ApplicationVersionView(APIView):
                          responses=result.get_api_array_response(ApplicationVersionApi.get_response_body_api()),
                          tags=[_('Application/Version')])
     @has_permissions(PermissionConstants.APPLICATION_READ, compare=CompareConstants.AND)
+    @log(menu='Application', operate="Get the application list")
     def get(self, request: Request, application_id: str):
         return result.success(
             ApplicationVersionSerializer.Query(
@@ -47,6 +49,7 @@ class Page(APIView):
                              responses=result.get_page_api_response(ApplicationVersionApi.get_response_body_api()),
                              tags=[_('Application/Version')])
         @has_permissions(PermissionConstants.APPLICATION_READ, compare=CompareConstants.AND)
+        @log(menu='Application', operate="Get the list of application versions by page")
         def get(self, request: Request, application_id: str, current_page: int, page_size: int):
             return result.success(
                 ApplicationVersionSerializer.Query(
@@ -64,6 +67,7 @@ class Operate(APIView):
                              responses=result.get_api_response(ApplicationVersionApi.get_response_body_api()),
                              tags=[_('Application/Version')])
         @has_permissions(PermissionConstants.APPLICATION_READ, compare=CompareConstants.AND)
+        @log(menu='Application', operate="Get application version details")
         def get(self, request: Request, application_id: str, work_flow_version_id: str):
             return result.success(
                 ApplicationVersionSerializer.Operate(
@@ -82,6 +86,7 @@ def get(self, request: Request, application_id: str, work_flow_version_id: str):
             [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.MANAGE,
                                             dynamic_tag=keywords.get('application_id'))],
             compare=CompareConstants.AND))
+        @log(menu='Application', operate="Modify application version information")
         def put(self, request: Request, application_id: str, work_flow_version_id: str):
             return result.success(
                 ApplicationVersionSerializer.Operate(

apps/application/views/application_views.py

@@ -23,6 +23,7 @@
 from common.constants.authentication_type import AuthenticationType
 from common.constants.permission_constants import Permission, Group, Operate, \
     RoleConstants, ViewPermission, CompareConstants
+from common.log.log import log
 from common.response import result
 from common.util.common import query_params_to_single_dict
 from dataset.serializers.file_serializers import FileSerializer
@@ -177,6 +178,7 @@ class Operate(APIView):
                                             dynamic_tag=keywords.get('application_id'))],
             compare=CompareConstants.AND),
             compare=CompareConstants.AND)
+        @log(menu='Application/Conversation Log', operate="Delete a conversation")
         def delete(self, request: Request, application_id: str, chat_id: str):
             return result.success(
                 ChatSerializers.Operate(
@@ -199,6 +201,7 @@ class ClientChatHistoryPage(APIView):
                            [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                            dynamic_tag=keywords.get('application_id'))])
         )
+        @log(menu='Application/Conversation Log', operate="Get client conversation list by paging")
         def get(self, request: Request, application_id: str, current_page: int, page_size: int):
             return result.success(ChatSerializers.ClientChatHistory(
                 data={'client_id': request.auth.client_id, 'application_id': application_id}).page(
@@ -218,6 +221,7 @@ class Operate(APIView):
                                                 dynamic_tag=keywords.get('application_id'))],
                 compare=CompareConstants.AND),
                 compare=CompareConstants.AND)
+            @log(menu='Application/Conversation Log', operate="Client deletes conversation")
             def delete(self, request: Request, application_id: str, chat_id: str):
                 return result.success(
                     ChatSerializers.Operate(
@@ -235,6 +239,7 @@ def delete(self, request: Request, application_id: str, chat_id: str):
                                                 dynamic_tag=keywords.get('application_id'))],
                 compare=CompareConstants.AND),
                 compare=CompareConstants.AND)
+            @log(menu='Application/Conversation Log', operate="Client modifies dialogue summary")
             def put(self, request: Request, application_id: str, chat_id: str):
                 return result.success(
                     ChatSerializers.Operate(
@@ -256,6 +261,7 @@ class Page(APIView):
                            [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                            dynamic_tag=keywords.get('application_id'))])
         )
+        @log(menu='Application/Conversation Log', operate="Get the conversation list by page")
         def get(self, request: Request, application_id: str, current_page: int, page_size: int):
             return result.success(ChatSerializers.Query(
                 data={**query_params_to_single_dict(request.query_params), 'application_id': application_id,
@@ -281,6 +287,7 @@ class Operate(APIView):
                                [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                                dynamic_tag=keywords.get('application_id'))])
             )
+            @log(menu='Application/Conversation Log', operate="Get conversation record details")
             def get(self, request: Request, application_id: str, chat_id: str, chat_record_id: str):
                 return result.success(ChatRecordSerializer.Operate(
                     data={'application_id': application_id,
@@ -299,6 +306,7 @@ def get(self, request: Request, application_id: str, chat_id: str, chat_record_i
                            [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                            dynamic_tag=keywords.get('application_id'))])
         )
+        @log(menu='Application/Conversation Log', operate="Get a list of conversation records")
         def get(self, request: Request, application_id: str, chat_id: str):
             return result.success(ChatRecordSerializer.Query(
                 data={'application_id': application_id,
@@ -320,6 +328,7 @@ class Page(APIView):
                                [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                                dynamic_tag=keywords.get('application_id'))])
             )
+            @log(menu='Application/Conversation Log', operate="Get the conversation history list by page")
             def get(self, request: Request, application_id: str, chat_id: str, current_page: int, page_size: int):
                 return result.success(ChatRecordSerializer.Query(
                     data={'application_id': application_id,
@@ -343,6 +352,7 @@ class Vote(APIView):
                                [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                                dynamic_tag=keywords.get('application_id'))])
             )
+            @log(menu='Application/Conversation Log', operate="Like, Dislike")
             def put(self, request: Request, application_id: str, chat_id: str, chat_record_id: str):
                 return result.success(ChatRecordSerializer.Vote(
                     data={'vote_status': request.data.get('vote_status'), 'chat_id': chat_id,
@@ -363,6 +373,7 @@ class ChatRecordImprove(APIView):
                                [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                                dynamic_tag=keywords.get('application_id'))]
                                ))
+            @log(menu='Application/Conversation Log', operate="Get the list of marked paragraphs")
             def get(self, request: Request, application_id: str, chat_id: str, chat_record_id: str):
                 return result.success(ChatRecordSerializer.ChatRecordImprove(
                     data={'chat_id': chat_id, 'chat_record_id': chat_record_id}).get())
@@ -390,6 +401,7 @@ class Improve(APIView):
                                                                                      'dataset_id'))],
                                                  compare=CompareConstants.AND
                                                  ), compare=CompareConstants.AND)
+            @log(menu='Application/Conversation Log', operate="Annotation")
             def put(self, request: Request, application_id: str, chat_id: str, chat_record_id: str, dataset_id: str,
                     document_id: str):
                 return result.success(ChatRecordSerializer.Improve(
@@ -415,6 +427,7 @@ def put(self, request: Request, application_id: str, chat_id: str, chat_record_i
                                                                                      'dataset_id'))],
                                                  compare=CompareConstants.AND
                                                  ), compare=CompareConstants.AND)
+            @log(menu='Application/Conversation Log', operate="Add to Knowledge Base")
             def post(self, request: Request, application_id: str, dataset_id: str):
                 return result.success(ChatRecordSerializer.PostImprove().post_improve(request.data))
 
@@ -440,6 +453,7 @@ class Operate(APIView):
                                                                                          'dataset_id'))],
                                                      compare=CompareConstants.AND
                                                      ), compare=CompareConstants.AND)
+                @log(menu='Application/Conversation Log', operate="Delete a Annotation")
                 def delete(self, request: Request, application_id: str, chat_id: str, chat_record_id: str,
                            dataset_id: str,
                            document_id: str, paragraph_id: str):

apps/application/views/chat_views.py

@@ -110,24 +110,51 @@ def get_image_id(image_id):
     return get_image_id
 
 
+title_font_list = [
+    [36, 100],
+    [26, 36],
+    [24, 26],
+    [22, 24],
+    [18, 22],
+    [16, 18]
+]
+
+
+def get_title_level(paragraph: Paragraph):
+    try:
+        if paragraph.style is not None:
+            psn = paragraph.style.name
+            if psn.startswith('Heading') or psn.startswith('TOC 标题') or psn.startswith('标题'):
+                return int(psn.replace("Heading ", '').replace('TOC 标题', '').replace('标题',
+                                                                                       ''))
+        if len(paragraph.runs) == 1:
+            font_size = paragraph.runs[0].font.size
+            pt = font_size.pt
+            if pt >= 16:
+                for _value, index in zip(title_font_list, range(len(title_font_list))):
+                    if pt >= _value[0] and pt < _value[1]:
+                        return index + 1
+    except Exception as e:
+        pass
+    return None
+
+
 class DocSplitHandle(BaseSplitHandle):
     @staticmethod
     def paragraph_to_md(paragraph: Paragraph, doc: Document, images_list, get_image_id):
         try:
-            psn = paragraph.style.name
-            if psn.startswith('Heading') or psn.startswith('TOC 标题') or psn.startswith('标题'):
-                title = "".join(["#" for i in range(
-                    int(psn.replace("Heading ", '').replace('TOC 标题', '').replace('标题',
-                                                                                    '')))]) + " " + paragraph.text
+            title_level = get_title_level(paragraph)
+            if title_level is not None:
+                title = "".join(["#" for i in range(title_level)]) + " " + paragraph.text
                 images = reduce(lambda x, y: [*x, *y],
                                 [get_paragraph_element_images(e, doc, images_list, get_image_id) for e in
                                  paragraph._element],
                                 [])
-
                 if len(images) > 0:
                     return title + '\n' + images_to_string(images, doc, images_list, get_image_id) if len(
                         paragraph.text) > 0 else images_to_string(images, doc, images_list, get_image_id)
                 return title
+
         except Exception as e:
             traceback.print_exc()
             return paragraph.text

apps/common/handle/impl/doc_split_handle.py

@@ -6,6 +6,7 @@
     @date：2025/3/14 16:09
     @desc:
 """
+from gettext import gettext
 
 from setting.models.log_management import Log
 
@@ -31,6 +32,10 @@ def _get_user(request):
     @return:
     """
     user = request.user
+    if user is None:
+        return {
+            "user_name": gettext('unknown')
+        }
     return {
         "id": str(user.id),
         "email": user.email,
@@ -70,6 +75,7 @@ def run(view, request, **kwargs):
                 return func(view, request, **kwargs)
             except Exception as e:
                 status = 500
+                raise e
             finally:
                 ip = get_ip_address(request)
                 user = get_user(request)

apps/common/log/log.py

@@ -24,6 +24,26 @@
 from ..models.db_model_manage import DBModelManage
 
 
+def encryption(message: str):
+    """
+        加密敏感字段数据  加密方式是 如果密码是 1234567890  那么给前端则是 123******890
+    :param message:
+    :return:
+    """
+    max_pre_len = 8
+    max_post_len = 4
+    message_len = len(message)
+    pre_len = int(message_len / 5 * 2)
+    post_len = int(message_len / 5 * 1)
+    pre_str = "".join([message[index] for index in
+                       range(0, max_pre_len if pre_len > max_pre_len else 1 if pre_len <= 0 else int(pre_len))])
+    end_str = "".join(
+        [message[index] for index in
+         range(message_len - (int(post_len) if pre_len < max_post_len else max_post_len), message_len)])
+    content = "***************"
+    return pre_str + content + end_str
+
+
 def sub_array(array: List, item_num=10):
     result = []
     temp = []

apps/common/util/common.py

@@ -339,13 +339,14 @@ def parse(self, text: str):
         for e in result:
             if len(e['content']) > 4096:
                 pass
-        return [item for item in [self.post_reset_paragraph(row) for row in result] if
+        title_list = list(set([row.get('title') for row in result]))
+        return [item for item in [self.post_reset_paragraph(row, title_list) for row in result] if
                 'content' in item and len(item.get('content').strip()) > 0]
 
-    def post_reset_paragraph(self, paragraph: Dict):
+    def post_reset_paragraph(self, paragraph: Dict, title_list: List[str]):
         result = self.filter_title_special_characters(paragraph)
         result = self.sub_title(result)
-        result = self.content_is_null(result)
+        result = self.content_is_null(result, title_list)
         return result
 
     @staticmethod
@@ -357,11 +358,14 @@ def sub_title(paragraph: Dict):
         return paragraph
 
     @staticmethod
-    def content_is_null(paragraph: Dict):
+    def content_is_null(paragraph: Dict, title_list: List[str]):
         if 'title' in paragraph:
             title = paragraph.get('title')
             content = paragraph.get('content')
             if (content is None or len(content.strip()) == 0) and (title is not None and len(title) > 0):
+                find = [t for t in title_list if t.__contains__(title) and t != title]
+                if find:
+                    return {'title': '', 'content': ''}
                 return {'title': '', 'content': title}
         return paragraph