@sqlrooms/ai 0.5.1 → 0.7.0

package/README.md

@@ -0,0 +1,114 @@
+An AI integration package for SQLRooms that provides components and utilities for adding AI-powered features to your data applications. This package enables natural language querying, data analysis, and AI-assisted insights.
+
+## Features
+
+- 🤖 **AI Query Interface**: Natural language to SQL conversion
+- 📊 **Automated Analysis**: AI-powered data analysis and insights
+- 🔄 **State Management**: Zustand-based state management for AI features
+- 🧩 **UI Components**: Ready-to-use components for AI interactions
+- 📝 **Query History**: Track and manage AI query history
+- 🎯 **Tool Integration**: Framework for AI tools and actions
+
+## Installation
+
+```bash
+npm install @sqlrooms/ai
+# or
+yarn add @sqlrooms/ai
+```
+
+## Basic Usage
+
+### Setting Up AI Integration
+
+```tsx
+import {createAiSlice, createDefaultAiConfig, useAiStore} from '@sqlrooms/ai';
+import {createProjectStore} from '@sqlrooms/project-builder';
+
+// Create a project store with AI capabilities
+const useStore = createProjectStore({
+  ai: createAiSlice(createDefaultAiConfig()),
+});
+
+function MyApp() {
+  return (
+    <ProjectStateProvider projectStore={useStore}>
+      <MyDataApp />
+    </ProjectStateProvider>
+  );
+}
+```
+
+### Using AI Query Controls
+
+```tsx
+import {QueryControls} from '@sqlrooms/ai';
+
+function AiQueryPanel() {
+  return (
+    <div className="p-4 border rounded-lg">
+      <h2 className="text-xl font-bold mb-4">Ask AI</h2>
+      <QueryControls
+        placeholder="Ask a question about your data..."
+        onSubmit={(query) => console.log('Processing query:', query)}
+      />
+    </div>
+  );
+}
+```
+
+### Displaying Analysis Results
+
+```tsx
+import {AnalysisResultsContainer, AnalysisResult} from '@sqlrooms/ai';
+import {useAiStore} from '@sqlrooms/ai';
+
+function AnalysisPanel() {
+  const {analysisResults} = useAiStore();
+
+  return (
+    <div className="p-4 border rounded-lg">
+      <h2 className="text-xl font-bold mb-4">AI Analysis</h2>
+      <AnalysisResultsContainer>
+        {analysisResults.map((result, index) => (
+          <AnalysisResult key={index} result={result} />
+        ))}
+      </AnalysisResultsContainer>
+    </div>
+  );
+}
+```
+
+### Working with AI State
+
+```tsx
+import {useAiStore} from '@sqlrooms/ai';
+
+function AiStatusIndicator() {
+  const {isProcessing, lastQuery, error} = useAiStore();
+
+  if (isProcessing) {
+    return <div>AI is thinking...</div>;
+  }
+
+  if (error) {
+    return <div>Error: {error.message}</div>;
+  }
+
+  if (lastQuery) {
+    return <div>Last query: "{lastQuery}"</div>;
+  }
+
+  return <div>Ask AI a question about your data</div>;
+}
+```
+
+## Advanced Features
+
+- **Custom AI Tools**: Define custom tools for AI to use
+- **Query Templates**: Create and manage reusable query templates
+- **Result Visualization**: Automatically visualize AI analysis results
+- **Conversation Context**: Maintain context across multiple queries
+- **Feedback Loop**: Collect user feedback to improve AI responses
+
+For more information, visit the SQLRooms documentation.

package/dist/AiSlice.d.ts

@@ -1,12 +1,13 @@
 import { ProjectState, type StateCreator } from '@sqlrooms/project-builder';
 import { BaseProjectConfig } from '@sqlrooms/project-config';
