aimyapi 0.2.0 → 0.2.1

package/dist/index.cjs

@@ -340,10 +340,33 @@ 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, debug = false, model = "gpt-4o-mini") {

package/dist/index.js

@@ -340,10 +340,33 @@ 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, debug = false, model = "gpt-4o-mini") {

package/dist/index.mjs

@@ -318,10 +318,33 @@ 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, debug = false, model = "gpt-4o-mini") {

package/example/ordering_api.md

@@ -10,37 +10,21 @@ user: How are you today?
 
 assistant:
 ```
-import * as ApiDefs from 'api.ts'
-
-(async() {
-    try {
-        orderingApi.respondToUser("I'm great, thanks for asking!");
-    } catch(err) { 
-        console.error(err); 
-    }
-})();        
+orderingApi.respondToUser("I'm great, thanks for asking!");        
 ```
 
 user: Add a hamburger with no cheese to my order
 
 assistant:
 ```
-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); 
-    }
-})();        
+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?");        
 ```
 
 log: Added Hamburger with id 1
@@ -49,39 +33,22 @@ user: I'd like a large pizza with mushrooms
 
 assistant:
 ```
-
-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); 
-    }
-})();        
+orderingApi.addItemToOrder("Pizza", ["Large"], ["mushrooms"]);
+orderingApi.respondToUser("Ok, I added a Large Pizza with mushrooms");        
 ```
 
 user: Add a hamburger with bacon
 
 assistant:
 ```
-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); 
-    }
-})();        
+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?");        
 ```
 
 log: Added Hamburger with id 2
@@ -90,44 +57,28 @@ user: Add jalapenos to that
 
 assistant: 
 ```
-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); 
-    }
-})();        
+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
 
 assistant:
 ```
-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); 
-    }
-})();        
+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?");        
 ```
 
 log: Added Hamburger with id 2
@@ -137,13 +88,5 @@ user: I want an elephant.
 
 assistant:
 ```
-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); 
-    }
-})();        
+orderingApi.respondToUser("I'm sorry, but that isn't on our menu.");        
 ```

package/example/sales_api.md

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

package/package.json

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