highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-13 09:30:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Confluence Data Center Edge Cases (#631)

Browse Source
This commit is contained in:
Yuhong Sun 2023-10-25 21:52:07 -07:00 committed by GitHub
parent a8b7155b5e
commit 379e71160a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/danswer/connectors/confluence/connector.py
View File

@ -131,7 +131,8 @@ class ConfluenceConnector(LoadConnector, PollConnector):
url=self.wiki_base, url=self.wiki_base,
# passing in username causes issues for Confluence data center # passing in username causes issues for Confluence data center
username=username if self.is_cloud else None, username=username if self.is_cloud else None,
password=access_token, password=access_token if self.is_cloud else None,
token=access_token if not self.is_cloud else None,
cloud=self.is_cloud, cloud=self.is_cloud,
) )
return None return None
@ -250,6 +251,13 @@ class ConfluenceConnector(LoadConnector, PollConnector):
author = page["version"].get("by", {}).get("email") author = page["version"].get("by", {}).get("email")
last_modified = datetime.fromisoformat(last_modified_str) last_modified = datetime.fromisoformat(last_modified_str)
if last_modified.tzinfo is None:
# If no timezone info, assume it is UTC
last_modified = last_modified.replace(tzinfo=timezone.utc)
else:
# If not in UTC, translate it
last_modified = last_modified.astimezone(timezone.utc)
if time_filter is None or time_filter(last_modified): if time_filter is None or time_filter(last_modified):
page_id = page["id"] page_id = page["id"]