Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Confluence Fixes for Robustification #2349

Merged
merged 2 commits into from
Sep 8, 2024
Merged

Minor Confluence Fixes for Robustification #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c1ef78
add connector config
pablonyx Sep 6, 2024
bc6e1ab
update confluence connector
pablonyx Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/danswer/connectors/confluence/rate_limit_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ConfluenceRateLimitError(Exception):

def make_confluence_call_handle_rate_limit(confluence_call: F) -> F:
def wrapped_call(*args: list[Any], **kwargs: Any) -> Any:
max_retries = 10
max_retries = 5
starting_delay = 5
backoff = 2
max_delay = 600
Expand Down
1 change: 1 addition & 0 deletions web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ export default function AddConnector({
{isPaidEnterpriseFeaturesEnabled && (
<>
<IsPublicGroupSelector
removeIndent
formikProps={formikProps}
objectName="Connector"
/>
Expand Down
3 changes: 3 additions & 0 deletions web/src/components/IsPublicGroupSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
formikProps,
objectName,
publicToWhom = "Users",
removeIndent = false,
enforceGroupSelection = true,
}: {
formikProps: FormikProps<T>;
objectName: string;
publicToWhom?: string;
removeIndent?: boolean;
enforceGroupSelection?: boolean;
}) => {
const { data: userGroups, isLoading: userGroupsIsLoading } = useUserGroups();
Expand Down Expand Up @@ -74,6 +76,7 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
<>
<BooleanFormField
name="is_public"
removeIndent={removeIndent}
label={
publicToWhom === "Curators"
? `Make this ${objectName} Curator Accessible?`
Expand Down
5 changes: 3 additions & 2 deletions web/src/lib/connectors/connectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@ Selecting the "Index Recursively" checkbox will index the specified page and all
{
type: "checkbox",
query: "Should index pages recursively?",
label:
"Index Recursively (if this is set and the Wiki Page URL leads to a page, we will index the page and all of its children instead of just the page)",
label: "Index Recursively",
name: "index_recursively",
description:
"If this is set and the Wiki Page URL leads to a page, we will index the page and all of its children instead of just the page. This is set by default for Confluence connectors without a page ID specified.",
optional: false,
},
{
Expand Down
Loading