Resolved merge conflicts from pull

Author: amanbairagi30

eslint.config.js

@@ -1,48 +1,48 @@
-import { FlatCompat } from "@eslint/eslintrc";
-import tseslint from "typescript-eslint";
+// import { FlatCompat } from "@eslint/eslintrc";
+// import tseslint from "typescript-eslint";
 
-const compat = new FlatCompat({
-  baseDirectory: import.meta.dirname,
-});
+// const compat = new FlatCompat({
+//   baseDirectory: import.meta.dirname,
+// });
 
-export default tseslint.config(
-  {
-    ignores: [".next"],
-  },
-  ...compat.extends("next/core-web-vitals"),
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-    extends: [
-      ...tseslint.configs.recommended,
-      ...tseslint.configs.recommendedTypeChecked,
-      ...tseslint.configs.stylisticTypeChecked,
-    ],
-    rules: {
-      "@typescript-eslint/array-type": "off",
-      "@typescript-eslint/consistent-type-definitions": "off",
-      "@typescript-eslint/consistent-type-imports": [
-        "warn",
-        { prefer: "type-imports", fixStyle: "inline-type-imports" },
-      ],
-      "@typescript-eslint/no-unused-vars": [
-        "warn",
-        { argsIgnorePattern: "^_" },
-      ],
-      "@typescript-eslint/require-await": "off",
-      "@typescript-eslint/no-misused-promises": [
-        "error",
-        { checksVoidReturn: { attributes: false } },
-      ],
-    },
-  },
-  {
-    linterOptions: {
-      reportUnusedDisableDirectives: true,
-    },
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-      },
-    },
-  },
-);
+// export default tseslint.config(
+//   {
+//     ignores: [".next"],
+//   },
+//   ...compat.extends("next/core-web-vitals"),
+//   {
+//     files: ["**/*.ts", "**/*.tsx"],
+//     extends: [
+//       ...tseslint.configs.recommended,
+//       ...tseslint.configs.recommendedTypeChecked,
+//       ...tseslint.configs.stylisticTypeChecked,
+//     ],
+//     rules: {
+//       "@typescript-eslint/array-type": "off",
+//       "@typescript-eslint/consistent-type-definitions": "off",
+//       "@typescript-eslint/consistent-type-imports": [
+//         "warn",
+//         { prefer: "type-imports", fixStyle: "inline-type-imports" },
+//       ],
+//       "@typescript-eslint/no-unused-vars": [
+//         "warn",
+//         { argsIgnorePattern: "^_" },
+//       ],
+//       "@typescript-eslint/require-await": "off",
+//       "@typescript-eslint/no-misused-promises": [
+//         "error",
+//         { checksVoidReturn: { attributes: false } },
+//       ],
+//     },
+//   },
+//   {
+//     linterOptions: {
+//       reportUnusedDisableDirectives: true,
+//     },
+//     languageOptions: {
+//       parserOptions: {
+//         projectService: true,
+//       },
+//     },
+//   },
+// );

prisma/migrations/20250617075116_added_role_in_message_table/migration.sql

@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[userId]` on the table `Subscription` will be added. If there are existing duplicate values, this will fail.
+  - Changed the type of `role` on the `Message` table. No cast exists, the column would be dropped and recreated, which cannot be done if there is data, since the column is required.
+
+*/
+-- CreateEnum
+CREATE TYPE "MessageRole" AS ENUM ('USER', 'ASSISTANT');
+
+-- AlterTable
+ALTER TABLE "Message" DROP COLUMN "role",
+ADD COLUMN     "role" "MessageRole" NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Subscription_userId_key" ON "Subscription"("userId");

prisma/schema.prisma

@@ -102,7 +102,7 @@ model Message {
     chatId String
     chat Chat @relation(fields: [chatId], references: [id], onDelete: Cascade)
     content String
-    role String
+    role MessageRole
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
     @@index([chatId])
@@ -125,4 +125,9 @@ enum TransactionStatus {
   PENDING
   SUCCESS
   FAILED
+}
+
+enum MessageRole {
+  USER
+  ASSISTANT
 }

src/actions/fetchUser.ts

@@ -7,7 +7,21 @@ export async function FetchUser() {
         return null
     }
     const user = await db.user.findUnique({
-        where: { id: session.user.id }
+        where: { id: session.user.id, },
+        select: {
+            name: true,
+            email: true,
+            image: true,
+            nickname: true,
+            about: true,
+            whatDoYouDo: true,
+            customTraits: true,
+            subscription: {
+                select: {
+                    plan: true,
+                }
+            }
+        }
     })
 
     return user

src/actions/saveChat.ts

@@ -57,7 +57,7 @@ export async function saveChat(messages: Message[]) {
             id: message.id,
             chatId: chat.id,
             content: message.content,
-            role: message.role,
+            role: message.role === "user" ? "USER" : "ASSISTANT",
           },
         });
       }

src/app/(app)/ask/layout.tsx

@@ -8,14 +8,17 @@ import { SelectTheme } from "@/components/ui/theme-toggler";
 import { UIStructure } from "@/components/ui/ui-structure";
 import { SlidersHorizontalIcon } from "@phosphor-icons/react/dist/ssr";
 import Link from "next/link";
+import { TRPCReactProvider } from "@/trpc/react";
 
 export default function ChatLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
+
   return (
     <>
+   <TRPCReactProvider> 
       <UIStructure />
       <SidebarInset className="!h-svh p-2">
         <div className="bg-muted/80 relative h-full max-h-svh w-full rounded-xl p-4">
@@ -34,8 +37,9 @@ export default function ChatLayout({
           <div className="mx-auto flex max-h-fit w-full max-w-3xl overflow-y-hidden">
             {children}
           </div>
-        </div>
-      </SidebarInset>
+            </div>
+        </SidebarInset>
+      </TRPCReactProvider>
     </>
   );
 }

src/app/(app)/settings/subscription/page.tsx

@@ -50,7 +50,7 @@ export default async function SubscriptionPage() {
               whatDoYouDo={user?.whatDoYouDo as string}
               customTraits={user?.customTraits as string[]}
               about={user?.about as string}
-              plan={user?.plan as string}
+              plan={user?.subscription?.plan as string}
             />
 
             {/* Message Usage */}

src/app/_components/Chat.tsx

@@ -6,23 +6,13 @@ import { Textarea } from "@/components/ui/textarea";
 import { Button } from "@/components/ui/button";
 import { MicrophoneIcon } from "@phosphor-icons/react";
 import { useParams } from "next/navigation";
-import {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectLabel,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
+
 import { SpinnerGapIcon } from "@phosphor-icons/react/dist/ssr";
 import ReactMarkdown from "react-markdown";
 import SyntaxHighlighter from "react-syntax-highlighter";
-import { vs2015 } from "react-syntax-highlighter/dist/esm/styles/hljs";
 import remarkGfm from "remark-gfm";
 import { Geist_Mono } from "next/font/google";
 import { cn } from "@/lib/utils";
-import { api } from "@/trpc/react";
 import { ModelSelector } from "@/components/ui/model-selector";
 import { DEFAULT_MODEL_ID } from "@/models/constants";
 
@@ -58,12 +48,6 @@ const Chat = () => {
     scrollToBottom();
   }, [messages]);
 
-  const saveChat = api.chat.createChat.useMutation({
-    onError: (error) => {
-      console.error("Error saving chat:", error);
-    },
-  });
-
   const processStream = async (response: Response, userMessage: string) => {
     if (!response.ok) {
       console.error("Error from API:", response.statusText);
@@ -147,10 +131,6 @@ const Chat = () => {
       }
 
       console.log("Saving chat to database:", userMessage, accumulatedContent);
-      saveChat.mutate({
-        message: userMessage,
-        model: model,
-      });
     } catch (error) {
       console.error("Error processing stream:", error);
     } finally {

src/app/_components/post.tsx

@@ -2,7 +2,7 @@ import { env } from "@/env";
 import { auth } from "@/server/auth";
 import { fetchChatCompletion } from "@/models/service";
 import { DEFAULT_MODEL_ID, getModelById } from "@/models/constants";
-
+import { db } from "@/server/db";
 interface ChatMessage {
   role: "user" | "assistant" | "system";
   content: string;
@@ -11,6 +11,7 @@ interface ChatMessage {
 interface TypeGPTPayload {
   messages: ChatMessage[];
   model?: string;
+  chatId: string;
 }
 
 interface TypeGPTErrorResponse {
@@ -30,9 +31,18 @@ export async function POST(req: Request): Promise<Response> {
       return new Response("Unauthorized", { status: 401 });
     }
 
-    const { messages, model = DEFAULT_MODEL_ID } =
+    const { messages, model = DEFAULT_MODEL_ID, chatId } =
       (await req.json()) as TypeGPTPayload;
 
+    // Save user message
+    await db.message.create({
+      data: {
+        chatId,
+        content: messages[messages.length - 1]?.content ?? "",
+        role: "USER",
+      },
+    });
+
     const modelInfo = getModelById(model);
     if (!modelInfo) {
       return new Response(
@@ -50,6 +60,8 @@ export async function POST(req: Request): Promise<Response> {
     const writer = writable.getWriter();
 
     void (async () => {
+      let accumulatedContent = "";
+      
       try {
         const response = await fetchChatCompletion({
           modelId: model,
@@ -89,11 +101,53 @@ export async function POST(req: Request): Promise<Response> {
             const { done, value } = await reader.read();
 
             if (done) {
+              // Save AI message to database after stream completes
+              if (accumulatedContent.trim()) {
+                await db.message.create({
+                  data: {
+                    chatId,
+                    content: accumulatedContent,
+                    role: "ASSISTANT",
+                  },
+                });
+              }
+              
               await writer.write(encoder.encode("data: [DONE]\n\n"));
               await writer.close();
               break;
             }
 
+            // Accumulate content for database storage
+            const chunk = new TextDecoder().decode(value);
+            const lines = chunk.split("\n");
+            
+            for (const line of lines) {
+              if (line.trim() === "") continue;
+              
+              if (line.startsWith("data: ")) {
+                const data = line.substring(6);
+                
+                if (data === "[DONE]") continue;
+                
+                try {
+                  const parsedData = JSON.parse(data) as {
+                    choices?: Array<{
+                      delta?: {
+                        content?: string;
+                      };
+                    }>;
+                  };
+                  
+                  const content = parsedData.choices?.[0]?.delta?.content;
+                  if (content) {
+                    accumulatedContent += content;
+                  }
+                } catch (e) {
+                  // Ignore parsing errors for non-JSON lines
+                }
+              }
+            }
+
             await writer.write(value);
           }
         } catch (error) {
@@ -112,7 +166,6 @@ export async function POST(req: Request): Promise<Response> {
       }
     })();
 
-
     return new Response(readable, { headers });
   } catch (error) {
     console.error("Error in chat API:", error);