Fix bug with Google Drive shortcut error case

onyx-dot-app · Nov 21, 2023 · eeb844e · eeb844e · vercel · Nov 21, 2023
1 parent d6a84ab
commit eeb844e
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/backend/danswer/connectors/google_drive/connector.py b/backend/danswer/connectors/google_drive/connector.py
@@ -101,20 +101,27 @@ 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']}"
                     )
                     if continue_on_failure:
                         continue
                     raise
-            yield file
+            else:
+                yield file
 
 
 def _get_folder_id(