Merge pull request #1479 from elizaOS/enhance/client-direct

feat: Enhance client direct
elizaOS · Dec 26, 2024 · b3dcc51 · b3dcc51
2 parents e60449d + 998f706
commit b3dcc51
Showing 1 changed file with 32 additions and 20 deletions.
diff --git a/packages/client-direct/src/index.ts b/packages/client-direct/src/index.ts
@@ -2,7 +2,12 @@ import bodyParser from "body-parser";
 import cors from "cors";
 import express, { Request as ExpressRequest } from "express";
 import multer, { File } from "multer";
-import { elizaLogger, generateCaption, generateImage } from "@elizaos/core";
+import {
+    elizaLogger,
+    generateCaption,
+    generateImage,
+    getEmbeddingZeroVector,
+} from "@elizaos/core";
 import { composeContext } from "@elizaos/core";
 import { generateMessageResponse } from "@elizaos/core";
 import { messageCompletionFooter } from "@elizaos/core";
@@ -177,17 +182,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,
                 });
 
@@ -202,34 +209,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,
@@ -239,6 +242,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]);