Skip to content

feat: backfill file source type from APPLICATION to APPLICATION_SETTINGS for records without chat_id #6949

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

Closed
shaohuzhang1 wants to merge 1 commit into from
+6 −7
Closed

feat: backfill file source type from APPLICATION to APPLICATION_SETTINGS for records without chat_id #6949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/common/auth/handle/impl/user_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def get_permissions(
for role_id in role_ids:
for m in role_permission_mapping_dict.get(str(role_id)) or []:
p = PERMISSION_STR_MAP.get(m.permission_id)
if PermissionScopeConstants.WORKSPACE in p.meta.scope:
if p is not None and PermissionScopeConstants.WORKSPACE in p.meta.scope:
permissions.append(p)

for group, ps in group_by(permissions, lambda p: p.meta.group).items():
Expand Down
2 changes: 2 additions & 0 deletions apps/knowledge/models/knowledge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,8 @@ class FileSourceType(models.TextChoices):
TEMPORARY_120_MINUTE = "TEMPORARY_120_MINUTE"
# 临时1天 数据1天后被清理 source_id为TEMPORARY_1_DAY
TEMPORARY_1_DAY = "TEMPORARY_1_DAY"
# 应用的icon 背景图等 用户的icon
APPLICATION_SETTINGS = "APPLICATION_SETTINGS"


class VectorField(models.Field):
Expand Down
9 changes: 3 additions & 6 deletions apps/oss/serializers/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,9 @@ def auth(file, mk_file_auth):
# PublicFileAccess 中记录的文件允许公开访问
if QuerySet(PublicFileAccess).filter(source_type='FILE', source_id=str(file.id)).exists():
return
if file.source_type == FileSourceType.APPLICATION:
application = QuerySet(Application).filter(id=file.source_id).first()
if application is None:
_deny()
if file.meta.get('chat_id') is None:
return
if file.source_type == FileSourceType.APPLICATION_SETTINGS:
return

# 非公共文件,直接拒绝
if mk_file_auth is None:
_deny()
Expand Down
Loading