From 379e71160a1e09f78f1827485a597fe2b465e13f Mon Sep 17 00:00:00 2001 From: Yuhong Sun Date: Wed, 25 Oct 2023 21:52:07 -0700 Subject: [PATCH] Confluence Data Center Edge Cases (#631) --- backend/danswer/connectors/confluence/connector.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/danswer/connectors/confluence/connector.py b/backend/danswer/connectors/confluence/connector.py index d2ebda622..15576d919 100644 --- a/backend/danswer/connectors/confluence/connector.py +++ b/backend/danswer/connectors/confluence/connector.py @@ -131,7 +131,8 @@ class ConfluenceConnector(LoadConnector, PollConnector): url=self.wiki_base, # passing in username causes issues for Confluence data center 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, ) return None @@ -250,6 +251,13 @@ class ConfluenceConnector(LoadConnector, PollConnector): author = page["version"].get("by", {}).get("email") 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): page_id = page["id"]