Merge branch 'v2' into pr@v2@fix_resource_authorization_modify

zhanweizhang7 · web-flow · commit 9556f731545e · 2025-06-20T12:00:07.000+08:00
diff --git a/apps/models_provider/serializers/model_serializer.py b/apps/models_provider/serializers/model_serializer.py
@@ -107,12 +107,15 @@ def model_to_dict(model: Model):
     class Operate(serializers.Serializer):
         id = serializers.UUIDField(required=True, label=_("model id"))
         user_id = serializers.UUIDField(required=False, label=_("user id"))
+        workspace_id = serializers.CharField(required=False, label=_("workspace id"))
 
         def is_valid(self, *, raise_exception=False):
             super().is_valid(raise_exception=True)
-            model = QuerySet(Model).filter(
-                id=self.data.get("id")
-            ).first()
+            workspace_id = self.data.get("workspace_id")
+            model_query = QuerySet(Model).filter(id=self.data.get("id"))
+            if workspace_id is not None:
+                model_query = model_query.filter(workspace_id=workspace_id)
+            model = model_query.first()
             if model is None:
                 raise AppApiException(500, _('Model does not exist'))
             if model.workspace_id == 'None':
@@ -122,21 +125,23 @@ def one(self, with_valid=False):
             if with_valid:
                 super().is_valid(raise_exception=True)
             model = QuerySet(Model).get(
-                id=self.data.get('id')
+                id=self.data.get('id'), workspace_id=self.data.get('workspace_id')
             )
             return ModelSerializer.model_to_dict(model)
 
         def one_meta(self, with_valid=False):
             model = None
             if with_valid:
                 super().is_valid(raise_exception=True)
-                model = QuerySet(Model).filter(id=self.data.get("id")).first()
+                model = QuerySet(Model).filter(id=self.data.get("id"),
+                                               workspace_id=self.data.get('workspace_id')).first()
                 if model is None:
                     raise AppApiException(500, _('Model does not exist'))
             return {'id': str(model.id), 'provider': model.provider, 'name': model.name, 'model_type': model.model_type,
                     'model_name': model.model_name,
                     'status': model.status,
-                    'meta': model.meta
+                    'meta': model.meta,
+                    'workspace_id': model.workspace_id,
                     }
 
         def pause_download(self, with_valid=True):
diff --git a/apps/models_provider/views/model.py b/apps/models_provider/views/model.py
@@ -121,8 +121,9 @@ class Operate(APIView):
              )
         def put(self, request: Request, workspace_id, model_id: str):
             return result.success(
-                ModelSerializer.Operate(data={'id': model_id, 'user_id': request.user.id}).edit(request.data,
-                                                                                                str(request.user.id)))
+                ModelSerializer.Operate(
+                    data={'id': model_id, 'user_id': request.user.id, 'workspace_id': workspace_id}).edit(request.data,
+                                                                                                          str(request.user.id)))
 
         @extend_schema(methods=['DELETE'],
                        summary=_('Delete model'),
@@ -138,7 +139,8 @@ def put(self, request: Request, workspace_id, model_id: str):
              )
         def delete(self, request: Request, workspace_id: str, model_id: str):
             return result.success(
-                ModelSerializer.Operate(data={'id': model_id, 'user_id': request.user.id}).delete())
+                ModelSerializer.Operate(
+                    data={'id': model_id, 'user_id': request.user.id, 'workspace_id': workspace_id}).delete())
 
         @extend_schema(methods=['GET'],
                        summary=_('Query model details'),
@@ -151,7 +153,9 @@ def delete(self, request: Request, workspace_id: str, model_id: str):
                          RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
         def get(self, request: Request, workspace_id: str, model_id: str):
             return result.success(
-                ModelSerializer.Operate(data={'id': model_id, 'user_id': request.user.id}).one(with_valid=True))
+                ModelSerializer.Operate(
+                    data={'id': model_id, 'user_id': request.user.id, 'workspace_id': workspace_id}).one(
+                    with_valid=True))
 
     class ModelParamsForm(APIView):
         authentication_classes = [TokenAuth]
