aimyapi 0.1.14 → 0.2.0

package/README.md

@@ -68,7 +68,7 @@ api.print("I'm great, thanks for asking!");
 Instantiate your api and AIMyAPI. AIMyAPI will wrap your API so that it can be called from within the QuickJS sandbox.
 
 ```
-import AIMyAPI from "aimyapi"
+import { AIMyAPI } from "aimyapi"
 
 const api = new API();
 
@@ -184,7 +184,7 @@ npm run example1
 ```
 
 ```
-import AIMyAPI from "../lib";
+import { AIMyAPI } from "../lib";
 import { API } from "./sales_api_impl";
 import * as APIExports from "./sales_api";
 import path from "path";
@@ -253,7 +253,7 @@ npm run example2
 
 Code:
 ```
-import AIMyAPI from "../lib";
+import { AIMyAPI } from "../lib";
 import { OrderingAPI } from "./ordering_api_impl";
 import * as APIExports from "./ordering_api";
 import path from "path";

package/dist/index.cjs

@@ -346,10 +346,9 @@ function createBasePrompt(apiFilePath, documentationPath) {
   const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", 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 +358,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 +368,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 +392,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 +412,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 +425,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 +452,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,16 +476,16 @@ 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;
     }
   };
 }
-const aimyapi = {
+const AIMyAPI = {
   // Standard way of using the library
   createWithAPI,
   // functions for customized usage
@@ -487,6 +494,6 @@ const aimyapi = {
   createSandbox
 };
 
-exports.aimyapi = aimyapi;
+exports.AIMyAPI = AIMyAPI;
 exports.createBasePrompt = createBasePrompt;
 exports.generateCode = generateCode;

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,9 +28,9 @@ 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;
+declare const AIMyAPI: AIMyAPIModuleExports;
 
-export { type AIMyAPIInstance, type AIMyAPIModuleExports, type AIMyAPIOptions, type GenerateCodeResult, aimyapi, createBasePrompt, generateCode };
+export { AIMyAPI, type AIMyAPIInstance, type AIMyAPIModuleExports, type AIMyAPIOptions, type GenerateCodeResult, createBasePrompt, generateCode };

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,9 +28,9 @@ 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;
+declare const AIMyAPI: AIMyAPIModuleExports;
 
-export { type AIMyAPIInstance, type AIMyAPIModuleExports, type AIMyAPIOptions, type GenerateCodeResult, aimyapi, createBasePrompt, generateCode };
+export { AIMyAPI, type AIMyAPIInstance, type AIMyAPIModuleExports, type AIMyAPIOptions, type GenerateCodeResult, createBasePrompt, generateCode };

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,9 +28,9 @@ 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;
+declare const AIMyAPI: AIMyAPIModuleExports;
 
-export { type AIMyAPIInstance, type AIMyAPIModuleExports, type AIMyAPIOptions, type GenerateCodeResult, aimyapi, createBasePrompt, generateCode };
+export { AIMyAPI, type AIMyAPIInstance, type AIMyAPIModuleExports, type AIMyAPIOptions, type GenerateCodeResult, createBasePrompt, generateCode };

package/dist/index.js

@@ -346,10 +346,9 @@ function createBasePrompt(apiFilePath, documentationPath) {
   const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", 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 +358,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 +368,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 +392,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 +412,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 +425,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 +452,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,16 +476,16 @@ 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;
     }
   };
 }
