Skip to content

Commit d3e20a6

Browse files
committed
enable project module to support no auth
1 parent 1ac6ab6 commit d3e20a6

File tree

8 files changed

+72
-54
lines changed

8 files changed

+72
-54
lines changed

backend/onyx/access/access.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ def get_access_for_user_files(
134134
user_files = db_session.query(UserFile).filter(UserFile.id.in_(user_file_ids)).all()
135135
return {
136136
str(user_file.id): DocumentAccess.build(
137-
user_emails=[user_file.user.email],
137+
user_emails=[user_file.user.email] if user_file.user else [],
138138
user_groups=[],
139-
is_public=False,
139+
is_public=True if user_file.user is None else False,
140140
external_user_emails=[],
141141
external_user_group_ids=[],
142142
)

backend/onyx/chat/process_message.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ def stream_chat_message_objects(
634634
PreviousMessage.from_chat_message(msg, files) for msg in history_msgs
635635
]
636636
project_file_ids = []
637-
if chat_session.project_id and user_id:
637+
if chat_session.project_id:
638638
project_file_ids.extend(
639639
[
640640
file.file_id

backend/onyx/chat/user_files/parse_user_files.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def parse_user_files(
5151

5252
project_user_file_ids = []
5353

54-
if project_id and user_id:
54+
if project_id:
5555
project_user_file_ids.extend(
5656
[
5757
file.id

backend/onyx/db/projects.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def create_user_files(
8787
def upload_files_to_user_files_with_indexing(
8888
files: List[UploadFile],
8989
project_id: int | None,
90-
user: User,
90+
user: User | None,
9191
db_session: Session,
9292
) -> CategorizedFilesResult:
9393
categorized_files_result = create_user_files(files, project_id, user, db_session)
@@ -122,7 +122,7 @@ def upload_files_to_user_files_with_indexing(
122122

123123

124124
def check_project_ownership(
125-
project_id: int, user_id: UUID, db_session: Session
125+
project_id: int, user_id: UUID | None, db_session: Session
126126
) -> bool:
127127
return (
128128
db_session.query(UserProject)
@@ -133,7 +133,7 @@ def check_project_ownership(
133133

134134

135135
def get_user_files_from_project(
136-
project_id: int, user_id: UUID, db_session: Session
136+
project_id: int, user_id: UUID | None, db_session: Session
137137
) -> list[UserFile]:
138138
# First check if the user owns the project
139139
if not check_project_ownership(project_id, user_id, db_session):

0 commit comments

Comments
 (0)