-import { CoreAssistantMessage, CoreToolMessage, CoreUserMessage, LanguageModelV1 } from 'ai';
+import { CoreAssistantMessage, CoreToolMessage, CoreUserMessage } from 'ai';
 import { z } from 'zod';
 type AiMessage = (CoreToolMessage | CoreAssistantMessage | CoreUserMessage) & {
     id: string;
 };
 export declare const AiSliceConfig: z.ZodObject<{
     ai: z.ZodObject<{
+        modelProvider: z.ZodString;
         model: z.ZodString;
         analysisResults: z.ZodArray<z.ZodObject<{
             id: z.ZodString;
@@ -73,32 +74,17 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 }>, z.ZodObject<{
-                    type: z.ZodLiteral<"answer">;
-                    answer: z.ZodString;
-                    chart: z.ZodUnion<[z.ZodObject<{
-                        sqlQuery: z.ZodString;
-                        vegaLiteSpec: z.ZodString;
-                    }, "strip", z.ZodTypeAny, {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    }, {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    }>, z.ZodNull]>;
+                    sqlQuery: z.ZodString;
+                    vegaLiteSpec: z.ZodString;
+                    reasoning: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 }, {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 }>]>;
             }, "strip", z.ZodTypeAny, {
                 toolName: string;
@@ -108,12 +94,9 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }, {
                 toolName: string;
@@ -123,14 +106,23 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }>, "many">;
+            toolCallMessages: z.ZodArray<z.ZodObject<{
+                toolCallId: z.ZodString;
+                element: z.ZodAny;
+            }, "strip", z.ZodTypeAny, {
+                toolCallId: string;
+                element?: any;
+            }, {
+                toolCallId: string;
+                element?: any;
+            }>, "many">;
+            analysis: z.ZodString;
+            isCompleted: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
             id: string;
             prompt: string;
@@ -154,14 +146,17 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }[];
+            toolCallMessages: {
+                toolCallId: string;
+                element?: any;
+            }[];
+            analysis: string;
+            isCompleted: boolean;
         }, {
             id: string;
             prompt: string;
@@ -185,16 +180,20 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }[];
+            toolCallMessages: {
+                toolCallId: string;
+                element?: any;
+            }[];
+            analysis: string;
+            isCompleted: boolean;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
+        modelProvider: string;
         model: string;
         analysisResults: {
             id: string;
@@ -219,16 +218,20 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }[];
+            toolCallMessages: {
+                toolCallId: string;
+                element?: any;
+            }[];
+            analysis: string;
+            isCompleted: boolean;
         }[];
     }, {
+        modelProvider: string;
         model: string;
         analysisResults: {
             id: string;
@@ -253,18 +256,22 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }[];
+            toolCallMessages: {
+                toolCallId: string;
+                element?: any;
+            }[];
+            analysis: string;
+            isCompleted: boolean;
         }[];
     }>;
 }, "strip", z.ZodTypeAny, {
     ai: {
+        modelProvider: string;
         model: string;
         analysisResults: {
             id: string;
@@ -289,18 +296,22 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }[];
+            toolCallMessages: {
+                toolCallId: string;
+                element?: any;
+            }[];
+            analysis: string;
+            isCompleted: boolean;
         }[];
     };
 }, {
     ai: {
+        modelProvider: string;
         model: string;
         analysisResults: {
             id: string;
@@ -325,14 +336,17 @@ export declare const AiSliceConfig: z.ZodObject<{
                     sqlQuery: string;
                     reasoning: string;
                 } | {
-                    type: "answer";
-                    answer: string;
-                    chart: {
-                        sqlQuery: string;
-                        vegaLiteSpec: string;
-                    } | null;
+                    sqlQuery: string;
+                    reasoning: string;
+                    vegaLiteSpec: string;
                 };
             }[];
+            toolCallMessages: {
+                toolCallId: string;
+                element?: any;
+            }[];
+            analysis: string;
+            isCompleted: boolean;
         }[];
     };
 }>;
@@ -349,10 +363,11 @@ export type AiSliceState = {
         messagesById: Map<string, AiMessage>;
         addMessages: (messages: AiMessage[]) => void;
         getMessages: () => AiMessage[];
+        setAiModel: (model: string) => void;
     };
 };
