Merge pull request #19 from Manifest-Holdings/next

email/models/proxy Next => Prod
Manifest-Holdings · Feb 25, 2025 · 068597c · 068597c
2 parents 4e6262e + 1d7cd15
commit 068597c
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 134 deletions.
diff --git a/packages/client-discord/src/messages.ts b/packages/client-discord/src/messages.ts
@@ -1510,7 +1510,7 @@ export class MessageManager {
         const response = await generateShouldRespond({
             runtime: this.runtime,
             context: shouldRespondContext,
-            modelClass: ModelClass.LARGE,
+            modelClass: ModelClass.SMALL,
         });
 
         if (response === "RESPOND") {

diff --git a/packages/client-discord/src/voice.ts b/packages/client-discord/src/voice.ts
@@ -862,7 +862,7 @@ export class VoiceManager extends EventEmitter {
         const response = await generateShouldRespond({
             runtime: this.runtime,
             context: shouldRespondContext,
-            modelClass: ModelClass.LARGE,
+            modelClass: ModelClass.SMALL,
         });
 
         if (response === "RESPOND") {

diff --git a/packages/client-telegram/src/messageManager.ts b/packages/client-telegram/src/messageManager.ts
@@ -873,7 +873,7 @@ export class MessageManager {
             const response = await generateShouldRespond({
                 runtime: this.runtime,
                 context: shouldRespondContext,
-                modelClass: ModelClass.LARGE,
+                modelClass: ModelClass.SMALL,
             });
 
             return response === "RESPOND";

diff --git a/packages/client-twitter/src/base.ts b/packages/client-twitter/src/base.ts
@@ -18,7 +18,7 @@ import {
 } from "agent-twitter-client";
 import { EventEmitter } from "events";
 import type { TwitterConfig } from "./environment.ts";
-import { Agent, fetch, ProxyAgent, setGlobalDispatcher } from "undici";
+import { Agent, fetch as undiciFetch, ProxyAgent, setGlobalDispatcher } from "undici";
 
 export function extractAnswer(text: string): string {
     const startIndex = text.indexOf("Answer: ") + 8;
@@ -120,7 +120,6 @@ function doLogin(username, cb, proxyUrl?: string, localAddress?: string) {
                     `${username}:${password}`
                 ).toString("base64")}`;
             }
-
             proxyAgent = new ProxyAgent(agentOptions);
         }
         if (localAddress) {
@@ -131,10 +130,10 @@ function doLogin(username, cb, proxyUrl?: string, localAddress?: string) {
         }
         try {
             const twitterClient = new Scraper({
-                fetch: fetch,
+                fetch: undiciFetch,
                 transform: {
                     request: (input: any, init: any) => {
-                        if (agent) {
+                        if (proxyAgent || agent) {
                             return [
                                 input,
                                 { ...init, dispatcher: proxyAgent ?? agent },

diff --git a/packages/client-twitter/src/interactions.ts b/packages/client-twitter/src/interactions.ts
@@ -438,7 +438,7 @@ export class TwitterInteractionClient {
         const shouldRespond = await generateShouldRespond({
             runtime: this.runtime,
             context: shouldRespondContext,
-            modelClass: ModelClass.LARGE,
+            modelClass: ModelClass.SMALL,
         });
 
         // Promise<"RESPOND" | "IGNORE" | "STOP" | null> {
@@ -693,4 +693,4 @@ export class TwitterInteractionClient {
 
         return thread;
     }
-}
+}
diff --git a/packages/client-twitter/src/post.ts b/packages/client-twitter/src/post.ts
@@ -833,7 +833,7 @@ export class TwitterPostClient {
                     const actionResponse = await generateTweetActions({
                         runtime: this.runtime,
                         context: actionContext,
-                        modelClass: ModelClass.LARGE,
+                        modelClass: ModelClass.SMALL,
                     });
 
                     if (!actionResponse) {