refactor: simplify api responses

Author: sinedied

packages/agent-api/src/functions/chats-delete.ts

@@ -2,7 +2,6 @@ import process from 'node:process';
 import { HttpRequest, HttpResponseInit, InvocationContext, app } from '@azure/functions';
 import { AzureCosmsosDBNoSQLChatMessageHistory } from '@langchain/azure-cosmosdb';
 import 'dotenv/config';
-import { badRequest, ok, notFound } from '../http-response.js';
 import { getCredentials, getUserId } from '../auth.js';
 
 async function deleteChats(request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> {
@@ -11,11 +10,21 @@ async function deleteChats(request: HttpRequest, context: InvocationContext): Pr
   const userId = getUserId(request);
 
   if (!userId) {
-    return badRequest('Invalid or missing userId in the request');
+    return {
+      status: 400,
+      jsonBody: {
+        error: 'Invalid or missing userId in the request',
+      },
+    }
   }
 
   if (!sessionId) {
-    return badRequest('Invalid or missing sessionId in the request');
+    return {
+      status: 400,
+      jsonBody: {
+        error: 'Invalid or missing sessionId in the request',
+      },
+    }
   }
 
   try {
@@ -42,12 +51,17 @@ async function deleteChats(request: HttpRequest, context: InvocationContext): Pr
     });
 
     await chatHistory.clear();
-    return ok();
+    return { status: 204 };
   } catch (_error: unknown) {
     const error = _error as Error;
     context.error(`Error when processing chats-delete request: ${error.message}`);
 
-    return notFound('Session not found');
+    return {
+      status: 404,
+      jsonBody: {
+        error: 'Session not found',
+      },
+    }
   }
 }
 

packages/agent-api/src/functions/chats-get.ts

@@ -2,7 +2,6 @@ import process from 'node:process';
 import { HttpRequest, HttpResponseInit, InvocationContext, app } from '@azure/functions';
 import { AzureCosmsosDBNoSQLChatMessageHistory } from '@langchain/azure-cosmosdb';
 import 'dotenv/config';
-import { badRequest, ok, notFound } from '../http-response.js';
 import { getCredentials, getUserId } from '../auth.js';
 
 async function getChats(request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> {
@@ -11,7 +10,12 @@ async function getChats(request: HttpRequest, context: InvocationContext): Promi
   const userId = getUserId(request);
 
   if (!userId) {
-    return badRequest('Invalid or missing userId in the request');
+    return {
+      status: 400,
+      jsonBody: {
+        error: 'Invalid or missing userId in the request',
+      },
+    }
   }
 
   try {
@@ -43,20 +47,25 @@ async function getChats(request: HttpRequest, context: InvocationContext): Promi
         role: message.getType() === 'human' ? 'user' : 'assistant',
         content: message.content,
       }));
-      return ok(chatMessages);
+      return { jsonBody: chatMessages }
     }
 
     const sessions = await chatHistory.getAllSessions();
     const chatSessions = sessions.map((session) => ({
       id: session.id,
       title: session.context?.title,
     }));
-    return ok(chatSessions);
+    return { jsonBody: chatSessions };
   } catch (_error: unknown) {
     const error = _error as Error;
     context.error(`Error when processing chats-get request: ${error.message}`);
 
-    return notFound('Session not found');
+    return {
+      status: 404,
+      jsonBody: {
+        error: 'Session not found',
+      },
+    }
   }
 }
 

packages/agent-api/src/functions/chats-post.ts

@@ -12,15 +12,14 @@ import { loadMcpTools } from '@langchain/mcp-adapters';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { v4 as uuidv4 } from 'uuid';
 import 'dotenv/config';
-import { badRequest, data, serviceUnavailable } from '../http-response.js';
 import { getAzureOpenAiTokenProvider, getCredentials, getUserId } from '../auth.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ChainValues } from '@langchain/core/utils/types.js';
 
 const agentSystemPrompt = `
 # Role
 You an expert assistant that helps users with managing burger orders. Use the provided tools to get the information you need and perform actions on behalf of the user.
-Only anwser to requests that are related to burger orders and the menu. If the user asks for something else, politely inform them that you can only assist with burger orders.
+Only answer to requests that are related to burger orders and the menu. If the user asks for something else, politely inform them that you can only assist with burger orders.
 
 # Task
 1. Help the user with their request, ask any clarifying questions if needed.
@@ -51,7 +50,12 @@ export async function postChats(request: HttpRequest, context: InvocationContext
     const userId = getUserId(request, requestBody);
 
     if (!messages || messages.length === 0 || !messages.at(-1)?.content) {
-      return badRequest('Invalid or missing messages in the request body');
+      return {
+        status: 400,
+        jsonBody: {
+          error: 'Invalid or missing messages in the request body',
+        },
+      }
     }
 
     let model: BaseChatModel;
@@ -140,7 +144,7 @@ export async function postChats(request: HttpRequest, context: InvocationContext
       historyMessagesKey: 'chat_history',
       getMessageHistory: async () => chatHistory,
     });
-    // Retriever to search for the documents in the database
+    // Add question and start the agent
     const question = messages.at(-1)!.content;
     const responseStream = await agentChainWithHistory.stream({ userId, question }, { configurable: { sessionId } });
     const jsonStream = Readable.from(createJsonStream(responseStream, sessionId));
@@ -158,15 +162,23 @@ export async function postChats(request: HttpRequest, context: InvocationContext
       chatHistory.setContext({ title: response.content });
     }
 
-    return data(jsonStream, {
-      'Content-Type': 'application/x-ndjson',
-      'Transfer-Encoding': 'chunked',
-    });
+    return {
+      headers: {
+        'Content-Type': 'application/x-ndjson',
+        'Transfer-Encoding': 'chunked',
+      },
+      body: jsonStream,
+    }
   } catch (_error: unknown) {
     const error = _error as Error;
     context.error(`Error when processing chat-post request: ${error.message}`);
 
-    return serviceUnavailable('Service temporarily unavailable. Please try again later.');
+    return {
+      status: 500,
+      jsonBody: {
+        error: 'Internal server error while processing the request',
+      },
+    }
   }
 }