From 39f573610dac217884fdaae98ae0afe68297d064 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Thu, 18 Apr 2024 18:34:15 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E7=B3=BB=E7=BB=9F=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD(#3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/serializers/user_serializers.py        |  3 ++-
 ui/src/api/type/user.ts                           |  4 ++++
 ui/src/layout/components/top-bar/avatar/index.vue | 11 ++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/users/serializers/user_serializers.py b/apps/users/serializers/user_serializers.py
index 6672a4cb545..352bf6f96eb 100644
--- a/apps/users/serializers/user_serializers.py
+++ b/apps/users/serializers/user_serializers.py
@@ -418,7 +418,8 @@ def get_user_profile(user: User):
         permission_list = get_user_dynamics_permission(str(user.id))
         permission_list += [p.value for p in get_permission_list_by_role(RoleConstants[user.role])]
         return {'id': user.id, 'username': user.username, 'email': user.email, 'role': user.role,
-                'permissions': [str(p) for p in permission_list]}
+                'permissions': [str(p) for p in permission_list],
+                'is_edit_password': user.password == 'd880e722c47a34d8e9fce789fc62389d' if user.role == 'ADMIN' else False}
 
     @staticmethod
     def get_response_body_api():
diff --git a/ui/src/api/type/user.ts b/ui/src/api/type/user.ts
index 04cbd41409a..6724252c959 100644
--- a/ui/src/api/type/user.ts
+++ b/ui/src/api/type/user.ts
@@ -19,6 +19,10 @@ interface User {
    * 用户权限
    */
   permissions: Array<string>
+  /**
+   * 是否需要修改密码
+   */
+  is_edit_password?: boolean
 }
 
 interface LoginRequest {
diff --git a/ui/src/layout/components/top-bar/avatar/index.vue b/ui/src/layout/components/top-bar/avatar/index.vue
index 19bdcdbb50b..d6a889cf304 100644
--- a/ui/src/layout/components/top-bar/avatar/index.vue
+++ b/ui/src/layout/components/top-bar/avatar/index.vue
@@ -30,16 +30,19 @@
   </el-dropdown>
   <ResetPassword ref="resetPasswordRef"></ResetPassword>
   <AboutDialog ref="AboutDialogRef"></AboutDialog>
+  <UserPwdDialog ref="UserPwdDialogRef" />
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import useStore from '@/stores'
 import { useRouter } from 'vue-router'
 import ResetPassword from './ResetPassword.vue'
 import AboutDialog from './AboutDialog.vue'
+import UserPwdDialog from '@/views/user-manage/component/UserPwdDialog.vue'
 const { user } = useStore()
 const router = useRouter()
 
+const UserPwdDialogRef = ref()
 const AboutDialogRef = ref()
 const resetPasswordRef = ref<InstanceType<typeof ResetPassword>>()
 
@@ -56,6 +59,12 @@ const logout = () => {
     router.push({ name: 'login' })
   })
 }
