[create-pull-request] automated change

Author: jonasfroeller

database/migrations/relations.ts

@@ -1,9 +1,9 @@
 import { relations } from "drizzle-orm/relations";
 import {
 	neptunUser,
-	chatConversation,
 	neptunUserOauthAccount,
 	chatConversationMessage,
+	chatConversation,
 	chatConversationFile,
 	neptunUserFile,
 	githubAppInstallation,
@@ -21,25 +21,21 @@ import {
 	chatConversationShareWhitelistEntry,
 } from "./schema.js";
 
-export const chatConversationRelations = relations(
-	chatConversation,
-	({ one, many }) => ({
+export const neptunUserOauthAccountRelations = relations(
+	neptunUserOauthAccount,
+	({ one }) => ({
 		neptunUser: one(neptunUser, {
-			fields: [chatConversation.neptunUserId],
+			fields: [neptunUserOauthAccount.neptunUserId],
 			references: [neptunUser.id],
 		}),
-		chatConversationMessages: many(chatConversationMessage),
-		chatConversationFiles: many(chatConversationFile),
-		projectChatConversations: many(projectChatConversation),
-		chatConversationShares: many(chatConversationShare),
 	}),
 );
 
 export const neptunUserRelations = relations(neptunUser, ({ many }) => ({
-	chatConversations: many(chatConversation),
 	neptunUserOauthAccounts: many(neptunUserOauthAccount),
 	chatConversationMessages: many(chatConversationMessage),
 	chatConversationFiles: many(chatConversationFile),
+	chatConversations: many(chatConversation),
 	githubAppInstallations: many(githubAppInstallation),
 	neptunContextFiles: many(neptunContextFile),
 	neptunContextImports: many(neptunContextImport),
@@ -52,16 +48,6 @@ export const neptunUserRelations = relations(neptunUser, ({ many }) => ({
 	),
 }));
 
-export const neptunUserOauthAccountRelations = relations(
-	neptunUserOauthAccount,
-	({ one }) => ({
-		neptunUser: one(neptunUser, {
-			fields: [neptunUserOauthAccount.neptunUserId],
-			references: [neptunUser.id],
-		}),
-	}),
-);
-
 export const chatConversationMessageRelations = relations(
 	chatConversationMessage,
 	({ one, many }) => ({
@@ -77,6 +63,20 @@ export const chatConversationMessageRelations = relations(
 	}),
 );
 
+export const chatConversationRelations = relations(
+	chatConversation,
+	({ one, many }) => ({
+		chatConversationMessages: many(chatConversationMessage),
+		chatConversationFiles: many(chatConversationFile),
+		neptunUser: one(neptunUser, {
+			fields: [chatConversation.neptunUserId],
+			references: [neptunUser.id],
+		}),
+		projectChatConversations: many(projectChatConversation),
+		chatConversationShares: many(chatConversationShare),
+	}),
+);
+
 export const chatConversationFileRelations = relations(
 	chatConversationFile,
 	({ one }) => ({
@@ -258,14 +258,14 @@ export const neptunUserTemplateRelations = relations(
 			fields: [neptunUserTemplate.neptunUserId],
 			references: [neptunUser.id],
 		}),
-		neptunUserTemplateCollection: one(neptunUserTemplateCollection, {
-			fields: [neptunUserTemplate.templateCollectionId],
-			references: [neptunUserTemplateCollection.id],
-		}),
 		neptunUserFile: one(neptunUserFile, {
 			fields: [neptunUserTemplate.userFileId],
 			references: [neptunUserFile.id],
 		}),
+		neptunUserTemplateCollection: one(neptunUserTemplateCollection, {
+			fields: [neptunUserTemplate.templateCollectionId],
+			references: [neptunUserTemplateCollection.id],
+		}),
 	}),
 );
 

database/migrations/schema.ts

@@ -1,28 +1,25 @@
 import {
 	pgTable,
+	unique,
 	pgEnum,
 	serial,
 	text,
 	timestamp,
 	integer,
-	unique,
 	boolean,
 	jsonb,
 	uuid,
 } from "drizzle-orm/pg-core";
 
 export const aiModelEnum = pgEnum("ai_model_enum", [
-	"OpenAssistant/oasst-sft-4-pythia-12b-epoch-3.5",
-	"meta-llama/Meta-Llama-3-8B-Instruct",
-	"mistralai/Mistral-7B-Instruct-v0.1",
 	"qwen/Qwen2.5-72B-Instruct",
 	"qwen/Qwen2.5-Coder-32B-Instruct",
 	"deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
 	"meta-llama/Llama-3.3-70B-Instruct",
 	"mistralai/Mistral-Nemo-Instruct-2407",
 	"mistralai/Mistral-7B-Instruct-v0.3",
-	"google/gemma-2-27b-it",
 	"microsoft/Phi-3-mini-4k-instruct",
+	"google/gemma-2-27b-it",
 ]);
 export const chatConversationMessageActorEnum = pgEnum(
 	"chat_conversation_message_actor_enum",
@@ -69,17 +66,6 @@ export const projectType = pgEnum("project_type", [
 	"web-app",
 ]);
 
-export const chatConversation = pgTable("chat_conversation", {
-	id: serial("id").primaryKey().notNull(),
-	name: text("name").notNull(),
-	model: aiModelEnum("model").notNull(),
-	createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
-	updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow(),
-	neptunUserId: integer("neptun_user_id")
-		.notNull()
-		.references(() => neptunUser.id, { onDelete: "cascade" }),
-});
-
 export const neptunUser = pgTable(
 	"neptun_user",
 	{
@@ -142,6 +128,17 @@ export const chatConversationFile = pgTable("chat_conversation_file", {
 		.references(() => neptunUserFile.id, { onDelete: "cascade" }),
 });
 
+export const chatConversation = pgTable("chat_conversation", {
+	id: serial("id").primaryKey().notNull(),
+	name: text("name").notNull(),
+	model: text("model").notNull(),
+	createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
+	updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow(),
+	neptunUserId: integer("neptun_user_id")
+		.notNull()
+		.references(() => neptunUser.id, { onDelete: "cascade" }),
+});
+
 export const githubAppInstallation = pgTable("github_app_installation", {
 	id: serial("id").primaryKey().notNull(),
 	githubAccountType: text("github_account_type").notNull(),
@@ -218,7 +215,6 @@ export const neptunContextImport = pgTable("neptun_context_import", {
 	importStatus: text("import_status").default("pending").notNull(),
 	errorMessage: text("error_message"),
 	fileTree: jsonb("file_tree"),
-	excludePatterns: text("exclude_patterns").array(),
 	createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
 	updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow(),
 	neptunUserId: integer("neptun_user_id")