Merge branch 'v2' of https://github.com/maxkb-dev/maxkb into v2

Author: liqiang-fit2cloud

apps/application/flow/step_node/form_node/impl/base_form_node.py

@@ -17,6 +17,19 @@
 from application.flow.step_node.form_node.i_form_node import IFormNode
 
 
+def get_default_option(option_list, _type, value_field):
+    if option_list is not None and len(option_list) > 0:
+        default_value_list = [o.get(value_field) for o in option_list if o.get('default')]
+        if len(default_value_list) == 0:
+            return option_list[0].get(value_field)
+        else:
+            if _type == 'MultiSelect':
+                return default_value_list
+            else:
+                return default_value_list[0]
+    return []
+
+
 def write_context(step_variable: Dict, global_variable: Dict, node, workflow):
     if step_variable is not None:
         for key in step_variable:
@@ -44,6 +57,30 @@ def save_context(self, details, workflow_manage):
             for key in form_data:
                 self.context[key] = form_data[key]
 
+    def reset_field(self, field):
+        if ['SingleSelect', 'MultiSelect', 'RadioCard'].__contains__(field.get('input_type')):
+            if field.get('assignment_method') == 'ref_variables':
+                option_list = self.workflow_manage.get_reference_field(field.get('option_list')[0],
+                                                                       field.get('option_list')[1:])
+                field['option_list'] = option_list
+                field['default_value'] = get_default_option(option_list, field.get('input_type'),
+                                                            field.get('value_field'))
+
+        reset_field = ['field', 'label', 'default_value']
+        for f in reset_field:
+            _value = field[f]
+            if _value is None:
+                continue
+            if isinstance(_value, str):
+                field[f] = self.workflow_manage.generate_prompt(_value)
+            elif f == 'label':
+                _label_value = _value.get('label')
+                _value['label'] = self.workflow_manage.generate_prompt(_label_value)
+                tooltip = _value.get('attrs').get('tooltip')
+                if tooltip is not None:
+                    _value.get('attrs')['tooltip'] = self.workflow_manage.generate_prompt(tooltip)
+        return field
+
     def execute(self, form_field_list, form_content_format, form_data, **kwargs) -> NodeResult:
         if form_data is not None:
             self.context['is_submit'] = True
@@ -52,6 +89,7 @@ def execute(self, form_field_list, form_content_format, form_data, **kwargs) ->
                 self.context[key] = form_data.get(key)
         else:
             self.context['is_submit'] = False
+        form_field_list = [self.reset_field(field) for field in form_field_list]
         form_setting = {"form_field_list": form_field_list, "runtime_node_id": self.runtime_node_id,
                         "chat_record_id": self.flow_params_serializer.data.get("chat_record_id"),
                         "is_submit": self.context.get("is_submit", False)}
@@ -60,6 +98,7 @@ def execute(self, form_field_list, form_content_format, form_data, **kwargs) ->
         form_content_format = self.workflow_manage.reset_prompt(form_content_format)
         prompt_template = PromptTemplate.from_template(form_content_format, template_format='jinja2')
         value = prompt_template.format(form=form, context=context)
+
         return NodeResult(
             {'result': value, 'form_field_list': form_field_list, 'form_content_format': form_content_format}, {},
             _write_context=write_context)

apps/application/flow/tools.py

@@ -60,15 +60,20 @@ def get_reasoning_content(self, chunk):
                 if not self.reasoning_content_is_end:
                     self.reasoning_content_is_end = True
                     self.content += self.all_content
-                    return {'content': self.all_content, 'reasoning_content': ''}
+                    return {'content': self.all_content,
+                            'reasoning_content': chunk.additional_kwargs.get('reasoning_content',
+                                                                             '') if chunk.additional_kwargs else ''
+                            }
         else:
             if self.reasoning_content_is_start:
                 self.reasoning_content_chunk += chunk.content
         reasoning_content_end_tag_prefix_index = self.reasoning_content_chunk.find(
             self.reasoning_content_end_tag_prefix)
         if self.reasoning_content_is_end:
             self.content += chunk.content
-            return {'content': chunk.content, 'reasoning_content': ''}
+            return {'content': chunk.content, 'reasoning_content': chunk.additional_kwargs.get('reasoning_content',
+                                                                                               '') if chunk.additional_kwargs else ''
+                    }
         # 是否包含结束
         if reasoning_content_end_tag_prefix_index > -1:
             if len(self.reasoning_content_chunk) - reasoning_content_end_tag_prefix_index >= self.reasoning_content_end_tag_len:
