aimyapi 0.1.2 → 0.1.4

package/lib/index.ts

@@ -27,22 +27,31 @@ export function createBasePrompt(apiFilePath:string, documentationPath: string):
     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}}", documentationText).replace("{{API}}", apiText);   
     //console.timeEnd("Loading templates")
     
     return createTaskPrompt;
 }
 
-// userChatHistory is not currently used but could be in the future.
+// FIXME: add an options parameter and allow specifying the token limit
 export const generateCode = async function(queryText:string, userChatHistory:ChatCompletionRequestMessage[], createTaskPrompt:string, apiPath:string, debug:boolean = false): Promise<string> {
     if(!queryText)
         return;
 
     let generatedCode = '';
     const prompt = createTaskPrompt.replace("{{QUERY_TEXT}}", queryText);
-
+    const messages:ChatCompletionRequestMessage[] = [
+        {
+            role: "system",
+            content: prompt,
+        },
+        ...userChatHistory,
+        {
+            role: "user",
+            content: `${queryText}`,
+            name: "user"
+        }
+    ];
     // TODO: I should switch this back to gpt3.5 turbo since it's cheaper
     try {
         // const task = await openai.createCompletion(
@@ -56,24 +65,12 @@ export const generateCode = async function(queryText:string, userChatHistory:Cha
 
         const results = await openai.createChatCompletion({
             model: "gpt-3.5-turbo",
-            messages: [
-                {
-                    role: "system",
-                    content: prompt,
-                },
-                ...userChatHistory,
-                {
-                    role: "user",
-                    content: `${queryText}`,
-                    name: "user"
-                }
-            ],
+            messages: messages,
             temperature: 0.1,
-            max_tokens: 800,
+            max_tokens: 700,
             }
         );
 
-
         if(debug)
             console.log(results.data.usage);
         
@@ -91,13 +88,13 @@ export const generateCode = async function(queryText:string, userChatHistory:Cha
 
         generatedCode = response.substring(codeStart + 3, codeEnd).replace('typescript', '');
        
-        generatedCode = `// Query=${queryText}\n` + generatedCode.replace("./api.ts", apiPath);
+        generatedCode = generatedCode.replace("./api.ts", apiPath);
         return generatedCode;
     } catch(err) {
         console.error(err);
+        console.log("Prompt", messages);
         return '';
     } 
-
 };
 
 let QuickJS:QuickJSWASMModule = null;

package/lib/sandbox.ts

@@ -139,7 +139,7 @@ export default async function createSandbox(QuickJS, requireLookup:any = {}, glo
         const compiled = tsCompile(task);
 
         if (!compiled || compiled.length === 0) {
-          console.log("Could not compile");
+          console.error("Could not compile", task);
           return false;
         }
 

package/package.json

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

package/tsconfig.json

@@ -7,6 +7,6 @@
         "outDir": "dist" /* Redirect output structure to the directory. */,
         "declaration": true
     },
-    "include": ["**/*.ts"],
-    "exclude": ["**/node_modules"]    
+    "include": ["**/lib/*.ts"],
+    "exclude": ["**/node_modules, **/dist"]    
 }

package/dist/example/example1.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/example/example1.js

@@ -1,52 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lib_1 = __importDefault(require("../lib"));
-const sales_api_impl_1 = require("./sales_api_impl");
-const APIExports = __importStar(require("./sales_api"));
-const path_1 = __importDefault(require("path"));
-// Simpler example using no support for chat history; 
-(async () => {
-    const api = new sales_api_impl_1.API();
-    const aimyapi = await lib_1.default.createWithAPI({
-        apiObject: api,
-        apiGlobalName: "api",
-        apiExports: APIExports,
-        apiDefFilePath: path_1.default.join(__dirname, "./sales_api.ts"),
-        apiDocsPath: path_1.default.join(__dirname, "./sales_api.md"),
-        debug: false,
-    });
-    console.log("Print 'hello' three times.");
-    await aimyapi.processRequest("Print 'hello' three times.");
-    console.log("What was our best month in 2020");
-    await aimyapi.processRequest("What was our best month in 2020");
-    console.log("Which business unit had the highest sales in 2020?");
-    await aimyapi.processRequest("Which business unit had the highest sales in 2020?");
-    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/dist/example/example2.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/example/example2.js

@@ -1,66 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lib_1 = __importDefault(require("../lib"));
-const ordering_api_impl_1 = require("./ordering_api_impl");
-const APIExports = __importStar(require("./ordering_api"));
-const path_1 = __importDefault(require("path"));
-// More complex fast food ordering example that uses chat history.
-// Fast food ordering example.
-(async () => {
-    const api = new ordering_api_impl_1.OrderingAPI();
-    const aimyapi = await lib_1.default.createWithAPI({
-        apiObject: api,
-        apiGlobalName: "orderingApi",
-        apiExports: APIExports,
-        apiDefFilePath: path_1.default.join(__dirname, "./ordering_api.ts"),
-        apiDocsPath: path_1.default.join(__dirname, "./ordering_api.md"),
-        debug: false,
-    });
-    async function runQuery(query) {
-        console.log(`Query: ${query}`);
-        // generate the code for this query
-        const code = await aimyapi.generateCode(query, api._getHistory());
-        api._addMessageToHistory({
-            content: query,
-            role: "user",
-            name: "user",
-        });
-        api._addMessageToHistory({
-            content: '```\n' + code + '\n```',
-            role: "assistant",
-            name: "assistant",
-        });
-        // run the code in the sandbox
-        await aimyapi.runCode(code);
-    }
-    await runQuery("How's the burger here?");
-    await runQuery("I'd like a plain hamburger 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/dist/example/example3.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/example/example3.js

@@ -1,79 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lib_1 = __importDefault(require("../lib"));
-const ordering_api_impl_1 = require("./ordering_api_impl");
-const APIExports = __importStar(require("./ordering_api"));
-const path_1 = __importDefault(require("path"));
-const readline_1 = __importDefault(require("readline"));
-function getInput(query) {
-    const rl = readline_1.default.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 api = new ordering_api_impl_1.OrderingAPI();
-    const aimyapi = await lib_1.default.createWithAPI({
-        apiObject: api,
-        apiGlobalName: "orderingApi",
-        apiExports: APIExports,
-        apiDefFilePath: path_1.default.join(__dirname, "./ordering_api.ts"),
-        apiDocsPath: path_1.default.join(__dirname, "./ordering_api.md"),
-        debug: false,
-    });
-    async function runQuery(query) {
-        console.log(`Query: ${query}`);
-        // generate the code for this query
-        const code = await aimyapi.generateCode(query, api._getHistory());
-        api._addMessageToHistory({
-            content: query,
-            role: "user",
-            name: "user",
-        });
-        api._addMessageToHistory({
-            content: '```\n' + code + '\n```',
-            role: "assistant",
-            name: "assistant",
-        });
-        // run the code in the sandbox
-        await aimyapi.runCode(code);
-    }
-    console.log("Welcome to the restaurant. You can ask to hear the menu or order something. What would you like to do?");
-    while (!api._isCompleted) {
-        const query = await getInput("Your query: ");
-        await runQuery(query);
-    }
-})();

package/dist/example/ordering_api.d.ts

@@ -1,36 +0,0 @@
-export declare const API_VERSION = "1.0.1";
-export interface Customization {
-    name: string;
-    priceAdjustment: number;
-}
-export interface MenuItemBase {
-    orderId?: string;
-    name: string;
-    price: number;
-    description: string;
-    category: string;
-    tags: string[];
-    customizations: Customization[];
-    readonly allowedCustomizations: Customization[];
-    toppings: string[];
-    readonly allowedToppings: string[];
-}
-export declare const Menu: MenuItemBase[];
-export interface OrderingAPIInterface {
-    sendEmail(to: string, subject: string, body: string): Promise<void>;
-    getCurrentOrder(): MenuItemBase[];
-    getItemInOrder(itemOrderId: string): MenuItemBase | undefined;
-    getCustomizationByName(itemName: string, name: string): Customization | undefined;
-    addItemToOrder(itemName: string, customizationNames: string[], toppings: string[]): void;
-    removeItemFromOrder(itemOrderId: string): void;
-    modifyItemInOrder(itemOrderId: string, customizationNames: string[], toppings: string[]): void;
-    getOrderTotal(): number;
-    completeOrder(): void;
-    respondToUser(text: string): void;
-    delay(milliseconds: number): Promise<void>;
-    displayItem(item: MenuItemBase): void;
-    displayOrder(): void;
-}
-declare global {
-    var orderingApi: OrderingAPIInterface;
-}

package/dist/example/ordering_api.js

@@ -1,125 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Menu = exports.API_VERSION = void 0;
-exports.API_VERSION = "1.0.1";
-exports.Menu = [
-    {
-        "name": "Pizza",
-        "price": 10.99,
-        "description": "A classic pizza with your choice of toppings.",
-        "category": "Pizza",
-        "tags": [
-            "cheese",
-            "pizza"
-        ],
-        "customizations": [],
-        "allowedCustomizations": [
-            {
-                "name": "Extra Cheese",
-                "priceAdjustment": 1.99
-            },
-            {
-                "name": "Extra Sauce",
-                "priceAdjustment": 0.99
-            },
-            {
-                "name": "Gluten Free Crust",
-                "priceAdjustment": 2.99
-            },
-            {
-                "name": "Large",
-                "priceAdjustment": 3.99
-            }
-        ],
-        "toppings": [],
-        "allowedToppings": [
-            "pepperoni",
-            "sausage",
-            "mushrooms",
-            "onions",
-            "green peppers",
-            "black olives",
-            "green olives",
-            "anchovies",
-            "pineapple",
-            "ham",
-            "bacon",
-            "chicken",
-        ]
-    },
-    {
-        "name": "Hamburger",
-        "price": 8.99,
-        "description": "A classic american hamburger with your choice of toppings. Cheese, lettuce, tomato, and onion are included by default. Other toppings available on request.",
-        "category": "Burgers",
-        "tags": [
-            "hamburger",
-            "burger"
-        ],
-        "customizations": [],
-        "allowedCustomizations": [
-            {
-                "name": "Special sauce",
-                "priceAdjustment": 1.99
-            }
-        ],
-        "toppings": [],
-        "allowedToppings": [
-            "cheese",
-            "lettuce",
-            "tomato",
-            "onion",
-            "pickles",
-            "bacon",
-            "mushrooms",
-            "avocado",
-            "jalapenos",
-        ],
-    },
-    {
-        "name": "Fries",
-        "price": 2.99,
-        "description": "A classic side of fries.",
-        "category": "Sides",
-        "tags": [
-            "fries",
-            "french fries"
-        ],
-        "customizations": [],
-        "allowedCustomizations": [
-            {
-                "name": "Large",
-                "priceAdjustment": 1.99
-            },
-        ],
-        "toppings": [],
-        "allowedToppings": [
-            "old bay",
-        ]
-    },
-    {
-        "name": "Fountain Drink",
-        "price": 1.99,
-        "description": "A classic fountain drink. Choose from Cola, Diet Cola, Dr. Dazzle, or Mountain Rush.",
-        "category": "Drinks",
-        "tags": [
-            "drink",
-            "soda",
-            "fountain drink"
-        ],
-        "customizations": [],
-        "allowedCustomizations": [
-            {
-                "name": "Large",
-                "priceAdjustment": 0.99
-            },
-            {
-                "name": "Extra Ice",
-                "priceAdjustment": 0.99
-            },
-        ],
-        "toppings": [],
-        "allowedToppings": []
-    }
-];
-;

package/dist/example/ordering_api_impl.d.ts

@@ -1,23 +0,0 @@
-import { ChatCompletionRequestMessage } from "openai";
-import { Customization, MenuItemBase, OrderingAPIInterface } from "./ordering_api";
-export declare class OrderingAPI implements OrderingAPIInterface {
-    private _order;
-    private _lastOrderIdNumber;
-    _isCompleted: boolean;
-    private _history;
-    sendEmail(to: string, subject: string, body: string): Promise<void>;
-    respondToUser(text: string): void;
-    delay(milliseconds: number): Promise<void>;
-    getCurrentOrder(): MenuItemBase[];
-    getCustomizationByName(itemName: string, name: string): Customization | undefined;
-    addItemToOrder(itemName: string, customizationNames: string[], toppings: string[]): void;
-    getItemInOrder(itemOrderId: string): MenuItemBase;
-    removeItemFromOrder(itemOrderId: string): void;
-    modifyItemInOrder(itemOrderId: string, customizationNames: string[], toppings: string[]): void;
-    getOrderTotal(): number;
-    completeOrder(): void;
-    displayItem(item: MenuItemBase): void;
-    displayOrder(): void;
-    _addMessageToHistory(message: ChatCompletionRequestMessage): void;
-    _getHistory(): ChatCompletionRequestMessage[];
-}

package/dist/example/ordering_api_impl.js

@@ -1,128 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrderingAPI = void 0;
-const utils_1 = require("../lib/utils");
-const ordering_api_1 = require("./ordering_api");
-// TODO: make functions to print out an item, and print out the current order with the price totals.
-class OrderingAPI {
-    constructor() {
-        this._order = [];
-        this._lastOrderIdNumber = 0;
-        this._isCompleted = false;
-        this._history = [];
-    }
-    // Mock implementation, doesn't actually send an email
-    sendEmail(to, subject, body) {
-        console.log(`Sending email to "${to}" with subject "${subject}" and body\n"${body}"`);
-        return (0, utils_1.delay)(1000);
-    }
-    respondToUser(text) {
-        console.log(text);
-        this._history.push({
-            role: "assistant",
-            content: "Response output: " + text,
-        });
-    }
-    delay(milliseconds) {
-        return (0, utils_1.delay)(milliseconds);
-    }
-    getCurrentOrder() {
-        return this._order;
-    }
-    // addItemToOrder(item: MenuItemBase) {
-    //     item.orderId = "" + (this._lastOrderIdNumber++);
-    //     this._order.push(item);
-    // }
-    getCustomizationByName(itemName, name) {
-        const item = ordering_api_1.Menu.find((item) => item.name === itemName);
-        if (!item) {
-            return undefined;
-        }
-        return item.allowedCustomizations.find((customization) => customization.name === name);
-    }
-    addItemToOrder(itemName, customizationNames, toppings) {
-        const item = ordering_api_1.Menu.find((item) => item.name === itemName);
-        if (!item) {
-            throw new Error(`Item with name "${itemName}" not found`);
-        }
-        const customizations = customizationNames
-            .map((customizationName) => {
-            return this.getCustomizationByName(itemName, customizationName);
-        })
-            .filter((customization) => customization !== undefined);
-        const newItem = {
-            ...item,
-            customizations,
-            toppings: toppings,
-            orderId: "" + this._lastOrderIdNumber++,
-        };
-        this._order.push(newItem);
-        this.respondToUser(`Added ${itemName} with id ${newItem.orderId}`);
-        this.displayItem(newItem);
-    }
-    getItemInOrder(itemOrderId) {
-        const item = this._order.find((item) => item.orderId === itemOrderId);
-        if (!item) {
-            return undefined;
-        }
-        return item;
-    }
-    removeItemFromOrder(itemOrderId) {
-        this._order = this._order.filter((item) => item.orderId !== itemOrderId);
-        this.respondToUser(`Removed item ${itemOrderId}`);
-    }
-    modifyItemInOrder(itemOrderId, customizationNames, toppings) {
-        const existingIndex = this._order.findIndex((item) => item.orderId === itemOrderId);
-        if (existingIndex !== -1) {
-            const customizations = customizationNames
-                .map((customizationName) => {
-                return this.getCustomizationByName(this._order[existingIndex].name, customizationName);
-            })
-                .filter((customization) => customization !== undefined);
-            this._order[existingIndex].customizations = customizations;
-            this._order[existingIndex].toppings = toppings;
-        }
-        else {
-            throw new Error(`Item with id #"${itemOrderId}" not found in order`);
-        }
-        this.respondToUser(`Modified item ${itemOrderId}`);
-    }
-    getOrderTotal() {
-        const total = this._order.reduce((total, item) => {
-            const customizationTotal = item.customizations.reduce((total, customization) => {
-                return total + customization?.priceAdjustment || 0;
-            }, 0);
-            return total + item.price + customizationTotal;
-        }, 0);
-        return total;
-    }
-    completeOrder() {
-        this.displayOrder();
-        this.respondToUser("Order completed!");
-        this._lastOrderIdNumber = 0;
-        // clear history
-        this._history = [];
-        this._isCompleted = true;
-    }
-    displayItem(item) {
-        this.respondToUser(`\t#${item.orderId || ""} ${item.name}...\t\t$${item.price.toFixed(2)}`);
-        item.toppings.forEach((topping) => {
-            this.respondToUser(`\t\t${topping}`);
-        });
-        item.customizations.forEach((customization) => {
-            this.respondToUser(`\t\t${customization.name}...\t$${customization.priceAdjustment.toFixed(2)}`);
-        });
-    }
-    displayOrder() {
-        this.respondToUser("----\n\nDisplaying order:\n\n");
-        this._order.forEach((item) => this.displayItem(item));
-        this.respondToUser(`--\tTotal:\t\t$${this.getOrderTotal()}`);
-    }
-    _addMessageToHistory(message) {
-        this._history.push(message);
-    }
-    _getHistory() {
-        return this._history;
-    }
-}
-exports.OrderingAPI = OrderingAPI;

package/dist/example/sales_api.d.ts

@@ -1,16 +0,0 @@
-export declare const API_VERSION = "1.0.1";
-export interface SalesData {
-    sales: number;
-    month: number;
-    year: number;
-    businessUnit: "Advertising" | "Hardware" | "Software";
-}
-export interface APIInterface {
-    sendEmail(to: string, subject: string, body: string): Promise<void>;
-    getSalesData(): SalesData[];
-    print(text: string): void;
-    delay(milliseconds: number): Promise<void>;
-}
-declare global {
-    var api: APIInterface;
-}

package/dist/example/sales_api.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.API_VERSION = void 0;
-exports.API_VERSION = "1.0.1";
-;

package/dist/example/sales_api_impl.d.ts

@@ -1,7 +0,0 @@
-import { APIInterface, SalesData } from "./sales_api";
-export declare class API implements APIInterface {
-    sendEmail(to: string, subject: string, body: string): Promise<void>;
-    getSalesData(): SalesData[];
-    print(text: string): void;
-    delay(milliseconds: number): Promise<void>;
-}