From 28d44ac56771a6e3d09733f13fb8354561cb5a23 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Thu, 21 Mar 2024 14:49:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/application/chat_pipeline/I_base_chat_pipeline.py | 2 +- apps/application/swagger_api/application_api.py | 10 ---------- apps/common/auth/authenticate.py | 7 ------- apps/common/config/embedding_config.py | 4 ++-- apps/common/froms/array_object_card.py | 2 +- apps/common/froms/object_card.py | 2 +- apps/common/froms/password_input.py | 2 +- apps/common/froms/tab_card.py | 2 +- apps/common/froms/table_checkbox.py | 2 +- apps/common/froms/table_radio.py | 2 +- apps/common/froms/text_input_field.py | 2 +- apps/common/handle/handle_exception.py | 1 - apps/common/util/fork.py | 9 ++++----- apps/common/util/rsa_util.py | 6 ++---- apps/common/util/test.py | 7 +++---- apps/embedding/vector/pg_vector.py | 5 ++--- apps/setting/models/system_management.py | 1 - apps/setting/views/system_setting.py | 2 +- ui/src/api/model.ts | 1 - ui/src/components/ai-chat/index.vue | 1 - ui/src/components/dynamics-form/FormItem.vue | 2 -- ui/src/components/dynamics-form/index.vue | 2 -- ui/src/request/index.ts | 5 +---- .../applicaiton-overview/component/LimitDialog.vue | 2 -- ui/src/views/application/CreateAndSetting.vue | 2 -- ui/src/views/dataset/component/BaseForm.vue | 1 - ui/src/views/dataset/component/ParagraphPreview.vue | 4 +--- .../views/document/component/ImportDocumentDialog.vue | 2 -- ui/src/views/document/index.vue | 1 - ui/src/views/email/index.vue | 2 -- ui/src/views/log/component/EditContentDialog.vue | 2 -- ui/src/views/log/component/EditMarkDialog.vue | 2 -- ui/src/views/team/component/CreateMemberDialog.vue | 8 -------- ui/src/views/template/component/EditModel.vue | 1 - ui/src/views/user-manage/component/UserDialog.vue | 2 -- ui/src/views/user-manage/component/UserPwdDialog.vue | 2 -- 36 files changed, 24 insertions(+), 86 deletions(-) diff --git a/apps/application/chat_pipeline/I_base_chat_pipeline.py b/apps/application/chat_pipeline/I_base_chat_pipeline.py index 1c0f8d998..8b796a7b4 100644 --- a/apps/application/chat_pipeline/I_base_chat_pipeline.py +++ b/apps/application/chat_pipeline/I_base_chat_pipeline.py @@ -8,7 +8,7 @@ """ import time from abc import abstractmethod -from typing import Type, Dict +from typing import Type from rest_framework import serializers diff --git a/apps/application/swagger_api/application_api.py b/apps/application/swagger_api/application_api.py index 0bfe77fb1..38d747bb1 100644 --- a/apps/application/swagger_api/application_api.py +++ b/apps/application/swagger_api/application_api.py @@ -10,16 +10,6 @@ from drf_yasg import openapi from common.mixins.api_mixin import ApiMixin -""" - name = serializers.CharField(required=True) - desc = serializers.CharField(required=True) - model_id = serializers.CharField(required=True) - multiple_rounds_dialogue = serializers.BooleanField(required=True) - prologue = serializers.CharField(required=True) - example = serializers.ListSerializer(required=False, child=serializers.CharField(required=True)) - dataset_id_list = serializers.ListSerializer(required=False, child=serializers.UUIDField(required=True)) -""" - class ApplicationApi(ApiMixin): class Authentication(ApiMixin): diff --git a/apps/common/auth/authenticate.py b/apps/common/auth/authenticate.py index bdd73874a..de1499e70 100644 --- a/apps/common/auth/authenticate.py +++ b/apps/common/auth/authenticate.py @@ -10,19 +10,12 @@ import traceback from django.core import cache from django.core import signing -from django.db.models import QuerySet from rest_framework.authentication import TokenAuthentication -from application.models.api_key_model import ApplicationAccessToken, ApplicationApiKey from common.auth.handle.impl.application_key import ApplicationKey from common.auth.handle.impl.public_access_token import PublicAccessToken from common.auth.handle.impl.user_token import UserToken -from common.constants.authentication_type import AuthenticationType -from common.constants.permission_constants import Auth, get_permission_list_by_role, RoleConstants, Permission, Group, \ - Operate from common.exception.app_exception import AppAuthenticationFailed, AppEmbedIdentityFailed, AppChatNumOutOfBoundsFailed -from smartdoc.settings import JWT_AUTH -from users.models.user import User, get_user_dynamics_permission token_cache = cache.caches['token_cache'] diff --git a/apps/common/config/embedding_config.py b/apps/common/config/embedding_config.py index 1a1ef362f..367dce7f8 100644 --- a/apps/common/config/embedding_config.py +++ b/apps/common/config/embedding_config.py @@ -6,10 +6,10 @@ @date：2023/10/23 16:03 @desc: """ -import types -from smartdoc.const import CONFIG from langchain_community.embeddings import HuggingFaceEmbeddings +from smartdoc.const import CONFIG + class EmbeddingModel: instance = None diff --git a/apps/common/froms/array_object_card.py b/apps/common/froms/array_object_card.py index 2bc47a53b..9cf8c9bf8 100644 --- a/apps/common/froms/array_object_card.py +++ b/apps/common/froms/array_object_card.py @@ -6,7 +6,7 @@ @date：2023/10/31 18:03 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms.base_field import BaseExecField, TriggerType diff --git a/apps/common/froms/object_card.py b/apps/common/froms/object_card.py index 493c488c9..0245ba296 100644 --- a/apps/common/froms/object_card.py +++ b/apps/common/froms/object_card.py @@ -6,7 +6,7 @@ @date：2023/10/31 18:02 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms.base_field import BaseExecField, TriggerType diff --git a/apps/common/froms/password_input.py b/apps/common/froms/password_input.py index a8452c893..87a97e24d 100644 --- a/apps/common/froms/password_input.py +++ b/apps/common/froms/password_input.py @@ -6,7 +6,7 @@ @date：2023/11/1 14:48 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms import BaseField, TriggerType diff --git a/apps/common/froms/tab_card.py b/apps/common/froms/tab_card.py index 2b09d46bf..f73999431 100644 --- a/apps/common/froms/tab_card.py +++ b/apps/common/froms/tab_card.py @@ -6,7 +6,7 @@ @date：2023/10/31 18:03 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms.base_field import BaseExecField, TriggerType diff --git a/apps/common/froms/table_checkbox.py b/apps/common/froms/table_checkbox.py index f08b2720b..16d61ddb2 100644 --- a/apps/common/froms/table_checkbox.py +++ b/apps/common/froms/table_checkbox.py @@ -6,7 +6,7 @@ @date：2023/10/31 18:01 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms.base_field import TriggerType, BaseExecField diff --git a/apps/common/froms/table_radio.py b/apps/common/froms/table_radio.py index ad0647030..0c2ef2fc6 100644 --- a/apps/common/froms/table_radio.py +++ b/apps/common/froms/table_radio.py @@ -6,7 +6,7 @@ @date：2023/10/31 18:01 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms.base_field import TriggerType, BaseExecField diff --git a/apps/common/froms/text_input_field.py b/apps/common/froms/text_input_field.py index 8da50a870..eeb16782b 100644 --- a/apps/common/froms/text_input_field.py +++ b/apps/common/froms/text_input_field.py @@ -6,7 +6,7 @@ @date：2023/10/31 17:58 @desc: """ -from typing import List, Dict +from typing import Dict from common.froms.base_field import BaseField, TriggerType diff --git a/apps/common/handle/handle_exception.py b/apps/common/handle/handle_exception.py index dfe2496ab..d3e86401b 100644 --- a/apps/common/handle/handle_exception.py +++ b/apps/common/handle/handle_exception.py @@ -8,7 +8,6 @@ """ import logging import traceback -from typing import Dict from rest_framework.exceptions import ValidationError, ErrorDetail, APIException from rest_framework.views import exception_handler diff --git a/apps/common/util/fork.py b/apps/common/util/fork.py index 6c6186df9..027ff118b 100644 --- a/apps/common/util/fork.py +++ b/apps/common/util/fork.py @@ -4,12 +4,11 @@ import re import traceback from functools import reduce from typing import List, Set -import requests -import html2text as ht -from bs4 import BeautifulSoup -from urllib.parse import urljoin, urlparse, ParseResult, urlsplit, parse_qs +from urllib.parse import urljoin, urlparse, ParseResult, urlsplit -from common.exception.app_exception import AppApiException +import html2text as ht +import requests +from bs4 import BeautifulSoup requests.packages.urllib3.disable_warnings() diff --git a/apps/common/util/rsa_util.py b/apps/common/util/rsa_util.py index a8e361e8c..ee93bf499 100644 --- a/apps/common/util/rsa_util.py +++ b/apps/common/util/rsa_util.py @@ -7,17 +7,15 @@ @desc: """ import base64 -import os +import threading from Crypto.Cipher import PKCS1_v1_5 as PKCS1_cipher from Crypto.PublicKey import RSA -from django.db.models import QuerySet from django.core import cache +from django.db.models import QuerySet from setting.models import SystemSetting, SettingType -import threading - lock = threading.Lock() rsa_cache = cache.caches['default'] cache_key = "rsa_key" diff --git a/apps/common/util/test.py b/apps/common/util/test.py index f271cf058..a9536ba9c 100644 --- a/apps/common/util/test.py +++ b/apps/common/util/test.py @@ -6,9 +6,10 @@ @date：2023/11/15 15:13 @desc: """ -import time -from django.core import signing import hashlib +import time + +from django.core import signing from django.core.cache import cache # alg使用的算法 @@ -75,5 +76,3 @@ def check_token(token): return False -if __name__ == '__main__': - token = create_token('zhangsan', 'lisi') diff --git a/apps/embedding/vector/pg_vector.py b/apps/embedding/vector/pg_vector.py index 09af84639..3c539e707 100644 --- a/apps/embedding/vector/pg_vector.py +++ b/apps/embedding/vector/pg_vector.py @@ -11,13 +11,12 @@ import os import uuid from typing import Dict, List -from django.contrib.postgres.search import SearchVector from django.db.models import QuerySet from langchain_community.embeddings import HuggingFaceEmbeddings from common.config.embedding_config import EmbeddingModel -from common.db.search import native_search, generate_sql_by_query_dict -from common.db.sql_execute import select_one, select_list +from common.db.search import generate_sql_by_query_dict +from common.db.sql_execute import select_list from common.util.file_util import get_file_content from embedding.models import Embedding, SourceType from embedding.vector.base_vector import BaseVectorStore diff --git a/apps/setting/models/system_management.py b/apps/setting/models/system_management.py index 736707935..8dea8955b 100644 --- a/apps/setting/models/system_management.py +++ b/apps/setting/models/system_management.py @@ -6,7 +6,6 @@ @date：2024/3/19 13:47 @desc: 邮箱管理 """ -import uuid from django.db import models diff --git a/apps/setting/views/system_setting.py b/apps/setting/views/system_setting.py index fdf19d67d..e08a4702e 100644 --- a/apps/setting/views/system_setting.py +++ b/apps/setting/views/system_setting.py @@ -13,7 +13,7 @@ from rest_framework.request import Request from rest_framework.views import APIView from common.auth import TokenAuth, has_permissions -from common.constants.permission_constants import PermissionConstants, RoleConstants +from common.constants.permission_constants import RoleConstants from common.response import result from setting.serializers.system_setting import SystemSettingSerializer from setting.swagger_api.system_setting import SystemSettingEmailApi diff --git a/ui/src/api/model.ts b/ui/src/api/model.ts index fe8e63f8b..265582117 100644 --- a/ui/src/api/model.ts +++ b/ui/src/api/model.ts @@ -103,7 +103,6 @@ const updateModel: ( request: EditModelRequest, loading?: Ref ) => Promise> = (model_id, request, loading) => { - console.log(request) return put(`${prefix}/${model_id}`, request, {}, loading) } diff --git a/ui/src/components/ai-chat/index.vue b/ui/src/components/ai-chat/index.vue index b03a995ab..1b3acb8d1 100644 --- a/ui/src/components/ai-chat/index.vue +++ b/ui/src/components/ai-chat/index.vue @@ -447,7 +447,6 @@ function chatMessage(chat?: any, problem?: string) { applicationApi .postChatMessage(chartOpenId.value, chat.problem_text) .then((response) => { - console.log(response.status) if (response.status === 401) { application .asyncAppAuthentication(accessToken) diff --git a/ui/src/components/dynamics-form/FormItem.vue b/ui/src/components/dynamics-form/FormItem.vue index 68886a460..89a64d9b4 100644 --- a/ui/src/components/dynamics-form/FormItem.vue +++ b/ui/src/components/dynamics-form/FormItem.vue @@ -132,11 +132,9 @@ onMounted(() => { bus.on(key, (v: any) => { if (value && value.length > 0) { if (value.includes(v)) { - console.log('符合情况,即将获取数据', key, v) props.trigger(props.formfield, loading) } } else { - console.log('符合情况,即将获取数据', key, v) props.trigger(props.formfield, loading) } }) diff --git a/ui/src/components/dynamics-form/index.vue b/ui/src/components/dynamics-form/index.vue index 962e41294..d9d9b1774 100644 --- a/ui/src/components/dynamics-form/index.vue +++ b/ui/src/components/dynamics-form/index.vue @@ -78,7 +78,6 @@ const show = (field: FormField) => { for (const index in keys) { const key = keys[index] let v = _.get(formValue.value, key) - console.log(v, key) if (v && v !== undefined && v !== null) { let values = field.relation_show_field_dict[key] if (values && values.length > 0) { @@ -173,7 +172,6 @@ const render = ( }) } if (data) { - console.log(data) formValue.value = data } } diff --git a/ui/src/request/index.ts b/ui/src/request/index.ts index d89183460..6c83f3ed6 100644 --- a/ui/src/request/index.ts +++ b/ui/src/request/index.ts @@ -47,7 +47,6 @@ instance.interceptors.response.use( return response }, (err: any) => { - console.log(err) if (err.code === 'ECONNABORTED') { MsgError(err.message) console.error(err) @@ -218,9 +217,7 @@ export const exportExcel: ( window.URL.revokeObjectURL(link.href) } }) - .catch((e) => { - console.log(e) - }) + .catch((e) => {}) } /** diff --git a/ui/src/views/applicaiton-overview/component/LimitDialog.vue b/ui/src/views/applicaiton-overview/component/LimitDialog.vue index cdbd94feb..cb127ad3d 100644 --- a/ui/src/views/applicaiton-overview/component/LimitDialog.vue +++ b/ui/src/views/applicaiton-overview/component/LimitDialog.vue @@ -90,8 +90,6 @@ const submit = async (formEl: FormInstance | undefined) => { MsgSuccess('设置成功') dialogVisible.value = false }) - } else { - console.log('error submit!', fields) } }) } diff --git a/ui/src/views/application/CreateAndSetting.vue b/ui/src/views/application/CreateAndSetting.vue index 0c2a7152d..6b5136d50 100644 --- a/ui/src/views/application/CreateAndSetting.vue +++ b/ui/src/views/application/CreateAndSetting.vue @@ -414,8 +414,6 @@ const submit = async (formEl: FormInstance | undefined) => { router.push({ path: `/application` }) }) } - } else { - console.log('error submit!') } }) } diff --git a/ui/src/views/dataset/component/BaseForm.vue b/ui/src/views/dataset/component/BaseForm.vue index a196c46b9..81dba2ebe 100644 --- a/ui/src/views/dataset/component/BaseForm.vue +++ b/ui/src/views/dataset/component/BaseForm.vue @@ -63,7 +63,6 @@ const FormRef = ref() watch( () => props.data, (value) => { - console.log(value) if (value && JSON.stringify(value) !== '{}') { form.value.name = value.name form.value.desc = value.desc diff --git a/ui/src/views/dataset/component/ParagraphPreview.vue b/ui/src/views/dataset/component/ParagraphPreview.vue index 0264d3879..03671b0f5 100644 --- a/ui/src/views/dataset/component/ParagraphPreview.vue +++ b/ui/src/views/dataset/component/ParagraphPreview.vue @@ -105,9 +105,7 @@ function updateContent(data: any) { emit('update:data', newData.value) } -const handleClick = (tab: TabsPaneContext, event: Event) => { - // console.log(tab, event) -} +const handleClick = (tab: TabsPaneContext, event: Event) => {} onMounted(() => {}) diff --git a/ui/src/views/document/component/ImportDocumentDialog.vue b/ui/src/views/document/component/ImportDocumentDialog.vue index 219e0a9db..5a921202e 100644 --- a/ui/src/views/document/component/ImportDocumentDialog.vue +++ b/ui/src/views/document/component/ImportDocumentDialog.vue @@ -112,8 +112,6 @@ const submit = async (formEl: FormInstance | undefined) => { dialogVisible.value = false }) } - } else { - console.log('error submit!', fields) } }) } diff --git a/ui/src/views/document/index.vue b/ui/src/views/document/index.vue index 462730865..f97f60916 100644 --- a/ui/src/views/document/index.vue +++ b/ui/src/views/document/index.vue @@ -336,7 +336,6 @@ function changeState(bool: Boolean, row: any) { } function editName(val: string) { - console.log() if (val) { const obj = { name: val diff --git a/ui/src/views/email/index.vue b/ui/src/views/email/index.vue index 961e3243e..e7a6f6333 100644 --- a/ui/src/views/email/index.vue +++ b/ui/src/views/email/index.vue @@ -95,8 +95,6 @@ const submit = async (formEl: FormInstance | undefined, test?: string) => { MsgSuccess('设置成功') }) } - } else { - console.log('error submit!') } }) } diff --git a/ui/src/views/log/component/EditContentDialog.vue b/ui/src/views/log/component/EditContentDialog.vue index 7b28b9d5b..86ad4f95e 100644 --- a/ui/src/views/log/component/EditContentDialog.vue +++ b/ui/src/views/log/component/EditContentDialog.vue @@ -180,8 +180,6 @@ const submitForm = async (formEl: FormInstance | undefined) => { emit('refresh', res.data) dialogVisible.value = false }) - } else { - console.log('error submit!', fields) } }) } diff --git a/ui/src/views/log/component/EditMarkDialog.vue b/ui/src/views/log/component/EditMarkDialog.vue index fe2df9d4b..cae7155c5 100644 --- a/ui/src/views/log/component/EditMarkDialog.vue +++ b/ui/src/views/log/component/EditMarkDialog.vue @@ -135,8 +135,6 @@ const submit = async (formEl: FormInstance) => { .then((res) => { dialogVisible.value = false }) - } else { - console.log('error submit!') } }) } diff --git a/ui/src/views/team/component/CreateMemberDialog.vue b/ui/src/views/team/component/CreateMemberDialog.vue index edcb7e56b..7257f1af4 100644 --- a/ui/src/views/team/component/CreateMemberDialog.vue +++ b/ui/src/views/team/component/CreateMemberDialog.vue @@ -126,18 +126,10 @@ const submitMember = async (formEl: FormInstance | undefined) => { dialogVisible.value = false loading.value = false }) - } else { - console.log('error submit!') } }) } -// const getUser = (val: string) => { -// UserApi.getUserList(val, loading).then((res) => { -// userOptions.value.push(res.data) -// }) -// } - onMounted(() => {}) defineExpose({ open, close }) diff --git a/ui/src/views/template/component/EditModel.vue b/ui/src/views/template/component/EditModel.vue index efd530e72..02597da1f 100644 --- a/ui/src/views/template/component/EditModel.vue +++ b/ui/src/views/template/component/EditModel.vue @@ -136,7 +136,6 @@ const getModelForm = (model_name: string) => { ).then((ok) => { model_form_field.value = ok.data if (modelValue.value) { - console.log(modelValue.value.credential) // 渲染动态表单 dynamicsFormRef.value?.render(model_form_field.value, modelValue.value.credential) } diff --git a/ui/src/views/user-manage/component/UserDialog.vue b/ui/src/views/user-manage/component/UserDialog.vue index b39829fd7..41357a76a 100644 --- a/ui/src/views/user-manage/component/UserDialog.vue +++ b/ui/src/views/user-manage/component/UserDialog.vue @@ -132,8 +132,6 @@ const submit = async (formEl: FormInstance | undefined) => { dialogVisible.value = false }) } - } else { - console.log('error submit!', fields) } }) } diff --git a/ui/src/views/user-manage/component/UserPwdDialog.vue b/ui/src/views/user-manage/component/UserPwdDialog.vue index 3be7f5e61..7249e3e48 100644 --- a/ui/src/views/user-manage/component/UserPwdDialog.vue +++ b/ui/src/views/user-manage/component/UserPwdDialog.vue @@ -117,8 +117,6 @@ const submit = async (formEl: FormInstance | undefined) => { MsgSuccess('修改用户密码成功') dialogVisible.value = false }) - } else { - console.log('error submit!', fields) } }) }