aimyapi 0.1.15 → 0.2.1

package/dist/index.cjs

@@ -340,16 +340,38 @@ const openai = new openai$1.OpenAI({
   apiKey: process.env.OPENAI_API_KEY
   // This is also the default, can be omitted
 });
+const CODE_START = `\`\`\`
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {`;
+const CODE_END = `    } catch(err) { 
+        console.error(err); 
+    }
+})();        
+\`\`\``;
+function indentString(str, numTabs) {
+  const tabs = "	".repeat(numTabs);
+  return str.split("\n").map((line) => tabs + line).join("\n");
+}
+function replaceCodeBlocks(text) {
+  const codeBlockRegex = /```[\s\S]*?```/g;
+  return text.replace(codeBlockRegex, (match) => {
+    const code = match.slice(3, -3).trim();
+    return `${CODE_START}
+${indentString(code, 2)}
+${CODE_END}`;
+  });
+}
 function createBasePrompt(apiFilePath, documentationPath) {
   const apiText = fs.readFileSync(apiFilePath, "utf8");
   const documentationText = documentationPath ? fs.readFileSync(documentationPath, "utf8") : "";
-  const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", documentationText).replace("{{API}}", apiText);
+  const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", replaceCodeBlocks(documentationText)).replace("{{API}}", apiText);
   return createTaskPrompt;
 }
