Minor Confluence Fixes for Robustification (#2349)

* add connector config * update confluence connector
onyx-dot-app · Sep 8, 2024 · 7d4f8ef · 7d4f8ef
1 parent 7c03b6f
commit 7d4f8ef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/backend/danswer/connectors/confluence/rate_limit_handler.py b/backend/danswer/connectors/confluence/rate_limit_handler.py
@@ -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

diff --git a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
@@ -514,6 +514,7 @@ export default function AddConnector({
                     {isPaidEnterpriseFeaturesEnabled && (
                       <>
                         <IsPublicGroupSelector
+                          removeIndent
                           formikProps={formikProps}
                           objectName="Connector"
                         />

diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
@@ -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();
@@ -74,6 +76,7 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
         <>
           <BooleanFormField
             name="is_public"
+            removeIndent={removeIndent}
             label={
               publicToWhom === "Curators"
                 ? `Make this ${objectName} Curator Accessible?`

diff --git a/web/src/lib/connectors/connectors.ts b/web/src/lib/connectors/connectors.ts
@@ -255,9 +255,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,
       },
       {