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

Author: liqiang-fit2cloud

apps/setting/models_provider/impl/gemini_model_provider/credential/image.py

@@ -0,0 +1,64 @@
+# coding=utf-8
+import base64
+import os
+from typing import Dict
+
+from langchain_core.messages import HumanMessage
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm, TooltipLabel
+from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
+
+class GeminiImageModelParams(BaseForm):
+    temperature = forms.SliderField(TooltipLabel('温度', '较高的数值会使输出更加随机，而较低的数值会使其更加集中和确定'),
+                                    required=True, default_value=0.7,
+                                    _min=0.1,
+                                    _max=1.0,
+                                    _step=0.01,
+                                    precision=2)
+
+    max_tokens = forms.SliderField(
+        TooltipLabel('输出最大Tokens', '指定模型可生成的最大token个数'),
+        required=True, default_value=800,
+        _min=1,
+        _max=100000,
+        _step=1,
+        precision=0)
+
+
+
+class GeminiImageModelCredential(BaseForm, BaseModelCredential):
+    api_key = forms.PasswordInputField('API Key', required=True)
+
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], provider,
+                 raise_exception=False):
+        model_type_list = provider.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 = provider.get_model(model_type, model_name, model_credential)
+            res = model.stream([HumanMessage(content=[{"type": "text", "text": "你好"}])])
+            for chunk in res:
+                print(chunk)
+        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', ''))}
+
+    def get_model_params_setting_form(self, model_name):
+        return GeminiImageModelParams()

apps/setting/models_provider/impl/gemini_model_provider/gemini_model_provider.py

@@ -11,24 +11,47 @@
 from common.util.file_util import get_file_content
 from setting.models_provider.base_model_provider import IModelProvider, ModelProvideInfo, ModelInfo, ModelTypeConst, \
     ModelInfoManage
+from setting.models_provider.impl.gemini_model_provider.credential.image import GeminiImageModelCredential
 from setting.models_provider.impl.gemini_model_provider.credential.llm import GeminiLLMModelCredential
+from setting.models_provider.impl.gemini_model_provider.model.image import GeminiImage
 from setting.models_provider.impl.gemini_model_provider.model.llm import GeminiChatModel
 from smartdoc.conf import PROJECT_DIR
 
 gemini_llm_model_credential = GeminiLLMModelCredential()
+gemini_image_model_credential = GeminiImageModelCredential()
 
-gemini_1_pro = ModelInfo('gemini-1.0-pro', '最新的Gemini 1.0 Pro模型，随Google更新而更新',
-                         ModelTypeConst.LLM,
-                         gemini_llm_model_credential,
-                         GeminiChatModel)
+model_info_list = [
+    ModelInfo('gemini-1.0-pro', '最新的Gemini 1.0 Pro模型，随Google更新而更新',
+              ModelTypeConst.LLM,
+              gemini_llm_model_credential,
+              GeminiChatModel),
+    ModelInfo('gemini-1.0-pro-vision', '最新的Gemini 1.0 Pro Vision模型，随Google更新而更新',
+              ModelTypeConst.LLM,
+              gemini_llm_model_credential,
+              GeminiChatModel),
+]
 
-gemini_1_pro_vision = ModelInfo('gemini-1.0-pro-vision', '最新的Gemini 1.0 Pro Vision模型，随Google更新而更新',
-                                ModelTypeConst.LLM,
-                                gemini_llm_model_credential,
-                                GeminiChatModel)
+model_image_info_list = [
+    ModelInfo('gemini-1.5-flash', '最新的Gemini 1.5 Flash模型，随Google更新而更新',
+              ModelTypeConst.IMAGE,
+              gemini_image_model_credential,
+              GeminiImage),
+    ModelInfo('gemini-1.5-pro', '最新的Gemini 1.5 Flash模型，随Google更新而更新',
+              ModelTypeConst.IMAGE,
+              gemini_image_model_credential,
+              GeminiImage),
+]
 
-model_info_manage = ModelInfoManage.builder().append_model_info(gemini_1_pro).append_model_info(
-    gemini_1_pro_vision).append_default_model_info(gemini_1_pro).build()
+
+
+model_info_manage = (
+    ModelInfoManage.builder()
+    .append_model_info_list(model_info_list)
+    .append_model_info_list(model_image_info_list)
+    .append_default_model_info(model_info_list[0])
+    .append_default_model_info(model_image_info_list[0])
+    .build()
+)
 
 
 class GeminiModelProvider(IModelProvider):

