cleanup

pages/api/chat.ts

@@ -1,5 +1,5 @@
 import { DEFAULT_SYSTEM_PROMPT, DEFAULT_TEMPERATURE } from '@/utils/app/const';
-import { OpenAIError, OpenAIStream } from '@/utils/server';
+import { LLMError, LLMStream } from '@/utils/server';
 
 import { ChatBody, Message } from '@/types/chat';
 
@@ -52,12 +52,12 @@ const handler = async (req: Request): Promise<Response> => {
 
     encoding.free();
 
-    const stream = await OpenAIStream(model, promptToSend, temperatureToUse, key, messagesToSend);
+    const stream = await LLMStream(model, promptToSend, temperatureToUse, key, messagesToSend);
 
     return new Response(stream);
   } catch (error) {
     console.error(error);
-    if (error instanceof OpenAIError) {
+    if (error instanceof LLMError) {
       return new Response('Error', { status: 500, statusText: error.message });
     } else {
       return new Response('Error', { status: 500 });

pages/api/google.ts

@@ -1,7 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { OPENAI_API_HOST } from '@/utils/app/const';
-import { cleanSourceText } from '@/utils/server/google';
 
 import { Message } from '@/types/chat';
 import { GoogleBody, GoogleSource } from '@/types/google';
@@ -64,7 +63,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse<any>) => {
           const parsed = new Readability(doc).parse();
 
           if (parsed) {
-            let sourceText = cleanSourceText(parsed.textContent);
+            let sourceText = parsed.textContent;
 
             return {
               ...source,

utils/server/google.ts

@@ -1,9 +0,0 @@
-export const cleanSourceText = (text: string) => {
-  return text
-    .trim()
-    .replace(/(\n){4,}/g, '\n\n\n')
-    .replace(/\n\n/g, ' ')
-    .replace(/ {3,}/g, '  ')
-    .replace(/\t/g, '')
-    .replace(/\n+(\s*\n)*/g, '\n');
-};

utils/server/index.ts

@@ -1,7 +1,7 @@
 import { Message } from '@/types/chat';
 import { OpenAIModel } from '@/types/openai';
 
-import { AZURE_DEPLOYMENT_ID, OPENAI_API_HOST, OPENAI_API_TYPE, OPENAI_API_VERSION, OPENAI_ORGANIZATION } from '../app/const';
+import { OPENAI_API_HOST } from '../app/const';
 
 import {
   ParsedEvent,
@@ -9,21 +9,21 @@ import {
   createParser,
 } from 'eventsource-parser';
 
-export class OpenAIError extends Error {
+export class LLMError extends Error {
   type: string;
   param: string;
   code: string;
 
   constructor(message: string, type: string, param: string, code: string) {
     super(message);
-    this.name = 'OpenAIError';
+    this.name = 'LLMError';
     this.type = type;
     this.param = param;
     this.code = code;
   }
 }
 
-export const OpenAIStream = async (
+export const LLMStream = async (
   model: OpenAIModel,
   systemPrompt: string,
   temperature : number,
@@ -31,25 +31,12 @@ export const OpenAIStream = async (
   messages: Message[],
 ) => {
   let url = `${OPENAI_API_HOST}/v1/chat/completions`;
-  if (OPENAI_API_TYPE === 'azure') {
-    url = `${OPENAI_API_HOST}/openai/deployments/${AZURE_DEPLOYMENT_ID}/chat/completions?api-version=${OPENAI_API_VERSION}`;
-  }
   const res = await fetch(url, {
     headers: {
-      'Content-Type': 'application/json',
-      ...(OPENAI_API_TYPE === 'openai' && {
-        Authorization: `Bearer ${key ? key : process.env.OPENAI_API_KEY}`
-      }),
-      ...(OPENAI_API_TYPE === 'azure' && {
-        'api-key': `${key ? key : process.env.OPENAI_API_KEY}`
-      }),
-      ...((OPENAI_API_TYPE === 'openai' && OPENAI_ORGANIZATION) && {
-        'OpenAI-Organization': OPENAI_ORGANIZATION,
-      }),
+      'Content-Type': 'application/json'
     },
     method: 'POST',
     body: JSON.stringify({
-      ...(OPENAI_API_TYPE === 'openai' && {model: model.id}),
       messages: [
         {
           role: 'system',
@@ -69,7 +56,7 @@ export const OpenAIStream = async (
   if (res.status !== 200) {
     const result = await res.json();
     if (result.error) {
-      throw new OpenAIError(
+      throw new LLMError(
         result.error.message,
         result.error.type,
         result.error.param,
@@ -77,7 +64,7 @@ export const OpenAIStream = async (
       );
     } else {
       throw new Error(
-        `OpenAI API returned an error: ${
+        `LLM API returned an error: ${
           decoder.decode(result?.value) || result.statusText
         }`,
       );