Merge branch 'staging' into nate/dashboard-links

This commit is contained in:
Nate Kelley 2025-07-07 12:58:58 -06:00
commit ca0c434e76
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
4 changed files with 18 additions and 16 deletions

View File

@ -43,4 +43,4 @@ jobs:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
run: |
cd apps/trigger
pnpm dlx trigger.dev@v4-beta.22 deploy --env ${{ github.ref_name == 'main' && 'production' || 'staging' }}
pnpm dlx trigger.dev@v4-beta deploy --env ${{ github.ref_name == 'main' && 'production' || 'staging' }}

View File

@ -1,5 +1,5 @@
import { logger, schemaTask } from '@trigger.dev/sdk';
import { initLogger, wrapTraced, currentSpan } from 'braintrust';
import { logger, schemaTask, tasks } from '@trigger.dev/sdk';
import { currentSpan, initLogger, wrapTraced } from 'braintrust';
import { AnalystAgentTaskInputSchema, type AnalystAgentTaskOutput } from './types';
// Task 2 & 4: Database helpers (IMPLEMENTED)
@ -340,13 +340,14 @@ export const analystAgentTask: ReturnType<
const braintrustMetadataPromise = getBraintrustMetadata({ messageId: payload.message_id });
// Wait for all operations to complete
const [messageContext, conversationHistory, dataSource, dashboardFiles, braintrustMetadata] = await Promise.all([
messageContextPromise,
conversationHistoryPromise,
dataSourcePromise,
dashboardFilesPromise,
braintrustMetadataPromise,
]);
const [messageContext, conversationHistory, dataSource, dashboardFiles, braintrustMetadata] =
await Promise.all([
messageContextPromise,
conversationHistoryPromise,
dataSourcePromise,
dashboardFilesPromise,
braintrustMetadataPromise,
]);
const dataLoadEnd = Date.now();
const dataLoadTime = dataLoadEnd - dataLoadStart;
@ -444,7 +445,7 @@ export const analystAgentTask: ReturnType<
inputData: workflowInput,
runtimeContext,
});
// Log the metadata as part of the span
currentSpan().log({
metadata: {
@ -456,7 +457,7 @@ export const analystAgentTask: ReturnType<
chatId: braintrustMetadata.chatId,
},
});
return result;
},
{

View File

@ -8,6 +8,7 @@ import {
isNotNull,
isNull,
lt,
lte,
messages,
users,
} from '@buster/database';
@ -117,7 +118,7 @@ export async function fetchPreviousPostProcessingMessages(
eq(messages.chatId, chatId),
isNotNull(messages.postProcessingMessage),
isNull(messages.deletedAt),
lt(messages.createdAt, beforeTimestamp.toISOString())
lte(messages.createdAt, beforeTimestamp.toISOString())
)
)
.orderBy(messages.createdAt);

View File

@ -20,8 +20,8 @@ BEGIN
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;
-- Create trigger on public.users before insert
CREATE TRIGGER set_avatar_url_and_name_trigger
-- Create trigger on public.users before insert (if not exists)
CREATE OR REPLACE TRIGGER set_avatar_url_and_name_trigger
BEFORE INSERT ON public.users
FOR EACH ROW
EXECUTE FUNCTION set_avatar_url_and_name_from_auth();
@ -40,7 +40,7 @@ END;
$$ LANGUAGE plpgsql SECURITY DEFINER;
-- Create trigger on auth.users after insert
CREATE TRIGGER update_avatar_url_and_name_on_auth_insert
CREATE OR REPLACE TRIGGER update_avatar_url_and_name_on_auth_insert
AFTER INSERT ON auth.users
FOR EACH ROW
EXECUTE FUNCTION update_public_users_avatar_url_and_name();