-const generateCode = async function(queryText, userChatHistory, createTaskPrompt, apiPath, debug = false, model = "gpt-4o") {
+const generateCode = async function(queryText, userChatHistory, createTaskPrompt, debug = false, model = "gpt-4o-mini") {
   if (!queryText)
     return { code: "", loggableCode: "" };
-  let generatedCode = "";
   const prompt = createTaskPrompt.replace("{{QUERY_TEXT}}", queryText);
   const messages = [
     {
@@ -359,8 +381,7 @@ const generateCode = async function(queryText, userChatHistory, createTaskPrompt
     ...userChatHistory,
     {
       role: "user",
-      content: `${queryText}.
-Respond only with code enclosed in \`\`\`.`,
+      content: `${queryText}. Respond with json`,
       name: "user"
     }
   ];
@@ -370,7 +391,23 @@ Respond only with code enclosed in \`\`\`.`,
         model,
         messages,
         temperature: 0,
-        max_tokens: 700
+        max_tokens: 2e3,
+        response_format: {
+          json_schema: {
+            name: "codeResponse",
+            description: "The code generated by the AI",
+            schema: {
+              type: "object",
+              properties: {
+                yourCode: {
+                  type: "string",
+                  description: "The code generated by the AI"
+                }
+              }
+            }
+          },
+          type: "json_schema"
+        }
       }
     );
     if (debug)
@@ -378,21 +415,14 @@ Respond only with code enclosed in \`\`\`.`,
     const response = results.choices[0].message.content;
     if (debug)
       console.log(response);
-    const codeStart = response.indexOf("```");
-    const codeEnd = response.lastIndexOf("```");
-    if (codeStart === -1 || codeEnd === -1 || codeStart === codeEnd) {
-      return { code: "", loggableCode: "", rawResponse: response };
+    try {
+      const json = JSON.parse(response);
+      const code = json.yourCode.replaceAll("```", "");
+      return { code, loggableCode: code };
+    } catch (err) {
+      console.error("Error parsing response", err);
+      return { code: "", loggableCode: "" };
     }
-    generatedCode = response.substring(codeStart + 3, codeEnd).replace("typescript", "");
-    const codeHeader = `import * as ApiDefs from '${apiPath}'
-(async() {
-	try {`;
-    const codeFooter = `
-	} catch(err) {
-		console.error(err);
-	}
-})();`;
-    return { code: codeHeader + generatedCode + codeFooter, loggableCode: generatedCode };
   } catch (err) {
     console.error(err);
     return { code: "", loggableCode: "" };
@@ -405,7 +435,7 @@ async function createWithAPI(options) {
     apiGlobals: {},
     apiWhitelist: Object.getOwnPropertyNames(Object.getPrototypeOf(options.apiObject)).filter((f) => f !== "constructor" && !f.startsWith("_")),
     debug: false,
-    model: "gpt-4o",
+    model: "gpt-4o-mini",
     ...options
   };
   if (!options.apiObject || !options.apiDefFilePath) {
@@ -418,7 +448,7 @@ async function createWithAPI(options) {
     generateCode: async function(queryText, userChatHistory, currentContext = void 0) {
       if (!queryText)
         return { code: "", loggableCode: "" };
-      return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath, debug, model);
+      return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), debug, model);
     },
     runCode: async function(generatedCode) {
       if (!QuickJS) {
@@ -445,7 +475,7 @@ async function createWithAPI(options) {
         if (debug) {
           console.log("Running Code:\n", generatedCode);
         }
-        const res = await runTask(generatedCode);
+        const res = await runTask(generatedCode.replace("'api.ts'", `'${options.apiDefFilePath}'`));
         if (!res) {
           console.error("Task unsuccessful");
         }
@@ -469,10 +499,10 @@ async function createWithAPI(options) {
         console.log("Query:", userQuery);
       }
       console.time("Generate Task");
-      const generatedCode = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath);
+      const generatedCode = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""));
       console.timeEnd("Generate Task");
       console.time("Run Code");
-      await this.runCode(generatedCode.code);
+      await this.runCode(generatedCode.code.replace("'api.ts'", `'${options.apiDefFilePath}'`));
       console.timeEnd("Run Code");
       return generatedCode;
     }

package/dist/index.d.cts

@@ -7,7 +7,7 @@ interface GenerateCodeResult {
     loggableCode: string;
     rawResponse?: string;
 }
-declare const generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, apiPath: string, debug?: boolean, model?: string) => Promise<GenerateCodeResult>;
+declare const generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, debug?: boolean, model?: string) => Promise<GenerateCodeResult>;
 interface AIMyAPIOptions {
     apiObject: object;
     apiExports: object;
@@ -28,7 +28,7 @@ interface AIMyAPIInstance {
 interface AIMyAPIModuleExports {
     createWithAPI: (options: AIMyAPIOptions) => Promise<AIMyAPIInstance>;
     createBasePrompt: (apiFilePath: string, documentationPath: string) => string;
-    generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, apiPath: string, debug: boolean) => Promise<GenerateCodeResult>;
+    generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, debug: boolean) => Promise<GenerateCodeResult>;
     createSandbox: (QuickJS: QuickJSWASMModule, globals: any) => Promise<any>;
 }
 declare const AIMyAPI: AIMyAPIModuleExports;

package/dist/index.d.mts

@@ -7,7 +7,7 @@ interface GenerateCodeResult {
     loggableCode: string;
     rawResponse?: string;
 }
-declare const generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, apiPath: string, debug?: boolean, model?: string) => Promise<GenerateCodeResult>;
+declare const generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, debug?: boolean, model?: string) => Promise<GenerateCodeResult>;
 interface AIMyAPIOptions {
     apiObject: object;
     apiExports: object;
@@ -28,7 +28,7 @@ interface AIMyAPIInstance {
 interface AIMyAPIModuleExports {
     createWithAPI: (options: AIMyAPIOptions) => Promise<AIMyAPIInstance>;
     createBasePrompt: (apiFilePath: string, documentationPath: string) => string;
-    generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, apiPath: string, debug: boolean) => Promise<GenerateCodeResult>;
+    generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, debug: boolean) => Promise<GenerateCodeResult>;
     createSandbox: (QuickJS: QuickJSWASMModule, globals: any) => Promise<any>;
 }
 declare const AIMyAPI: AIMyAPIModuleExports;

package/dist/index.d.ts

