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

fixed label filter (#2978)

Browse Source 
* added old error handling to comment fetching

* Not

* properly escaped cql labels

* reverted changes
This commit is contained in:
hagen-danswer 2024-10-29 09:05:01 -07:00 committed by GitHub
parent 75dd103238
commit cc40f0d27b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,12 +91,13 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
cql_page_query += f" and id='{page_id}'" cql_page_query += f" and id='{page_id}'"
self.cql_page_query = cql_page_query self.cql_page_query = cql_page_query
self.cql_label_filter = ""
self.cql_time_filter = "" self.cql_time_filter = ""
self.cql_label_filter = ""
if labels_to_skip: if labels_to_skip:
labels_to_skip = list(set(labels_to_skip)) labels_to_skip = list(set(labels_to_skip))
comma_separated_labels = ",".join(labels_to_skip) comma_separated_labels = ",".join(f"'{label}'" for label in labels_to_skip)
self.cql_label_filter = f"&label not in ({comma_separated_labels})" self.cql_label_filter = f" and label not in ({comma_separated_labels})"
def load_credentials(self, credentials: dict[str, Any]) -> dict[str, Any] | None: def load_credentials(self, credentials: dict[str, Any]) -> dict[str, Any] | None:
# see https://github.com/atlassian-api/atlassian-python-api/blob/master/atlassian/rest_client.py # see https://github.com/atlassian-api/atlassian-python-api/blob/master/atlassian/rest_client.py
@ -125,7 +126,8 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
for comment in comments: for comment in comments:
comment_string += "\nComment:\n" comment_string += "\nComment:\n"
comment_string += extract_text_from_confluence_html( comment_string += extract_text_from_confluence_html(
confluence_client=self.confluence_client, confluence_object=comment confluence_client=self.confluence_client,
confluence_object=comment,
) )
return comment_string return comment_string