order flow is kind of working but still bugs

lalalune · lalalune · commit 2df768d18408 · 2024-12-10T23:17:41.000-08:00
diff --git a/packages/plugin-dominos/src/PizzaOrderManager.ts b/packages/plugin-dominos/src/PizzaOrderManager.ts
@@ -1,7 +1,6 @@
 import { IAgentRuntime, UUID } from "@ai16z/eliza";
+import { NearbyStores, Order } from "dominos";
 import {
-    NearbyStores,
-    Order,
     Customer,
     ErrorType,
     OrderError,
@@ -15,7 +14,7 @@ import {
     PizzaSize,
     PizzaTopping,
     ToppingPortion,
-} from "dominos";
+} from "./types";
 
 export class PizzaOrderManager implements OrderManager {
     storeId: string;
@@ -231,6 +230,7 @@ export class PizzaOrderManager implements OrderManager {
 
     // Get next required action based on order state
     getNextRequiredAction(order: Order, customer: Customer): string {
+        console.log("getNextRequiredAction: ", order, customer);
         if (!order.items || order.items.length === 0) {
             return "Collect initial pizza order details - show size, crust, and topping options to customer";
         }
@@ -270,6 +270,7 @@ export class PizzaOrderManager implements OrderManager {
     }
 
     getNextRequiredActionDialogue(order: Order, customer: Customer): string {
+        console.log("getNextRequiredActionDialogue: ", order, customer);
         if (!order.items || order.items.length === 0) {
             return "Let me help you build your perfect pizza! What size would you like? We have Small, Medium, Large and Extra Large. Then I can help you choose your crust type and toppings.";
         }
@@ -352,7 +353,7 @@ export class PizzaOrderManager implements OrderManager {
 
     // Format currency
     private formatCurrency(amount: number): string {
-        return `$${amount.toFixed(2)}`;
+        return `$${amount?.toFixed(2) || "?"}`;
     }
 
     // Format topping for display with category
@@ -375,10 +376,11 @@ export class PizzaOrderManager implements OrderManager {
 
     // Generate detailed order summary
     getOrderSummary(order: Order, customer: Customer): string {
+        console.log("getOrderSummary: ", order, customer);
         let summary = "===== CURRENT ORDER =====\n\n";
 
         // Add items
-        order.items.forEach((item, index) => {
+        order.items?.forEach((item, index) => {
             summary += `PIZZA ${index + 1}\n`;
             summary += `==================\n`;
             summary += `Size: ${item.size} (${this.formatCurrency(this.menuConfig.basePrices[item.size])})\n`;
@@ -393,7 +395,7 @@ export class PizzaOrderManager implements OrderManager {
 
             if (item.toppings && item.toppings.length > 0) {
                 summary += "\nTOPPINGS:\n";
-                item.toppings.forEach((topping) => {
+                item.toppings?.forEach((topping) => {
                     const toppingInfo = this.getToppingInfo(topping.code);
                     summary += `• ${this.formatTopping(topping)} `;
                     summary += `(+${this.formatCurrency(
@@ -427,7 +429,7 @@ export class PizzaOrderManager implements OrderManager {
             if (customer.phone) summary += `Phone: ${customer.phone}\n`;
             if (customer.address) {
                 summary += "Delivery Address:\n";
-                summary += `${customer.address}\n`;
+                summary += `${(customer?.address && JSON.stringify(customer.address)) || "Not provided"}\n`;
             }
             if (customer.email) summary += `Email: ${customer.email}\n`;
             summary += "==================\n\n";
@@ -626,6 +628,7 @@ export class PizzaOrderManager implements OrderManager {
 
     // Calculate order progress
     calculateOrderProgress(order: Order, customer: Customer): OrderProgress {
+        console.log("calculateOrderProgress: ", order, customer);
         return {
             hasCustomerInfo: !this.validateCustomerInfo(customer),
             hasPaymentMethod: order.paymentMethod !== undefined,
@@ -642,46 +645,54 @@ export class PizzaOrderManager implements OrderManager {
         customer: Customer
     ): Promise<Order | OrderError> {
         // Validate pizza configuration
-        for (const item of order.items) {
-            // Validate size
-            if (!Object.values(PizzaSize).includes(item.size)) {
-                return {
-                    type: ErrorType.VALIDATION_FAILED,
-                    message: `Invalid pizza size: ${item.size}`,
-                    code: "INVALID_SIZE",
-                };
-            }
+        if (order && order.items) {
+            for (const item of order.items) {
+                // Validate size
+                if (!Object.values(PizzaSize).includes(item.size)) {
+                    return {
+                        type: ErrorType.VALIDATION_FAILED,
+                        message: `Invalid pizza size: ${item.size}`,
+                        code: "INVALID_SIZE",
+                    };
+                }
 
-            // Validate crust
-            if (!Object.values(PizzaCrust).includes(item.crust)) {
-                return {
-                    type: ErrorType.VALIDATION_FAILED,
-                    message: `Invalid crust type: ${item.crust}`,
-                    code: "INVALID_CRUST",
-                };
-            }
+                // Validate crust
+                if (!Object.values(PizzaCrust).includes(item.crust)) {
+                    return {
+                        type: ErrorType.VALIDATION_FAILED,
+                        message: `Invalid crust type: ${item.crust}`,
+                        code: "INVALID_CRUST",
+                    };
+                }
 
-            // Validate toppings
-            if (item.toppings) {
-                const toppingError = this.validateToppings(item.toppings);
-                if (toppingError) return toppingError;
-            }
+                // Validate toppings
+                if (item.toppings) {
+                    const toppingError = this.validateToppings(item.toppings);
+                    if (toppingError) return toppingError;
+                }
 
-            // Validate quantity
-            if (item.quantity < 1 || item.quantity > 10) {
-                return {
-                    type: ErrorType.VALIDATION_FAILED,
-                    message: "Quantity must be between 1 and 10",
-                    code: "INVALID_QUANTITY",
-                };
+                // Validate quantity
+                if (item.quantity < 1 || item.quantity > 10) {
+                    return {
+                        type: ErrorType.VALIDATION_FAILED,
+                        message: "Quantity must be between 1 and 10",
+                        code: "INVALID_QUANTITY",
+                    };
+                }
             }
+        } else {
+            console.warn("No order items found");
         }
 
         // Calculate total price
-        order.total = order.items.reduce(
-            (total, item) => total + this.calculatePizzaPrice(item),
-            0
-        );
+        if (order.items) {
+            order.total = order.items?.reduce(
+                (total, item) => total + this.calculatePizzaPrice(item),
+                0
+            );
+        } else {
+            console.warn("No order items found");
+        }
 
         // Validate customer information
         const customerError = this.validateCustomerInfo(customer);
diff --git a/packages/plugin-dominos/src/actions/startOrder.ts b/packages/plugin-dominos/src/actions/startOrder.ts
@@ -9,7 +9,9 @@ import {
     ModelClass,
     State,
 } from "@ai16z/eliza";
-import { Customer, Item, Order, PizzaCrust, PizzaSize } from "dominos";
+import { Customer, Item, Order } from "dominos";
+import { PizzaCrust, PizzaSize } from "../types";
+
 import { z } from "zod";
 import { PizzaOrderManager } from "../PizzaOrderManager";
 
@@ -27,6 +29,8 @@ const handler: Handler = async (
         return "There is already an active order. Please complete or cancel the existing order before starting a new one.";
     }
 
+    console.log("Existing order: ", existingOrder);
+
     // Extract order details from message using LLM
     const extractionTemplate = `
       Extract pizza order details from the following text. Include size, crust type, toppings, quantity, and any special instructions.
@@ -80,7 +84,7 @@ const handler: Handler = async (
         })) as z.infer<typeof PizzaOrderSchema>;
 
         // Create new order
-        const customer = new Customer();
+        const customer = new Customer({});
         await orderManager.saveCustomer(userId, customer);
 
         const order = new Order(customer);
@@ -107,7 +111,7 @@ const handler: Handler = async (
         return response;
     } catch (error) {
         // Fallback to basic order if extraction fails
-        const customer = new Customer();
+        const customer = new Customer({});
         await orderManager.saveCustomer(userId, customer);
 
         const order = new Order(customer);
diff --git a/packages/plugin-dominos/src/actions/updateCustomer.ts b/packages/plugin-dominos/src/actions/updateCustomer.ts
@@ -40,7 +40,7 @@ export const handler: Handler = async (
 
     let customer = await orderManager.getCustomer(userId);
     if (!customer) {
-        customer = new Customer();
+        customer = new Customer({});
     }
 
     // Extract customer details using LLM and schema
diff --git a/packages/plugin-dominos/src/actions/updateOrder.ts b/packages/plugin-dominos/src/actions/updateOrder.ts
@@ -9,7 +9,9 @@ import {
     ModelClass,
     State,
 } from "@ai16z/eliza";
-import { Item, PizzaCrust, PizzaSize, ToppingPortion } from "dominos";
+import { Item } from "dominos";
+import { PizzaCrust, PizzaSize, ToppingPortion } from "../types";
+
 import { z } from "zod";
 import { PizzaOrderManager } from "../PizzaOrderManager";
 
@@ -152,7 +154,7 @@ export const handler: Handler = async (
 
         // Apply modifications
         for (const mod of orderUpdates.modifications) {
-            const item = order.items[mod.itemIndex];
+            const item = order.items && order.items[mod.itemIndex];
             if (!item) continue;
 
             switch (mod.type) {
diff --git a/packages/plugin-dominos/src/index.ts b/packages/plugin-dominos/src/index.ts
@@ -1,13 +1,16 @@
 import { Plugin } from "@ai16z/eliza";
 import { startOrder } from "./actions/startOrder.ts";
 import { pizzaOrderProvider } from "./providers/pizzaOrder.ts";
+import { endOrder } from "./actions/endOrder.ts";
+import { updateCustomer } from "./actions/updateCustomer.ts";
+import { updateOrder } from "./actions/updateOrder.ts";
 
 export * as actions from "./actions/index.ts";
 export * as providers from "./providers/index.ts";
 
 export const dominosPlugin: Plugin = {
     name: "dominos",
     description: "Order a dominos pizza",
-    actions: [startOrder],
+    actions: [startOrder, endOrder, updateCustomer, updateOrder],
     providers: [pizzaOrderProvider],
 };
diff --git a/packages/plugin-dominos/src/providers/pizzaOrder.ts b/packages/plugin-dominos/src/providers/pizzaOrder.ts
@@ -1,5 +1,5 @@
 import { IAgentRuntime, Memory, Provider } from "@ai16z/eliza";
-import { OrderStatus } from "dominos";
+import { OrderStatus } from "../types";
 import { PizzaOrderManager } from "../PizzaOrderManager";
 
 export const pizzaOrderProvider: Provider = {
@@ -37,6 +37,8 @@ export const pizzaOrderProvider: Provider = {
             context += "Order is being processed but needs confirmation.\n";
         }
 
+        console.log("Order context:\n", context);
+
         return context;
     },
 };
diff --git a/packages/plugin-dominos/src/types.ts b/packages/plugin-dominos/src/types.ts

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export const handler: Handler = async (`
`40`	`40`
`41`	`41`	`let customer = await orderManager.getCustomer(userId);`
`42`	`42`	`if (!customer) {`
`43`		`- customer = new Customer();`
	`43`	`+ customer = new Customer({});`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// Extract customer details using LLM and schema`