highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-05-31 18:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with Google Drive shortcut error case

Browse Source
This commit is contained in:
Weves 2023-11-20 16:26:42 -08:00 committed by Chris Weaver
parent d6a84ab413
commit eeb844e35e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,12 +101,18 @@ def _run_drive_file_query(
for file in files:
if follow_shortcuts and "shortcutDetails" in file:
try:
file = service.files().get(
fileId=file["shortcutDetails"]["targetId"],
supportsAllDrives=include_shared,
fields="mimeType, id, name, modifiedTime, webViewLink, shortcutDetails",
)
file = add_retries(lambda: file.execute())()
file_shortcut_points_to = add_retries(
lambda: (
service.files()
.get(
fileId=file["shortcutDetails"]["targetId"],
supportsAllDrives=include_shared,
fields="mimeType, id, name, modifiedTime, webViewLink, shortcutDetails",
)
.execute()
)
)()
yield file_shortcut_points_to
except HttpError:
logger.error(
f"Failed to follow shortcut with details: {file['shortcutDetails']}"
@ -114,7 +120,8 @@ def _run_drive_file_query(
if continue_on_failure:
continue
raise
yield file
else:
yield file
def _get_folder_id(