Merge remote-tracking branch 'origin/bino-dev' into bino

iotexproject · Feb 5, 2025 · be4080e · be4080e
2 parents 7f60eae + 137471e
commit be4080e
Show file tree

Hide file tree

Showing 9 changed files with 245 additions and 132 deletions.
diff --git a/packages/client-discord/src/attachments.ts b/packages/client-discord/src/attachments.ts
@@ -34,7 +34,7 @@ async function generateSummary(
     "summary": "Generated summary and/or description of the text"
   }
   </response>
-  \`\`\``;
+`;
 
     const response = await generateText({
         runtime,

diff --git a/packages/client-discord/src/messages.ts b/packages/client-discord/src/messages.ts
@@ -1250,22 +1250,6 @@ export class MessageManager {
             runtime: this.runtime,
             context: shouldRespondContext,
             modelClass: ModelClass.SMALL,
-            // @ts-ignore
-            messages: this.runtime.idealOutputs?.shouldRespondTemplate
-                ? [
-                      {
-                          role: "user",
-                          content: [
-                              {
-                                  type: "text",
-                                  // @ts-ignore
-                                  text: this.runtime.idealOutputs
-                                      ?.shouldRespondTemplate,
-                              },
-                          ],
-                      },
-                  ]
-                : undefined,
         });
 
         if (parsedResponse === "RESPOND") {

diff --git a/packages/client-telegram/src/messageManager.ts b/packages/client-telegram/src/messageManager.ts
@@ -666,22 +666,6 @@ export class MessageManager {
                 runtime: this.runtime,
                 context: shouldRespondContext,
                 modelClass: ModelClass.SMALL,
-                // @ts-ignore
-                messages: this.runtime.idealOutputs?.shouldRespondTemplate
-                    ? [
-                          {
-                              role: "user",
-                              content: [
-                                  {
-                                      type: "text",
-                                      // @ts-ignore
-                                      text: this.runtime.idealOutputs
-                                          ?.shouldRespondTemplate,
-                                  },
-                              ],
-                          },
-                      ]
-                    : undefined,
             });
 
             return response === "RESPOND";

diff --git a/packages/client-twitter/src/interactions.ts b/packages/client-twitter/src/interactions.ts
@@ -429,21 +429,6 @@ export class TwitterInteractionClient {
             runtime: this.runtime,
             context: shouldRespondContext,
             modelClass: ModelClass.SMALL,
-            // @ts-ignore
-            messages: this.runtime.idealOutputs?.twitterShouldRespondTemplate
-                ? [
-                      {
-                          role: "user",
-                          content: [
-                              {
-                                  type: "text",
-                                  // @ts-ignore
-                                  text: this.runtime.idealOutputs?.twitterShouldRespondTemplate,
-                              },
-                          ],
-                      },
-                  ]
-                : undefined,
         });
 
         // Promise<"RESPOND" | "IGNORE" | "STOP" | null> {

diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts
@@ -1086,7 +1086,7 @@ export async function generateShouldRespond({
                 runtime,
                 context,
                 modelClass,
-                messages
+                messages,
             });
 
             const extractedResponse = parseTagContent(response, "response");
@@ -2074,7 +2074,6 @@ async function handleAnthropic({
     schema,
     schemaName,
     schemaDescription,
-    mode = "json",
     modelOptions,
     runtime,
 }: ProviderOptions): Promise<GenerateObjectResult<unknown>> {
@@ -2088,7 +2087,6 @@ async function handleAnthropic({
         schema,
         schemaName,
         schemaDescription,
-        mode,
         ...modelOptions,
     });
 }
@@ -2340,10 +2338,7 @@ export async function generateTweetActions({
                 context,
                 modelClass,
             });
-            console.debug(
-                "Received response from generateText for tweet actions:",
-                response
-            );
+
             const parsedResponse = parseTagContent(response, "response");
             const { actions } = parseActionResponseFromText(parsedResponse);
             if (actions) {

diff --git a/packages/plugin-node/package.json b/packages/plugin-node/package.json
@@ -46,7 +46,6 @@
         "formdata-node": "6.0.3",
         "fs-extra": "11.2.0",
         "gaxios": "6.7.1",
-        "gif-frames": "0.4.1",
         "glob": "11.0.0",
         "graceful-fs": "4.2.11",
         "html-escaper": "3.0.3",

diff --git a/packages/plugin-node/src/actions/describe-image.ts b/packages/plugin-node/src/actions/describe-image.ts
@@ -43,12 +43,18 @@ export const describeImage: Action = {
             stop: ["\n"],
         });
 
-        if (!isFileLocationResult(fileLocationResultObject?.object)) {
+        if (
+            !isFileLocationResult(
+                fileLocationResultObject?.object ?? fileLocationResultObject
+            )
+        ) {
             elizaLogger.error("Failed to generate file location");
             return false;
         }
 
-        const { fileLocation } = fileLocationResultObject.object;
+        let fileLocation = (fileLocationResultObject?.object as any)
+            ?.fileLocation;
+        fileLocation ??= fileLocationResultObject;
 
         const { description } = await runtime
             .getService<IImageDescriptionService>(ServiceType.IMAGE_DESCRIPTION)

diff --git a/packages/plugin-node/src/index.ts b/packages/plugin-node/src/index.ts
@@ -12,7 +12,7 @@ import {
     VideoService,
     AwsS3Service,
 } from "./services/index.ts";
-import { describeImage } from "./actions/describe-image.ts";
+// import { describeImage } from "./actions/describe-image.ts";
 
 export type NodePlugin = ReturnType<typeof createNodePlugin>;
 
@@ -30,6 +30,6 @@ export function createNodePlugin() {
             new VideoService(),
             new AwsS3Service(),
         ],
-        actions: [describeImage],
+        actions: [],
     } as const satisfies Plugin;
 }