Shift AI call to collab service

Author: dylkaw

.env.sample

@@ -25,12 +25,10 @@ MATCHING_SVC_PORT=6969
 ## Collab service variables
 COLLAB_SVC_PORT=3002
 COLLAB_SVC_DB_URI=
+OPENAI_API_KEY=
 
 ## Redis variables
 REDIS_PORT=6379
 
 ## Redisinsight variables
-REDIS_INSIGHT_PORT=5540
-
-## OpenAI API key
-OPENAI_API_KEY=
+REDIS_INSIGHT_PORT=5540

collab-service/app/controller/ai-controller.js

@@ -0,0 +1,19 @@
+import { sendAiMessage } from "../model/repository.js";
+
+// send ai message
+export async function sendAiMessageController(req, res) {
+  const { message } = req.body;
+  if (!message) {
+    return res.status(400).json({ error: "Message content is required" });
+  }
+
+  const data = await sendAiMessage(message);
+  const aiResponse =
+    data.choices?.[0]?.message?.content || "No response from AI";
+
+  if (aiResponse) {
+    res.status(200).json({ data });
+  } else {
+    res.status(500).json({ error: "Failed to retrieve AI response" });
+  }
+}

collab-service/app/model/repository.js

@@ -9,7 +9,7 @@ export async function newRoom(user1, user2, roomId, questionId) {
   try {
     // Remove any existing rooms where either user1 or user2 is a participant
     await UsersSession.deleteMany({ users: { $in: [user1, user2] } });
-    
+
     const newRoom = new UsersSession({
       users: [user1, user2],
       roomId: roomId,
@@ -35,7 +35,6 @@ export async function getRoomId(user) {
   }
 }
 
-
 export async function getAllRooms() {
   try {
     const rooms = await UsersSession.find({});
@@ -113,4 +112,25 @@ export async function getQuestionIdByRoomId(roomId) {
     console.error(`Error finding questionId for roomId ${roomId}:`, error);
     return null;
   }
-}
+}
+
+export async function sendAiMessage(message) {
+  try {
+    console.log("sending to openai");
+    const response = await fetch("https://api.openai.com/v1/chat/completions", {
+      method: "POST",
+      headers: {
+        'Content-Type': "application/json",
+        'Authorization': `Bearer ${process.env.OPENAI_API_KEY}`,
+      },
+      body: JSON.stringify({
+        model: "gpt-3.5-turbo",
+        messages: [{ role: "user", content: message }],
+      }),
+    });
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error("Error in sending AI message:", error);
+  }
+}

collab-service/app/routes/collab-routes.js

@@ -6,6 +6,7 @@ import {
   getRoomChatHistory,
   getQuestionId
 } from "../controller/collab-controller.js";
+import { sendAiMessageController } from "../controller/ai-controller.js";
 
 const router = express.Router();
 
@@ -19,4 +20,6 @@ router.get("/chat-history/:roomId", getRoomChatHistory);
 
 router.get("/rooms/:roomId/questionId", getQuestionId);
 
+router.post("/send-ai-message", sendAiMessageController)
+
 export default router;

docker-compose.yml

@@ -8,7 +8,6 @@ services:
         - QUESTION_SVC_PORT=$QUESTION_SVC_PORT
         - MATCHING_SVC_PORT=$MATCHING_SVC_PORT
         - COLLAB_SVC_PORT=$COLLAB_SVC_PORT
-        - OPENAI_API_KEY=$OPENAI_API_KEY
     ports:
       - $FRONTEND_PORT:$FRONTEND_PORT
     depends_on:
@@ -80,4 +79,5 @@ services:
       - $COLLAB_SVC_PORT:$COLLAB_SVC_PORT
     environment:
       - PORT=$COLLAB_SVC_PORT
-      - DB_URI=$COLLAB_SVC_DB_URI
+      - DB_URI=$COLLAB_SVC_DB_URI
+      - OPENAI_API_KEY=$OPENAI_API_KEY

frontend/Dockerfile

@@ -4,8 +4,7 @@ ARG BASE_URI \
     USER_SVC_PORT \
     QUESTION_SVC_PORT \
     MATCHING_SVC_PORT \
-    COLLAB_SVC_PORT \
-    OPENAI_API_KEY
+    COLLAB_SVC_PORT
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .
@@ -14,9 +13,8 @@ ENV NEXT_PUBLIC_BASE_URI=$BASE_URI \
     NEXT_PUBLIC_USER_SVC_PORT=$USER_SVC_PORT \
     NEXT_PUBLIC_QUESTION_SVC_PORT=$QUESTION_SVC_PORT \
     NEXT_PUBLIC_MATCHING_SVC_PORT=$MATCHING_SVC_PORT  \
-    NEXT_PUBLIC_COLLAB_SVC_PORT=$COLLAB_SVC_PORT \
-    NEXT_PUBLIC_OPENAI_API_KEY=$OPENAI_API_KEY
-
+    NEXT_PUBLIC_COLLAB_SVC_PORT=$COLLAB_SVC_PORT 
+    
 # Production build stage
 FROM base AS build
 COPY . .

frontend/components/collab/chat.tsx

@@ -98,8 +98,8 @@ export default function Chat({ roomId }: { roomId: string }) {
         id: crypto.randomUUID(),
         userId: "ai",
         text:
-          data.choices && data.choices[0]?.message?.content
-            ? data.choices[0].message.content
+          data.data.choices && data.data.choices[0]?.message?.content
+            ? data.data.choices[0].message.content
             : "An error occurred. Please try again.",
         timestamp: new Date(),
       };

frontend/lib/api/openai/send-ai-message.ts

@@ -1,19 +1,14 @@
+import { collabServiceUri } from "@/lib/api/api-uri";
+
 export const sendAiMessage = async (message: string) => {
-    const response = await fetch('https://api.openai.com/v1/chat/completions', {
+    console.log(`{collabServiceUri(window.location.hostname)}/send-ai-message`);
+    console.log(message);
+    const response = await fetch(`${collabServiceUri(window.location.hostname)}/collab/send-ai-message`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'Authorization': `Bearer ${process.env.NEXT_PUBLIC_OPENAI_API_KEY}`,
       },
-      body: JSON.stringify({
-        model: 'gpt-3.5-turbo',
-        messages: [
-          {
-            role: 'user',
-            content: message,
-          },
-        ],
-      }),
+      body: JSON.stringify({message: message}),
     });
     return response;
 }