aimyapi 1.0.7 → 1.0.8

package/dist/index.mjs

@@ -416,11 +416,12 @@ const checkCodeSchema = z.object({
 const submitCodeSchema = z.object({
   code: z.string()
 });
-const generateCode = async function(instance, queryText, userChatHistory, createTaskPrompt, debug = false, hideLogsFromAgent = false, model = "gpt-5-mini", additionalModelOptions) {
+const generateCode = async function(instance, queryText, userChatHistory, createTaskPrompt, debug = false, hideLogsFromAgent = false, model = "gpt-5-mini", additionalModelOptions, attempt = 0) {
   let finalSubmittedCode = "";
   if (debug) {
     console.log("Generating code for query:", queryText);
   }
+  const newHistoryItems = [];
   const codingTools = [
     {
       type: "function",
@@ -465,6 +466,14 @@ const generateCode = async function(instance, queryText, userChatHistory, create
         name: "submitCode",
         // @ts-ignore
         function: async ({ code }) => {
+          const checkRes = await instance.checkCode(code);
+          if (!checkRes.success) {
+            return {
+              success: false,
+              reason: "Code check failed",
+              logs: checkRes.logs
+            };
+          }
           finalSubmittedCode = code;
           return {
             success: true
@@ -487,7 +496,7 @@ const generateCode = async function(instance, queryText, userChatHistory, create
         ...userChatHistory,
         {
           role: "user",
-          content: createTaskPrompt.replace("{{USER_QUERY}}", queryText)
+          content: attempt == 0 ? createTaskPrompt.replace("{{USER_QUERY}}", queryText) : queryText
         }
       ],
       tools: codingTools,
@@ -496,6 +505,7 @@ const generateCode = async function(instance, queryText, userChatHistory, create
       if (debug) {
         console.log("Message:", JSON.stringify(message, null, 2));
       }
+      newHistoryItems.push(message);
     }).on("functionToolCall", (functionCall) => {
       if (debug) {
         console.log("Function Call:", JSON.stringify(functionCall, null, 2));
@@ -507,15 +517,37 @@ const generateCode = async function(instance, queryText, userChatHistory, create
     });
     const finalContent = await runner.finalContent();
     if (debug) {
-      console.log("Final Content:", finalContent);
+      console.log("Generate code final response:", finalContent);
+    }
+    if (!finalSubmittedCode) {
+      console.error("No code was submitted by the agent.");
+      if (attempt < 3) {
+        return generateCode(instance, `You must call submitCode with valid code before proceeding. Attempt ${attempt + 1} of 3.`, [
+          ...userChatHistory,
+          {
+            role: "user",
+            content: attempt == 0 ? createTaskPrompt.replace("{{USER_QUERY}}", queryText) : queryText
+          },
+          ...newHistoryItems
+        ], createTaskPrompt, debug, hideLogsFromAgent, model, additionalModelOptions, attempt + 1);
+      } else {
+        return {
+          success: false,
+          comments: "No code was submitted by the agent after multiple attempts. Final comment: " + finalContent
+        };
+      }
     }
     return {
+      success: true,
       code: finalSubmittedCode,
       comments: finalContent || void 0
     };
   } catch (err) {
     console.error(err);
-    return null;
+    return {
+      success: false,
+      comments: `Error generating code: ${err}`
+    };
   }
 };
 async function createWithAPI(options) {

package/example/example1.ts

@@ -1,31 +1,31 @@
-import { AIMyAPI } from "../src";
-import { API } from "./sales_api_impl";
-
-// Simpler example using no support for chat history; 
-
-(async () => {
-    const api = new API();
-
-    const aimyapi = await AIMyAPI.createWithAPI({
-        apiObject: api,
-        apiGlobalName: "salesApi", // Should match whatever you declared as your global in your api.
-        apiDefFilePath:  "./example/sales_api.ts",
-        apiDocsPath: "./example/sales_api.md",
-        debug: false,
-    })
-
-    aimyapi.runCode(`console.log("Hello from the sandbox! Here is some sales data:", salesApi.getSalesData())`);
-    
-    console.log("Print 'hello' three times.")
-    await aimyapi.processRequest("Print 'hello' three times.");
-
-    console.log("What month had the highest sales in 2020 for any business unit?")
-    await aimyapi.processRequest("What was our best month in 2020");
-
-    console.log("Which business unit had the highest sales in 2020? Print the totals for each")
-    await aimyapi.processRequest("Which business unit had the highest sales in 2020? Print the totals for each");
-    // Note: this is a bit of a trick question because two of them are tied for first. The agent usually doesn't realize this edge case. Should we instruct it to look for edge cases?
-
-    console.log("Compute the total sales for each month in 2020 then email the top 3 to test@email.com")
-    await aimyapi.processRequest("Compute the total sales for each month in 2020 then email the top 3 to test@email.com");
+import { AIMyAPI } from "../src";
+import { API } from "./sales_api_impl";
+
+// Simpler example using no support for chat history; 
+
+(async () => {
+    const api = new API();
+
+    const aimyapi = await AIMyAPI.createWithAPI({
+        apiObject: api,
+        apiGlobalName: "salesApi", // Should match whatever you declared as your global in your api.
+        apiDefFilePath:  "./example/sales_api.ts",
+        apiDocsPath: "./example/sales_api.md",
+        debug: false,
+    })
+
+    aimyapi.runCode(`console.log("Hello from the sandbox! Here is some sales data:", salesApi.getSalesData())`);
+    
+    console.log("Print 'hello' three times.")
+    await aimyapi.processRequest("Print 'hello' three times.");
+
+    console.log("What month had the highest sales in 2020 for any business unit?")
+    await aimyapi.processRequest("What was our best month in 2020");
+
+    console.log("Which business unit had the highest sales in 2020? Print the totals for each")
+    await aimyapi.processRequest("Which business unit had the highest sales in 2020? Print the totals for each");
+    // Note: this is a bit of a trick question because two of them are tied for first. The agent usually doesn't realize this edge case. Should we instruct it to look for edge cases?
+
+    console.log("Compute the total sales for each month in 2020 then email the top 3 to test@email.com")
+    await aimyapi.processRequest("Compute the total sales for each month in 2020 then email the top 3 to test@email.com");
 })();

package/example/example2.ts

@@ -1,59 +1,59 @@
-// Note: This example is quite stupid and slow and you'd be better off using Tool calling for something like this, but I'm leaving it for demonstration purposes
-
-import { AIMyAPI } from "../src";
-import { Menu } from "./ordering_api";
-import { OrderingAPI } from "./ordering_api_impl";
-
-// More complex fast food ordering example that uses chat history.
-// Fast food ordering example.
-
-(async () => {
-    const orderingApi = new OrderingAPI();
-
-    const options = {
-        apiObject: orderingApi,
-        apiGlobalName: "orderingApi",       // Should match whatever you declared as your global in your ordering api.
-        apiGlobals: {
-            Menu: Menu,
-        },
-        apiDefFilePath: "./example/ordering_api.ts",
-        apiDocsPath: "./example/ordering_api.md",
-        debug: false,
-    };
-    const aimyapi = await AIMyAPI.createWithAPI(options)
-
-    async function runQuery(query:string) {
-        console.log(`Query: ${query}`)
-
-        // generate the code for this query
-        const codeResult = await aimyapi.generateCode(query, orderingApi._getHistory());
-
-        if(codeResult) {
-            orderingApi._addMessageToHistory({
-                content: query,
-                role: "user",
-                name: "user",
-            });
-
-            orderingApi._addMessageToHistory({
-                content: codeResult.comments || "done",
-                role: "assistant",
-                name: "assistant",
-            });
-
-            // run the code in the sandbox
-            if(codeResult.code) {
-                await aimyapi.runCode(codeResult.code);
-            }
-        } else {
-            console.error("No code generated for this query.");
-        }
-
-    }
-   
-    await runQuery("How's the burger here?");
-    await runQuery("I'd like a plain hamburger (no cheese) and a large fries, a pizza with anchovies and a cola. I'd also like a cheese burger with bacon and avocado.");
-    await runQuery("I changed my mind, instead of anchovies, can I get a large gluten free pizza with pineapple instead.");
-    await runQuery("email me the total at myemail@test.com and complete the order");
-
+// Note: This example is quite stupid and slow and you'd be better off using Tool calling for something like this, but I'm leaving it for demonstration purposes
+
+import { AIMyAPI } from "../src";
+import { Menu } from "./ordering_api";
+import { OrderingAPI } from "./ordering_api_impl";
+
+// More complex fast food ordering example that uses chat history.
+// Fast food ordering example.
+
+(async () => {
+    const orderingApi = new OrderingAPI();
+
+    const options = {
+        apiObject: orderingApi,
+        apiGlobalName: "orderingApi",       // Should match whatever you declared as your global in your ordering api.
+        apiGlobals: {
+            Menu: Menu,
+        },
+        apiDefFilePath: "./example/ordering_api.ts",
+        apiDocsPath: "./example/ordering_api.md",
+        debug: false,
+    };
+    const aimyapi = await AIMyAPI.createWithAPI(options)
+
+    async function runQuery(query:string) {
+        console.log(`Query: ${query}`)
+
+        // generate the code for this query
+        const codeResult = await aimyapi.generateCode(query, orderingApi._getHistory());
+
+        if(codeResult) {
+            orderingApi._addMessageToHistory({
+                content: query,
+                role: "user",
+                name: "user",
+            });
+
+            orderingApi._addMessageToHistory({
+                content: codeResult.comments || "done",
+                role: "assistant",
+                name: "assistant",
+            });
+
+            // run the code in the sandbox
+            if(codeResult.code) {
+                await aimyapi.runCode(codeResult.code);
+            }
+        } else {
+            console.error("No code generated for this query.");
+        }
+
+    }
+   
+    await runQuery("How's the burger here?");
+    await runQuery("I'd like a plain hamburger (no cheese) and a large fries, a pizza with anchovies and a cola. I'd also like a cheese burger with bacon and avocado.");
+    await runQuery("I changed my mind, instead of anchovies, can I get a large gluten free pizza with pineapple instead.");
+    await runQuery("email me the total at myemail@test.com and complete the order");
+
 })();

package/example/example3.ts

@@ -1,70 +1,70 @@
-
-import { AIMyAPI } from "../src";
-import { Menu } from "./ordering_api";
-import { OrderingAPI } from "./ordering_api_impl";
-
-import readline from 'readline';
-
-function getInput(query: string): Promise<string> {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-
-    return new Promise(resolve => rl.question(query, ans => {
-        rl.close();
-        resolve(ans);
-    }))
-}
-
-// More complex fast food ordering example that uses chat history.
-// Fast food ordering example.
-// -- Interactive version
-(async () => {
-    const orderingApi = new OrderingAPI();
-    
-    const options = {
-        apiObject: orderingApi,
-        apiGlobalName: "orderingApi",       // Should match whatever you declared as your global in your ordering api.
-        apiGlobals: {
-            Menu: Menu,
-        },
-        apiDefFilePath: "./example/ordering_api.ts",
-        apiDocsPath: "./example/ordering_api.md",
-        debug: false,
-    };
-    const aimyapi = await AIMyAPI.createWithAPI(options)
-
-    async function runQuery(query:string) {
-        console.log(`Query: ${query}`)
-
-        // generate the code for this query
-        const result = await aimyapi.generateCode(query, orderingApi._getHistory());
-
-        if(result) {
-            orderingApi._addMessageToHistory({
-                content: query,
-                role: "user",
-                name: "user",
-            });
-
-            orderingApi._addMessageToHistory({
-                content: result.comments || "done",
-                role: "assistant",
-                name: "assistant",
-            });
-
-            // run the code in the sandbox
-            if(result.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?");
-    while (!orderingApi._isCompleted) {
-        const query:string = await getInput("Your query: ");
-        await runQuery(query);
-    }
-
+
+import { AIMyAPI } from "../src";
+import { Menu } from "./ordering_api";
+import { OrderingAPI } from "./ordering_api_impl";
+
+import readline from 'readline';
+
+function getInput(query: string): Promise<string> {
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+
+    return new Promise(resolve => rl.question(query, ans => {
+        rl.close();
+        resolve(ans);
+    }))
+}
+
+// More complex fast food ordering example that uses chat history.
+// Fast food ordering example.
+// -- Interactive version
+(async () => {
+    const orderingApi = new OrderingAPI();
+    
+    const options = {
+        apiObject: orderingApi,
+        apiGlobalName: "orderingApi",       // Should match whatever you declared as your global in your ordering api.
+        apiGlobals: {
+            Menu: Menu,
+        },
+        apiDefFilePath: "./example/ordering_api.ts",
+        apiDocsPath: "./example/ordering_api.md",
+        debug: false,
+    };
+    const aimyapi = await AIMyAPI.createWithAPI(options)
+
+    async function runQuery(query:string) {
+        console.log(`Query: ${query}`)
+
+        // generate the code for this query
+        const result = await aimyapi.generateCode(query, orderingApi._getHistory());
+
+        if(result) {
+            orderingApi._addMessageToHistory({
+                content: query,
+                role: "user",
+                name: "user",
+            });
+
+            orderingApi._addMessageToHistory({
+                content: result.comments || "done",
+                role: "assistant",
+                name: "assistant",
+            });
+
+            // run the code in the sandbox
+            if(result.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?");
+    while (!orderingApi._isCompleted) {
+        const query:string = await getInput("Your query: ");
+        await runQuery(query);
+    }
+
 })();

package/example/ordering_api.md

@@ -1,94 +1,94 @@
-# Documentation
-
-You work at a restaurant. 
-Your responses should be energetic, positive and polite.
-Help the customer with whatever questions they may have and ring up their orders.
-Do not complete the order until the user says they are finished ordering.
-Your code should check for errors or for cases where items may not be found.
-
-## Examples of how you should respond:
-
-user: How are you today?
-
-code:
-```typescript
-orderingApi.respondToUser("I'm great, thanks for asking!");        
-```
-
-user: Add a hamburger with no cheese to my order
-
-code:
-```typescript
-const itemName = "Hamburger";
-const item = 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?");        
-```
-
-log: Added Hamburger with id 1
-
-user: I'd like a large pizza with mushrooms
-
-code:
-```typescript
-orderingApi.addItemToOrder("Pizza", ["Large"], ["mushrooms"]);
-orderingApi.respondToUser("Ok, I added a Large Pizza with mushrooms");        
-```
-
-user: Add a hamburger with bacon
-
-code:
-```typescript
-const itemName = "Hamburger";
-const item = 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?");        
-```
-
-log: Added Hamburger with id 2
-
-user: Add jalapenos to that
-
-code: 
-```typescript
-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.");
-}        
-```
-
-user: Add a hamburger with no lettuce
-
-code:
-```typescript
-const itemName = "Hamburger";
-const item = 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?");        
-```
-
-log: Added Hamburger with id 2
-
-
-user: I want an elephant.
-
-code:
-```typescript
-orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");        
-```
+# Documentation
+
+You work at a restaurant. 
+Your responses should be energetic, positive and polite.
+Help the customer with whatever questions they may have and ring up their orders.
+Do not complete the order until the user says they are finished ordering.
+Your code should check for errors or for cases where items may not be found.
+
+## Examples of how you should respond:
+
+user: How are you today?
+
+code:
+```typescript
+orderingApi.respondToUser("I'm great, thanks for asking!");        
+```
+
+user: Add a hamburger with no cheese to my order
+
+code:
+```typescript
+const itemName = "Hamburger";
+const item = 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?");        
+```
+
+log: Added Hamburger with id 1
+
+user: I'd like a large pizza with mushrooms
+
+code:
+```typescript
+orderingApi.addItemToOrder("Pizza", ["Large"], ["mushrooms"]);
+orderingApi.respondToUser("Ok, I added a Large Pizza with mushrooms");        
+```
+
+user: Add a hamburger with bacon
+
+code:
+```typescript
+const itemName = "Hamburger";
+const item = 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?");        
+```
+
+log: Added Hamburger with id 2
+
+user: Add jalapenos to that
+
+code: 
+```typescript
+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.");
+}        
+```
+
+user: Add a hamburger with no lettuce
+
+code:
+```typescript
+const itemName = "Hamburger";
+const item = 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?");        
+```
+
+log: Added Hamburger with id 2
+
+
+user: I want an elephant.
+
+code:
+```typescript
+orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");        
+```