Merge branch 'mckaywrigley:main' into org

jollytoad · May 22, 2024 · 81a3cad · 81a3cad
2 parents 2d9f8e8 + d60e1f3
commit 81a3cad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/app/api/chat/anthropic/route.ts b/app/api/chat/anthropic/route.ts
@@ -37,14 +37,14 @@ export async function POST(request: NextRequest) {
               return { type: "text", text: content }
             } else if (
               content?.type === "image_url" &&
-              content?.image_url?.length
+              content?.image_url?.url?.length
             ) {
               return {
                 type: "image",
                 source: {
                   type: "base64",
-                  media_type: getMediaTypeFromDataURL(content.image_url),
-                  data: getBase64FromDataURL(content.image_url)
+                  media_type: getMediaTypeFromDataURL(content.image_url.url),
+                  data: getBase64FromDataURL(content.image_url.url)
                 }
               }
             } else {

diff --git a/app/api/chat/openai/route.ts b/app/api/chat/openai/route.ts
@@ -28,7 +28,11 @@ export async function POST(request: Request) {
       model: chatSettings.model as ChatCompletionCreateParamsBase["model"],
       messages: messages as ChatCompletionCreateParamsBase["messages"],
       temperature: chatSettings.temperature,
-      max_tokens: chatSettings.model === "gpt-4-vision-preview" ? 4096 : null, // TODO: Fix
+      max_tokens:
+        chatSettings.model === "gpt-4-vision-preview" ||
+        chatSettings.model === "gpt-4o"
+          ? 4096
+          : null, // TODO: Fix
       stream: true
     })
 

diff --git a/lib/build-prompt.ts b/lib/build-prompt.ts
@@ -144,7 +144,9 @@ export async function buildFinalMessages(
 
           return {
             type: "image_url",
-            image_url: formedUrl
+            image_url: {
+              url: formedUrl
+            }
           }
         })
       ]