@@ -7,7 +7,7 @@ interface GenerateCodeResult {
     loggableCode: string;
     rawResponse?: string;
 }
-declare const generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, apiPath: string, debug?: boolean, model?: string) => Promise<GenerateCodeResult>;
+declare const generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, debug?: boolean, model?: string) => Promise<GenerateCodeResult>;
 interface AIMyAPIOptions {
     apiObject: object;
     apiExports: object;
@@ -28,7 +28,7 @@ interface AIMyAPIInstance {
 interface AIMyAPIModuleExports {
     createWithAPI: (options: AIMyAPIOptions) => Promise<AIMyAPIInstance>;
     createBasePrompt: (apiFilePath: string, documentationPath: string) => string;
-    generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, apiPath: string, debug: boolean) => Promise<GenerateCodeResult>;
+    generateCode: (queryText: string, userChatHistory: ChatCompletionMessageParam[], createTaskPrompt: string, debug: boolean) => Promise<GenerateCodeResult>;
     createSandbox: (QuickJS: QuickJSWASMModule, globals: any) => Promise<any>;
 }
 declare const AIMyAPI: AIMyAPIModuleExports;

package/dist/index.js

@@ -340,16 +340,38 @@ const openai = new openai$1.OpenAI({
   apiKey: process.env.OPENAI_API_KEY
   // This is also the default, can be omitted
 });
+const CODE_START = `\`\`\`
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {`;
+const CODE_END = `    } catch(err) { 
+        console.error(err); 
+    }
+})();        
+\`\`\``;
+function indentString(str, numTabs) {
+  const tabs = "	".repeat(numTabs);
+  return str.split("\n").map((line) => tabs + line).join("\n");
+}
+function replaceCodeBlocks(text) {
+  const codeBlockRegex = /```[\s\S]*?```/g;
+  return text.replace(codeBlockRegex, (match) => {
+    const code = match.slice(3, -3).trim();
+    return `${CODE_START}
+${indentString(code, 2)}
+${CODE_END}`;
+  });
+}
 function createBasePrompt(apiFilePath, documentationPath) {
   const apiText = fs.readFileSync(apiFilePath, "utf8");
   const documentationText = documentationPath ? fs.readFileSync(documentationPath, "utf8") : "";
-  const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", documentationText).replace("{{API}}", apiText);
+  const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", replaceCodeBlocks(documentationText)).replace("{{API}}", apiText);
   return createTaskPrompt;
 }
-const generateCode = async function(queryText, userChatHistory, createTaskPrompt, apiPath, debug = false, model = "gpt-4o") {
+const generateCode = async function(queryText, userChatHistory, createTaskPrompt, debug = false, model = "gpt-4o-mini") {
   if (!queryText)
     return { code: "", loggableCode: "" };
-  let generatedCode = "";
   const prompt = createTaskPrompt.replace("{{QUERY_TEXT}}", queryText);
   const messages = [
     {
@@ -359,8 +381,7 @@ const generateCode = async function(queryText, userChatHistory, createTaskPrompt
     ...userChatHistory,
     {
       role: "user",
-      content: `${queryText}.
-Respond only with code enclosed in \`\`\`.`,
+      content: `${queryText}. Respond with json`,
       name: "user"
     }
   ];
@@ -370,7 +391,23 @@ Respond only with code enclosed in \`\`\`.`,
         model,
         messages,
         temperature: 0,
-        max_tokens: 700
+        max_tokens: 2e3,
+        response_format: {
+          json_schema: {
+            name: "codeResponse",
+            description: "The code generated by the AI",
+            schema: {
+              type: "object",
+              properties: {
+                yourCode: {
+                  type: "string",
+                  description: "The code generated by the AI"
+                }
+              }
+            }
+          },
+          type: "json_schema"
+        }
       }
     );
     if (debug)
@@ -378,21 +415,14 @@ Respond only with code enclosed in \`\`\`.`,
     const response = results.choices[0].message.content;
     if (debug)
       console.log(response);
-    const codeStart = response.indexOf("```");
-    const codeEnd = response.lastIndexOf("```");
-    if (codeStart === -1 || codeEnd === -1 || codeStart === codeEnd) {
-      return { code: "", loggableCode: "", rawResponse: response };
+    try {
+      const json = JSON.parse(response);
+      const code = json.yourCode.replaceAll("```", "");
+      return { code, loggableCode: code };
+    } catch (err) {
+      console.error("Error parsing response", err);
+      return { code: "", loggableCode: "" };
     }
-    generatedCode = response.substring(codeStart + 3, codeEnd).replace("typescript", "");
-    const codeHeader = `import * as ApiDefs from '${apiPath}'
-(async() {
-	try {`;
-    const codeFooter = `
-	} catch(err) {
-		console.error(err);
-	}
-})();`;
-    return { code: codeHeader + generatedCode + codeFooter, loggableCode: generatedCode };
   } catch (err) {
     console.error(err);
     return { code: "", loggableCode: "" };
@@ -405,7 +435,7 @@ async function createWithAPI(options) {
     apiGlobals: {},
     apiWhitelist: Object.getOwnPropertyNames(Object.getPrototypeOf(options.apiObject)).filter((f) => f !== "constructor" && !f.startsWith("_")),
     debug: false,
-    model: "gpt-4o",
+    model: "gpt-4o-mini",
     ...options
   };
   if (!options.apiObject || !options.apiDefFilePath) {
@@ -418,7 +448,7 @@ async function createWithAPI(options) {
     generateCode: async function(queryText, userChatHistory, currentContext = void 0) {
       if (!queryText)
         return { code: "", loggableCode: "" };
-      return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath, debug, model);
+      return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), debug, model);
     },
     runCode: async function(generatedCode) {
       if (!QuickJS) {
@@ -445,7 +475,7 @@ async function createWithAPI(options) {
         if (debug) {
           console.log("Running Code:\n", generatedCode);
         }
-        const res = await runTask(generatedCode);
+        const res = await runTask(generatedCode.replace("'api.ts'", `'${options.apiDefFilePath}'`));
         if (!res) {
           console.error("Task unsuccessful");
         }
@@ -469,10 +499,10 @@ async function createWithAPI(options) {
         console.log("Query:", userQuery);
       }
       console.time("Generate Task");
-      const generatedCode = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath);
+      const generatedCode = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""));
       console.timeEnd("Generate Task");
       console.time("Run Code");
-      await this.runCode(generatedCode.code);
+      await this.runCode(generatedCode.code.replace("'api.ts'", `'${options.apiDefFilePath}'`));
       console.timeEnd("Run Code");
       return generatedCode;
     }

package/dist/index.mjs

@@ -318,16 +318,38 @@ const openai = new OpenAI({
   apiKey: process.env.OPENAI_API_KEY
   // This is also the default, can be omitted
 });
+const CODE_START = `\`\`\`
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {`;
+const CODE_END = `    } catch(err) { 
+        console.error(err); 
+    }
+})();        
+\`\`\``;
+function indentString(str, numTabs) {
+  const tabs = "	".repeat(numTabs);
+  return str.split("\n").map((line) => tabs + line).join("\n");
+}
+function replaceCodeBlocks(text) {
+  const codeBlockRegex = /```[\s\S]*?```/g;
+  return text.replace(codeBlockRegex, (match) => {
+    const code = match.slice(3, -3).trim();
+    return `${CODE_START}
+${indentString(code, 2)}
+${CODE_END}`;
+  });
+}
 function createBasePrompt(apiFilePath, documentationPath) {
   const apiText = fs.readFileSync(apiFilePath, "utf8");
   const documentationText = documentationPath ? fs.readFileSync(documentationPath, "utf8") : "";
-  const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", documentationText).replace("{{API}}", apiText);
+  const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", replaceCodeBlocks(documentationText)).replace("{{API}}", apiText);
   return createTaskPrompt;
 }
-const generateCode = async function(queryText, userChatHistory, createTaskPrompt, apiPath, debug = false, model = "gpt-4o") {
+const generateCode = async function(queryText, userChatHistory, createTaskPrompt, debug = false, model = "gpt-4o-mini") {
   if (!queryText)
     return { code: "", loggableCode: "" };
-  let generatedCode = "";
   const prompt = createTaskPrompt.replace("{{QUERY_TEXT}}", queryText);
   const messages = [
     {
@@ -337,8 +359,7 @@ const generateCode = async function(queryText, userChatHistory, createTaskPrompt
     ...userChatHistory,
     {
       role: "user",
-      content: `${queryText}.
-Respond only with code enclosed in \`\`\`.`,
+      content: `${queryText}. Respond with json`,
       name: "user"
     }
   ];
@@ -348,7 +369,23 @@ Respond only with code enclosed in \`\`\`.`,
         model,
         messages,
         temperature: 0,
-        max_tokens: 700
+        max_tokens: 2e3,
+        response_format: {
+          json_schema: {
+            name: "codeResponse",
+            description: "The code generated by the AI",
+            schema: {
+              type: "object",
+              properties: {
+                yourCode: {
+                  type: "string",
+                  description: "The code generated by the AI"
+                }
+              }
+            }
+          },
+          type: "json_schema"
+        }
       }
     );
     if (debug)
@@ -356,21 +393,14 @@ Respond only with code enclosed in \`\`\`.`,
     const response = results.choices[0].message.content;
     if (debug)
       console.log(response);
-    const codeStart = response.indexOf("```");
-    const codeEnd = response.lastIndexOf("```");
-    if (codeStart === -1 || codeEnd === -1 || codeStart === codeEnd) {
-      return { code: "", loggableCode: "", rawResponse: response };
+    try {
+      const json = JSON.parse(response);
+      const code = json.yourCode.replaceAll("```", "");
+      return { code, loggableCode: code };
+    } catch (err) {
+      console.error("Error parsing response", err);
+      return { code: "", loggableCode: "" };
     }
-    generatedCode = response.substring(codeStart + 3, codeEnd).replace("typescript", "");
-    const codeHeader = `import * as ApiDefs from '${apiPath}'
-(async() {
-	try {`;
-    const codeFooter = `
-	} catch(err) {
-		console.error(err);
-	}
-})();`;
-    return { code: codeHeader + generatedCode + codeFooter, loggableCode: generatedCode };
   } catch (err) {
     console.error(err);
     return { code: "", loggableCode: "" };
@@ -383,7 +413,7 @@ async function createWithAPI(options) {
     apiGlobals: {},
     apiWhitelist: Object.getOwnPropertyNames(Object.getPrototypeOf(options.apiObject)).filter((f) => f !== "constructor" && !f.startsWith("_")),
     debug: false,
-    model: "gpt-4o",
+    model: "gpt-4o-mini",
     ...options
   };
   if (!options.apiObject || !options.apiDefFilePath) {
@@ -396,7 +426,7 @@ async function createWithAPI(options) {
     generateCode: async function(queryText, userChatHistory, currentContext = void 0) {
       if (!queryText)
         return { code: "", loggableCode: "" };
-      return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath, debug, model);
+      return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), debug, model);
     },
     runCode: async function(generatedCode) {
       if (!QuickJS) {
@@ -423,7 +453,7 @@ async function createWithAPI(options) {
         if (debug) {
           console.log("Running Code:\n", generatedCode);
         }
-        const res = await runTask(generatedCode);
+        const res = await runTask(generatedCode.replace("'api.ts'", `'${options.apiDefFilePath}'`));
         if (!res) {
           console.error("Task unsuccessful");
         }
@@ -447,10 +477,10 @@ async function createWithAPI(options) {
         console.log("Query:", userQuery);
       }
       console.time("Generate Task");
-      const generatedCode = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath);
+      const generatedCode = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""));
       console.timeEnd("Generate Task");
       console.time("Run Code");
-      await this.runCode(generatedCode.code);
+      await this.runCode(generatedCode.code.replace("'api.ts'", `'${options.apiDefFilePath}'`));
       console.timeEnd("Run Code");
       return generatedCode;
     }

package/example/ordering_api.md

@@ -10,7 +10,7 @@ user: How are you today?
 
 assistant:
 ```
-orderingApi.respondToUser("I'm great, thanks for asking!");
+orderingApi.respondToUser("I'm great, thanks for asking!");        
 ```
 
 user: Add a hamburger with no cheese to my order
@@ -24,7 +24,7 @@ if (!item) {
 }
 
 orderingApi.addItemToOrder(itemName, undefined, item.toppings.filter( topping => topping.name != "cheese") );
-orderingApi.respondToUser("Ok, I added a Hamburger. What else would you like?");
+orderingApi.respondToUser("Ok, I added a Hamburger. What else would you like?");        
 ```
 
 log: Added Hamburger with id 1
@@ -34,7 +34,7 @@ user: I'd like a large pizza with mushrooms
 assistant:
 ```
 orderingApi.addItemToOrder("Pizza", ["Large"], ["mushrooms"]);
-orderingApi.respondToUser("Ok, I added a Large Pizza with mushrooms");
+orderingApi.respondToUser("Ok, I added a Large Pizza with mushrooms");        
 ```
 
 user: Add a hamburger with bacon
@@ -48,7 +48,7 @@ if (!item) {
 }
 
 orderingApi.addItemToOrder(itemName, undefined, [...item.toppings, "bacon"]);
-orderingApi.respondToUser("Ok, I added a Hamburger with no cheese or onions. What else would you like?");
+orderingApi.respondToUser("Ok, I added a Hamburger with no cheese or onions. What else would you like?");        
 ```
 
 log: Added Hamburger with id 2
@@ -64,7 +64,7 @@ if(existingItem) {
     orderingApi.respondToUser("Ok, I added jalapenos to your Hamburger");
 } else {
     orderingApi.respondToUser("Hmm, I can't find that item.");
-}
+}        
 ```
 
 user: Add a hamburger with no lettuce
@@ -78,7 +78,7 @@ if (!item) {
 }
 
 orderingApi.addItemToOrder(itemName, undefined, [...item.toppings.filter(topping => topping != "lettuce")]);
-orderingApi.respondToUser("Ok, I added a Hamburger with no cheese or onions. What else would you like?");
+orderingApi.respondToUser("Ok, I added a Hamburger with no cheese or onions. What else would you like?");        
 ```
 
 log: Added Hamburger with id 2
@@ -88,5 +88,5 @@ user: I want an elephant.
 
 assistant:
 ```
-orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");
+orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");        
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aimyapi",
-  "version": "0.1.15",
+  "version": "0.2.1",
   "description": "AI My API! Use LLMs to create small programs that safely* run and make calls against your API. Similar to ChatGPT's Code Interpreter.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/prompts/create-task-prompt.md

@@ -11,11 +11,22 @@ Here is the API that you will use:
 
 Documentation:
 
-Note: the api definitions are available as `ApiDefs`.
+Write your code in this format:
+```
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        // ... your code here
+    } catch(err) { 
+        console.error(err); 
+    }
+})();
+```
 
 {{DOCUMENTATION}}
 
-Current Context:
+Contextual data:
 ```
 {{CONTEXT}}
 ```

package/src/index.ts

@@ -13,19 +13,37 @@ const openai = new OpenAI({
     apiKey: process.env.OPENAI_API_KEY // This is also the default, can be omitted
   });
 
+const CODE_START = `\`\`\`
+import * as ApiDefs from 'api.ts'
 
-// function formatObject(obj: any): string {
-//     return Object.keys(obj).reduce((acc, key) => {
-//       return `${acc}${key}:\n${obj[key]}\n\n`;
-//     }, "");
-// }
+(async() {
+    try {`;
+
+const CODE_END = `    } catch(err) { 
+        console.error(err); 
+    }
+})();        
+\`\`\``;
+
+function indentString(str, numTabs) {
+    const tabs = '\t'.repeat(numTabs);
+    return str.split('\n').map(line => tabs + line).join('\n');
+  }
+
+function replaceCodeBlocks(text) {
+    const codeBlockRegex = /```[\s\S]*?```/g;
+    return text.replace(codeBlockRegex, (match) => {
+        const code = match.slice(3, -3).trim();
+        return `${CODE_START}\n${indentString(code, 2)}\n${CODE_END}`;
+});
+}
 
 export function createBasePrompt(apiFilePath:string, documentationPath: string): string {
     const apiText: string = fs.readFileSync(apiFilePath, 'utf8');
     const documentationText: string = documentationPath ? fs.readFileSync(documentationPath, 'utf8') : '';
 
     //console.time("Loading templates");
-    const createTaskPrompt: string = fs.readFileSync( path.join(__dirname, '../prompts/create-task-prompt.md'), 'utf8').replace("{{DOCUMENTATION}}", documentationText).replace("{{API}}", apiText);   
+    const createTaskPrompt: string = fs.readFileSync( path.join(__dirname, '../prompts/create-task-prompt.md'), 'utf8').replace("{{DOCUMENTATION}}", replaceCodeBlocks(documentationText)).replace("{{API}}", apiText);   
     //console.timeEnd("Loading templates")
     
     return createTaskPrompt;
@@ -38,11 +56,10 @@ export interface GenerateCodeResult {
 }
 
 // FIXME: add an options parameter and allow specifying the token limit
-export const generateCode = async function(queryText:string, userChatHistory:ChatCompletionMessageParam[], createTaskPrompt:string, apiPath:string, debug:boolean = false, model="gpt-4o"): Promise<GenerateCodeResult> {
+export const generateCode = async function(queryText:string, userChatHistory:ChatCompletionMessageParam[], createTaskPrompt:string, debug:boolean = false, model="gpt-4o-mini"): Promise<GenerateCodeResult> {
     if(!queryText)
         return { code: '', loggableCode: '' };
 
-    let generatedCode = '';
     const prompt = createTaskPrompt.replace("{{QUERY_TEXT}}", queryText);
     const messages:ChatCompletionMessageParam[] = [
         {
@@ -52,16 +69,33 @@ export const generateCode = async function(queryText:string, userChatHistory:Cha
         ...userChatHistory,
         {
             role: "user",
-            content: `${queryText}.\nRespond only with code enclosed in \`\`\`.`,
+            content: `${queryText}. Respond with json`,
             name: "user"
         }
     ];
+
     try {
         const results = await openai.chat.completions.create({
             model,
             messages: messages,
             temperature: 0.0,
-            max_tokens: 700,
+            max_tokens: 2000,
+            response_format: {
+                json_schema: {
+                    name: "codeResponse",
+                    description: "The code generated by the AI",
+                    schema: {
+                        type: 'object',
+                        properties: {
+                            yourCode: {
+                                type: 'string',
+                                description: 'The code generated by the AI',
+                            }
+                        },
+                    },
+                },
+                type: 'json_schema',
+              }
             }
         );
 
@@ -72,21 +106,16 @@ export const generateCode = async function(queryText:string, userChatHistory:Cha
 
         if(debug)
             console.log(response);
-            
-        // Return only the code between ``` and ``` (usually at the end of the completion)
-        const codeStart = response.indexOf('```');
-        const codeEnd = response.lastIndexOf('```');
-
-        // error, no code detected inside the response
-        if(codeStart === -1 || codeEnd === -1 || codeStart === codeEnd) {
-            return { code: '', loggableCode: '', rawResponse: response };
+        
+        try {
+            const json = JSON.parse(response); 
+            const code = json.yourCode.replaceAll('```', '');
+
+            return { code, loggableCode: code };
+        } catch(err) {
+            console.error("Error parsing response", err);
+            return { code: '', loggableCode: '' };
         }
-
-        generatedCode = response.substring(codeStart + 3, codeEnd).replace('typescript', '');
-       
-        const codeHeader = `import * as ApiDefs from '${apiPath}'\n(async() {\n\ttry {`;
-        const codeFooter = `\n\t} catch(err) {\n\t\tconsole.error(err);\n\t}\n})();`;
-        return { code: codeHeader + generatedCode + codeFooter, loggableCode: generatedCode };
     } catch(err) {
         console.error(err);
         return { code: '', loggableCode: '' };
@@ -124,7 +153,7 @@ async function createWithAPI(options:AIMyAPIOptions): Promise<AIMyAPIInstance> {
         apiGlobals: {},
         apiWhitelist: Object.getOwnPropertyNames(Object.getPrototypeOf(options.apiObject)).filter((f) => f !== "constructor" && !f.startsWith("_")),
         debug: false, 
-        model: "gpt-4o",
+        model: "gpt-4o-mini",
         ...options
     } as AIMyAPIOptions;
 
@@ -142,7 +171,7 @@ async function createWithAPI(options:AIMyAPIOptions): Promise<AIMyAPIInstance> {
             if(!queryText)
                 return { code: '', loggableCode: '' };
 
-            return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), apiDefFilePath, debug, model);
+            return await generateCode(queryText, userChatHistory, createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : ""), debug, model);
         },
         runCode: async function(generatedCode:string) {
             if(!QuickJS) {
@@ -177,7 +206,7 @@ async function createWithAPI(options:AIMyAPIOptions): Promise<AIMyAPIInstance> {
                     console.log("Running Code:\n", generatedCode);
                 }
 
-                const res = await runTask(generatedCode);
+                const res = await runTask(generatedCode.replace("'api.ts'", `'${options.apiDefFilePath}'`));
         
                 if(!res) {
                     console.error("Task unsuccessful");
@@ -211,11 +240,11 @@ async function createWithAPI(options:AIMyAPIOptions): Promise<AIMyAPIInstance> {
         
             // Generate Code
             console.time("Generate Task")
-            const generatedCode:GenerateCodeResult = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : "" ), apiDefFilePath);
+            const generatedCode:GenerateCodeResult = await generateCode(userQuery, [], createTaskPrompt.replace("{{CONTEXT}}", currentContext ? "```" + JSON.stringify(currentContext, null, 2) + "```" : "" ));
             console.timeEnd("Generate Task")
         
             console.time("Run Code")
-            await this.runCode(generatedCode.code);
+            await this.runCode(generatedCode.code.replace("'api.ts'", `'${options.apiDefFilePath}'`));
             console.timeEnd("Run Code")
 
             return generatedCode;
@@ -228,7 +257,7 @@ export interface AIMyAPIModuleExports {
     createWithAPI: (options:AIMyAPIOptions) => Promise<AIMyAPIInstance>;
     
     createBasePrompt: (apiFilePath:string, documentationPath: string) => string;
-    generateCode: (queryText:string, userChatHistory:ChatCompletionMessageParam[], createTaskPrompt:string, apiPath:string, debug:boolean) => Promise<GenerateCodeResult>;
+    generateCode: (queryText:string, userChatHistory:ChatCompletionMessageParam[], createTaskPrompt:string, debug:boolean) => Promise<GenerateCodeResult>;
     createSandbox: (QuickJS:QuickJSWASMModule, globals: any) => Promise<any>;
 }