From f23d933cc166a6a33251c84f2988182346d1cfd4 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Tue, 15 Jul 2025 15:44:26 -0600 Subject: [PATCH] initial commit to move files --- .../src/helpers/{ => assets}/assets.ts | 6 +- .../src/helpers/{ => assets}/dashboards.ts | 4 +- packages/database/src/helpers/assets/index.ts | 13 +++ .../database/src/helpers/{ => chats}/chats.ts | 19 +---- packages/database/src/helpers/chats/index.ts | 14 ++++ .../database/src/helpers/dataSources/index.ts | 1 + packages/database/src/helpers/index.ts | 81 ++----------------- .../database/src/helpers/messages/index.ts | 4 + .../src/helpers/{ => messages}/messages.ts | 4 +- .../{ => metadata}/braintrustMetadata.ts | 6 +- .../database/src/helpers/metadata/index.ts | 8 ++ .../src/helpers/organizations/index.ts | 7 ++ .../{ => organizations}/organizations.ts | 4 +- 13 files changed, 68 insertions(+), 103 deletions(-) rename packages/database/src/helpers/{ => assets}/assets.ts (97%) rename packages/database/src/helpers/{ => assets}/dashboards.ts (97%) create mode 100644 packages/database/src/helpers/assets/index.ts rename packages/database/src/helpers/{ => chats}/chats.ts (92%) create mode 100644 packages/database/src/helpers/chats/index.ts create mode 100644 packages/database/src/helpers/dataSources/index.ts create mode 100644 packages/database/src/helpers/messages/index.ts rename packages/database/src/helpers/{ => messages}/messages.ts (98%) rename packages/database/src/helpers/{ => metadata}/braintrustMetadata.ts (93%) create mode 100644 packages/database/src/helpers/metadata/index.ts create mode 100644 packages/database/src/helpers/organizations/index.ts rename packages/database/src/helpers/{ => organizations}/organizations.ts (94%) diff --git a/packages/database/src/helpers/assets.ts b/packages/database/src/helpers/assets/assets.ts similarity index 97% rename from packages/database/src/helpers/assets.ts rename to packages/database/src/helpers/assets/assets.ts index a00be7793..e62082c16 100644 --- a/packages/database/src/helpers/assets.ts +++ b/packages/database/src/helpers/assets/assets.ts @@ -1,11 +1,11 @@ import { and, eq, isNull } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm'; import { z } from 'zod'; -import { db } from '../connection'; -import { dashboardFiles, messages, messagesToFiles, metricFiles } from '../schema'; +import { db } from '../../connection'; +import { dashboardFiles, messages, messagesToFiles, metricFiles } from '../../schema'; // Type inference from schema -export type Message = InferSelectModel; +type Message = InferSelectModel; /** * Input schemas diff --git a/packages/database/src/helpers/dashboards.ts b/packages/database/src/helpers/assets/dashboards.ts similarity index 97% rename from packages/database/src/helpers/dashboards.ts rename to packages/database/src/helpers/assets/dashboards.ts index db7df6cbb..a5e060002 100644 --- a/packages/database/src/helpers/dashboards.ts +++ b/packages/database/src/helpers/assets/dashboards.ts @@ -1,8 +1,8 @@ import type { InferSelectModel } from 'drizzle-orm'; import { and, eq, isNull } from 'drizzle-orm'; import { z } from 'zod'; -import { db } from '../connection'; -import { dashboardFiles, messages, messagesToFiles } from '../schema'; +import { db } from '../../connection'; +import { dashboardFiles, messages, messagesToFiles } from '../../schema'; // Input schema for type safety const GetChatDashboardFilesInputSchema = z.object({ diff --git a/packages/database/src/helpers/assets/index.ts b/packages/database/src/helpers/assets/index.ts new file mode 100644 index 000000000..27d906d6a --- /dev/null +++ b/packages/database/src/helpers/assets/index.ts @@ -0,0 +1,13 @@ +// Export all asset-related functionality +export { + generateAssetMessages, + createMessageFileAssociation, + GenerateAssetMessagesInputSchema, + type GenerateAssetMessagesInput, +} from './assets'; + +export { + getChatDashboardFiles, + type DashboardFileContext, + type DashboardFile, +} from './dashboards'; diff --git a/packages/database/src/helpers/chats.ts b/packages/database/src/helpers/chats/chats.ts similarity index 92% rename from packages/database/src/helpers/chats.ts rename to packages/database/src/helpers/chats/chats.ts index a34f38df4..b5cab903c 100644 --- a/packages/database/src/helpers/chats.ts +++ b/packages/database/src/helpers/chats/chats.ts @@ -1,13 +1,13 @@ import { and, eq, isNull } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm'; import { z } from 'zod'; -import { db } from '../connection'; -import { chats, messages, userFavorites, users } from '../schema'; +import { db } from '../../connection'; +import { chats, messages, userFavorites, users } from '../../schema'; // Type inference from schema export type Chat = InferSelectModel; -export type Message = InferSelectModel; -export type User = InferSelectModel; +type Message = InferSelectModel; +type User = InferSelectModel; // Create a type for updateable chat fields by excluding auto-managed fields type UpdateableChatFields = Partial< @@ -164,17 +164,6 @@ export async function createMessage(input: CreateMessageInput): Promise } } -/** - * Get all messages for a chat - */ -export async function getMessagesForChat(chatId: string): Promise { - return db - .select() - .from(messages) - .where(and(eq(messages.chatId, chatId), isNull(messages.deletedAt))) - .orderBy(messages.createdAt); -} - /** * Flexibly update chat fields - only updates fields that are provided * Accepts a partial Chat object and updates only the provided fields diff --git a/packages/database/src/helpers/chats/index.ts b/packages/database/src/helpers/chats/index.ts new file mode 100644 index 000000000..7e6a38b66 --- /dev/null +++ b/packages/database/src/helpers/chats/index.ts @@ -0,0 +1,14 @@ +// Export all chat-related functionality +export { + createChat, + updateChat, + getChatWithDetails, + createMessage, + CreateChatInputSchema, + GetChatInputSchema, + CreateMessageInputSchema, + type CreateChatInput, + type GetChatInput, + type CreateMessageInput, + type Chat, +} from './chats'; diff --git a/packages/database/src/helpers/dataSources/index.ts b/packages/database/src/helpers/dataSources/index.ts new file mode 100644 index 000000000..bb5299ade --- /dev/null +++ b/packages/database/src/helpers/dataSources/index.ts @@ -0,0 +1 @@ +export * from './organizationDataSource'; diff --git a/packages/database/src/helpers/index.ts b/packages/database/src/helpers/index.ts index 6a61bbeac..278c06028 100644 --- a/packages/database/src/helpers/index.ts +++ b/packages/database/src/helpers/index.ts @@ -1,78 +1,7 @@ -// Export all database helpers export * from './messages'; export * from './users'; - -// Message helpers (domain-organized) -export { - getMessageContext, - MessageContextInputSchema, - MessageContextOutputSchema, - type MessageContextInput, - type MessageContextOutput, -} from './messages/messageContext'; - -export { - getChatConversationHistory, - ChatConversationHistoryInputSchema, - ChatConversationHistoryOutputSchema, - type ChatConversationHistoryInput, - type ChatConversationHistoryOutput, -} from './messages/chatConversationHistory'; - -// Data source helpers -export { - getOrganizationDataSource, - OrganizationDataSourceInputSchema, - OrganizationDataSourceOutputSchema, - type OrganizationDataSourceInput, - type OrganizationDataSourceOutput, -} from './dataSources/organizationDataSource'; - -// Chat helpers -export { - createChat, - updateChat, - getChatWithDetails, - createMessage, - getMessagesForChat, - CreateChatInputSchema, - GetChatInputSchema, - CreateMessageInputSchema, - type CreateChatInput, - type GetChatInput, - type CreateMessageInput, - type Chat, - type Message, -} from './chats'; - -// Asset helpers -export { - generateAssetMessages, - createMessageFileAssociation, - GenerateAssetMessagesInputSchema, - type GenerateAssetMessagesInput, -} from './assets'; - -// Dashboard helpers -export { - getChatDashboardFiles, - type DashboardFileContext, - type DashboardFile, -} from './dashboards'; - -// Organization helpers -export { - getUserOrganizationId, - GetUserOrganizationInputSchema, - type GetUserOrganizationInput, - type UserToOrganization, -} from './organizations'; - -// Braintrust metadata helper -export { - getBraintrustMetadata, - BraintrustMetadataInputSchema, - BraintrustMetadataOutputSchema, - type BraintrustMetadataInput, - type BraintrustMetadataOutput, -} from './braintrustMetadata'; +export * from './dataSources'; +export * from './assets'; +export * from './metadata'; +export * from './chats'; +export * from './organizations'; diff --git a/packages/database/src/helpers/messages/index.ts b/packages/database/src/helpers/messages/index.ts new file mode 100644 index 000000000..cff4e4cc5 --- /dev/null +++ b/packages/database/src/helpers/messages/index.ts @@ -0,0 +1,4 @@ +// Export all message-related functionality +export * from './messages'; +export * from './chatConversationHistory'; +export * from './messageContext'; diff --git a/packages/database/src/helpers/messages.ts b/packages/database/src/helpers/messages/messages.ts similarity index 98% rename from packages/database/src/helpers/messages.ts rename to packages/database/src/helpers/messages/messages.ts index 5cdc0e396..e7a01f7e4 100644 --- a/packages/database/src/helpers/messages.ts +++ b/packages/database/src/helpers/messages/messages.ts @@ -1,7 +1,7 @@ import type { InferSelectModel } from 'drizzle-orm'; import { and, desc, eq, isNull } from 'drizzle-orm'; -import { db } from '../connection'; -import { messages } from '../schema'; +import { db } from '../../connection'; +import { messages } from '../../schema'; export type Message = InferSelectModel; diff --git a/packages/database/src/helpers/braintrustMetadata.ts b/packages/database/src/helpers/metadata/braintrustMetadata.ts similarity index 93% rename from packages/database/src/helpers/braintrustMetadata.ts rename to packages/database/src/helpers/metadata/braintrustMetadata.ts index 8d70c6872..7ca07d9e4 100644 --- a/packages/database/src/helpers/braintrustMetadata.ts +++ b/packages/database/src/helpers/metadata/braintrustMetadata.ts @@ -1,8 +1,8 @@ import { eq } from 'drizzle-orm'; import { z } from 'zod'; -import { db } from '../connection'; -import { organizations, users } from '../schema'; -import { getMessageContext } from './messages/messageContext'; +import { db } from '../../connection'; +import { organizations, users } from '../../schema'; +import { getMessageContext } from '../messages/messageContext'; // Input schema export const BraintrustMetadataInputSchema = z.object({ diff --git a/packages/database/src/helpers/metadata/index.ts b/packages/database/src/helpers/metadata/index.ts new file mode 100644 index 000000000..48989ab99 --- /dev/null +++ b/packages/database/src/helpers/metadata/index.ts @@ -0,0 +1,8 @@ +// Export all metadata-related functionality +export { + getBraintrustMetadata, + BraintrustMetadataInputSchema, + BraintrustMetadataOutputSchema, + type BraintrustMetadataInput, + type BraintrustMetadataOutput, +} from './braintrustMetadata'; diff --git a/packages/database/src/helpers/organizations/index.ts b/packages/database/src/helpers/organizations/index.ts new file mode 100644 index 000000000..03289bc77 --- /dev/null +++ b/packages/database/src/helpers/organizations/index.ts @@ -0,0 +1,7 @@ +// Export all organization-related functionality +export { + getUserOrganizationId, + GetUserOrganizationInputSchema, + type GetUserOrganizationInput, + type UserToOrganization, +} from './organizations'; diff --git a/packages/database/src/helpers/organizations.ts b/packages/database/src/helpers/organizations/organizations.ts similarity index 94% rename from packages/database/src/helpers/organizations.ts rename to packages/database/src/helpers/organizations/organizations.ts index 725352497..511d2fa8b 100644 --- a/packages/database/src/helpers/organizations.ts +++ b/packages/database/src/helpers/organizations/organizations.ts @@ -1,8 +1,8 @@ import { and, eq, isNull } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm'; import { z } from 'zod'; -import { db } from '../connection'; -import { usersToOrganizations } from '../schema'; +import { db } from '../../connection'; +import { usersToOrganizations } from '../../schema'; // Type inference from schema export type UserToOrganization = InferSelectModel;