fix: enhance workspace role handling in permissions and update translations for hit test messages

apps/folders/views/folder.py

@@ -9,7 +9,7 @@
 from common.auth.constants.compare_constants import CompareConstants
 from common.auth.constants.permission_constants import PermissionConstants
 from common.auth.constants.role_constants import RoleConstants
-from common.auth.struct.aggregate_permission import ViewPermission, PermissionFunc
+from common.auth.struct.aggregate_permission import ViewPermission
 from common.auth.struct.permission import Permission
 from common.log.log import log
 from common.result import result
@@ -57,6 +57,7 @@ class FolderView(APIView):
             ],
             compare=CompareConstants.AND,
         ),
+        RoleConstants.USER.get_workspace_role(),
         RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
     )
     @log(
@@ -83,6 +84,7 @@ def post(self, request: Request, workspace_id: str, source: str):
     @has_permissions(
         lambda r, kwargs: PermissionConstants[f"{kwargs.get('source')}_FOLDER_READ"].get_workspace_permission(),
         lambda r, kwargs: PermissionConstants[f"{kwargs.get('source')}_READ"].get_workspace_permission(),
+        RoleConstants.USER.get_workspace_role(),
         RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
     )
     def get(self, request: Request, workspace_id: str, source: str):
@@ -121,6 +123,7 @@ class Operate(APIView):
                 ],
                 compare=CompareConstants.AND,
             ),
+            RoleConstants.USER.get_workspace_role(),
             RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
         )
         @log(
@@ -146,6 +149,7 @@ def put(self, request: Request, workspace_id: str, source: str, folder_id: str):
         )
         @has_permissions(
             lambda r, kwargs: PermissionConstants[f"{kwargs.get('source')}_READ"].get_workspace_permission(),
+            RoleConstants.USER.get_workspace_role(),
             RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
             RoleConstants.EXTENDS_ADMIN,
         )
@@ -181,6 +185,7 @@ def get(self, request: Request, workspace_id: str, source: str, folder_id: str):
                 ],
                 compare=CompareConstants.AND,
             ),
+            RoleConstants.USER.get_workspace_role(),
             RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
         )
         @log(

apps/knowledge/serializers/common.py

@@ -316,6 +316,21 @@ def update_resource_mapping_by_knowledge(knowledge_id: str):
             QuerySet(KnowledgeWorkflow).filter(knowledge_id=knowledge_id).order_by("-create_time")[0:1].first()
         )
         if knowledge_workflow:
+            # 知识库工作流的默认模型（default_model_setting 中的 model_id），与智能体一致
+            instance_mapping += get_instance_resource(
+                knowledge_workflow,
+                ResourceType.KNOWLEDGE,
+                str(knowledge_id),
+                {
+                    "MODEL": [
+                        lambda instance: [
+                            item.get("model_id")
+                            for item in (instance.default_model_setting or {}).values()
+                            if item and isinstance(item, dict) and item.get("model_id")
+                        ]
+                    ]
+                },
+            )
             save_workflow_mapping(
                 knowledge_workflow.work_flow, ResourceType.KNOWLEDGE, str(knowledge_id), instance_mapping
             )

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -3054,7 +3054,7 @@ msgstr "同步网站知识库"
 #: apps/knowledge/views/knowledge.py:182 apps/knowledge/views/knowledge.py:183
 #: apps/knowledge/views/knowledge.py:184
 msgid "Hit test list"
-msgstr "命中测试列表"
+msgstr "召回测试列表"
 
 #: apps/knowledge/views/knowledge.py:212 apps/knowledge/views/knowledge.py:213
 #: apps/knowledge/views/knowledge.py:214
@@ -5396,7 +5396,7 @@ msgstr "同步网站知识库"
 #: apps/resource_manage/views/knowledge.py:142
 #: apps/resource_manage/views/knowledge.py:143
 msgid "System Hit test list"
-msgstr "命中测试列表"
+msgstr "召回测试列表"
 
 #: apps/resource_manage/views/knowledge.py:168
 #: apps/resource_manage/views/knowledge.py:169
@@ -6225,7 +6225,7 @@ msgstr "同步共享知识库网站"
 #: apps/shared/views/shared_knowledge.py:146
 #: apps/shared/views/shared_knowledge.py:147
 msgid "Shared Hit test list"
-msgstr "命中测试列表"
+msgstr "召回测试列表"
 
 #: apps/shared/views/shared_knowledge.py:172
 #: apps/shared/views/shared_knowledge.py:173
@@ -8667,7 +8667,7 @@ msgid "System Application"
 msgstr "系统智能体"
 
 msgid "Hit-Test"
-msgstr "命中测试"
+msgstr "召回测试"
 
 msgid "Export Application"
 msgstr "导出智能体"

apps/locales/zh_Hant/LC_MESSAGES/django.po

@@ -3054,7 +3054,7 @@ msgstr "同步網站知識庫"
 #: apps/knowledge/views/knowledge.py:182 apps/knowledge/views/knowledge.py:183
 #: apps/knowledge/views/knowledge.py:184
 msgid "Hit test list"
-msgstr "命中測試列表"
+msgstr "召回測試列表"
 
 #: apps/knowledge/views/knowledge.py:212 apps/knowledge/views/knowledge.py:213
 #: apps/knowledge/views/knowledge.py:214
@@ -5396,7 +5396,7 @@ msgstr "同步網站知識庫"
 #: apps/resource_manage/views/knowledge.py:142
 #: apps/resource_manage/views/knowledge.py:143
 msgid "System Hit test list"
-msgstr "命中測試列表"
+msgstr "召回測試列表"
 
 #: apps/resource_manage/views/knowledge.py:168
 #: apps/resource_manage/views/knowledge.py:169
@@ -6225,7 +6225,7 @@ msgstr "同步共享知識庫網站"
 #: apps/shared/views/shared_knowledge.py:146
 #: apps/shared/views/shared_knowledge.py:147
 msgid "Shared Hit test list"
-msgstr "命中測試列表"
+msgstr "召回測試列表"
 
 #: apps/shared/views/shared_knowledge.py:172
 #: apps/shared/views/shared_knowledge.py:173
@@ -8667,7 +8667,7 @@ msgid "System Application"
 msgstr "系統智能體"
 
 msgid "Hit-Test"
-msgstr "命中測試"
+msgstr "召回測試"
 
 msgid "Export Application"
 msgstr "導出智能體"

apps/models_provider/sql/list_model_user_ee.sql

@@ -60,5 +60,5 @@ FROM (SELECT model."id"::text, model."name",
                                                                           and user_role_relation.workspace_id =
                                                                               workspace_user_group_resource_permission.workspace_id)
                                            )
-                                       ) ) temp ${model_query_set}
+                                       ) ) ) temp ${model_query_set}