apps/setting/models_provider/impl/gemini_model_provider/model/image.py

@@ -0,0 +1,24 @@
+from typing import Dict
+
+from langchain_google_genai import ChatGoogleGenerativeAI
+
+from common.config.tokenizer_manage_config import TokenizerManage
+from setting.models_provider.base_model_provider import MaxKBBaseModel
+
+
+def custom_get_token_ids(text: str):
+    tokenizer = TokenizerManage.get_tokenizer()
+    return tokenizer.encode(text)
+
+
+class GeminiImage(MaxKBBaseModel, ChatGoogleGenerativeAI):
+
+    @staticmethod
+    def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
+        optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)
+        return GeminiImage(
+            model=model_name,
+            google_api_key=model_credential.get('api_key'),
+            streaming=True,
+            **optional_params,
+        )

apps/setting/models_provider/impl/volcanic_engine_model_provider/credential/tti.py

@@ -28,8 +28,8 @@ class VolcanicEngineTTIModelGeneralParams(BaseForm):
 
 
 class VolcanicEngineTTIModelCredential(BaseForm, BaseModelCredential):
-    access_key = forms.PasswordInputField('Access Key', required=True)
-    secret_key = forms.PasswordInputField('Secret Key', required=True)
+    access_key = forms.PasswordInputField('Access Key ID', required=True)
+    secret_key = forms.PasswordInputField('Secret Access Key', required=True)
 
     def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], provider,
                  raise_exception=False):

ui/src/assets/icon_file-audio.svg

@@ -526,41 +526,6 @@
                   </template>
                   <!-- 图片生成 -->
                   <template v-if="item.type == WorkflowType.ImageGenerateNode">
-                    <div
-                      class="card-never border-r-4 mt-8"
-                      v-if="item.type !== WorkflowType.Application"
-                    >
-                      <h5 class="p-8-12">历史记录</h5>
-                      <div class="p-8-12 border-t-dashed lighter">
-                        <template v-if="item.history_message?.length > 0">
-                          <p
-                            class="mt-4 mb-4"
-                            v-for="(history, historyIndex) in item.history_message"
-                            :key="historyIndex"
-                          >
-                            <span class="color-secondary mr-4">{{ history.role }}:</span>
-
-                            <span v-if="Array.isArray(history.content)">
-                              <template v-for="(h, i) in history.content" :key="i">
-                                <el-image
-                                  v-if="h.type === 'image_url'"
-                                  :src="h.image_url.url"
-                                  alt=""
-                                  fit="cover"
-                                  style="width: 40px; height: 40px; display: inline-block"
-                                  class="border-r-4 mr-8"
-                                />
-
-                                <span v-else>{{ h.text }}<br /></span>
-                              </template>
-                            </span>
-
-                            <span v-else>{{ history.content }}</span>
-                          </p>
-                        </template>
-                        <template v-else> - </template>
-                      </div>
-                    </div>
                     <div class="card-never border-r-4 mt-8">
                       <h5 class="p-8-12">本次对话</h5>
                       <div class="p-8-12 border-t-dashed lighter pre-wrap">

ui/src/assets/icon_text-image.svg

@@ -20,7 +20,7 @@
               <el-input v-model="detail.padding_problem_text" disabled />
             </el-form-item>
             <el-form-item label="引用分段">
-              <div v-if="detail.paragraph_list.length > 0">
+              <div v-if="detail.paragraph_list.length > 0" class="w-full">
                 <template v-for="(item, index) in detail.paragraph_list" :key="index">
                   <ParagraphCard :data="item" :index="index" />
                 </template>

ui/src/components/ai-chat/ExecutionDetailDialog.vue

@@ -25,7 +25,7 @@ defineProps({
   cursor: pointer;
   min-height: var(--card-min-height);
   border: 1px dashed var(--el-border-color);
-  background: #eff0f1;
+  background: var(--el-disabled-bg-color);
   border-radius: 8px;
   box-sizing: border-box;
 

ui/src/components/ai-chat/ParagraphSourceDialog.vue

@@ -129,7 +129,7 @@ defineExpose({
     cursor: pointer;
     min-height: var(--card-min-height);
     border: 1px dashed var(--el-color-primary);
-    background: #eff0f1;
+    background: var(--el-disabled-bg-color);;
     padding-bottom: 20px;
 
     .add-icon {