From cc40f0d27bdb6d75a05227a8360e9ac72c7e8f3d Mon Sep 17 00:00:00 2001 From: hagen-danswer Date: Tue, 29 Oct 2024 09:05:01 -0700 Subject: [PATCH] fixed label filter (#2978) * added old error handling to comment fetching * Not * properly escaped cql labels * reverted changes --- backend/danswer/connectors/confluence/connector.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/danswer/connectors/confluence/connector.py b/backend/danswer/connectors/confluence/connector.py index fe52862982d..f0945547e57 100644 --- a/backend/danswer/connectors/confluence/connector.py +++ b/backend/danswer/connectors/confluence/connector.py @@ -91,12 +91,13 @@ def __init__( cql_page_query += f" and id='{page_id}'" self.cql_page_query = cql_page_query - self.cql_label_filter = "" self.cql_time_filter = "" + + self.cql_label_filter = "" if labels_to_skip: labels_to_skip = list(set(labels_to_skip)) - comma_separated_labels = ",".join(labels_to_skip) - self.cql_label_filter = f"&label not in ({comma_separated_labels})" + comma_separated_labels = ",".join(f"'{label}'" for label in labels_to_skip) + self.cql_label_filter = f" and label not in ({comma_separated_labels})" 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 @@ -125,7 +126,8 @@ def _get_comment_string_for_page_id(self, page_id: str) -> str: for comment in comments: comment_string += "\nComment:\n" 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