-const aimyapi = {
+const AIMyAPI = {
   // Standard way of using the library
   createWithAPI,
   // functions for customized usage
@@ -487,6 +494,6 @@ const aimyapi = {
   createSandbox
 };
 
-exports.aimyapi = aimyapi;
+exports.AIMyAPI = AIMyAPI;
 exports.createBasePrompt = createBasePrompt;
 exports.generateCode = generateCode;

package/dist/index.mjs

@@ -324,10 +324,9 @@ function createBasePrompt(apiFilePath, documentationPath) {
   const createTaskPrompt = fs.readFileSync(path.join(__dirname, "../prompts/create-task-prompt.md"), "utf8").replace("{{DOCUMENTATION}}", 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 +336,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 +346,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 +370,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 +390,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 +403,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 +430,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,16 +454,16 @@ 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;
     }
   };
 }
-const aimyapi = {
+const AIMyAPI = {
   // Standard way of using the library
   createWithAPI,
   // functions for customized usage
@@ -465,4 +472,4 @@ const aimyapi = {
   createSandbox
 };
 
-export { aimyapi, createBasePrompt, generateCode };
+export { AIMyAPI, createBasePrompt, generateCode };

package/example/example1.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import AIMyAPI from "../src";
+import { AIMyAPI } from "../src";
 import * as APIExports from "./sales_api";
 import { API } from "./sales_api_impl";
 

package/example/example2.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import AIMyAPI, { GenerateCodeResult } from "../src";
+import { AIMyAPI, GenerateCodeResult } from "../src";
 import * as APIExports from "./ordering_api";
 import { OrderingAPI } from "./ordering_api_impl";
 

package/example/example3.ts

@@ -1,6 +1,6 @@
 
 import path from "path";
-import AIMyAPI from "../src";
+import { AIMyAPI } from "../src";
 import * as APIExports from "./ordering_api";
 import { OrderingAPI } from "./ordering_api_impl";
 
@@ -38,7 +38,7 @@ function getInput(query): Promise<string> {
         console.log(`Query: ${query}`)
 
         // generate the code for this query
-        const code = await aimyapi.generateCode(query, api._getHistory());
+        const result = await aimyapi.generateCode(query, api._getHistory());
 
         api._addMessageToHistory({
             content: query,
@@ -47,13 +47,13 @@ function getInput(query): Promise<string> {
         });
 
         api._addMessageToHistory({
-            content: '```\n' + code.replace(options.apiDefFilePath, "./api.ts") + '\n```',
+            content: '```\n' + result.code.replace(options.apiDefFilePath, "./api.ts") + '\n```',
             role: "assistant",
             name: "assistant",
         });
 
         // run the code in the sandbox
-        await aimyapi.runCode(code);
+        await aimyapi.runCode(result.code);
     }
    
     console.log("Welcome to the restaurant. You can ask to hear the menu or order something. What would you like to do?");

package/example/ordering_api.md

@@ -10,21 +10,37 @@ user: How are you today?
 
 assistant:
 ```
-orderingApi.respondToUser("I'm great, thanks for asking!");
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        orderingApi.respondToUser("I'm great, thanks for asking!");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```
 
 user: Add a hamburger with no cheese to my order
 
 assistant:
 ```
-const itemName = "Hamburger";
-const item = ApiDefs.Menu.find((item) => item.name === itemName);
-if (!item) {
-    throw new Error(`Item with name "${itemName}" not found`);
-}
-
-orderingApi.addItemToOrder(itemName, undefined, item.toppings.filter( topping => topping.name != "cheese") );
-orderingApi.respondToUser("Ok, I added a Hamburger. What else would you like?");
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        const itemName = "Hamburger";
+        const item = ApiDefs.Menu.find((item) => item.name === itemName);
+        if (!item) {
+            throw new Error(`Item with name "${itemName}" not found`);
+        }
+
+        orderingApi.addItemToOrder(itemName, undefined, item.toppings.filter( topping => topping.name != "cheese") );
+        orderingApi.respondToUser("Ok, I added a Hamburger. What else would you like?");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```
 
 log: Added Hamburger with id 1
@@ -33,22 +49,39 @@ 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");
+
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        orderingApi.addItemToOrder("Pizza", ["Large"], ["mushrooms"]);
+        orderingApi.respondToUser("Ok, I added a Large Pizza with mushrooms");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```
 
 user: Add a hamburger with bacon
 
 assistant:
 ```
-const itemName = "Hamburger";
-const item = ApiDefs.Menu.find((item) => item.name === itemName);
-if (!item) {
-    throw new Error(`Item with name "${itemName}" not found`);
-}
-
-orderingApi.addItemToOrder(itemName, undefined, [...item.toppings, "bacon"]);
-orderingApi.respondToUser("Ok, I added a Hamburger with no cheese or onions. What else would you like?");
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        const itemName = "Hamburger";
+        const item = ApiDefs.Menu.find((item) => item.name === itemName);
+        if (!item) {
+            throw new Error(`Item with name "${itemName}" not found`);
+        }
+
+        orderingApi.addItemToOrder(itemName, undefined, [...item.toppings, "bacon"]);
+        orderingApi.respondToUser("Ok, I added a Hamburger with no cheese or onions. What else would you like?");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```
 
 log: Added Hamburger with id 2
@@ -57,28 +90,44 @@ user: Add jalapenos to that
 
 assistant: 
 ```
-const existingItem = orderingApi.getItemInOrder("2");
-
-if(existingItem) {
-    orderingApi.modifyItemInOrder("2", existingItem.customizations.map(item => item.name), [...existingItem.toppings, "jalapenos"]);
-    orderingApi.respondToUser("Ok, I added jalapenos to your Hamburger");
-} else {
-    orderingApi.respondToUser("Hmm, I can't find that item.");
-}
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        const existingItem = orderingApi.getItemInOrder("2");
+
+        if(existingItem) {
+            orderingApi.modifyItemInOrder("2", existingItem.customizations.map(item => item.name), [...existingItem.toppings, "jalapenos"]);
+            orderingApi.respondToUser("Ok, I added jalapenos to your Hamburger");
+        } else {
+            orderingApi.respondToUser("Hmm, I can't find that item.");
+        }
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```
 
 user: Add a hamburger with no lettuce
 
 assistant:
 ```
-const itemName = "Hamburger";
-const item = ApiDefs.Menu.find((item) => item.name === itemName);
-if (!item) {
-    throw new Error(`Item with name "${itemName}" not found`);
-}
-
-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?");
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        const itemName = "Hamburger";
+        const item = ApiDefs.Menu.find((item) => item.name === itemName);
+        if (!item) {
+            throw new Error(`Item with name "${itemName}" not found`);
+        }
+
+        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?");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```
 
 log: Added Hamburger with id 2
@@ -88,5 +137,13 @@ user: I want an elephant.
 
 assistant:
 ```
-orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```

package/example/ordering_api_impl.ts

@@ -1,10 +1,10 @@
-import { ChatCompletionRequestMessage } from "openai";
+import { ChatCompletionMessageParam } from "openai/resources/index.mjs";
 import { delay } from "../src/utils";
 import {
-    Customization,
-    Menu,
-    MenuItemBase,
-    OrderingAPIInterface,
+	Customization,
+	Menu,
+	MenuItemBase,
+	OrderingAPIInterface,
 } from "./ordering_api";
 
 // TODO: make functions to print out an item, and print out the current order with the price totals.
@@ -14,7 +14,7 @@ export class OrderingAPI implements OrderingAPIInterface {
 	private _lastOrderIdNumber: number = 0;
     public _isCompleted:boolean = false;
 
-	private _history: ChatCompletionRequestMessage[] = [];
+	private _history: ChatCompletionMessageParam[] = [];
 
 	// Mock implementation, doesn't actually send an email
 	sendEmail(to: string, subject: string, body: string): Promise<void> {
@@ -194,11 +194,11 @@ export class OrderingAPI implements OrderingAPIInterface {
 		this.respondToUser(`--\tTotal:\t\t$${this.getOrderTotal().toFixed(2)}`);
 	}
 
-	_addMessageToHistory(message: ChatCompletionRequestMessage) {
+	_addMessageToHistory(message: ChatCompletionMessageParam) {
 		this._history.push(message);
 	}
 
-	_getHistory(): ChatCompletionRequestMessage[] {
+	_getHistory(): ChatCompletionMessageParam[] {
 		return this._history;
 	}
 

package/example/sales_api.md

@@ -6,5 +6,13 @@ user: How are you today?
 
 assistant:
 ```
-api.print("I'm great, thanks for asking!");
+import * as ApiDefs from 'api.ts'
+
+(async() {
+    try {
+        api.print("I'm great, thanks for asking!");
+    } catch(err) { 
+        console.error(err); 
+    }
+})();        
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aimyapi",
-  "version": "0.1.14",
+  "version": "0.2.0",
   "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

@@ -38,11 +38,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 +51,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 +88,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 +135,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 +153,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 +188,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 +222,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,11 +239,11 @@ 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>;
 }
 
-export const aimyapi:AIMyAPIModuleExports = {
+export const AIMyAPI:AIMyAPIModuleExports = {
     // Standard way of using the library
     createWithAPI,      
 
@@ -240,4 +251,4 @@ export const aimyapi:AIMyAPIModuleExports = {
     createBasePrompt,   
     generateCode,
     createSandbox,
-}
+}