@@ -203,7 +207,7 @@ class ModelMeta(APIView):
                          RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
         def get(self, request: Request, workspace_id: str, model_id: str):
             return result.success(
-                ModelSerializer.Operate(data={'id': model_id}).one_meta(with_valid=True))
+                ModelSerializer.Operate(data={'id': model_id, 'workspace_id': workspace_id}).one_meta(with_valid=True))
 
     class PauseDownload(APIView):
         authentication_classes = [TokenAuth]
@@ -220,7 +224,7 @@ class PauseDownload(APIView):
                          RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
         def put(self, request: Request, workspace_id: str, model_id: str):
             return result.success(
-                ModelSerializer.Operate(data={'id': model_id}).pause_download())
+                ModelSerializer.Operate(data={'id': model_id, 'workspace_id': workspace_id}).pause_download())
 
 
 class SharedModel(APIView):
diff --git a/apps/tools/migrations/0001_initial.py b/apps/tools/migrations/0001_initial.py
@@ -1,13 +1,11 @@
 # Generated by Django 5.2 on 2025-05-15 04:04
-import os
 
 import django.db.models.deletion
 import mptt.fields
 import uuid_utils.compat
 from django.db import migrations, models
 
-from common.utils.common import get_file_content
-from maxkb.conf import PROJECT_DIR
+
 from tools.models import ToolFolder
 
 
@@ -71,5 +69,4 @@ class Migration(migrations.Migration):
                 'db_table': 'tool',
             },
         ),
-        # migrations.RunSQL(get_file_content(os.path.join(PROJECT_DIR, "apps", "tools", 'migrations', 'internal_tool.sql')))
     ]
diff --git a/apps/tools/migrations/0002_tool_label.py b/apps/tools/migrations/0002_tool_label.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.2.3 on 2025-06-20 03:43
+import os
+
+from django.db import migrations, models
+from common.utils.common import get_file_content
+from maxkb.conf import PROJECT_DIR
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tools', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tool',
+            name='label',
+            field=models.CharField(max_length=128, null=True, verbose_name='标签'),
+        ),
+        migrations.RunSQL(get_file_content(os.path.join(PROJECT_DIR, "apps", "tools", 'migrations', 'internal_tool.sql')))
+    ]
diff --git a/apps/tools/migrations/internal_tool.sql b/apps/tools/migrations/internal_tool.sql
@@ -1,4 +1,4 @@
-INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-10 06:20:35.945414 +00:00', '2025-03-10 09:19:23.608026 +00:00', 'c75cb48e-fd77-11ef-84d2-5618c4394482', '博查搜索', '从博查搜索任何信息和网页URL', e'def bocha_search(query, apikey):
+INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-10 06:20:35.945414 +00:00', '2025-03-10 09:19:23.608026 +00:00', 'c75cb48e-fd77-11ef-84d2-5618c4394482', '博查搜索', 'Web Search', '从博查搜索任何信息和网页URL', e'def bocha_search(query, apikey):
     import requests
     import json
     url = "https://api.bochaai.com/v1/web-search"
