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

Made sure confluence connector recursive by page includes top level page (#3532)

Browse Source 
* Made sure confluence connector by page includes top level page

* surface level change
This commit is contained in:
hagen-danswer
2024-12-20 13:53:59 -08:00
committed by GitHub
parent ce37688b5b
commit 457a4c73f0
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/onyx/connectors/confluence/connector.py
View File

@@ -99,20 +99,23 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
# Remove trailing slash from wiki_base if present # Remove trailing slash from wiki_base if present
self.wiki_base = wiki_base.rstrip("/") self.wiki_base = wiki_base.rstrip("/")
# if nothing is provided, we will fetch all pages """
If nothing is provided, we default to fetching all pages
Only one or none of the following options should be specified so
the order shouldn't matter
However, we use elif to ensure that only of the following is enforced
"""
base_cql_page_query = "type=page" base_cql_page_query = "type=page"
if cql_query: if cql_query:
# if a cql_query is provided, we will use it to fetch the pages
base_cql_page_query = cql_query base_cql_page_query = cql_query
elif page_id: elif page_id:
# if a cql_query is not provided, we will use the page_id to fetch the page
if index_recursively: if index_recursively:
base_cql_page_query += f" and ancestor='{page_id}'" base_cql_page_query += f" and (ancestor='{page_id}' or id='{page_id}')"
else: else:
base_cql_page_query += f" and id='{page_id}'" base_cql_page_query += f" and id='{page_id}'"
elif space: elif space:
# if no cql_query or page_id is provided, we will use the space to fetch the pages uri_safe_space = quote(space)
base_cql_page_query += f" and space='{quote(space)}'" base_cql_page_query += f" and space='{uri_safe_space}'"
self.base_cql_page_query = base_cql_page_query self.base_cql_page_query = base_cql_page_query