Fix Sharepoint Folder Parsing #3791
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
yuhongsun96
commented
Jan 27, 2025
| filtered_driveitems = [ | ||
| item | ||
| for item in driveitems | ||
| if element.folder in item.parent_reference.path |
There was a problem hiding this comment.
previously a bit unsafe, if the folder was "test" anything with "test" in any of the paths would be included
yuhongsun96
commented
Jan 27, 2025
| @@ -82,8 +83,13 @@ def _extract_site_and_folder(site_urls: list[str]) -> list[SiteData]: | |||
| sites_index = parts.index("sites") | |||
| site_url = "/".join(parts[: sites_index + 2]) | |||
| folder = ( | |||
| parts[sites_index + 2] if len(parts) > sites_index + 2 else None | |||
| "/".join(unquote(part) for part in parts[sites_index + 2 :]) | |||
There was a problem hiding this comment.
now allows for nested folders and folders with %20 (spaces)
yuhongsun96
commented
Jan 27, 2025
| @@ -77,7 +77,9 @@ export function LabelWithTooltip({ | |||
| } | |||
|
|
|||
| export function SubLabel({ children }: { children: string | JSX.Element }) { | |||
| return <div className="text-xs text-subtle">{children}</div>; | |||
| return ( | |||
| <div className="text-xs text-subtle whitespace-pre-line">{children}</div> | |||
There was a problem hiding this comment.
Frontend uses bullet points but all of them are on the same line, this fixes that. Hope no unwanted side effects.
yuhongsun96
commented
Jan 27, 2025
| all_paths = [ | ||
| item.parent_reference.path for item in driveitems | ||
| ] | ||
| logger.warning( |
There was a problem hiding this comment.
couldn't repro, add logging
Weves
approved these changes
Jan 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
https://linear.app/danswer/issue/DAN-1342/sharepoint-cant-index-folders
Sharepoint Folders aren't getting parsed correctly
How Has This Been Tested?
Verified against our own Sharepoint (with some hacks since data format has changed)
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.