@@ -19,7 +19,7 @@ INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_
     else:
         raise Exception(f"API请求失败: {response.status_code}, 错误信息: {response.text}")
         return (response.text)', '[{"name": "query", "type": "string", "source": "reference", "is_required": true}]', '[{"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "apikey", "label": "API Key", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "API Key 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "API Key 长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', '/ui/fx/bochaai/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', '', 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default');
-INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-02-26 03:36:48.187286 +00:00', '2025-03-11 07:23:46.123972 +00:00', 'e89ad2ae-f3f2-11ef-ad09-0242ac110002', 'Google Search', 'Google Web Search', e'def google_search(query, apikey, cx):
+INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-02-26 03:36:48.187286 +00:00', '2025-03-11 07:23:46.123972 +00:00', 'e89ad2ae-f3f2-11ef-ad09-0242ac110002', 'Google Search','Web Search', 'Google Web Search', e'def google_search(query, apikey, cx):
     import requests
     import json
     url = "https://customsearch.googleapis.com/customsearch/v1"
@@ -36,7 +36,7 @@ INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_
     else:
         raise Exception(f"API请求失败: {response.status_code}, 错误信息: {response.text}")
         return (response.text)', '[{"name": "query", "type": "string", "source": "reference", "is_required": true}]', '[{"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "apikey", "label": "API Key", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "API Key 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "API Key 长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "cx", "label": "cx", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "cx 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "cx长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', '/ui/fx/google_search/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', '', 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default');
-INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-02-25 07:44:40.141515 +00:00', '2025-03-11 06:33:53.248495 +00:00', '5e912f00-f34c-11ef-8a9c-5618c4394482', 'LangSearch', e'A Web Search tool supporting natural language search
+INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-02-25 07:44:40.141515 +00:00', '2025-03-11 06:33:53.248495 +00:00', '5e912f00-f34c-11ef-8a9c-5618c4394482', 'LangSearch','Web Search', e'A Web Search tool supporting natural language search
 ', e'
 def langsearch(query, apikey):
     import json
@@ -61,7 +61,7 @@ def langsearch(query, apikey):
     else:
         raise Exception(f"API请求失败: {response.status_code}, 错误信息: {response.text}")
         return (response.text)', '[{"name": "query", "type": "string", "source": "reference", "is_required": true}]', '[{"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "apikey", "label": "API Key", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "API Key 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "API Key 长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', '/ui/fx/langsearch/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', '', 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default');
-INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-17 08:16:32.626245 +00:00', '2025-03-17 08:16:32.626308 +00:00', '22c21b76-0308-11f0-9694-5618c4394482', 'MySQL 查询', '一个连接MySQL数据库执行SQL查询的工具', e'
+INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-17 08:16:32.626245 +00:00', '2025-03-17 08:16:32.626308 +00:00', '22c21b76-0308-11f0-9694-5618c4394482', 'MySQL 查询','Database Search', '一个连接MySQL数据库执行SQL查询的工具', e'
 def query_mysql(host,port, user, password, database, sql):
     import pymysql
     import json
@@ -103,7 +103,7 @@ def query_mysql(host,port, user, password, database, sql):
     except Exception as e:
         print(f"Error while connecting to MySQL: {e}")
         raise e', '[{"name": "sql", "type": "string", "source": "reference", "is_required": true}]', '[{"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "host", "label": "host", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "host 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "host长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 20, "minlength": 1, "show-word-limit": true}, "field": "port", "label": "port", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "port 为必填属性", "required": true}, {"max": 20, "min": 1, "message": "port长度在 1 到 20 个字符", "trigger": "blur"}]}, "default_value": "3306", "show_default_value": false}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "user", "label": "user", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "user 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "user长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "root", "show_default_value": false}, {"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "password", "label": "password", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "password 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "password长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "database", "label": "database", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "database 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "database长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', '/ui/fx/mysql/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', null, 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default');
-INSERT INTO tool (create_time, update_time, id, name, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-17 07:37:54.620836 +00:00', '2025-03-17 07:37:54.620887 +00:00', 'bd1e8b88-0302-11f0-87bb-5618c4394482', 'PostgreSQL 查询', '一个连接PostgreSQL数据库执行SQL查询的工具', e'
+INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-17 07:37:54.620836 +00:00', '2025-03-17 07:37:54.620887 +00:00', 'bd1e8b88-0302-11f0-87bb-5618c4394482', 'PostgreSQL 查询','Database Search', '一个连接PostgreSQL数据库执行SQL查询的工具', e'
 def queryPgSQL(database, user, password, host, port, query):
     import psycopg2
     import json
diff --git a/apps/tools/models/tool.py b/apps/tools/models/tool.py
@@ -51,6 +51,7 @@ class Tool(AppModelMixin):
     folder = models.ForeignKey(ToolFolder, on_delete=models.DO_NOTHING, verbose_name="文件夹id", default='default')
     workspace_id = models.CharField(max_length=64, verbose_name="工作空间id", default="default", db_index=True)
     init_params = models.CharField(max_length=102400, verbose_name="初始化参数", null=True)
+    label = models.CharField(max_length=128, verbose_name="标签", null=True)
 
     class Meta:
         db_table = "tool"
diff --git a/apps/tools/serializers/tool.py b/apps/tools/serializers/tool.py
@@ -102,7 +102,7 @@ class ToolModelSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tool
         fields = ['id', 'name', 'icon', 'desc', 'code', 'input_field_list', 'init_field_list', 'init_params',
-                  'scope', 'is_active', 'user_id', 'template_id', 'workspace_id', 'folder_id', 'tool_type',
+                  'scope', 'is_active', 'user_id', 'template_id', 'workspace_id', 'folder_id', 'tool_type', 'label',
                   'create_time', 'update_time']
 
 
diff --git a/apps/tools/sql/list_tool.sql b/apps/tools/sql/list_tool.sql
@@ -10,6 +10,7 @@ from (select tool."id"::text,
              tool."user_id",
              "user".nick_name as "nick_name",
              tool."icon",
+             tool.label,
              tool."template_id"::text,
              tool."create_time",
              tool."update_time",
@@ -30,6 +31,7 @@ from (select tool."id"::text,
              tool_folder."user_id",
              "user".nick_name        as "nick_name",
              ''                      as "icon",
+             ''                      as label,
              ''                      as "template_id",
              tool_folder."create_time",
              tool_folder."update_time",
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,15 +10,15 @@ package-mode = false
 python = "^3.11"
 django = "5.2.3"
 drf-spectacular = { extras = ["sidecar"], version = "0.28.0" }
-django-redis = "5.4.0"
+django-redis = "6.0.0"
 django-db-connection-pool = "1.2.6"
 django-mptt = "0.17.0"
 psycopg = { extras = ["binary"], version = "3.2.9" }
 python-dotenv = "1.1.0"
 uuid-utils = "0.11.0"
 diskcache2 = "1.0.0"
 captcha = "0.7.1"
-langchain-openai = "0.3.23"
+langchain-openai = "0.3.24"
 langchain-anthropic = "0.3.15"
 langchain-community = "0.3.25"
 langchain-deepseek = "0.1.3"
@@ -30,11 +30,11 @@ langgraph = "0.4.8"
 torch = "2.7.1"
 qianfan = "0.4.12.3"
 zhipuai = "2.1.5.20250611"
-boto3 = "1.38.36"
-tencentcloud-sdk-python = "3.0.1402"
+boto3 = "1.38.39"
+tencentcloud-sdk-python = "3.0.1405"
 xinference-client = "1.7.0.post1"
 anthropic = "0.54.0"
-dashscope = "1.23.4"
+dashscope = "1.23.5"
 pylint = "3.3.7"
 pydub = "0.25.1"
 cffi = "1.17.1"
@@ -49,15 +49,15 @@ beautifulsoup4 = "4.13.4"
 html2text = "2025.4.15"
 jieba = "0.42.1"
 openpyxl = "3.1.5"
-python-docx = "1.1.2"
+python-docx = "1.2.0"
 xlrd = "2.0.2"
 xlwt = "1.3.0"
 pymupdf = "1.24.9"
 pypdf = "5.6.0"
 gunicorn = "23.0.0"
 python-daemon = "3.1.2"
 pytz = "2025.2"
-django-apscheduler = "0.6.2"
+django-apscheduler = "0.7.0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/ui/src/components/app-icon/KnowledgeIcon.vue b/ui/src/components/app-icon/KnowledgeIcon.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-avatar v-if="type === 1" class="avatar-purple" shape="square" :size="size">
+  <el-avatar v-if="type == 1" class="avatar-purple" shape="square" :size="size">
     <img src="@/assets/knowledge/icon_web.svg" style="width: 58%" alt="" />
   </el-avatar>
   <el-avatar
-    v-else-if="type === 2"
+    v-else-if="type == 2"
     class="avatar-purple"
     shape="square"
     :size="size"
diff --git a/ui/src/layout/layout-header/avatar/index.vue b/ui/src/layout/layout-header/avatar/index.vue
diff --git a/ui/src/views/user-manage/component/UserDrawer.vue b/ui/src/views/user-manage/component/UserDrawer.vue
