guh

Erisfiregamer1 · Apr 13, 2024 · d187d77 · d187d77
1 parent b12b9a7
commit d187d77
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 164 deletions.
diff --git a/bots/chatgpt.ts b/bots/chatgpt.ts
@@ -74,7 +74,7 @@ async function doTools(
     res.messages.push(result);
   });
 
-  const newres = await send("", res.messages, callback, requirements);
+  const newres = await send(null, res.messages, callback, requirements);
 
   console.log(newres);
 
@@ -141,7 +141,7 @@ export async function send(
         data: resp.choices[0].message.content,
       }, false);
     }
-    resp = await doTools(resp);
+    resp = await doTools(resp, null, requirements);
     resp.choices[0].message.content = resp.choices[0].message.content as string;
   }
 

diff --git a/bots/gpt_4.ts b/bots/gpt_4.ts
@@ -73,7 +73,7 @@ async function doTools(
     res.messages.push(result);
   });
 
-  const newres = await send("", res.messages, callback, requirements);
+  const newres = await send(null, res.messages, callback, requirements);
 
   console.log(newres);
 
@@ -138,7 +138,7 @@ export async function send(
     body: JSON.stringify({
       model: "gpt-4-turbo",
       messages: messages,
-      tools
+      tools,
     }),
   });
 
@@ -159,7 +159,7 @@ export async function send(
         data: resp.choices[0].message.content,
       }, false);
     }
-    resp = await doTools(resp);
+    resp = await doTools(resp, null, requirements);
     resp.choices[0].message.content = resp.choices[0].message.content as string;
   }
 

diff --git a/bots/gpt_4.ts.disabled b/bots/gpt_4.ts.disabled
diff --git a/main.d.ts b/main.d.ts
@@ -9,7 +9,7 @@ export type TextContent = {
 export type ImageContentPart = {
   type: "image_url";
   image_url: {
-    url: string; // URL or base64 encoded image data
+    url: string;
     detail?: string; // Optional, defaults to 'auto'
   };
 };