fix(wren-ui): adjust recommend question to reduce cost (#962)

Co-authored-by: Freda Lai <[email protected]>
Canner · Nov 28, 2024 · 80a2cc8 · 80a2cc8
1 parent 97fd0cc
commit 80a2cc8
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 15 deletions.
diff --git a/wren-ui/src/apollo/server/config.ts b/wren-ui/src/apollo/server/config.ts
@@ -40,6 +40,12 @@ export interface IConfig {
   wrenEngineVersion?: string;
   wrenAIVersion?: string;
   wrenProductVersion?: string;
+
+  // generate recommendation questions max categories
+  projectRecommendationQuestionMaxCategories?: number;
+  projectRecommendationQuestionsMaxQuestions?: number;
+  threadRecommendationQuestionMaxCategories?: number;
+  threadRecommendationQuestionsMaxQuestions?: number;
 }
 
 const defaultConfig = {
@@ -124,6 +130,24 @@ const config = {
   wrenEngineVersion: process.env.WREN_ENGINE_VERSION,
   wrenAIVersion: process.env.WREN_AI_SERVICE_VERSION,
   wrenProductVersion: process.env.WREN_PRODUCT_VERSION,
+
+  // generate recommendation questions max questions
+  projectRecommendationQuestionMaxCategories: process.env
+    .PROJECT_RECOMMENDATION_QUESTION_MAX_CATEGORIES
+    ? parseInt(process.env.PROJECT_RECOMMENDATION_QUESTION_MAX_CATEGORIES)
+    : 3,
+  projectRecommendationQuestionsMaxQuestions: process.env
+    .PROJECT_RECOMMENDATION_QUESTIONS_MAX_QUESTIONS
+    ? parseInt(process.env.PROJECT_RECOMMENDATION_QUESTIONS_MAX_QUESTIONS)
+    : 3,
+  threadRecommendationQuestionMaxCategories: process.env
+    .THREAD_RECOMMENDATION_QUESTION_MAX_CATEGORIES
+    ? parseInt(process.env.THREAD_RECOMMENDATION_QUESTION_MAX_CATEGORIES)
+    : 3,
+  threadRecommendationQuestionsMaxQuestions: process.env
+    .THREAD_RECOMMENDATION_QUESTIONS_MAX_QUESTIONS
+    ? parseInt(process.env.THREAD_RECOMMENDATION_QUESTIONS_MAX_QUESTIONS)
+    : 1,
 };
 
 export function getConfig(): IConfig {

diff --git a/wren-ui/src/apollo/server/services/askingService.ts b/wren-ui/src/apollo/server/services/askingService.ts
@@ -25,10 +25,13 @@ import {
   TelemetryEvent,
   WrenService,
 } from '../telemetry/telemetry';
-import { IViewRepository, View } from '../repositories';
+import { IViewRepository, Project, View } from '../repositories';
 import { IQueryService, PreviewDataResponse } from './queryService';
 import { IMDLService } from './mdlService';
 import { ThreadRecommendQuestionBackgroundTracker } from '../backgrounds';
+import { getConfig } from '@server/config';
+
+const config = getConfig();
 
 const logger = getLogger('AskingService');
 logger.level = 'debug';
@@ -411,11 +414,7 @@ export class AskingService implements IAskingService {
     const recommendQuestionData: RecommendationQuestionsInput = {
       manifest,
       previousQuestions: questions,
-      maxCategories: 3,
-      maxQuestions: 9,
-      configuration: {
-        language: project.language,
-      },
+      ...this.getThreadRecommendationQuestionsConfig(project),
     };
 
     const result = await this.wrenAIAdaptor.generateRecommendationQuestions(
@@ -668,9 +667,7 @@ export class AskingService implements IAskingService {
     const response = await this.wrenAIAdaptor.generateRecommendationQuestions({
       manifest,
       previousQuestions: input.previousQuestions,
-      maxCategories: 3,
-      maxQuestions: 3,
-      configuration: { language: project.language },
+      ...this.getThreadRecommendationQuestionsConfig(project),
     });
     return { id: response.queryId };
   }
@@ -748,4 +745,13 @@ export class AskingService implements IAskingService {
       },
     });
   }
+  private getThreadRecommendationQuestionsConfig(project: Project) {
+    return {
+      maxCategories: config.threadRecommendationQuestionMaxCategories,
+      maxQuestions: config.threadRecommendationQuestionsMaxQuestions,
+      configuration: {
+        language: project.language,
+      },
+    };
+  }
 }
diff --git a/wren-ui/src/apollo/server/services/projectService.ts b/wren-ui/src/apollo/server/services/projectService.ts
@@ -21,6 +21,9 @@ import { RecommendQuestionResultStatus } from './askingService';
 import { IMDLService } from './mdlService';
 import { ProjectRecommendQuestionBackgroundTracker } from '../backgrounds';
 import { ITelemetry } from '../telemetry/telemetry';
+import { getConfig } from '../config';
+
+const config = getConfig();
 
 const logger = getLogger('ProjectService');
 logger.level = 'debug';
@@ -233,8 +236,8 @@ export class ProjectService implements IProjectService {
 
   private getProjectRecommendationQuestionsConfig(project: Project) {
     return {
-      maxCategories: 3,
-      maxQuestions: 9,
+      maxCategories: config.projectRecommendationQuestionMaxCategories,
+      maxQuestions: config.projectRecommendationQuestionsMaxQuestions,
       regenerate: true,
       configuration: {
         language: project.language,

diff --git a/wren-ui/src/components/pages/home/prompt/RecommendedQuestionsPrompt.tsx b/wren-ui/src/components/pages/home/prompt/RecommendedQuestionsPrompt.tsx
@@ -48,7 +48,7 @@ const QuestionTemplate = ({ category, sql, question, onSelect }) => {
 const QuestionColumnIterator = makeIterable(QuestionTemplate);
 
 export default function RecommendedQuestionsPrompt(props) {
-  const { onSelect, recommendedQuestions, buttonProps } = props;
+  const { onSelect, recommendedQuestions } = props;
 
   const [isExpanded, setIsExpanded] = useState<boolean>(false);
 
@@ -65,15 +65,14 @@ export default function RecommendedQuestionsPrompt(props) {
 
   return (
     <div className="bg-gray-2 px-10 py-6">
-      <div className="d-flex align-center mb-3 justify-space-between">
+      <div className="d-flex align-center mb-3">
         <Logo size={24} color="var(--gray-8)" />
         <div className="text-md text-medium gray-8 mx-3">
           Know more about your data.
         </div>
         <div className="text-medium gray-7">
           Try asking some of the following questions
         </div>
-        <Button className="ml-3" {...buttonProps} />
       </div>
       <Space
         style={{ width: 680 }}

diff --git a/wren-ui/src/hooks/useRecommendedQuestionsInstruction.tsx b/wren-ui/src/hooks/useRecommendedQuestionsInstruction.tsx
@@ -125,6 +125,7 @@ export default function useRecommendedQuestionsInstruction() {
     };
 
     if (showRecommendedQuestionsPromptMode && isRegenerate) {
+      // The cost of generating recommend questions is too high, so we still return button pops, but the button will not show on the UI now.
       return {
         ...baseProps,
         icon: <ReloadOutlined />,

diff --git a/wren-ui/src/pages/home/index.tsx b/wren-ui/src/pages/home/index.tsx
@@ -64,7 +64,6 @@ function RecommendedQuestionsInstruction(props) {
       <RecommendedQuestionsPrompt
         recommendedQuestions={recommendedQuestions}
         onSelect={onSelect}
-        buttonProps={buttonProps}
       />
       <div className="py-12" />
     </div>