-export declare function createAiSlice<PC extends BaseProjectConfig & AiSliceConfig>({ createModel, initialAnalysisPrompt, }: {
-    createModel: (model: string) => LanguageModelV1;
+export declare function createAiSlice<PC extends BaseProjectConfig & AiSliceConfig>({ getApiKey, initialAnalysisPrompt, }: {
+    getApiKey: () => string;
     initialAnalysisPrompt?: string;
 }): StateCreator<AiSliceState>;
 type ProjectConfigWithAi = BaseProjectConfig & AiSliceConfig;

package/dist/AiSlice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AiSlice.d.ts","sourceRoot":"","sources":["../src/AiSlice.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAEZ,KAAK,YAAY,EAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,eAAe,EAChB,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAQtB,KAAK,SAAS,GAAG,CAAC,eAAe,GAAG,oBAAoB,GAAG,eAAe,CAAC,GAAG;IAC5E,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKxB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,wBAAgB,qBAAqB,IAAI,aAAa,CAOrD;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE;QACF,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,uBAAuB,CAAC,EAAE,eAAe,CAAC;QAC1C,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5C,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,cAAc,EAAE,MAAM,IAAI,CAAC;QAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACrC,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;QAC7C,WAAW,EAAE,MAAM,SAAS,EAAE,CAAC;KAChC,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,SAAS,iBAAiB,GAAG,aAAa,EAAE,EAC1E,WAAW,EACX,qBAAgI,GACjI,EAAE;IACD,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,eAAe,CAAC;IAChD,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GAAG,YAAY,CAAC,YAAY,CAAC,CAuJ7B;AAsCD,KAAK,mBAAmB,GAAG,iBAAiB,GAAG,aAAa,CAAC;AAC7D,KAAK,kBAAkB,GAAG,YAAY,CAAC,mBAAmB,CAAC,GAAG,YAAY,CAAC;AAE3E,wBAAgB,cAAc,CAAC,CAAC,EAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,CAAC,GACzC,CAAC,CAMH"}
+{"version":3,"file":"AiSlice.d.ts","sourceRoot":"","sources":["../src/AiSlice.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAEZ,KAAK,YAAY,EAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EAGhB,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAQtB,KAAK,SAAS,GAAG,CAAC,eAAe,GAAG,oBAAoB,GAAG,eAAe,CAAC,GAAG;IAC5E,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMxB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,wBAAgB,qBAAqB,IAAI,aAAa,CAQrD;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE;QACF,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,uBAAuB,CAAC,EAAE,eAAe,CAAC;QAC1C,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5C,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,cAAc,EAAE,MAAM,IAAI,CAAC;QAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACrC,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;QAC7C,WAAW,EAAE,MAAM,SAAS,EAAE,CAAC;QAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;KACrC,CAAC;CACH,CAAC;AAwFF,wBAAgB,aAAa,CAAC,EAAE,SAAS,iBAAiB,GAAG,aAAa,EAAE,EAC1E,SAAS,EACT,qBAAgI,GACjI,EAAE;IACD,SAAS,EAAE,MAAM,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GAAG,YAAY,CAAC,YAAY,CAAC,CAiH7B;AA+DD,KAAK,mBAAmB,GAAG,iBAAiB,GAAG,aAAa,CAAC;AAC7D,KAAK,kBAAkB,GAAG,YAAY,CAAC,mBAAmB,CAAC,GAAG,YAAY,CAAC;AAE3E,wBAAgB,cAAc,CAAC,CAAC,EAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,CAAC,GACzC,CAAC,CAMH"}

package/dist/AiSlice.js

@@ -6,6 +6,7 @@ import { runAnalysis } from './analysis';
 import { AnalysisResultSchema, } from './schemas';
 export const AiSliceConfig = z.object({
     ai: z.object({
+        modelProvider: z.string(),
         model: z.string(),
         analysisResults: z.array(AnalysisResultSchema),
     }),
@@ -13,23 +14,86 @@ export const AiSliceConfig = z.object({
 export function createDefaultAiConfig() {
     return {
         ai: {
+            modelProvider: 'openai',
             model: 'gpt-4o-mini',
             analysisResults: [],
         },
     };
 }
-export function createAiSlice({ createModel, initialAnalysisPrompt = 'Describe the data in the tables and make a chart providing an overview of the most important features.', }) {
+/**
+ * Execute the analysis. It will be used by the action `startAnalysis`.
+ *
+ * Each analysis contains an array of toolCalls and the results of the tool calls (toolResults).
+ * After all the tool calls have been executed, the LLM will stream the results as text stored in `analysis`.
+ *
+ * @param resultId - The result id
+ * @param prompt - The prompt
+ * @param model - The model
+ * @param apiKey - The api key
+ * @param abortController - The abort controller
+ * @param addMessages - The add messages function
+ * @param set - The set function
+ */
+async function executeAnalysis({ resultId, prompt, modelProvider, model, apiKey, abortController, addMessages, set, }) {
+    try {
+        await runAnalysis({
+            modelProvider,
+            model,
+            apiKey,
+            prompt,
+            abortController,
+            onStepFinish: (event, toolCallMessages) => {
+                addMessages(event.response.messages);
+                set(makeResultsAppender({
+                    resultId,
+                    toolResults: event.toolResults,
+                    toolCalls: event.toolCalls,
+                    toolCallMessages,
+                }));
+            },
+            onStreamResult: (message, isCompleted) => {
+                set(makeResultsAppender({
+                    resultId,
+                    analysis: message,
+                    isCompleted,
+                }));
+            },
+        });
+    }
+    catch (err) {
+        set(makeResultsAppender({
+            resultId,
+            isCompleted: true,
+            toolResults: [
+                {
+                    toolName: 'error',
+                    toolCallId: createId(),
+                    args: {},
+                    result: {
+                        success: false,
+                        error: err instanceof Error ? err.message : String(err),
+                    },
+                },
+            ],
+            toolCalls: [],
+        }));
+    }
+}
+export function createAiSlice({ getApiKey, initialAnalysisPrompt = 'Describe the data in the tables and make a chart providing an overview of the most important features.', }) {
     return createSlice((set, get) => ({
         ai: {
             analysisPrompt: initialAnalysisPrompt,
             isRunningAnalysis: false,
             messagesById: new Map(),
-            apiKey: null,
             setAnalysisPrompt: (prompt) => {
                 set((state) => produce(state, (draft) => {
                     draft.ai.analysisPrompt = prompt;
                 }));
             },
+            /**
+             * Set the AI model
+             * @param model - The model to set
+             */
             setAiModel: (model) => {
                 set((state) => produce(state, (draft) => {
                     draft.project.config.ai.model = model;
@@ -49,7 +113,6 @@ export function createAiSlice({ createModel, initialAnalysisPrompt = 'Describe t
                         }
                         newMessagesById.set(m.id, m);
                     }
-                    console.log('newMessagesById', Array.from(newMessagesById.values()));
                     return {
                         ai: {
                             ...state.ai,
@@ -72,6 +135,9 @@ export function createAiSlice({ createModel, initialAnalysisPrompt = 'Describe t
                         prompt: get().ai.analysisPrompt,
                         toolResults: [],
                         toolCalls: [],
+                        toolCallMessages: [],
+                        analysis: '',
+                        isCompleted: false,
                     });
                 }));
                 get().ai.addMessages([
@@ -81,63 +147,22 @@ export function createAiSlice({ createModel, initialAnalysisPrompt = 'Describe t
                         content: get().ai.analysisPrompt,
                     },
                 ]);
-                set((state) => produce(state, (draft) => {
-                    draft.ai.analysisPrompt = '';
-                }));
                 try {
-                    const { toolResults, toolCalls, ...rest } = await runAnalysis({
-                        model: createModel(get().project.config.ai.model),
-                        // prompt: get().analysisPrompt,
-                        messages: get().ai.getMessages(),
-                        onStepFinish: (event) => {
-                            console.log('onStepFinish', event);
-                            get().ai.addMessages(event.response.messages);
-                            set(makeResultsAppender({
-                                resultId,
-                                toolResults: event.toolResults,
-                                toolCalls: event.toolCalls,
-                            }));
-                        },
-                        abortSignal: abortController.signal,
-                    });
-                    console.log('final result', { toolResults, toolCalls, ...rest });
-                    // get().ai.addMessages([
-                    //   {
-                    //     id: createId(),
-                    //     role: 'tool',
-                    //     content: [],
-                    //     // @ts-ignore
-                    //     tool_call_id: toolCalls[toolCalls.length - 1].toolCallId,
-                    //   } satisfies AiMessage,
-                    // ]);
-                    // set(
-                    //   makeResultsAppender({
-                    //     resultId,
-                    //     toolResults,
-                    //     toolCalls: rest.toolCalls,
-                    //   }),
-                    // );
-                }
-                catch (err) {
-                    set(makeResultsAppender({
+                    await executeAnalysis({
                         resultId,
-                        toolResults: [
-                            {
-                                toolName: 'answer',
-                                toolCallId: createId(),
-                                args: {},
-                                result: {
-                                    success: false,
-                                    error: err instanceof Error ? err.message : String(err),
-                                },
-                            },
-                        ],
-                        toolCalls: [],
-                    }));
+                        prompt: get().ai.analysisPrompt,
+                        modelProvider: get().project.config.ai.modelProvider,
+                        model: get().project.config.ai.model,
+                        apiKey: getApiKey(),
+                        abortController,
+                        addMessages: get().ai.addMessages,
+                        set,
+                    });
                 }
                 finally {
                     set((state) => produce(state, (draft) => {
                         draft.ai.isRunningAnalysis = false;
+                        draft.ai.analysisPrompt = '';
                     }));
                 }
             },
@@ -154,19 +179,38 @@ function findResultById(analysisResults, id) {
     return analysisResults.find((r) => r.id === id);
 }
 /**
- * Returns a function that will update the state by appending new results
- * to the analysis results.
+ * Returns a function that will update the state by appending new results to the analysis results.
+ *
  * @param resultId - The result id
- * @param toolResults - The new tool results
- * @param toolCalls - The new tool calls
+ * @param toolCalls - The tool calls that were executed by the LLM, e.g. "query" or "chart" ("map" will be added soon). See {@link ToolCallSchema} for more details.
+ * @param toolResults - The results of the tool calls that were executed by the LLM. See {@link ToolResultSchema} for more details.
+ * @param toolCallMessages - The tool call messages that were created by some of our defined TOOLS, e.g. the table with query result. It's an array of React/JSX elements. It is linked to the tool call by the toolCallId.
+ * @param analysis - The analysis is the content generated after all the tool calls have been executed
+ * @param isCompleted - Whether the analysis is completed
  * @returns The new state
  */
-function makeResultsAppender({ resultId, toolResults, toolCalls, }) {
+function makeResultsAppender({ resultId, toolResults, toolCalls, analysis, isCompleted, toolCallMessages, }) {
     return (state) => produce(state, (draft) => {
         const result = findResultById(draft.project.config.ai.analysisResults, resultId);
         if (result) {
-            result.toolResults = [...result.toolResults, ...toolResults];
-            result.toolCalls = [...result.toolCalls, ...toolCalls];
+            if (toolResults) {
+                result.toolResults = [...result.toolResults, ...toolResults];
+            }
+            if (toolCalls) {
+                result.toolCalls = [...result.toolCalls, ...toolCalls];
+            }
+            if (toolCallMessages) {
+                result.toolCallMessages = [
+                    ...result.toolCallMessages,
+                    ...toolCallMessages,
+                ];
+            }
+            if (analysis) {
+                result.analysis = analysis;
+            }
+            if (isCompleted) {
+                result.isCompleted = isCompleted;
+            }
         }
         else {
             console.error('Result not found', resultId);