replace deprecated confluence group api endpoint #3197
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 ↗︎
|
hagen-danswer
commented
Nov 22, 2024
| @@ -269,20 +269,3 @@ def datetime_from_string(datetime_string: str) -> datetime: | |||
| datetime_object = datetime_object.astimezone(timezone.utc) | |||
|
|
|||
| return datetime_object | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
moved this to the onyx_confluence.py file
| @@ -38,41 +62,21 @@ def confluence_group_sync( | |||
| is_cloud = cc_pair.connector.connector_specific_config.get("is_cloud", False) | |||
| wiki_base = cc_pair.connector.connector_specific_config["wiki_base"] | |||
|
|
|||
| # test connection with direct client, no retries | |||
There was a problem hiding this comment.
moved this to the onyx_confluence.py file
| @@ -118,21 +116,6 @@ def load_credentials(self, credentials: dict[str, Any]) -> dict[str, Any] | None | |||
| is_cloud=self.is_cloud, | |||
| wiki_base=self.wiki_base, | |||
| ) | |||
|
|
|||
There was a problem hiding this comment.
moved this to the onyx_confluence.py file
rkuo-danswer
approved these changes
Nov 22, 2024
hagen-danswer
commented
Nov 22, 2024
| @@ -29,7 +29,7 @@ | |||
| from ee.danswer.db.connector_credential_pair import get_all_auto_sync_cc_pairs | |||
| from ee.danswer.db.external_perm import ExternalUserGroup | |||
| from ee.danswer.db.external_perm import replace_user__ext_group_for_cc_pair | |||
| from ee.danswer.external_permissions.sync_params import EXTERNAL_GROUP_SYNC_PERIOD | |||
| from ee.danswer.external_permissions.sync_params import EXTERNAL_GROUP_SYNC_PERIODS | |||
There was a problem hiding this comment.
individually control group sync periods based on source
ahmadassaf
pushed a commit
to ahmadassaf/danswer
that referenced
this pull request
Nov 25, 2024
* replace deprecated confluence group api endpoint * reworked it * properly escaped the user query * less passing around is_cloud * done
8 tasks
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.
Description
^
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.