Merge branch 'develop' into images-in-chat-client

Author: monilpat

client/src/Chat.tsx

@@ -1,9 +1,9 @@
 import { useRef, useState } from "react";
 import { useParams } from "react-router-dom";
 import { useMutation } from "@tanstack/react-query";
-import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import { ImageIcon } from "lucide-react";
+import { Input } from "@/components/ui/input";
 import "./App.css";
 import path from "path";
 
@@ -78,7 +78,7 @@ export default function Chat() {
                         messages.map((message, index) => (
                             <div
                                 key={index}
-                                className={`flex ${
+                                className={`text-left flex ${
                                     message.user === "user"
                                         ? "justify-end"
                                         : "justify-start"
@@ -107,6 +107,9 @@ export default function Chat() {
                                             />
                                         )
                                     ))}
+                                    <pre className="whitespace-pre-wrap break-words font-sans m-0">
+                                        {message.text}
+                                    </pre>
                                 </div>
                             </div>
                         ))

packages/client-direct/src/index.ts

@@ -1,12 +1,13 @@
 import bodyParser from "body-parser";
 import cors from "cors";
 import express, { Request as ExpressRequest } from "express";
-import multer from "multer";
+import multer, { File } from "multer";
 import {
     elizaLogger,
     generateCaption,
     generateImage,
     Media,
+    getEmbeddingZeroVector
 } from "@elizaos/core";
 import { composeContext } from "@elizaos/core";
 import { generateMessageResponse } from "@elizaos/core";
@@ -229,17 +230,19 @@ export class DirectClient {
                 };
 
                 const memory: Memory = {
-                    id: messageId,
+                    id: stringToUuid(messageId + "-" + userId),
+                    ...userMessage,
                     agentId: runtime.agentId,
                     userId,
                     roomId,
                     content,
                     createdAt: Date.now(),
                 };
 
+                await runtime.messageManager.addEmbeddingToMemory(memory);
                 await runtime.messageManager.createMemory(memory);
 
-                const state = await runtime.composeState(userMessage, {
+                let state = await runtime.composeState(userMessage, {
                     agentName: runtime.character.name,
                 });
 
@@ -254,34 +257,30 @@ export class DirectClient {
                     modelClass: ModelClass.LARGE,
                 });
 
+                if (!response) {
+                    res.status(500).send(
+                        "No response from generateMessageResponse"
+                    );
+                    return;
+                }
+
                 // save response to memory
-                const responseMessage = {
+                const responseMessage: Memory = {
+                    id: stringToUuid(messageId + "-" + runtime.agentId),
                     ...userMessage,
                     userId: runtime.agentId,
                     content: response,
+                    embedding: getEmbeddingZeroVector(),
+                    createdAt: Date.now(),
                 };
 
                 await runtime.messageManager.createMemory(responseMessage);
 
-                if (!response) {
-                    res.status(500).send(
-                        "No response from generateMessageResponse"
-                    );
-                    return;
-                }
+                state = await runtime.updateRecentMessageState(state);
 
                 let message = null as Content | null;
 
-                await runtime.evaluate(memory, state);
-
-                // Check if we should suppress the initial message
-                const action = runtime.actions.find(
-                    (a) => a.name === response.action
-                );
-                const shouldSuppressInitialMessage =
-                    action?.suppressInitialMessage;
-
-                const _result = await runtime.processActions(
+                await runtime.processActions(
                     memory,
                     [responseMessage],
                     state,
@@ -291,6 +290,15 @@ export class DirectClient {
                     }
                 );
 
+                await runtime.evaluate(memory, state);
+
+                // Check if we should suppress the initial message
+                const action = runtime.actions.find(
+                    (a) => a.name === response.action
+                );
+                const shouldSuppressInitialMessage =
+                    action?.suppressInitialMessage;
+
                 if (!shouldSuppressInitialMessage) {
                     if (message) {
                         res.json([response, message]);