+
+onMounted(() => {
+  if (user.userInfo?.is_edit_password) {
+    UserPwdDialogRef.value.open(user.userInfo)
+  }
+})
 </script>
 <style lang="scss" scoped>
 .avatar-dropdown {

From 02125c64e5cce3587837ab38f9731e5f2be2d6ce Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <79562285+wangdan-fit2cloud@users.noreply.github.com>
Date: Thu, 18 Apr 2024 19:13:31 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E3=80=90=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E3=80=91=E5=AF=B9=E8=AF=9D=E6=97=A5=E5=BF=97=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=B0=E6=96=87=E6=A1=A3=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2=20(#123)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 【应用】对话日志保存至文档选项支持搜索(#123)

* feat: 【应用】对话日志保存到文档下拉选项支持搜索 (#123)
---
 .../views/log/component/EditContentDialog.vue | 90 +++++++++++--------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/ui/src/views/log/component/EditContentDialog.vue b/ui/src/views/log/component/EditContentDialog.vue
index 86ad4f95ea8..a36b4a7ebab 100644
--- a/ui/src/views/log/component/EditContentDialog.vue
+++ b/ui/src/views/log/component/EditContentDialog.vue
@@ -26,17 +26,18 @@
         <el-input v-model="form.title" placeholder="请给当前内容设置一个标题，以便管理查看">
         </el-input>
       </el-form-item>
-      <el-form-item label="保存至文档" prop="document">
-        <el-cascader
-          v-model="form.document"
-          :props="LoadDocument"
-          placeholder="请选择文档"
-          class="w-full"
+      <el-form-item label="选择知识库" prop="dataset_id">
+        <el-select
+          v-model="form.dataset_id"
+          filterable
+          placeholder="请选择知识库"
+          :loading="optionLoading"
+          @change="changeDataset"
         >
-          <template #default="{ node, data }">
+          <el-option v-for="item in datasetList" :key="item.id" :label="item.name" :value="item.id">
             <span class="flex align-center">
               <AppAvatar
-                v-if="!data.dataset_id && data.type === '1'"
+                v-if="!item.dataset_id && item.type === '1'"
                 class="mr-12 avatar-purple"
                 shape="square"
                 :size="24"
@@ -44,17 +45,34 @@
                 <img src="@/assets/icon_web.svg" style="width: 58%" alt="" />
               </AppAvatar>
               <AppAvatar
-                v-else-if="!data.dataset_id && data.type === '0'"
+                v-else-if="!item.dataset_id && item.type === '0'"
                 class="mr-12"
                 shape="square"
                 :size="24"
               >
                 <img src="@/assets/icon_document.svg" style="width: 58%" alt="" />
               </AppAvatar>
-              <span class="ellipsis"> {{ data.name }}</span>
+              {{ item.name }}
             </span>
-          </template>
-        </el-cascader>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="保存至文档" prop="document_id">
+        <el-select
+          v-model="form.document_id"
+          filterable
+          placeholder="请选择文档"
+          :loading="optionLoading"
+        >
+          <el-option
+            v-for="item in documentList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
+            {{ item.name }}
+          </el-option>
+        </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -70,7 +88,6 @@ import { ref, watch, reactive } from 'vue'
 import { useRoute } from 'vue-router'
 import type { FormInstance, FormRules } from 'element-plus'
 import logApi from '@/api/log'
-import type { CascaderProps } from 'element-plus'
 import useStore from '@/stores'
 
 const { application, document } = useStore()
@@ -99,15 +116,19 @@ const form = ref<any>({
   problem_text: '',
   title: '',
   content: '',
-  document: []
+  dataset_id: '',
+  document_id: ''
 })
 
 const rules = reactive<FormRules>({
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }],
-  document: [{ type: 'array', required: true, message: '请选择文档', trigger: 'change' }]
+  dataset_id: [{ required: true, message: '请选择知识库', trigger: 'change' }],
+  document_id: [{ required: true, message: '请选择文档', trigger: 'change' }]
 })
 
-const datasetList = ref([])
+const datasetList = ref<any[]>([])
+const documentList = ref<any[]>([])
+const optionLoading = ref(false)
 
 watch(dialogVisible, (bool) => {
   if (!bool) {
@@ -117,45 +138,40 @@ watch(dialogVisible, (bool) => {
       problem_text: '',
       title: '',
       content: '',
-      document: []
+      dataset_id: '',
+      document_id: ''
     }
+    datasetList.value = []
+    documentList.value = []
+    formRef.value?.clearValidate()
   }
 })
 
-const LoadDocument: CascaderProps = {
-  lazy: true,
-  value: 'id',
-  label: 'name',
-  leaf: 'dataset_id',
-  lazyLoad(node, resolve: any) {
-    const { level, data } = node
-    if (data?.id) {
-      getDocument(data?.id as string, resolve)
-    } else {
-      getDataset(resolve)
-    }
-  }
+
+function changeDataset(id: string) {
+  form.value.document_id = ''
+  getDocument(id)
 }
 
-function getDocument(id: string, resolve: any) {
+function getDocument(id: string) {
   document.asyncGetAllDocument(id, loading).then((res: any) => {
-    datasetList.value = res.data
-    resolve(datasetList.value)
+    documentList.value = res.data
   })
 }
 
-function getDataset(resolve: any) {
+function getDataset() {
   application.asyncGetApplicationDataset(id, loading).then((res: any) => {
     datasetList.value = res.data
-    resolve(datasetList.value)
   })
 }
 
 const open = (data: any) => {
+  getDataset()
   form.value.chat_id = data.chat_id
   form.value.record_id = data.id
   form.value.problem_text = data.problem_text
   form.value.content = data.answer_text
+  formRef.value?.clearValidate()
   dialogVisible.value = true
 }
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -171,8 +187,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           id,
           form.value.chat_id,
           form.value.record_id,
-          form.value.document[0],
-          form.value.document[1],
+          form.value.dataset_id,
+          form.value.document_id,
           obj,
           loading
         )

From 73cf7d84e2760121e38ae6dd22ad9d0a0aefb273 Mon Sep 17 00:00:00 2001
From: baixin <52996290+baixin513@users.noreply.github.com>
Date: Fri, 19 Apr 2024 10:28:09 +0800
Subject: [PATCH 3/5] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新 Readme 支持的模型
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4c5021ad75b..b5b3136e373 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ MaxKB 是一款基于 LLM 大语言模型的知识库问答系统。MaxKB = Max
 
 - **开箱即用**：支持直接上传文档、自动爬取在线文档，支持文本自动拆分、向量化，智能问答交互体验好；
 - **无缝嵌入**：支持零编码快速嵌入到第三方业务系统；
-- **多模型支持**：支持对接主流的大模型，包括本地私有大模型（如 Llama 2）、Azure OpenAI 和百度千帆大模型等。
+- **多模型支持**：支持对接主流的大模型，包括本地私有大模型（如 Llama 2、Llama 3）、通义千问、OpenAI、Azure OpenAI、Kimi 和百度千帆大模型等。
 
 ## 快速开始
 
@@ -53,7 +53,7 @@ docker run -d --name=maxkb -p 8080:8080 -v ~/.maxkb:/var/lib/postgresql/data 1pa
 -   后端：[Python / Django](https://www.djangoproject.com/)
 -   LangChain：[LangChain](https://www.langchain.com/)
 -   向量数据库：[PostgreSQL / pgvector](https://www.postgresql.org/)
--   大模型：Azure OpenAI、百度千帆大模型、[Ollama](https://github.com/ollama/ollama)
+-   大模型：Azure OpenAI、OpenAI、百度千帆大模型、[Ollama](https://github.com/ollama/ollama)、通义千问、Kimi
 
 ## Star History
 

From 4aa1b58ae59cc59aa27b4d66b699c3aea3a6cfe7 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Fri, 19 Apr 2024 14:43:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=99=BA?=
 =?UTF-8?q?=E8=B0=B1=E5=A4=A7=E6=A8=A1=E5=9E=8B=20#178=20(#180)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/model_provider_constants.py     |  2 +
 .../impl/zhipu_model_provider/__init__.py     |  0
 .../icon/zhipuai_icon_svg                     |  1 +
 .../zhipu_model_provider.py                   | 93 +++++++++++++++++++
 pyproject.toml                                |  3 +
 5 files changed, 99 insertions(+)
 create mode 100644 apps/setting/models_provider/impl/zhipu_model_provider/__init__.py
 create mode 100644 apps/setting/models_provider/impl/zhipu_model_provider/icon/zhipuai_icon_svg
 create mode 100644 apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py

diff --git a/apps/setting/models_provider/constants/model_provider_constants.py b/apps/setting/models_provider/constants/model_provider_constants.py
index 3816795e59f..696260a3c39 100644
--- a/apps/setting/models_provider/constants/model_provider_constants.py
+++ b/apps/setting/models_provider/constants/model_provider_constants.py
@@ -14,6 +14,7 @@
 from setting.models_provider.impl.qwen_model_provider.qwen_model_provider import QwenModelProvider
 from setting.models_provider.impl.wenxin_model_provider.wenxin_model_provider import WenxinModelProvider
 from setting.models_provider.impl.kimi_model_provider.kimi_model_provider import KimiModelProvider
+from setting.models_provider.impl.zhipu_model_provider.zhipu_model_provider import ZhiPuModelProvider
 
 
 class ModelProvideConstants(Enum):
@@ -23,3 +24,4 @@ class ModelProvideConstants(Enum):
     model_openai_provider = OpenAIModelProvider()
     model_kimi_provider = KimiModelProvider()
     model_qwen_provider = QwenModelProvider()
+    model_zhipu_provider = ZhiPuModelProvider()
diff --git a/apps/setting/models_provider/impl/zhipu_model_provider/__init__.py b/apps/setting/models_provider/impl/zhipu_model_provider/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apps/setting/models_provider/impl/zhipu_model_provider/icon/zhipuai_icon_svg b/apps/setting/models_provider/impl/zhipu_model_provider/icon/zhipuai_icon_svg
new file mode 100644
index 00000000000..f39fedcbbc3
--- /dev/null
+++ b/apps/setting/models_provider/impl/zhipu_model_provider/icon/zhipuai_icon_svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"  fill="none" viewBox="0 0 30 32" id="icon-pure-logo"><g clip-path="url(#icon-pure-logo_a)" fill="#1665FF"><path d="M15 32a.377.377 0 0 0 .377-.375.377.377 0 0 0-.378-.375.377.377 0 0 0-.378.375c0 .207.17.375.378.375Zm3.907-20.375a2.26 2.26 0 0 0 2.27-2.25 2.26 2.26 0 0 0-2.27-2.25 2.26 2.26 0 0 0-2.269 2.25 2.26 2.26 0 0 0 2.27 2.25Zm3.908 6.625a2.26 2.26 0 0 0 2.27-2.25 2.26 2.26 0 0 0-2.27-2.25A2.26 2.26 0 0 0 20.546 16a2.26 2.26 0 0 0 2.27 2.25Zm-15.63 0A2.26 2.26 0 0 0 9.454 16a2.26 2.26 0 0 0-2.27-2.25A2.26 2.26 0 0 0 4.917 16a2.26 2.26 0 0 0 2.269 2.25Zm17.647-6.501a1.38 1.38 0 0 0 1.386-1.375A1.38 1.38 0 0 0 24.832 9a1.38 1.38 0 0 0-1.386 1.374c0 .76.621 1.375 1.386 1.375ZM15 6.25a1.38 1.38 0 0 0 1.385-1.375c0-.76-.62-1.375-1.386-1.375a1.38 1.38 0 0 0-1.386 1.375c0 .759.62 1.374 1.386 1.374Zm-9.833 5.499a1.38 1.38 0 0 0 1.386-1.375A1.38 1.38 0 0 0 5.167 9a1.38 1.38 0 0 0-1.386 1.374c0 .76.621 1.375 1.386 1.375Zm0 11.251a1.38 1.38 0 0 0 1.386-1.374c0-.76-.62-1.375-1.386-1.375a1.38 1.38 0 0 0-1.386 1.375A1.38 1.38 0 0 0 5.167 23ZM15 28.625a1.38 1.38 0 0 0 1.385-1.374c0-.76-.62-1.375-1.386-1.375a1.38 1.38 0 0 0-1.386 1.375c0 .759.62 1.374 1.386 1.374ZM24.832 23a1.38 1.38 0 0 0 1.386-1.374c0-.76-.62-1.375-1.386-1.375a1.38 1.38 0 0 0-1.386 1.375A1.38 1.38 0 0 0 24.832 23ZM22.059 4.751a.88.88 0 0 0 .883-.875.88.88 0 0 0-.883-.876.88.88 0 0 0-.883.876.88.88 0 0 0 .883.875Zm-14.118 0a.88.88 0 0 0 .883-.875A.88.88 0 0 0 7.94 3a.88.88 0 0 0-.883.876.88.88 0 0 0 .883.875ZM.883 16.876a.88.88 0 0 0 .883-.875.88.88 0 0 0-.883-.876.88.88 0 0 0-.883.876.88.88 0 0 0 .883.875ZM7.941 29a.88.88 0 0 0 .883-.875.88.88 0 0 0-.883-.876.88.88 0 0 0-.883.876.88.88 0 0 0 .883.875Zm14.118 0a.88.88 0 0 0 .883-.875.88.88 0 0 0-.883-.876.88.88 0 0 0-.883.876.88.88 0 0 0 .883.875Zm7.058-12.124a.88.88 0 0 0 .883-.875.88.88 0 0 0-.883-.876.88.88 0 0 0-.883.876.88.88 0 0 0 .883.875Zm-.503-8.251a.377.377 0 0 0 .378-.375.377.377 0 0 0-.378-.375.377.377 0 0 0-.378.375c0 .207.17.375.378.375ZM15 .75a.377.377 0 0 0 .377-.375A.377.377 0 0 0 15 0a.377.377 0 0 0-.378.375c0 .207.17.375.378.375ZM1.386 8.625a.377.377 0 0 0 .378-.375.377.377 0 0 0-.378-.375.377.377 0 0 0-.378.375c0 .207.17.375.378.375Zm0 15.625a.377.377 0 0 0 .378-.374.377.377 0 0 0-.378-.375.377.377 0 0 0-.378.375c0 .207.17.375.378.375Zm27.228-.125a.377.377 0 0 0 .378-.375.377.377 0 0 0-.378-.375.377.377 0 0 0-.378.375c0 .207.17.375.378.375Z"></path><path d="M19.538 20.5c-1.007-.374-2.142.126-2.646 1-.505.876-1.513 1.375-2.647 1-.63-.126-1.008-.625-1.261-1 0-.125-.127-.25-.127-.5 0-1 .756-1.75 1.64-1.875h.25c1.765.125 3.277-1.375 3.404-3.126.127-1.75-1.386-3.25-3.152-3.375h-.378c-1.008 0-1.64-.75-1.64-1.75 0-.249 0-.5.127-.624v-.125c0-.126.127-.126.127-.25.378-1.25-.252-2.5-1.512-2.874-1.135-.375-2.52.25-2.9 1.5-.377 1.125.252 2.375 1.387 2.874.168.084.336.126.505.126h.126c.883.125 1.64.875 1.64 1.75 0 .374-.127.624-.252.875-.252.5-.505 1-.505 1.625 0 .626.127 1.375.505 1.875.126.25.251.625.251.876 0 .875-.63 1.625-1.512 1.75h-.378c-1.261.249-2.018 1.5-1.764 2.75.253 1.25 1.512 2 2.646 1.75.63-.126 1.135-.501 1.386-1 .505-.876 1.64-1.375 2.647-1 .505.126 1.008.5 1.262 1 .251.375.756.75 1.26 1 1.262.374 2.396-.25 2.9-1.5.504-1.126-.127-2.376-1.387-2.751h-.002Z"></path></g><defs><clipPath id="icon-pure-logo_a"><path fill="#fff" d="M0 0h30v32H0z"></path></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py b/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py
new file mode 100644
index 00000000000..b84bb3d15cc
--- /dev/null
+++ b/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py
@@ -0,0 +1,93 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： zhipu_model_provider.py
+    @date：2024/04/19 13:5
+    @desc:
+"""
+import os
+from typing import Dict
+
+from langchain.schema import HumanMessage
+from langchain_community.chat_models import ChatZhipuAI
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm
+from common.util.file_util import get_file_content
+from setting.models_provider.base_model_provider import ModelProvideInfo, ModelTypeConst, BaseModelCredential, \
+    ModelInfo, IModelProvider, ValidCode
+from smartdoc.conf import PROJECT_DIR
+
+
+class ZhiPuLLMModelCredential(BaseForm, BaseModelCredential):
+
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], raise_exception=False):
+        model_type_list = ZhiPuModelProvider().get_model_type_list()
+        if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
+            raise AppApiException(ValidCode.valid_error.value, f'{model_type} 模型类型不支持')
+        for key in ['api_key']:
+            if key not in model_credential:
+                if raise_exception:
+                    raise AppApiException(ValidCode.valid_error.value, f'{key} 字段为必填字段')
+                else:
+                    return False
+        try:
+            model = ZhiPuModelProvider().get_model(model_type, model_name, model_credential)
+            model.invoke([HumanMessage(content='你好')])
+        except Exception as e:
+            if isinstance(e, AppApiException):
+                raise e
+            if raise_exception:
+                raise AppApiException(ValidCode.valid_error.value, f'校验失败,请检查参数是否正确: {str(e)}')
+            else:
+                return False
+        return True
+
+    def encryption_dict(self, model: Dict[str, object]):
+        return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
+
+    api_key = forms.PasswordInputField('API Key', required=True)
+
+
+qwen_model_credential = ZhiPuLLMModelCredential()
+
+model_dict = {
+    'glm-4': ModelInfo('glm-4', '', ModelTypeConst.LLM, qwen_model_credential),
+    'glm-4v': ModelInfo('glm-4v', '', ModelTypeConst.LLM, qwen_model_credential),
+    'glm-3-turbo': ModelInfo('glm-3-turbo', '', ModelTypeConst.LLM, qwen_model_credential)
+}
+
+
+class ZhiPuModelProvider(IModelProvider):
+
+    def get_dialogue_number(self):
+        return 3
+
+    def get_model(self, model_type, model_name, model_credential: Dict[str, object], **model_kwargs) -> ChatZhipuAI:
+        zhipuai_chat = ChatZhipuAI(
+            temperature=0.5,
+            api_key=model_credential.get('api_key'),
+            model=model_name
+        )
+        return zhipuai_chat
+
+    def get_model_credential(self, model_type, model_name):
+        if model_name in model_dict:
+            return model_dict.get(model_name).model_credential
+        return qwen_model_credential
+
+    def get_model_provide_info(self):
+        return ModelProvideInfo(provider='model_zhipu_provider', name='智谱AI', icon=get_file_content(
+            os.path.join(PROJECT_DIR, "apps", "setting", 'models_provider', 'impl', 'zhipu_model_provider', 'icon',
+                         'zhipuai_icon_svg')))
+
+    def get_model_list(self, model_type: str):
+        if model_type is None:
+            raise AppApiException(500, '模型类型不能为空')
+        return [model_dict.get(key).to_dict() for key in
+                list(filter(lambda key: model_dict.get(key).model_type == model_type, model_dict.keys()))]
+
+    def get_model_type_list(self):
+        return [{'key': "大语言模型", 'value': "LLM"}]
diff --git a/pyproject.toml b/pyproject.toml
index 35d4a42f074..f37b3373beb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,6 +33,9 @@ pymupdf = "1.24.1"
 python-docx = "^1.1.0"
 xlwt = "^1.3.0"
 dashscope = "^1.17.0"
+zhipuai = "^2.0.1"
+httpx = "^0.27.0"
+httpx-sse = "^0.4.0"
 
 [build-system]
 requires = ["poetry-core"]

From 8fe1a147ff29dfd0a6c20491c76c2f978538a2d6 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:43:31 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=AE=AF?=
 =?UTF-8?q?=E9=A3=9E=E6=98=9F=E7=81=AB=E5=A4=A7=E6=A8=A1=E5=9E=8B=20#181?=
 =?UTF-8?q?=20(#184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/model_provider_constants.py     |   2 +
 .../impl/xf_model_provider/__init__.py        |   8 ++
 .../impl/xf_model_provider/icon/xf_icon_svg   |   1 +
 .../xf_model_provider/model/xf_chat_model.py  |  43 ++++++++
 .../xf_model_provider/xf_model_provider.py    | 103 ++++++++++++++++++
 pyproject.toml                                |   1 +
 6 files changed, 158 insertions(+)
 create mode 100644 apps/setting/models_provider/impl/xf_model_provider/__init__.py
 create mode 100644 apps/setting/models_provider/impl/xf_model_provider/icon/xf_icon_svg
 create mode 100644 apps/setting/models_provider/impl/xf_model_provider/model/xf_chat_model.py
 create mode 100644 apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py

diff --git a/apps/setting/models_provider/constants/model_provider_constants.py b/apps/setting/models_provider/constants/model_provider_constants.py
index 696260a3c39..0a46cbfa41f 100644
--- a/apps/setting/models_provider/constants/model_provider_constants.py
+++ b/apps/setting/models_provider/constants/model_provider_constants.py
@@ -14,6 +14,7 @@
 from setting.models_provider.impl.qwen_model_provider.qwen_model_provider import QwenModelProvider
 from setting.models_provider.impl.wenxin_model_provider.wenxin_model_provider import WenxinModelProvider
 from setting.models_provider.impl.kimi_model_provider.kimi_model_provider import KimiModelProvider
+from setting.models_provider.impl.xf_model_provider.xf_model_provider import XunFeiModelProvider
 from setting.models_provider.impl.zhipu_model_provider.zhipu_model_provider import ZhiPuModelProvider
 
 
@@ -25,3 +26,4 @@ class ModelProvideConstants(Enum):
     model_kimi_provider = KimiModelProvider()
     model_qwen_provider = QwenModelProvider()
     model_zhipu_provider = ZhiPuModelProvider()
+    model_xf_provider = XunFeiModelProvider()
diff --git a/apps/setting/models_provider/impl/xf_model_provider/__init__.py b/apps/setting/models_provider/impl/xf_model_provider/__init__.py
new file mode 100644
index 00000000000..c743b4e183a
--- /dev/null
+++ b/apps/setting/models_provider/impl/xf_model_provider/__init__.py
@@ -0,0 +1,8 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： __init__.py.py
+    @date：2024/04/19 15:55
+    @desc:
+"""
\ No newline at end of file
diff --git a/apps/setting/models_provider/impl/xf_model_provider/icon/xf_icon_svg b/apps/setting/models_provider/impl/xf_model_provider/icon/xf_icon_svg
new file mode 100644
index 00000000000..b74e351e2ee
--- /dev/null
+++ b/apps/setting/models_provider/impl/xf_model_provider/icon/xf_icon_svg
@@ -0,0 +1 @@
+<svg t="1713509569091" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4361" xmlns:xlink="http://www.w3.org/1999/xlink"  width="100%" height="100%" ><path d="M500.1216 971.40736c-55.58272-4.28032-102.11328-16.7936-147.74272-39.7312-115.0976-57.83552-192.88064-168.5504-208.81408-297.12384-2.8672-23.18336-2.90816-69.18144-0.06144-93.3888a387.95264 387.95264 0 0 1 82.65728-196.46464c6.22592-7.7824 47.616-49.7664 94.49472-95.92832 112.8448-111.104 111.53408-109.85472 113.29536-108.09344 1.024 1.024 0.75776 5.59104-0.8192 14.45888-3.13344 17.57184-3.13344 55.99232 0.04096 77.0048 9.66656 64.49152 37.66272 124.3136 87.16288 186.32704 12.6976 15.91296 59.22816 63.24224 76.57472 77.88544 20.13184 16.9984 33.1776 37.53984 39.34208 61.8496 4.07552 16.0768 4.07552 42.10688 0 58.20416-10.24 40.57088-40.8576 72.58112-81.6128 85.38112-9.35936 2.92864-13.84448 3.39968-32.68608 3.39968s-23.3472-0.47104-32.768-3.39968c-29.02016-9.07264-56.40192-30.06464-32.52224-24.94464 12.94336 2.7648 29.65504-3.2768 37.49888-13.57824 10.81344-14.1312 12.57472-29.53216 5.09952-44.48256-3.76832-7.53664-6.8608-10.91584-19.12832-20.82816-33.1776-26.86976-65.7408-59.5968-88.8832-89.25184-11.81696-15.17568-28.8768-40.59136-33.95584-50.5856-1.92512-3.7888-4.15744-6.90176-4.95616-6.90176-2.00704 0-17.92 24.43264-24.73984 37.96992-7.84384 15.52384-15.33952 37.888-19.12832 57.0368-4.64896 23.3472-4.64896 59.14624-0.04096 82.16576 17.77664 88.63744 82.78016 154.74688 171.02848 173.8752 12.3904 2.70336 19.39456 3.23584 42.496 3.23584 23.08096 0 30.1056-0.53248 42.47552-3.23584 43.04896-9.3184 78.4384-28.672 109.6704-59.904 32.72704-32.72704 52.26496-69.44768 61.29664-115.3024 4.54656-23.06048 4.56704-56.36096 0.04096-79.29856-3.87072-19.5584-8.76544-35.16416-15.85152-50.3808-6.69696-14.35648-6.0416-15.21664 9.1136-12.0832 40.89856 8.45824 85.6064 31.41632 114.40128 58.75712 34.6112 32.84992 49.27488 65.45408 49.27488 109.71136 0 24.00256-3.4816 41.6768-13.35296 68.17792-20.54144 54.9888-50.54464 100.61824-93.7984 142.66368-51.26144 49.80736-116.8384 85.03296-183.95136 98.79552-30.45376 6.2464-76.53376 9.89184-101.1712 7.9872z m391.53664-433.93024c-17.05984-32.93184-41.75872-56.48384-76.8-73.19552-18.80064-8.97024-35.67616-14.52032-68.75136-22.58944-44.46208-10.8544-66.2528-18.2272-93.16352-31.62112-26.2144-13.04576-46.16192-27.3408-66.3552-47.5136-26.70592-26.74688-42.63936-52.4288-54.35392-87.67488-10.36288-31.27296-10.0352-27.2384-10.62912-128.96256-0.45056-78.37696-0.2048-92.0576 1.51552-92.0576 1.1264 0 45.8752 42.98752 99.40992 95.51872 190.95552 187.37152 194.58048 191.11936 216.7808 224.78848 20.13184 30.53568 39.26016 72.0896 48.76288 105.92256 4.7104 16.73216 11.0592 48.18944 11.81696 58.40896 0.7168 9.8304-2.84672 9.35936-8.23296-1.024z" fill="#3DC8F9" p-id="4362"></path><path d="M523.12064 53.8624c-1.7408 0-1.96608 13.68064-1.51552 92.0576 0.57344 101.74464 0.24576 97.6896 10.6496 128.96256 11.6736 35.2256 27.62752 60.928 54.33344 87.6544 20.19328 20.19328 40.1408 34.48832 66.3552 47.5136 26.91072 13.4144 48.70144 20.80768 93.14304 31.6416 33.09568 8.0896 49.9712 13.6192 68.75136 22.58944 35.04128 16.71168 59.74016 40.2432 76.8 73.19552 5.40672 10.38336 8.97024 10.8544 8.25344 1.024-0.75776-10.21952-7.12704-41.6768-11.81696-58.40896-9.50272-33.83296-28.63104-75.3664-48.76288-105.92256-22.20032-33.66912-25.82528-37.41696-216.7808-224.78848-53.5552-52.5312-98.304-95.51872-99.40992-95.51872z" fill="#EA0100" p-id="4363"></path><path d="M391.3728 762.30656s86.2208 88.41216 241.9712 100.06528c155.7504 11.63264 193.536-45.44512 193.536-45.44512s76.3904-100.864 65.08544-177.54112c-11.32544-76.67712-71.02464-131.21536-174.96064-154.89024 0 0 31.90784 80.2816 20.5824 128.14336-11.32544 47.86176-20.0704 138.93632-159.5392 186.7776 0 0-102.68672 30.208-186.6752-37.10976z" fill="#1652D8" p-id="4364"></path></svg>
\ No newline at end of file
diff --git a/apps/setting/models_provider/impl/xf_model_provider/model/xf_chat_model.py b/apps/setting/models_provider/impl/xf_model_provider/model/xf_chat_model.py
new file mode 100644
index 00000000000..a09d48092c9
--- /dev/null
+++ b/apps/setting/models_provider/impl/xf_model_provider/model/xf_chat_model.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： __init__.py.py
+    @date：2024/04/19 15:55
+    @desc:
+"""
+
+from typing import List, Optional, Any, Iterator
+
+from langchain_community.chat_models import ChatSparkLLM
+from langchain_community.chat_models.sparkllm import _convert_message_to_dict, _convert_delta_to_message_chunk
+from langchain_core.callbacks import CallbackManagerForLLMRun
+from langchain_core.messages import BaseMessage, AIMessageChunk
+from langchain_core.outputs import ChatGenerationChunk
+
+
+class XFChatSparkLLM(ChatSparkLLM):
+    def _stream(
+            self,
+            messages: List[BaseMessage],
+            stop: Optional[List[str]] = None,
+            run_manager: Optional[CallbackManagerForLLMRun] = None,
+            **kwargs: Any,
+    ) -> Iterator[ChatGenerationChunk]:
+        default_chunk_class = AIMessageChunk
+
+        self.client.arun(
+            [_convert_message_to_dict(m) for m in messages],
+            self.spark_user_id,
+            self.model_kwargs,
+            True,
+        )
+        for content in self.client.subscribe(timeout=self.request_timeout):
+            if "data" not in content:
+                continue
+            delta = content["data"]
+            chunk = _convert_delta_to_message_chunk(delta, default_chunk_class)
+            cg_chunk = ChatGenerationChunk(message=chunk)
+            if run_manager:
+                run_manager.on_llm_new_token(str(chunk.content), chunk=cg_chunk)
+            yield cg_chunk
diff --git a/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py b/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py
new file mode 100644
index 00000000000..28059c5c69b
--- /dev/null
+++ b/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py
@@ -0,0 +1,103 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： xf_model_provider.py
+    @date：2024/04/19 14:47
+    @desc:
+"""
+import os
+from typing import Dict
+
+from langchain.schema import HumanMessage
+from langchain_community.chat_models import ChatSparkLLM
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm
+from common.util.file_util import get_file_content
+from setting.models_provider.base_model_provider import ModelProvideInfo, ModelTypeConst, BaseModelCredential, \
+    ModelInfo, IModelProvider, ValidCode
+from setting.models_provider.impl.xf_model_provider.model.xf_chat_model import XFChatSparkLLM
+from smartdoc.conf import PROJECT_DIR
+import ssl
+
+ssl._create_default_https_context = ssl.create_default_context()
+
+
+class XunFeiLLMModelCredential(BaseForm, BaseModelCredential):
+
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], raise_exception=False):
+        model_type_list = XunFeiModelProvider().get_model_type_list()
+        if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
+            raise AppApiException(ValidCode.valid_error.value, f'{model_type} 模型类型不支持')
+
+        for key in ['spark_api_url', 'spark_app_id', 'spark_api_key', 'spark_api_secret']:
+            if key not in model_credential:
+                if raise_exception:
+                    raise AppApiException(ValidCode.valid_error.value, f'{key} 字段为必填字段')
+                else:
+                    return False
+        try:
+            model = XunFeiModelProvider().get_model(model_type, model_name, model_credential)
+            model.invoke([HumanMessage(content='你好')])
+        except Exception as e:
+            if isinstance(e, AppApiException):
+                raise e
+            if raise_exception:
+                raise AppApiException(ValidCode.valid_error.value, f'校验失败,请检查参数是否正确: {str(e)}')
+            else:
+                return False
+        return True
+
+    def encryption_dict(self, model: Dict[str, object]):
+        return {**model, 'spark_api_secret': super().encryption(model.get('spark_api_secret', ''))}
+
+    spark_api_url = forms.TextInputField('API 域名', required=True)
+    spark_app_id = forms.TextInputField('APP ID', required=True)
+    spark_api_key = forms.PasswordInputField("API Key", required=True)
+    spark_api_secret = forms.PasswordInputField('API Secret', required=True)
+
+
+qwen_model_credential = XunFeiLLMModelCredential()
+
+model_dict = {
+    'generalv3.5': ModelInfo('generalv3.5', '', ModelTypeConst.LLM, qwen_model_credential),
+    'generalv3': ModelInfo('generalv3', '', ModelTypeConst.LLM, qwen_model_credential),
+    'generalv2': ModelInfo('generalv2', '', ModelTypeConst.LLM, qwen_model_credential)
+}
+
+
+class XunFeiModelProvider(IModelProvider):
+
+    def get_dialogue_number(self):
+        return 3
+
+    def get_model(self, model_type, model_name, model_credential: Dict[str, object], **model_kwargs) -> XFChatSparkLLM:
+        zhipuai_chat = XFChatSparkLLM(
+            spark_app_id=model_credential.get('spark_app_id'),
+            spark_api_key=model_credential.get('spark_api_key'),
+            spark_api_secret=model_credential.get('spark_api_secret'),
+            spark_api_url=model_credential.get('spark_api_url'),
+            spark_llm_domain=model_name
+        )
+        return zhipuai_chat
+
+    def get_model_credential(self, model_type, model_name):
+        if model_name in model_dict:
+            return model_dict.get(model_name).model_credential
+        return qwen_model_credential
+
+    def get_model_provide_info(self):
+        return ModelProvideInfo(provider='model_xf_provider', name='讯飞星火', icon=get_file_content(
+            os.path.join(PROJECT_DIR, "apps", "setting", 'models_provider', 'impl', 'xf_model_provider', 'icon',
+                         'xf_icon_svg')))
+
+    def get_model_list(self, model_type: str):
+        if model_type is None:
+            raise AppApiException(500, '模型类型不能为空')
+        return [model_dict.get(key).to_dict() for key in
+                list(filter(lambda key: model_dict.get(key).model_type == model_type, model_dict.keys()))]
+
+    def get_model_type_list(self):
+        return [{'key': "大语言模型", 'value': "LLM"}]
diff --git a/pyproject.toml b/pyproject.toml
index f37b3373beb..f70b250bbce 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,6 +36,7 @@ dashscope = "^1.17.0"
 zhipuai = "^2.0.1"
 httpx = "^0.27.0"
 httpx-sse = "^0.4.0"
+websocket-client = "^1.7.0"
 
 [build-system]
 requires = ["poetry-core"]