diffをデータベースに保存

Author: na-trium-144

app/actions/chatActions.ts

@@ -4,7 +4,7 @@
 import { generateContent } from "./gemini";
 import { DynamicMarkdownSection } from "../[lang]/[pageId]/pageContent";
 import { ReplCommand, ReplOutput } from "@my-code/runtime/interface";
-import { addChat, ChatWithMessages } from "@/lib/chatHistory";
+import { addChat, ChatWithMessages, CreateChatDiff } from "@/lib/chatHistory";
 import { getPagesList, introSectionId, PagePath, SectionId } from "@/lib/docs";
 
 type ChatResult =
@@ -198,18 +198,35 @@ export async function askAI(params: ChatParams): Promise<ChatResult> {
       targetSectionId = introSectionId(path);
     }
     const responseMessage = text.split(/-{3,}/)[1].trim();
-    const diffMatch = text
+    const diffRaw: CreateChatDiff[] = [];
+    for (const m of text
       .split(/-{3,}/)[2]
       .matchAll(
         /<{3,}\s*SEARCH\n([\s\S]*?)\n={3,}\n([\s\S]*?)\n>{3,}\s*REPLACE/g
+      )) {
+      const search = m[1];
+      const replace = m[2];
+      const targetSection = sectionContent.find((s) =>
+        s.rawContent.includes(search)
       );
-    const diff: { search: string; replace: string }[] = diffMatch
-      ? Array.from(diffMatch, (m) => ({ search: m[1], replace: m[2] }))
-      : [];
-    const newChat = await addChat(path, targetSectionId, [
-      { role: "user", content: userQuestion },
-      { role: "ai", content: responseMessage },
-    ]);
+      if (targetSection) {
+        diffRaw.push({
+          search,
+          replace,
+          sectionId: targetSection.id,
+          targetMD5: targetSection.md5,
+        });
+      }
+    }
+    const newChat = await addChat(
+      path,
+      targetSectionId,
+      [
+        { role: "user", content: userQuestion },
+        { role: "ai", content: responseMessage },
+      ],
+      diffRaw
+    );
     return {
       error: null,
       chat: newChat,

app/lib/chatHistory.ts

@@ -3,7 +3,7 @@
 import { headers } from "next/headers";
 import { getAuthServer } from "./auth";
 import { getDrizzle } from "./drizzle";
-import { chat, message, section } from "@/schema/chat";
+import { chat, diff, message, section } from "@/schema/chat";
 import { and, asc, eq, exists } from "drizzle-orm";
 import { Auth } from "better-auth";
 import { revalidateTag, unstable_cacheLife } from "next/cache";
@@ -15,6 +15,12 @@ export interface CreateChatMessage {
   role: "user" | "ai" | "error";
   content: string;
 }
+export interface CreateChatDiff {
+  search: string;
+  replace: string;
+  sectionId: SectionId;
+  targetMD5: string;
+}
 
 // cacheに使うキーで、実際のURLではない
 const CACHE_KEY_BASE = "https://my-code.utcode.net/chatHistory";
@@ -57,6 +63,7 @@ export async function addChat(
   path: PagePath,
   sectionId: SectionId,
   messages: CreateChatMessage[],
+  diffRaw: CreateChatDiff[],
   context?: Partial<Context>
 ) {
   const { drizzle, userId } = await initContext(context);
@@ -82,6 +89,13 @@ export async function addChat(
     )
     .returning();
 
+  const chatDiffs = await drizzle.insert(diff).values(
+    diffRaw.map((d) => ({
+      chatId: newChat.chatId,
+      ...d,
+    }))
+  );
+
   revalidateTag(cacheKeyForPage(path, userId));
   if (isCloudflare()) {
     const cache = await caches.open("chatHistory");
@@ -98,6 +112,7 @@ export async function addChat(
       pagePath: `${path.lang}/${path.page}`,
     },
     messages: chatMessages,
+    diff: chatDiffs,
   };
 }
 
@@ -119,17 +134,20 @@ export async function getChat(
         drizzle
           .select()
           .from(section)
-          .where(and(
-            eq(section.sectionId, chat.sectionId),
-            eq(section.pagePath, `${path.lang}/${path.page}`),
-          ))
+          .where(
+            and(
+              eq(section.sectionId, chat.sectionId),
+              eq(section.pagePath, `${path.lang}/${path.page}`)
+            )
+          )
       )
     ),
     with: {
       section: true,
       messages: {
         orderBy: [asc(message.createdAt)],
       },
+      diff: true,
     },
     orderBy: [asc(chat.createdAt)],
   });

app/schema/chat.ts

@@ -21,16 +21,28 @@ export const message = pgTable("message", {
   createdAt: timestamp("createdAt").notNull().defaultNow(),
 });
 
+export const diff = pgTable("diff", {
+  id: uuid("id").primaryKey().defaultRandom(),
+  chatId: uuid("chatId").notNull(),
+  search: text("search").notNull(),
+  replace: text("replace").notNull(),
+  sectionId: text("sectionId").notNull(),
+  targetMD5: text("targetMD5").notNull(),
+  createdAt: timestamp("createdAt").notNull().defaultNow(),
+});
+
 export const chatRelations = relations(chat, ({ many, one }) => ({
   messages: many(message),
   section: one(section, {
     fields: [chat.sectionId],
     references: [section.sectionId],
   }),
+  diff: many(diff),
 }));
 
 export const sectionRelations = relations(chat, ({ many }) => ({
   chat: many(chat),
+  // diff: many(diff),
 }));
 
 export const messageRelations = relations(message, ({ one }) => ({
@@ -39,3 +51,14 @@ export const messageRelations = relations(message, ({ one }) => ({
     references: [chat.chatId],
   }),
 }));
+
+export const diffRelations = relations(diff, ({ one }) => ({
+  // section: one(section, {
+  //   fields: [diff.sectionId],
+  //   references: [section.sectionId],
+  // }),
+  chat: one(chat, {
+    fields: [diff.chatId],
+    references: [chat.chatId],
+  }),
+}));

drizzle/0004_busy_orphan.sql

@@ -0,0 +1,9 @@
+CREATE TABLE "diff" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"chatId" uuid NOT NULL,
+	"search" text NOT NULL,
+	"replace" text NOT NULL,
+	"sectionId" text NOT NULL,
+	"targetMD5" text NOT NULL,
+	"createdAt" timestamp DEFAULT now() NOT NULL
+);