@@ -93,7 +98,9 @@ def get_reasoning_content(self, chunk):
         else:
             if self.reasoning_content_is_end:
                 self.content += chunk.content
-                return {'content': chunk.content, 'reasoning_content': ''}
+                return {'content': chunk.content, 'reasoning_content': chunk.additional_kwargs.get('reasoning_content',
+                                                                                                   '') if chunk.additional_kwargs else ''
+                        }
             else:
                 # aaa
                 result = {'content': '', 'reasoning_content': self.reasoning_content_chunk}

apps/common/constants/permission_constants.py

@@ -170,6 +170,7 @@ class Operate(Enum):
     TO_CHAT = "READ+TO_CHAT"  # 去对话
     SETTING = "READ+SETTING"  # 管理
     DOWNLOAD = "READ+DOWNLOAD"  # 下载
+    AUTH = "READ+AUTH"
 
 
 class RoleGroup(Enum):
@@ -335,6 +336,7 @@ def get_workspace_role(self):
     Operate.DD.value: _('Dingding'),
     Operate.WEIXIN_PUBLIC_ACCOUNT.value: _('Weixin Public Account'),
     Operate.ADD_KNOWLEDGE.value: _('Add to Knowledge Base'),
+    Operate.AUTH.value:_('resource authorization'),
     Group.APPLICATION_OVERVIEW.value: _('Overview'),
     Group.APPLICATION_ACCESS.value: _('Application Access'),
     Group.APPLICATION_CHAT_USER.value: _('Dialogue users'),
@@ -481,6 +483,11 @@ class PermissionConstants(Enum):
         parent_group=[WorkspaceGroup.MODEL, UserGroup.MODEL],
         resource_permission_group_list=[ResourcePermissionConst.MODEL_MANGE]
     )
+    MODEL_RESOURCE_AUTHORIZATION = Permission(
+        group=Group.MODEL, operate=Operate.AUTH, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
+        parent_group=[WorkspaceGroup.MODEL, UserGroup.MODEL],
+        resource_permission_group_list=[ResourcePermissionConst.MODEL_MANGE]
+    )
     TOOL_READ = Permission(
         group=Group.TOOL, operate=Operate.READ, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
         parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL],
@@ -520,6 +527,11 @@ class PermissionConstants(Enum):
         parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL],
         resource_permission_group_list=[ResourcePermissionConst.TOOL_MANGE]
     )
+    TOOL_RESOURCE_AUTHORIZATION = Permission(
+        group=Group.TOOL, operate=Operate.AUTH, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
+        parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL],
+        resource_permission_group_list=[ResourcePermissionConst.TOOL_MANGE]
+    )
     KNOWLEDGE_READ = Permission(
         group=Group.KNOWLEDGE, operate=Operate.READ, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
         resource_permission_group_list=[ResourcePermissionConst.KNOWLEDGE_VIEW],
@@ -560,6 +572,11 @@ class PermissionConstants(Enum):
         resource_permission_group_list=[ResourcePermissionConst.KNOWLEDGE_MANGE],
         parent_group=[WorkspaceGroup.KNOWLEDGE, UserGroup.KNOWLEDGE]
     )
+    KNOWLEDGE_RESOURCE_AUTHORIZATION = Permission(
+        group=Group.KNOWLEDGE, operate=Operate.AUTH, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
+        resource_permission_group_list=[ResourcePermissionConst.KNOWLEDGE_MANGE],
+        parent_group=[WorkspaceGroup.KNOWLEDGE, UserGroup.KNOWLEDGE]
+    )
     KNOWLEDGE_DOCUMENT_READ = Permission(
         group=Group.KNOWLEDGE_DOCUMENT, operate=Operate.READ,
         role_list=[RoleConstants.ADMIN, RoleConstants.USER],
@@ -819,7 +836,11 @@ class PermissionConstants(Enum):
                                   parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
                                   resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
                                   )
-
+    APPLICATION_RESOURCE_AUTHORIZATION = Permission(group=Group.APPLICATION, operate=Operate.AUTH,
+                                  role_list=[RoleConstants.ADMIN, RoleConstants.USER],
+                                  parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
+                                  resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
+                                  )
     APPLICATION_OVERVIEW_READ = Permission(group=Group.APPLICATION_OVERVIEW, operate=Operate.READ,
                                            role_list=[RoleConstants.ADMIN, RoleConstants.USER],
                                            parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],

