update

Author: mattgotteiner

app/backend/approaches/chatreadretrieveread.py

@@ -234,7 +234,7 @@ async def run_agentic_retrieval_approach(
         minimum_reranker_score = overrides.get("minimum_reranker_score", 0)
         search_index_filter = self.build_filter(overrides, auth_claims)
         top = overrides.get("top", 3)
-        max_subqueries = overrides.get("max_subqueries", 3)
+        max_subqueries = overrides.get("max_subqueries", 10)
         # 50 is the amount of documents that the reranker can process per query
         max_docs_for_reranker = max_subqueries * 50
 

app/backend/approaches/retrievethenread.py

@@ -185,7 +185,7 @@ async def run_agentic_retrieval_approach(
         minimum_reranker_score = overrides.get("minimum_reranker_score", 0)
         search_index_filter = self.build_filter(overrides, auth_claims)
         top = overrides.get("top", 3)
-        max_subqueries = overrides.get("max_subqueries", 3)
+        max_subqueries = overrides.get("max_subqueries", 10)
         # 50 is the amount of documents that the reranker can process per query
         max_docs_for_reranker = max_subqueries * 50
 

app/frontend/src/api/models.ts

@@ -26,6 +26,7 @@ export type ChatAppRequestOverrides = {
     exclude_category?: string;
     seed?: number;
     top?: number;
+    max_subqueries?: number;
     temperature?: number;
     minimum_search_score?: number;
     minimum_reranker_score?: number;

app/frontend/src/components/Settings/Settings.tsx

@@ -14,6 +14,7 @@ export interface SettingsProps {
     promptTemplate: string;
     temperature: number;
     retrieveCount: number;
+    maxSubqueryCount: number;
     seed: number | null;
     minimumSearchScore: number;
     minimumRerankerScore: number;
@@ -53,6 +54,7 @@ export const Settings = ({
     promptTemplate,
     temperature,
     retrieveCount,
+    maxSubqueryCount,
     seed,
     minimumSearchScore,
     minimumRerankerScore,
@@ -104,6 +106,8 @@ export const Settings = ({
     const rerankerScoreFieldId = useId("rerankerScoreField");
     const retrieveCountId = useId("retrieveCount");
     const retrieveCountFieldId = useId("retrieveCountField");
+    const maxSubqueryCountId = useId("maxSubqueryCount");
+    const maxSubqueryCountFieldId = useId("maxSubqueryCountField");
     const includeCategoryId = useId("includeCategory");
     const includeCategoryFieldId = useId("includeCategoryField");
     const excludeCategoryId = useId("excludeCategory");
@@ -208,6 +212,21 @@ export const Settings = ({
                 />
             )}
 
+            {showAgenticRetrievalOption && useAgenticRetrieval && (
+                <TextField
+                    id={maxSubqueryCountFieldId}
+                    className={styles.settingsSeparator}
+                    label={t("labels.maxSubqueryCount")}
+                    type="number"
+                    min={1}
+                    max={20}
+                    defaultValue={maxSubqueryCount.toString()}
+                    onChange={(_ev, val) => onChange("maxSubqueryCount", parseInt(val || "10"))}
+                    aria-labelledby={maxSubqueryCountId}
+                    onRenderLabel={props => renderLabel(props, maxSubqueryCountId, maxSubqueryCountFieldId, t("helpTexts.maxSubqueryCount"))}
+                />
+            )}
+
             <TextField
                 id={retrieveCountFieldId}
                 className={styles.settingsSeparator}

app/frontend/src/locales/en/translation.json

@@ -83,6 +83,7 @@
         "minimumSearchScore": "Minimum search score",
         "minimumRerankerScore": "Minimum reranker score",
         "retrieveCount": "Retrieve this many search results:",
+        "maxSubqueryCount": "Max subqueries",
         "includeCategory": "Include category",
         "includeCategoryOptions": {
             "all": "All"
@@ -141,6 +142,8 @@
              "Sets a minimum score for search results coming back from the semantic reranker. The score always ranges between 0-4. The higher the score, the more semantically relevant the result is to the question.",
         "retrieveNumber":
              "Sets the number of search results to retrieve from Azure AI search. More results may increase the likelihood of finding the correct answer, but may lead to the model getting 'lost in the middle'.",
+        "maxSubqueryCount":
+            "Sets the maximum number of subqueries to use for the agentic retrieval query plan.",
         "includeCategory":
             "Specifies a category to include in the search results. There are no categories used in the default data set.",
          "excludeCategory":

app/frontend/src/pages/ask/Ask.tsx

@@ -30,6 +30,7 @@ export function Component(): JSX.Element {
     const [minimumSearchScore, setMinimumSearchScore] = useState<number>(0);
     const [retrievalMode, setRetrievalMode] = useState<RetrievalMode>(RetrievalMode.Hybrid);
     const [retrieveCount, setRetrieveCount] = useState<number>(3);
+    const [maxSubqueryCount, setMaxSubqueryCount] = useState<number>(10);
     const [useSemanticRanker, setUseSemanticRanker] = useState<boolean>(true);
     const [useSemanticCaptions, setUseSemanticCaptions] = useState<boolean>(false);
     const [useQueryRewriting, setUseQueryRewriting] = useState<boolean>(false);
@@ -101,6 +102,9 @@ export function Component(): JSX.Element {
             setShowSpeechOutputAzure(config.showSpeechOutputAzure);
             setShowAgenticRetrievalOption(config.showAgenticRetrievalOption);
             setUseAgenticRetrieval(config.showAgenticRetrievalOption);
+            if (config.showAgenticRetrievalOption) {
+                setRetrieveCount(25);
+            }
         });
     };
 
@@ -134,6 +138,7 @@ export function Component(): JSX.Element {
                         include_category: includeCategory.length === 0 ? undefined : includeCategory,
                         exclude_category: excludeCategory.length === 0 ? undefined : excludeCategory,
                         top: retrieveCount,
+                        max_subqueries: maxSubqueryCount,
                         temperature: temperature,
                         minimum_reranker_score: minimumRerankerScore,
                         minimum_search_score: minimumSearchScore,
@@ -191,6 +196,9 @@ export function Component(): JSX.Element {
             case "retrieveCount":
                 setRetrieveCount(value);
                 break;
+            case "maxSubqueryCount":
+                setMaxSubqueryCount(value);
+                break;
             case "useSemanticRanker":
                 setUseSemanticRanker(value);
                 break;
@@ -341,6 +349,7 @@ export function Component(): JSX.Element {
                     promptTemplateSuffix={promptTemplateSuffix}
                     temperature={temperature}
                     retrieveCount={retrieveCount}
+                    maxSubqueryCount={maxSubqueryCount}
                     seed={seed}
                     minimumSearchScore={minimumSearchScore}
                     minimumRerankerScore={minimumRerankerScore}

app/frontend/src/pages/chat/Chat.tsx

@@ -46,6 +46,7 @@ const Chat = () => {
     const [minimumRerankerScore, setMinimumRerankerScore] = useState<number>(0);
     const [minimumSearchScore, setMinimumSearchScore] = useState<number>(0);
     const [retrieveCount, setRetrieveCount] = useState<number>(3);
+    const [maxSubqueryCount, setMaxSubqueryCount] = useState<number>(10);
     const [retrievalMode, setRetrievalMode] = useState<RetrievalMode>(RetrievalMode.Hybrid);
     const [useSemanticRanker, setUseSemanticRanker] = useState<boolean>(true);
     const [useQueryRewriting, setUseQueryRewriting] = useState<boolean>(false);
@@ -134,6 +135,9 @@ const Chat = () => {
             setShowChatHistoryCosmos(config.showChatHistoryCosmos);
             setShowAgenticRetrievalOption(config.showAgenticRetrievalOption);
             setUseAgenticRetrieval(config.showAgenticRetrievalOption);
+            if (config.showAgenticRetrievalOption) {
+                setRetrieveCount(25);
+            }
         });
     };
 
@@ -308,6 +312,9 @@ const Chat = () => {
             case "retrieveCount":
                 setRetrieveCount(value);
                 break;
+            case "maxSubqueryCount":
+                setMaxSubqueryCount(value);
+                break;
             case "useSemanticRanker":
                 setUseSemanticRanker(value);
                 break;
@@ -529,6 +536,7 @@ const Chat = () => {
                         promptTemplate={promptTemplate}
                         temperature={temperature}
                         retrieveCount={retrieveCount}
+                        maxSubqueryCount={maxSubqueryCount}
                         seed={seed}
                         minimumSearchScore={minimumSearchScore}
                         minimumRerankerScore={minimumRerankerScore}