Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions assistant/src/memory/conversation-crud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
gte,
inArray,
isNull,
lt,
lte,
sql,
} from "drizzle-orm";
Expand Down Expand Up @@ -1112,6 +1113,77 @@ export function getMessages(conversationId: string): MessageRow[] {
.map(parseMessage);
}

export interface PaginatedMessagesResult {
messages: MessageRow[];
hasMore: boolean;
}

export function getMessagesPaginated(
conversationId: string,
limit: number | undefined,
beforeTimestamp?: number,
): PaginatedMessagesResult {
const db = getDb();

if (limit === undefined) {
const conditions = [eq(messages.conversationId, conversationId)];
if (beforeTimestamp !== undefined) {
conditions.push(lt(messages.createdAt, beforeTimestamp));
}
const rows = db
.select()
.from(messages)
.where(and(...conditions))
.orderBy(asc(messages.createdAt))
.all()
.map(parseMessage);
return { messages: rows, hasMore: false };
}

const conditions = [eq(messages.conversationId, conversationId)];
if (beforeTimestamp !== undefined) {
conditions.push(lt(messages.createdAt, beforeTimestamp));
Comment thread
Jasonnnz marked this conversation as resolved.
}

const rows = db
.select()
.from(messages)
.where(and(...conditions))
.orderBy(desc(messages.createdAt))
.limit(limit + 1)
.all()
.map(parseMessage);

const hasMore = rows.length > limit;
if (hasMore) {
rows.splice(limit);
}
rows.reverse();

return { messages: rows, hasMore };
}

export function getLastAssistantTimestampBefore(
conversationId: string,
beforeTimestamp: number,
): number {
const db = getDb();
const row = db
.select({ createdAt: messages.createdAt })
.from(messages)
.where(
and(
eq(messages.conversationId, conversationId),
eq(messages.role, "assistant"),
lt(messages.createdAt, beforeTimestamp),
),
)
.orderBy(desc(messages.createdAt))
.limit(1)
.get();
return row?.createdAt ?? 0;
}
Comment thread
Jasonnnz marked this conversation as resolved.

/** Fetch a single message by ID, optionally scoped to a specific conversation. */
export function getMessageById(
messageId: string,
Expand Down
4 changes: 4 additions & 0 deletions assistant/src/memory/db-init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ import {
migrateLlmRequestLogMessageId,
migrateLlmRequestLogProvider,
migrateMemoryItemSupersession,
migrateMessagesConversationCreatedAtIndex,
migrateMessagesFtsBackfill,
migrateNormalizePhoneIdentities,
migrateNotificationDeliveryThreadDecision,
Expand Down Expand Up @@ -520,6 +521,9 @@ export function initializeDb(): void {
// 93. Strip `integration:` prefix from provider_key across OAuth tables
migrateStripIntegrationPrefixFromProviderKeys(database);

// 94. Composite index on messages(conversation_id, created_at) for paginated history queries
migrateMessagesConversationCreatedAtIndex(database);

validateMigrationState(database);

if (process.env.BUN_TEST === "1") {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { DrizzleDb } from "../db-connection.js";

export function migrateMessagesConversationCreatedAtIndex(
database: DrizzleDb,
): void {
database.run(
/*sql*/ `CREATE INDEX IF NOT EXISTS idx_messages_conversation_created_at ON messages(conversation_id, created_at)`,
);
}
1 change: 1 addition & 0 deletions assistant/src/memory/migrations/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export { migrateContactsUserFileColumn } from "./192-contacts-user-file-column.j
export { migrateAddSourceTypeColumns } from "./193-add-source-type-columns.js";
export { migrateCreateMemoryRecallLogs } from "./194-memory-recall-logs.js";
export { migrateOAuthProvidersPingConfig } from "./195-oauth-providers-ping-config.js";
export { migrateMessagesConversationCreatedAtIndex } from "./196-messages-conversation-created-at-index.js";
export { migrateStripIntegrationPrefixFromProviderKeys } from "./196-strip-integration-prefix-from-provider-keys.js";
export {
MIGRATION_REGISTRY,
Expand Down
Loading