mirror of https://github.com/buster-so/buster.git
analysis type router fix
This commit is contained in:
parent
0472a5bc46
commit
a821af220f
|
@ -4,8 +4,10 @@ import type { PermissionedDataset } from '@buster/access-controls';
|
||||||
import type { ModelMessage } from 'ai';
|
import type { ModelMessage } from 'ai';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
import {
|
import {
|
||||||
|
type AnalysisTypeRouterResult,
|
||||||
type CreateTodosResult,
|
type CreateTodosResult,
|
||||||
type ExtractValuesSearchResult,
|
type ExtractValuesSearchResult,
|
||||||
|
runAnalysisTypeRouterStep,
|
||||||
runAnalystAgentStep,
|
runAnalystAgentStep,
|
||||||
runCreateTodosStep,
|
runCreateTodosStep,
|
||||||
runExtractValuesAndSearchStep,
|
runExtractValuesAndSearchStep,
|
||||||
|
@ -31,7 +33,7 @@ export async function runAnalystWorkflow(input: AnalystWorkflowInput) {
|
||||||
|
|
||||||
const { messages } = input;
|
const { messages } = input;
|
||||||
|
|
||||||
const { todos, values } = await runAnalystPrepSteps(input);
|
const { todos, values, analysisType } = await runAnalystPrepSteps(input);
|
||||||
|
|
||||||
// Add all messages from extract-values step (tool call, result, and optional user message)
|
// Add all messages from extract-values step (tool call, result, and optional user message)
|
||||||
messages.push(...values.messages);
|
messages.push(...values.messages);
|
||||||
|
@ -50,6 +52,7 @@ export async function runAnalystWorkflow(input: AnalystWorkflowInput) {
|
||||||
sql_dialect_guidance: input.dataSourceSyntax,
|
sql_dialect_guidance: input.dataSourceSyntax,
|
||||||
datasets: input.datasets,
|
datasets: input.datasets,
|
||||||
workflowStartTime,
|
workflowStartTime,
|
||||||
|
analysisMode: analysisType,
|
||||||
},
|
},
|
||||||
streamOptions: {
|
streamOptions: {
|
||||||
messages,
|
messages,
|
||||||
|
@ -92,8 +95,9 @@ async function runAnalystPrepSteps({
|
||||||
}: AnalystPrepStepInput): Promise<{
|
}: AnalystPrepStepInput): Promise<{
|
||||||
todos: CreateTodosResult;
|
todos: CreateTodosResult;
|
||||||
values: ExtractValuesSearchResult;
|
values: ExtractValuesSearchResult;
|
||||||
|
analysisType: AnalysisTypeRouterResult['analysisType'];
|
||||||
}> {
|
}> {
|
||||||
const [todos, values] = await Promise.all([
|
const [todos, values, , analysisType] = await Promise.all([
|
||||||
runCreateTodosStep({
|
runCreateTodosStep({
|
||||||
messages,
|
messages,
|
||||||
messageId,
|
messageId,
|
||||||
|
@ -107,7 +111,10 @@ async function runAnalystPrepSteps({
|
||||||
chatId,
|
chatId,
|
||||||
messageId,
|
messageId,
|
||||||
}),
|
}),
|
||||||
|
runAnalysisTypeRouterStep({
|
||||||
|
messages,
|
||||||
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return { todos, values };
|
return { todos, values, analysisType: analysisType.analysisType };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue