Merge pull request #304 from n4ze3m/next

bug fixes
n4ze3m · Oct 15, 2024 · 47299c2 · 47299c2
2 parents 919a0c3 + d80b60e
commit 47299c2
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 12 deletions.
diff --git a/app/ui/package.json b/app/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.11.3",
+  "version": "1.11.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/app/ui/src/hooks/useMessage.tsx b/app/ui/src/hooks/useMessage.tsx
@@ -107,7 +107,6 @@ export const useMessage = () => {
       method: "POST",
       body: JSON.stringify({
         message,
-        history,
         history_id: historyId,
       }),
       headers: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dialoqbase",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "Create chatbots with ease",
   "scripts": {
     "ui:dev": "pnpm run --filter ui dev",

diff --git a/server/src/handlers/api/v1/admin/delete.handler.ts b/server/src/handlers/api/v1/admin/delete.handler.ts
@@ -132,6 +132,11 @@ export const adminDeleteUserHandler = async (
           },
         });
       }
+      await tx.userApiKey.deleteMany({
+        where: {
+          user_id: request.body.user_id,
+        },
+      });
       await tx.user.delete({
         where: {
           user_id: request.body.user_id,

diff --git a/server/src/handlers/api/v1/bot/playground/chat.handler.ts b/server/src/handlers/api/v1/bot/playground/chat.handler.ts
@@ -17,7 +17,8 @@ export const chatRequestHandler = async (
   reply: FastifyReply
 ) => {
   const { id: bot_id } = request.params;
-  const { message, history, history_id } = request.body;
+  const { message, history_id } = request.body;
+  let history = [];
 
   try {
     const prisma = request.server.prisma;
@@ -33,6 +34,30 @@ export const chatRequestHandler = async (
       );
     }
 
+
+    if (history_id) {
+      const details = await prisma.botPlayground.findFirst({
+        where: {
+          id: history_id,
+          botId: bot_id,
+        },
+        include: {
+          BotPlaygroundMessage: {
+            orderBy: {
+              createdAt: "asc",
+            },
+          },
+        },
+      });
+
+      const botMessages = details?.BotPlaygroundMessage.map((message) => ({
+        type: message.type,
+        text: message.message,
+      }));
+
+      history = botMessages || [];
+    }
+
     const embeddingInfo = await getModelInfo({
       model: bot.embedding,
       prisma,
@@ -117,7 +142,8 @@ export const chatRequestStreamHandler = async (
   reply: FastifyReply
 ) => {
   const { id: bot_id } = request.params;
-  const { message, history, history_id } = request.body;
+  const { message, history_id } = request.body;
+  let history = [];
 
   try {
     const prisma = request.server.prisma;
@@ -133,6 +159,32 @@ export const chatRequestStreamHandler = async (
       );
     }
 
+
+    if (history_id) {
+      const details = await prisma.botPlayground.findFirst({
+        where: {
+          id: history_id,
+          botId: bot_id,
+        },
+        include: {
+          BotPlaygroundMessage: {
+            orderBy: {
+              createdAt: "asc",
+            },
+          },
+        },
+      });
+
+      const botMessages = details?.BotPlaygroundMessage.map((message) => ({
+        type: message.type,
+        text: message.message,
+      }));
+
+      history = botMessages || [];
+    }
+
+
+
     const embeddingInfo = await getModelInfo({
       model: bot.embedding,
       prisma,
@@ -143,7 +195,7 @@ export const chatRequestStreamHandler = async (
       return handleErrorResponse(
         history,
         message,
-        "There was an error processing your request."
+        "No embedding model found"
       );
     }
 
@@ -165,7 +217,7 @@ export const chatRequestStreamHandler = async (
       return handleErrorResponse(
         history,
         message,
-        "There was an error processing your request."
+        "Not model found"
       );
     }
 
@@ -236,11 +288,10 @@ export const chatRequestStreamHandler = async (
     await nextTick();
     return reply.raw.end();
   } catch (e) {
-    console.error(e);
     return handleErrorResponse(
       history,
       message,
-      "There was an error processing your request."
+      "Internal Server Error"
     );
   }
 };
diff --git a/server/src/schema/api/v1/bot/playground/index.ts b/server/src/schema/api/v1/bot/playground/index.ts
@@ -26,9 +26,6 @@ export const chatRequestSchema: FastifySchema = {
       message: {
         type: "string",
       },
-      history: {
-        type: "array",
-      },
       history_id: {
         type: "string",
       },