Skip to content

fix: Embedding model setting #4293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2025
Merged

fix: Embedding model setting #4293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
625b40f
fix: Model get in migration file
zhanweizhang7 Oct 30, 2025
f0c3cd7
fix: Embedding model setting
zhanweizhang7 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions apps/system_manage/migrations/0003_alter_workspaceuserresourcepermission_target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,18 @@

from common.constants.permission_constants import WorkspaceUserRoleMapping
from common.utils.common import group_by
from application.models import ApplicationFolder
from knowledge.models import KnowledgeFolder
from tools.models import ToolFolder
from system_manage.models import WorkspaceUserResourcePermission
from users.models import User


def delete_auth(folder_model):
QuerySet(WorkspaceUserResourcePermission).filter(target__in=QuerySet(folder_model).values_list('id')).delete()
def delete_auth(apps,folder_model):
workspace_user_resource_permission_model = apps.get_model('system_manage', 'WorkspaceUserResourcePermission')
QuerySet(workspace_user_resource_permission_model).filter(target__in=QuerySet(folder_model).values_list('id')).delete()


def get_workspace_user_resource_permission_list(auth_target_type, workspace_user_role_mapping_model_workspace_dict,
def get_workspace_user_resource_permission_list(apps, auth_target_type, workspace_user_role_mapping_model_workspace_dict,
folder_model):
workspace_user_resource_permission_model = apps.get_model('system_manage', 'WorkspaceUserResourcePermission')
return reduce(lambda x, y: [*x, *y], [
[WorkspaceUserResourcePermission(target=f.id, workspace_id=f.workspace_id, user_id=wurm.user_id,
[workspace_user_resource_permission_model(target=f.id, workspace_id=f.workspace_id, user_id=wurm.user_id,
auth_target_type=auth_target_type, auth_type="RESOURCE_PERMISSION_GROUP",
permission_list=['VIEW','MANAGE'] if wurm.user_id == f.user_id else ['VIEW']) for wurm in
workspace_user_role_mapping_model_workspace_dict.get(f.workspace_id, [])] for f in
Expand All @@ -30,31 +27,38 @@ def get_workspace_user_resource_permission_list(auth_target_type, workspace_user
def auth_folder(apps, schema_editor):
from common.database_model_manage.database_model_manage import DatabaseModelManage
DatabaseModelManage.init()

user_model = apps.get_model('users', 'User')
application_folder_model = apps.get_model('application', 'ApplicationFolder')
knowledge_folder_model = apps.get_model('knowledge', 'KnowledgeFolder')
tool_folder_model = apps.get_model('tools', 'ToolFolder')
workspace_user_resource_permission_model = apps.get_model('system_manage', 'WorkspaceUserResourcePermission')

workspace_user_role_mapping_model = DatabaseModelManage.get_model("workspace_user_role_mapping")
if workspace_user_role_mapping_model is None:
workspace_user_role_mapping_model_workspace_dict = {
'default': [WorkspaceUserRoleMapping('default', '', u.id) for u in QuerySet(User).all()]}
'default': [WorkspaceUserRoleMapping('default', '', u.id) for u in QuerySet(user_model).all()]}
else:
workspace_user_role_mapping_model_workspace_dict = group_by(
[v for v in {str(wurm.user_id) + str(wurm.workspace_id): wurm for wurm in
QuerySet(workspace_user_role_mapping_model)}.values()],
lambda item: item.workspace_id)

workspace_user_resource_permission_list = get_workspace_user_resource_permission_list("APPLICATION",
workspace_user_resource_permission_list = get_workspace_user_resource_permission_list(apps,"APPLICATION",
workspace_user_role_mapping_model_workspace_dict,
ApplicationFolder)
application_folder_model)

workspace_user_resource_permission_list += get_workspace_user_resource_permission_list("TOOL",
workspace_user_resource_permission_list += get_workspace_user_resource_permission_list(apps,"TOOL",
workspace_user_role_mapping_model_workspace_dict,
ToolFolder)
knowledge_folder_model)

workspace_user_resource_permission_list += get_workspace_user_resource_permission_list("KNOWLEDGE",
workspace_user_resource_permission_list += get_workspace_user_resource_permission_list(apps,"KNOWLEDGE",
workspace_user_role_mapping_model_workspace_dict,
KnowledgeFolder)
delete_auth(ApplicationFolder)
delete_auth(ToolFolder)
delete_auth(KnowledgeFolder)
QuerySet(WorkspaceUserResourcePermission).bulk_create(workspace_user_resource_permission_list)
tool_folder_model)
delete_auth(apps,application_folder_model)
delete_auth(apps,knowledge_folder_model)
delete_auth(apps,tool_folder_model)
QuerySet(workspace_user_resource_permission_model).bulk_create(workspace_user_resource_permission_list)


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/application-overview/component/LimitDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
v-model="form.access_num"
:min="0"
:step="1"
:max="10000"
:max="10000000"
:value-on-clear="0"
controls-position="right"
style="width: 268px"
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system-resource-management/ModelResourceIndex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
<el-dropdown-item
@click.stop="openParamSetting(row)"
v-if="
['TTS','LLM','IMAGE','TTI','STT','RERANKER'].includes(row.model_type) &&
['TTS','LLM','IMAGE','TTI','STT','EMBEDDING'].includes(row.model_type) &&
permissionPrecise.paramSetting()
"
>
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line of code you've provided has a minor issue with variable naming. You use 'EMBEDDING' but then check for 'model_type === 'E'' which does not match the variable name used in row.model_type. It should be:

                   <el-dropdown-item
                    @click.stop="openParamSetting(row)"
                     v-if="
-                      ['TTS','LLM','IMAGE','TTI','STT','RERANKER'].includes(row.model_type) &&
+                      ['TTS','LLM','IMAGE','TTI','STT','EMBEDDING'].includes(row.model_type) &&
                       permissionPrecise.paramSetting()
                     "
                   >

Additionally, ensure that permissionPrecise is properly initialized and callable within the scope where this component is using it to avoid any potential runtime errors.

Expand Down
Loading