Implement openai for non-streaming

Author: jahooma

web/src/app/api/v1/chat/completions/_post.ts

@@ -21,7 +21,10 @@ import {
   handleOpenRouterNonStream,
   handleOpenRouterStream,
 } from '@/llm-api/openrouter'
-import { handleOpenAIStream, OPENAI_SUPPORTED_MODELS } from '@/llm-api/openai'
+import {
+  handleOpenAINonStream,
+  OPENAI_SUPPORTED_MODELS,
+} from '@/llm-api/openai'
 import { extractApiKeyFromHeader } from '@/util/auth'
 
 export async function postChatCompletions(params: {
@@ -208,6 +211,36 @@ export async function postChatCompletions(params: {
     try {
       if (bodyStream) {
         // Streaming request
+        const stream = await handleOpenRouterStream({
+          body,
+          userId,
+          agentId,
+          openrouterApiKey,
+          fetch,
+          logger,
+          insertMessageBigquery,
+        })
+
+        trackEvent({
+          event: AnalyticsEvent.CHAT_COMPLETIONS_STREAM_STARTED,
+          userId,
+          properties: {
+            agentId,
+            runId: runIdFromBody,
+          },
+          logger,
+        })
+
+        return new NextResponse(stream, {
+          headers: {
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            Connection: 'keep-alive',
+            'Access-Control-Allow-Origin': '*',
+          },
+        })
+      } else {
+        // Non-streaming request
         const model = (body as any)?.model
         const shortModelName =
           typeof model === 'string' ? model.split('/')[1] : undefined
@@ -216,16 +249,17 @@ export async function postChatCompletions(params: {
           model.startsWith('openai/') &&
           OPENAI_SUPPORTED_MODELS.includes(shortModelName as any)
         const shouldUseOpenAIEndpoint = isOpenAIDirectModel && (body as any)?.n
-        const stream = await (shouldUseOpenAIEndpoint
-          ? handleOpenAIStream({
+
+        const result = await (shouldUseOpenAIEndpoint
+          ? handleOpenAINonStream({
               body,
               userId,
               agentId,
               fetch,
               logger,
               insertMessageBigquery,
             })
-          : handleOpenRouterStream({
+          : handleOpenRouterNonStream({
               body,
               userId,
               agentId,
@@ -235,36 +269,6 @@ export async function postChatCompletions(params: {
               insertMessageBigquery,
             }))
 
-        trackEvent({
-          event: AnalyticsEvent.CHAT_COMPLETIONS_STREAM_STARTED,
-          userId,
-          properties: {
-            agentId,
-            runId: runIdFromBody,
-          },
-          logger,
-        })
-
-        return new NextResponse(stream, {
-          headers: {
-            'Content-Type': 'text/event-stream',
-            'Cache-Control': 'no-cache',
-            Connection: 'keep-alive',
-            'Access-Control-Allow-Origin': '*',
-          },
-        })
-      } else {
-        // Non-streaming request
-        const result = await handleOpenRouterNonStream({
-          body,
-          userId,
-          agentId,
-          openrouterApiKey,
-          fetch,
-          logger,
-          insertMessageBigquery,
-        })
-
         trackEvent({
           event: AnalyticsEvent.CHAT_COMPLETIONS_GENERATION_STARTED,
           userId,