diff --git a/apps/web/src/api/buster_rest/healthcheck/queryRequests.ts b/apps/web/src/api/buster_rest/healthcheck/queryRequests.ts index 92d494f5e..0c368bb34 100644 --- a/apps/web/src/api/buster_rest/healthcheck/queryRequests.ts +++ b/apps/web/src/api/buster_rest/healthcheck/queryRequests.ts @@ -3,7 +3,7 @@ import { getHealthcheck } from './requests'; export const useHealthcheck = () => { return useQuery({ - queryKey: ['healthcheck'], + queryKey: ['healthcheck'] as const, queryFn: getHealthcheck, refetchInterval: 1000 * 30, // 30 seconds }); diff --git a/apps/web/src/api/createAxiosInstance.ts b/apps/web/src/api/createAxiosInstance.ts index e3d69827f..ffaec40b1 100644 --- a/apps/web/src/api/createAxiosInstance.ts +++ b/apps/web/src/api/createAxiosInstance.ts @@ -3,7 +3,6 @@ import type { AxiosRequestHeaders } from 'axios'; import axios, { type AxiosError, type InternalAxiosRequestConfig } from 'axios'; import qs from 'qs'; import { getSupabaseSession } from '@/integrations/supabase/getSupabaseUserClient'; -import { Route as AuthRoute } from '@/routes/auth.login'; import { BASE_URL_V2 } from './config'; import { rustErrorHandler } from './errors'; @@ -50,7 +49,7 @@ export const defaultAxiosRequestHandler = async (config: InternalAxiosRequestCon const { accessToken: token } = session; if (!token) { - console.warn('No token found', config); + console.warn('No token found', config.url, session); //embed route were having an issue with this... //window.location.href = AuthRoute.to; //return Promise.reject(new Error('No token found')); diff --git a/apps/web/src/components/features/ShareMenu/ShareMenuContentEmbed.tsx b/apps/web/src/components/features/ShareMenu/ShareMenuContentEmbed.tsx index 604d4de81..356c99924 100644 --- a/apps/web/src/components/features/ShareMenu/ShareMenuContentEmbed.tsx +++ b/apps/web/src/components/features/ShareMenu/ShareMenuContentEmbed.tsx @@ -59,6 +59,20 @@ export const ShareMenuContentEmbedFooter = ({ openSuccessMessage('Succuessfully published'); }; + const text = useMemo(() => { + if (assetType === 'metric_file') { + return 'Your metric currently isn’t published.'; + } else if (assetType === 'dashboard_file') { + return 'Your dashboard currently isn’t published.'; + } else if (assetType === 'chat') { + return 'Your chat currently isn’t published.'; + } else if (assetType === 'report_file') { + return 'Your report currently isn’t published.'; + } else { + return 'Your item currently isn’t published.'; + } + }, [assetType]); + return (
diff --git a/apps/web/src/components/ui/inputs/InputTextArea.tsx b/apps/web/src/components/ui/inputs/InputTextArea.tsx index 4e8831c98..47ff0e5b2 100644 --- a/apps/web/src/components/ui/inputs/InputTextArea.tsx +++ b/apps/web/src/components/ui/inputs/InputTextArea.tsx @@ -29,7 +29,7 @@ export interface InputTextAreaProps } export interface InputTextAreaRef extends HTMLTextAreaElement { - forceRecalculateHeight: () => void; + forceRecalculateHeight?: () => void; } export const InputTextArea = React.forwardRef( @@ -48,24 +48,45 @@ export const InputTextArea = React.forwardRef { const textareaRef = useRef(null); + <<<<<<< HEAD useImperativeHandle( ref, - () => { - if (!textareaRef.current) { - return null as unknown as InputTextAreaRef; - } - return Object.assign(textareaRef.current, { - forceRecalculateHeight: () => { - if (textareaRef.current) { - // Force a recalculation by triggering an input event - const event = new Event('input', { bubbles: true }); - textareaRef.current.dispatchEvent(event); - } - }, - }); - }, + () => + { + if (!textareaRef.current) { + return null as unknown as InputTextAreaRef; + } + return Object.assign(textareaRef.current, { + forceRecalculateHeight: () => { + if (textareaRef.current) { + // Force a recalculation by triggering an input event + const event = new Event('input', { bubbles: true }); + textareaRef.current.dispatchEvent(event); + } + }, + }); + } + , [] - ); + ) + ======= + useImperativeHandle(ref, () => + { + if (!textareaRef.current) { + return null as unknown as InputTextAreaRef; + } + return Object.assign(textareaRef.current, { + forceRecalculateHeight: () => { + if (textareaRef.current) { + // Force a recalculation by triggering an input event + const event = new Event('input', { bubbles: true }); + textareaRef.current.dispatchEvent(event); + } + }, + }); + } + , []) + >>>>>>> staging const handleKeyDown = (e: React.KeyboardEvent) => { if (e.key === 'Enter') { diff --git a/apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx b/apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx index b214f6d28..ee2554ca6 100644 --- a/apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx +++ b/apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx @@ -44,7 +44,7 @@ export const DashboardEditTitles: React.FC<{ useEffect(() => { if (debouncedWidth) { - inputTextAreaRef.current?.forceRecalculateHeight(); + inputTextAreaRef.current?.forceRecalculateHeight?.(); } }, [debouncedWidth]); diff --git a/apps/web/src/routes/healthcheck.tsx b/apps/web/src/routes/healthcheck.tsx index 5816b9a3a..761e94609 100644 --- a/apps/web/src/routes/healthcheck.tsx +++ b/apps/web/src/routes/healthcheck.tsx @@ -9,7 +9,6 @@ import { Card, CardContent, CardDescription, - CardFooter, CardHeader, CardTitle, } from '@/components/ui/card/CardBase'; @@ -61,7 +60,7 @@ function RouteComponent() { function LoadingState() { return ( -
+
@@ -76,7 +75,7 @@ function LoadingState() { function ErrorState({ error }: { error: Error | RustApiError }) { return ( -
+
@@ -206,8 +205,8 @@ function HealthcheckDashboard({ }; return ( -
-
+
+
{/* Header */}
@@ -274,10 +273,16 @@ function HealthcheckDashboard({ -
- 
-                  {JSON.stringify(user, null, 2)}
-
+
+ {user ? ( + 
+                    {JSON.stringify(user, null, 2)}
+
+ ) : ( + + No user data available + + )}
@@ -473,6 +478,11 @@ function HealthcheckDashboard({
+ {check.responseTime && ( + + {check.responseTime}ms + + )} {check.status} - {check.responseTime && ( - - {check.responseTime}ms - - )}
@@ -494,9 +499,9 @@ function HealthcheckDashboard({ {/* Footer */} -
+
- System health is monitored continuously. Data refreshes automatically. + System health is monitored continuously. Data refreshes about every 30 seconds.
diff --git a/packages/ai/src/agents/analyst-agent/analyst-agent.ts b/packages/ai/src/agents/analyst-agent/analyst-agent.ts index 23ab7f86a..b79c110cc 100644 --- a/packages/ai/src/agents/analyst-agent/analyst-agent.ts +++ b/packages/ai/src/agents/analyst-agent/analyst-agent.ts @@ -1,4 +1,5 @@ import type { PermissionedDataset } from '@buster/access-controls'; +import { waitForPendingUpdates } from '@buster/database/queries'; import { type ModelMessage, hasToolCall, stepCountIs, streamText } from 'ai'; import { wrapTraced } from 'braintrust'; import z from 'zod'; @@ -199,8 +200,10 @@ export function createAnalystAgent(analystAgentOptions: AnalystAgentOptions) { hasToolResults: !!event.toolResults, }); }, - onFinish: () => { + onFinish: async () => { console.info('Analyst Agent finished'); + // Ensure all pending database updates complete before stream terminates + await waitForPendingUpdates(analystAgentOptions.messageId); }, }), { diff --git a/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts b/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts index cdf89bda9..feac20378 100644 --- a/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts +++ b/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts @@ -1,4 +1,5 @@ import type { PermissionedDataset } from '@buster/access-controls'; +import { waitForPendingUpdates } from '@buster/database/queries'; import { type ModelMessage, hasToolCall, stepCountIs, streamText } from 'ai'; import { wrapTraced } from 'braintrust'; import z from 'zod'; @@ -230,6 +231,11 @@ export function createThinkAndPrepAgent(thinkAndPrepAgentSchema: ThinkAndPrepAge hasToolResults: !!event.toolResults, }); }, + onFinish: async () => { + console.info('Think and Prep Agent finished'); + // Ensure all pending database updates complete before stream terminates + await waitForPendingUpdates(messageId); + }, }), { name: 'Think and Prep Agent', diff --git a/packages/ai/src/tools/communication-tools/done-tool/done-tool-execute.ts b/packages/ai/src/tools/communication-tools/done-tool/done-tool-execute.ts index 40b2a22b3..fbd7062b7 100644 --- a/packages/ai/src/tools/communication-tools/done-tool/done-tool-execute.ts +++ b/packages/ai/src/tools/communication-tools/done-tool/done-tool-execute.ts @@ -1,4 +1,8 @@ -import { updateMessage, updateMessageEntries } from '@buster/database/queries'; +import { + updateMessage, + updateMessageEntries, + waitForPendingUpdates, +} from '@buster/database/queries'; import { wrapTraced } from 'braintrust'; import { cleanupState } from '../../shared/cleanup-state'; import { createRawToolResultEntry } from '../../shared/create-raw-llm-tool-result-entry'; @@ -57,6 +61,10 @@ export function createDoneToolExecute(context: DoneToolContext, state: DoneToolS } const result = await processDone(state, state.toolCallId, context.messageId, context); + + // Wait for all pending updates from delta/finish to complete before returning + await waitForPendingUpdates(context.messageId); + cleanupState(state); return result; }, diff --git a/packages/database/src/queries/messages/update-message-entries.ts b/packages/database/src/queries/messages/update-message-entries.ts index 3b56d6d3c..b7f705360 100644 --- a/packages/database/src/queries/messages/update-message-entries.ts +++ b/packages/database/src/queries/messages/update-message-entries.ts @@ -24,6 +24,17 @@ export type UpdateMessageEntriesParams = z.infer>(); +/** + * Wait for all pending updates for a given messageId to complete. + * This ensures all queued updates are flushed to the database before proceeding. + */ +export async function waitForPendingUpdates(messageId: string): Promise { + const pendingQueue = updateQueues.get(messageId); + if (pendingQueue) { + await pendingQueue; + } +} + /** * Internal function that performs the actual update logic. * This is separated so it can be queued.