highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-07-12 22:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix service accounts + shared drives (#490)

Browse Source
This commit is contained in:
Chris Weaver
2023-09-29 17:26:42 -07:00
committed by GitHub
parent bfab9d1ee7
commit 0c6077ee7e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/danswer/connectors/google_drive/connector.py
View File

@ -75,6 +75,7 @@ def _run_drive_file_query(
results = ( results = (
service.files() service.files()
.list( .list(
corpora="allDrives", # needed to search through shared drives
pageSize=batch_size, pageSize=batch_size,
supportsAllDrives=include_shared, supportsAllDrives=include_shared,
includeItemsFromAllDrives=include_shared, includeItemsFromAllDrives=include_shared,
@ -124,6 +125,7 @@ def _get_folder_id(
else: else:
query += f"mimeType='{DRIVE_FOLDER_TYPE}'" query += f"mimeType='{DRIVE_FOLDER_TYPE}'"
# TODO: support specifying folder path in shared drive rather than just `My Drive`
results = ( results = (
service.files() service.files()
.list( .list(
@ -248,7 +250,7 @@ def get_all_files_batched(
), ),
) )
if traverse_subfolders: if traverse_subfolders and folder_id is not None:
folder_ids_traversed = folder_ids_traversed or [] folder_ids_traversed = folder_ids_traversed or []
subfolders = _get_folders( subfolders = _get_folders(
service=service, service=service,

4
web/src/app/admin/connectors/google-drive/page.tsx
View File

@ -203,9 +203,9 @@ const GoogleDriveConnectorManagement = ({
})(values)} })(values)}
<BooleanFormField <BooleanFormField
name="include_shared" name="include_shared"
label="Include Shared Files" label="Include Shared Files + Shared Drives"
subtext={ subtext={
"If checked, then we will also index all documents shared with you. " + "If checked, then we will also index all documents + drives shared with you. " +
"If this is combined with folder paths, then we will only index documents " + "If this is combined with folder paths, then we will only index documents " +
"that match both criteria." "that match both criteria."
} }