apps/common/forms/radio_button_field.py

@@ -11,7 +11,7 @@
 from common.forms.base_field import BaseExecField, TriggerType
 
 
-class Radio(BaseExecField):
+class RadioButton(BaseExecField):
     """
     下拉单选
     """

apps/common/forms/radio_card_field.py

@@ -11,7 +11,7 @@
 from common.forms.base_field import BaseExecField, TriggerType
 
 
-class Radio(BaseExecField):
+class RadioCard(BaseExecField):
     """
     下拉单选
     """

apps/knowledge/serializers/paragraph.py

@@ -406,6 +406,15 @@ def is_valid(self, *, raise_exception=True):
         def association(self, with_valid=True, with_embedding=True):
             if with_valid:
                 self.is_valid(raise_exception=True)
+            # 已关联则直接返回
+            if QuerySet(ProblemParagraphMapping).filter(
+                knowledge_id=self.data.get('knowledge_id'),
+                document_id=self.data.get('document_id'),
+                paragraph_id=self.data.get('paragraph_id'),
+                problem_id=self.data.get('problem_id')
+            ).exists():
+                return True
+
             problem = QuerySet(Problem).filter(id=self.data.get("problem_id")).first()
             problem_paragraph_mapping = ProblemParagraphMapping(id=uuid.uuid7(),
                                                                 document_id=self.data.get('document_id'),

apps/locales/en_US/LC_MESSAGES/django.po

@@ -8648,4 +8648,16 @@ msgid "Multiple dialects, supporting 23 dialects"
 msgstr ""
 
 msgid "This interface is used to recognize short audio files within 60 seconds. Supports Mandarin Chinese, English, Cantonese, Japanese, Vietnamese, Malay, Indonesian, Filipino, Thai, Portuguese, Turkish, Arabic, Hindi, French, German, and 23 Chinese dialects."
+msgstr ""
+
+msgid "CueWord"
+msgstr ""
+
+msgid "If not passed, the default value is What is this audio saying? Only answer the audio content"
+msgstr ""
+
+msgid "The Qwen Omni series model supports inputting multiple modalities of data, including video, audio, images, and text, and outputting audio and text."
+msgstr ""
+
+msgid "resource authorization"
 msgstr ""

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -8774,4 +8774,16 @@ msgid "Multiple dialects, supporting 23 dialects"
 msgstr "多种方言，支持 23 种方言"
 
 msgid "This interface is used to recognize short audio files within 60 seconds. Supports Mandarin Chinese, English, Cantonese, Japanese, Vietnamese, Malay, Indonesian, Filipino, Thai, Portuguese, Turkish, Arabic, Hindi, French, German, and 23 Chinese dialects."
-msgstr "本接口用于识别 60 秒之内的短音频文件。支持中文普通话、英语、粤语、日语、越南语、马来语、印度尼西亚语、菲律宾语、泰语、葡萄牙语、土耳其语、阿拉伯语、印地语、法语、德语及 23 种汉语方言。"
+msgstr "本接口用于识别 60 秒之内的短音频文件。支持中文普通话、英语、粤语、日语、越南语、马来语、印度尼西亚语、菲律宾语、泰语、葡萄牙语、土耳其语、阿拉伯语、印地语、法语、德语及 23 种汉语方言。"
+
+msgid "CueWord"
+msgstr "提示词"
+
+msgid "If not passed, the default value is What is this audio saying? Only answer the audio content"
+msgstr "如果未传递，默认值为 这段音频在说什么，只回答音频的内容"
+
+msgid "The Qwen Omni series model supports inputting multiple modalities of data, including video, audio, images, and text, and outputting audio and text."
+msgstr "Qwen-Omni 系列模型支持输入多种模态的数据，包括视频、音频、图片、文本，并输出音频与文本"
+
+msgid "resource authorization"
+msgstr "资源授权"

apps/locales/zh_Hant/LC_MESSAGES/django.po

@@ -8774,4 +8774,16 @@ msgid "Multiple dialects, supporting 23 dialects"
 msgstr "多種方言，支持 23 種方言"
 
 msgid "This interface is used to recognize short audio files within 60 seconds. Supports Mandarin Chinese, English, Cantonese, Japanese, Vietnamese, Malay, Indonesian, Filipino, Thai, Portuguese, Turkish, Arabic, Hindi, French, German, and 23 Chinese dialects."
-msgstr "本介面用於識別 60 秒之內的短音頻文件。支援中文普通話、英語、粵語、日語、越南語、馬來語、印度尼西亞語、菲律賓語、泰語、葡萄牙語、土耳其語、阿拉伯語、印地語、法語、德語及 23 種漢語方言。"
+msgstr "本介面用於識別 60 秒之內的短音頻文件。支援中文普通話、英語、粵語、日語、越南語、馬來語、印度尼西亞語、菲律賓語、泰語、葡萄牙語、土耳其語、阿拉伯語、印地語、法語、德語及 23 種漢語方言。"
+
+msgid "CueWord"
+msgstr "提示詞"
+
+msgid "If not passed, the default value is What is this audio saying? Only answer the audio content"
+msgstr "如果未傳遞，預設值為這段音訊在說什麼，只回答音訊的內容"
+
+msgid "The Qwen Omni series model supports inputting multiple modalities of data, including video, audio, images, and text, and outputting audio and text."
+msgstr "Qwen-Omni系列模型支持輸入多種模態的數據，包括視頻、音訊、圖片、文字，並輸出音訊與文字"
+
+msgid "resource authorization"
+msgstr "資源授權"

apps/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py

@@ -15,6 +15,7 @@
     AliyunBaiLianEmbeddingCredential
 from models_provider.impl.aliyun_bai_lian_model_provider.credential.image import QwenVLModelCredential
 from models_provider.impl.aliyun_bai_lian_model_provider.credential.llm import BaiLianLLMModelCredential
+from models_provider.impl.aliyun_bai_lian_model_provider.credential.omni_stt import AliyunBaiLianOmiSTTModelCredential
 from models_provider.impl.aliyun_bai_lian_model_provider.credential.reranker import \
     AliyunBaiLianRerankerCredential
 from models_provider.impl.aliyun_bai_lian_model_provider.credential.stt import AliyunBaiLianSTTModelCredential
@@ -23,6 +24,7 @@
 from models_provider.impl.aliyun_bai_lian_model_provider.model.embedding import AliyunBaiLianEmbedding
 from models_provider.impl.aliyun_bai_lian_model_provider.model.image import QwenVLChatModel
 from models_provider.impl.aliyun_bai_lian_model_provider.model.llm import BaiLianChatModel
+from models_provider.impl.aliyun_bai_lian_model_provider.model.omni_stt import AliyunBaiLianOmiSpeechToText
 from models_provider.impl.aliyun_bai_lian_model_provider.model.reranker import AliyunBaiLianReranker
 from models_provider.impl.aliyun_bai_lian_model_provider.model.stt import AliyunBaiLianSpeechToText
 from models_provider.impl.aliyun_bai_lian_model_provider.model.tti import QwenTextToImageModel
@@ -33,6 +35,7 @@
 aliyun_bai_lian_model_credential = AliyunBaiLianRerankerCredential()
 aliyun_bai_lian_tts_model_credential = AliyunBaiLianTTSModelCredential()
 aliyun_bai_lian_stt_model_credential = AliyunBaiLianSTTModelCredential()
+aliyun_bai_lian_omi_stt_model_credential = AliyunBaiLianOmiSTTModelCredential()
 aliyun_bai_lian_embedding_model_credential = AliyunBaiLianEmbeddingCredential()
 aliyun_bai_lian_llm_model_credential = BaiLianLLMModelCredential()
 qwenvl_model_credential = QwenVLModelCredential()
@@ -73,7 +76,13 @@
                    ModelInfo('qwen-plus', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
                              BaiLianChatModel),
                    ModelInfo('qwen-max', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
-                             BaiLianChatModel)
+                             BaiLianChatModel),
+                   ModelInfo('qwen-omni-turbo',
+                             _('The Qwen Omni series model supports inputting multiple modalities of data, including video, audio, images, and text, and outputting audio and text.'),
+                             ModelTypeConst.STT, aliyun_bai_lian_omi_stt_model_credential, AliyunBaiLianOmiSpeechToText),
+                   ModelInfo('qwen2.5-omni-7b',
+                             _('The Qwen Omni series model supports inputting multiple modalities of data, including video, audio, images, and text, and outputting audio and text.'),
+                             ModelTypeConst.STT, aliyun_bai_lian_omi_stt_model_credential, AliyunBaiLianOmiSpeechToText),
                    ]
 
 module_info_vl_list = [