Add cql support for confluence connector #2679
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This pull request adds CQL (Confluence Query Language) support to the Confluence connector in Danswer, enhancing its querying capabilities and flexibility.
- Introduced a new
DanswerConfluenceclass in the backend to handle CQL queries - Added advanced configuration options in the frontend, including a CQL query field
- Updated
ConfluenceConnectorclass to utilize CQL for fetching pages and time-based filtering - Simplified the
ListInputcomponent in the frontend by using a reusableTextArrayField - Implemented an 'Advanced Options' toggle in the
DynamicConnectorCreationFormfor better user experience
5 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings
| @@ -1,5 +1,6 @@ | |||
| "use client"; | |||
|
|
|||
| import React from "react"; | |||
There was a problem hiding this comment.
style: Unnecessary import of React in a file using 'use client' directive
hagen-danswer
commented
Oct 4, 2024
| @@ -56,8 +57,55 @@ | |||
| ) | |||
|
|
|||
|
|
|||
| class DanswerConfluence(Confluence): | |||
There was a problem hiding this comment.
this class is necessary to make cql quries work. read comment
| def _replace_cql_time_filter( | ||
| cql_query: str, start_time: datetime, end_time: datetime | ||
| ) -> str: | ||
| """ |
There was a problem hiding this comment.
this ensures that the cql properly contains no overlapping lastmodified query parameters
| For example, entering "https://your-company.atlassian.net/wiki" as the Wiki Base URL, "KB" as the Space, and "164331" as the Page ID will index the specific page at https:///your-company.atlassian.net/wiki/spaces/KB/pages/164331/Page. If you leave the Page ID empty, it will index the entire KB space. | ||
|
|
||
| Selecting the "Index Recursively" checkbox will index the specified page and all of its children.`, | ||
| subtext: `Specify the base URL of your Confluence instance, the space name, and optionally a specific page ID to index. If no page ID is provided, the entire space will be indexed. If no space is specified, all available Confluence spaces will be indexed.`, |
| @@ -23,6 +24,61 @@ const DynamicConnectionForm: FC<DynamicConnectionFormProps> = ({ | |||
| setSelectedFiles, | |||
| values, | |||
| }) => { | |||
There was a problem hiding this comment.
added an advanced_values section
8 tasks
Weves
approved these changes
Oct 10, 2024
This was referenced Nov 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.