Merge branch 'develop' into patch-1

shakkernerd · web-flow · commit 7ba4dfa9949d · 2025-02-06T16:17:38.000Z
diff --git a/docs/docs/advanced/eliza-in-tee.md b/docs/docs/advanced/eliza-in-tee.md
@@ -307,7 +307,7 @@ Finally, click on the `Submit` button to deploy your Eliza agent.
 
 This will take a few minutes to complete. Once the deployment is complete, you can click on the `View` button to view your Eliza agent.
 
-Here is an example of a deployed agent named `vitailik2077`:
+Here is an example of a deployed agent named `vitalik2077`:
 
 ![Deployed Agent](https://i.imgur.com/ie8gpg9.png)
 
diff --git a/docs/docs/core/evaluators.md b/docs/docs/core/evaluators.md
@@ -24,7 +24,7 @@ Evaluators enable agents to:
 1. Import the necessary evaluator types:
 
 ```typescript
-import { Evaluator, IAgentRuntime, Memory, State } from "@elizaos/core-core";
+import { Evaluator, IAgentRuntime, Memory, State } from "@elizaos/core";
 ```
 
 2. Choose or create an evaluator:
diff --git a/docs/docs/packages/agent.md b/docs/docs/packages/agent.md
@@ -4,7 +4,7 @@ sidebar_position: 1
 
 # 🤖 Agent Package
 
-The Agent Package (`@eliza/agent`) provides the high-level orchestration layer for Eliza, managing agent lifecycles, character loading, client initialization, and runtime coordination.
+The Agent Package (`@elizaos/agent`) provides the high-level orchestration layer for Eliza, managing agent lifecycles, character loading, client initialization, and runtime coordination.
 
 ## Architecture Overview
 
diff --git a/packages/client-telegram/src/telegramClient.ts b/packages/client-telegram/src/telegramClient.ts
@@ -7,7 +7,7 @@ import { getOrCreateRecommenderInBe } from "./getOrCreateRecommenderInBe.ts";
 export class TelegramClient {
     private bot: Telegraf<Context>;
     private runtime: IAgentRuntime;
-    private messageManager: MessageManager;
+    public messageManager: MessageManager;
     private backend;
     private backendToken;
     private tgTrader;
diff --git a/packages/core/__tests__/models.test.ts b/packages/core/__tests__/models.test.ts
@@ -1,4 +1,4 @@
-import { getModel, getEndpoint, models } from "../src/models.ts";
+import { getModelSettings, getImageModelSettings, getEndpoint, models } from "../src/models.ts";
 import { ModelProviderName, ModelClass } from "../src/types.ts";
 import { describe, test, expect, vi } from "vitest";
 
@@ -129,22 +129,22 @@ describe("Model Provider Configuration", () => {
     });
     describe("Livepeer Provider", () => {
         test("should have correct endpoint configuration", () => {
-            expect(models[ModelProviderName.LIVEPEER].endpoint).toBe("http://gateway.test-gateway");
+            expect(getEndpoint(ModelProviderName.LIVEPEER)).toBe("http://gateway.test-gateway");
         });
 
         test("should have correct model mappings", () => {
             const livepeerModels = models[ModelProviderName.LIVEPEER].model;
-            expect(livepeerModels[ModelClass.SMALL]).toBe("meta-llama/Meta-Llama-3.1-8B-Instruct");
-            expect(livepeerModels[ModelClass.MEDIUM]).toBe("meta-llama/Meta-Llama-3.1-8B-Instruct");
-            expect(livepeerModels[ModelClass.LARGE]).toBe("meta-llama/Meta-Llama-3.1-8B-Instruct");
-            expect(livepeerModels[ModelClass.IMAGE]).toBe("ByteDance/SDXL-Lightning");
+            expect(livepeerModels[ModelClass.SMALL]?.name).toBe("meta-llama/Meta-Llama-3.1-8B-Instruct");
+            expect(livepeerModels[ModelClass.MEDIUM]?.name).toBe("meta-llama/Meta-Llama-3.1-8B-Instruct");
+            expect(livepeerModels[ModelClass.LARGE]?.name).toBe("meta-llama/Meta-Llama-3.1-8B-Instruct");
+            expect(livepeerModels[ModelClass.IMAGE]?.name).toBe("ByteDance/SDXL-Lightning");
         });
 
         test("should have correct settings configuration", () => {
-            const settings = models[ModelProviderName.LIVEPEER].settings;
-            expect(settings.maxInputTokens).toBe(128000);
-            expect(settings.maxOutputTokens).toBe(8192);
-            expect(settings.temperature).toBe(0);
+            const settings = getModelSettings(ModelProviderName.LIVEPEER, ModelClass.LARGE);
+            expect(settings?.maxInputTokens).toBe(8000);
+            expect(settings?.maxOutputTokens).toBe(8192);
+            expect(settings?.temperature).toBe(0);
         });
     });
 });
@@ -169,10 +169,10 @@ describe("Model Retrieval Functions", () => {
             ).toBe("nousresearch/hermes-3-llama-3.1-405b");
         });
 
-        test("should throw error for invalid model provider", () => {
-            expect(() =>
-                getModel("INVALID_PROVIDER" as any, ModelClass.SMALL)
-            ).toThrow();
+        test("Test to ensure an invalid model provider returns undefined", () => {
+            expect(
+                getModelSettings("INVALID_PROVIDER" as any, ModelClass.SMALL)
+            ).toBe(undefined);
         });
     });
 
@@ -250,12 +250,12 @@ describe("Environment Variable Integration", () => {
 describe("Generation with Livepeer", () => {
     test("should have correct image generation settings", () => {
         const livepeerConfig = models[ModelProviderName.LIVEPEER];
-        expect(livepeerConfig.model[ModelClass.IMAGE]).toBe("ByteDance/SDXL-Lightning");
-        expect(livepeerConfig.settings.temperature).toBe(0);
+        expect(livepeerConfig.model[ModelClass.IMAGE]?.name).toBe("ByteDance/SDXL-Lightning");
+        expect(getModelSettings(ModelProviderName.LIVEPEER, ModelClass.SMALL)?.temperature).toBe(0);
     });
 
     test("should use default image model", () => {
         delete process.env.IMAGE_LIVEPEER_MODEL;
-        expect(models[ModelProviderName.LIVEPEER].model[ModelClass.IMAGE]).toBe("ByteDance/SDXL-Lightning");
+        expect(getImageModelSettings(ModelProviderName.LIVEPEER)?.name).toBe("ByteDance/SDXL-Lightning");
     });
 });
diff --git a/packages/core/__tests__/parsing.test.ts b/packages/core/__tests__/parsing.test.ts
@@ -113,15 +113,15 @@ describe("Parsing Module", () => {
             const input = '```json\n{"key": "value", "number": 42}\n```';
             expect(parseJSONObjectFromText(input)).toEqual({
                 key: "value",
-                number: 42,
+                number: "42",
             });
         });
 
         it("should parse JSON object without code block", () => {
             const input = '{"key": "value", "number": 42}';
             expect(parseJSONObjectFromText(input)).toEqual({
                 key: "value",
-                number: 42,
+                number: "42",
             });
         });
 
diff --git a/packages/core/src/environment.ts b/packages/core/src/environment.ts
@@ -106,6 +106,14 @@ export const CharacterSchema = z.object({
                 })
                 .optional(),
             model: z.string().optional(),
+            modelConfig: z.object({
+                maxInputTokens: z.number().optional(),
+                maxOutputTokens: z.number().optional(),
+                temperature: z.number().optional(),
+                frequency_penalty: z.number().optional(),
+                presence_penalty:z.number().optional()
+            })
+            .optional(),
             embeddingModel: z.string().optional(),
         })
         .optional(),
diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts
@@ -502,7 +502,7 @@ export async function generateText({
     const max_context_length =
         modelConfiguration?.maxInputTokens || modelSettings.maxInputTokens;
     const max_response_length =
-        modelConfiguration?.max_response_length ||
+        modelConfiguration?.maxOutputTokens ||
         modelSettings.maxOutputTokens;
     const experimental_telemetry =
         modelConfiguration?.experimental_telemetry ||
@@ -2358,14 +2358,14 @@ async function handleGroq({
  */
 async function handleGoogle({
     model,
-    apiKey: _apiKey,
+    apiKey,
     schema,
     schemaName,
     schemaDescription,
     mode = "json",
     modelOptions,
 }: ProviderOptions): Promise<GenerateObjectResult<unknown>> {
-    const google = createGoogleGenerativeAI();
+    const google = createGoogleGenerativeAI({apiKey});
     return await aiGenerateObject({
         model: google(model),
         schema,
diff --git a/packages/core/src/models.ts b/packages/core/src/models.ts
@@ -987,7 +987,7 @@ export const models: Models = {
         },
     },
     [ModelProviderName.LIVEPEER]: {
-        endpoint: settings.LIVEPEER_GATEWAY_URL,
+        endpoint: settings.LIVEPEER_GATEWAY_URL || "http://gateway.test-gateway",
         model: {
             [ModelClass.SMALL]: {
                 name:
diff --git a/packages/core/src/parsing.ts b/packages/core/src/parsing.ts
@@ -146,6 +146,7 @@ export function parseJSONObjectFromText(
     const jsonBlockMatch = text.match(jsonBlockPattern);
 
     if (jsonBlockMatch) {
+        text = cleanJsonResponse(text);
         const parsingText = normalizeJsonString(text);
         try {
             jsonData = JSON.parse(parsingText);
@@ -159,6 +160,7 @@ export function parseJSONObjectFromText(
         const objectMatch = text.match(objectPattern);
 
         if (objectMatch) {
+            text = cleanJsonResponse(text);
             const parsingText = normalizeJsonString(text);
             try {
                 jsonData = JSON.parse(parsingText);
@@ -214,7 +216,7 @@ export function extractAttributes(
         });
     }
 
-    return attributes;
+    return Object.entries(attributes).length > 0 ? attributes : null;
 }
 
 /**
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -696,7 +696,7 @@ export type TelemetrySettings = {
 
 export interface ModelConfiguration {
     temperature?: number;
-    max_response_length?: number;
+    maxOutputTokens?: number;
     frequency_penalty?: number;
     presence_penalty?: number;
     maxInputTokens?: number;
diff --git a/packages/plugin-ethstorage/package.json b/packages/plugin-ethstorage/package.json
@@ -1,25 +1,26 @@
 {
-  "name": "@elizaos/plugin-ethstorage",
-  "main": "dist/index.js",
-  "type": "module",
-  "types": "dist/index.d.ts",
-  "dependencies": {
-    "@elizaos/core": "workspace:*",
-    "@elizaos/plugin-trustdb": "workspace:*",
-    "ethers": "^6.13.5",
-    "kzg-wasm": "^0.4.0"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "1.9.4",
-    "@types/node": "^20.0.0",
-    "tsup": "8.3.5"
-  },
-  "scripts": {
-    "build": "tsup --format esm --dts",
-    "dev": "tsup --format esm --dts --watch",
-    "lint": "biome lint .",
-    "lint:fix": "biome check --apply .",
-    "format": "biome format .",
-    "format:fix": "biome format --write ."
-  }
+	"name": "@elizaos/plugin-ethstorage",
+	"version": "0.25.6-alpha.1",
+	"main": "dist/index.js",
+	"type": "module",
+	"types": "dist/index.d.ts",
+	"dependencies": {
+		"@elizaos/core": "workspace:*",
+		"@elizaos/plugin-trustdb": "workspace:*",
+		"ethers": "^6.13.5",
+		"kzg-wasm": "^0.4.0"
+	},
+	"devDependencies": {
+		"@biomejs/biome": "1.9.4",
+		"@types/node": "^20.0.0",
+		"tsup": "8.3.5"
+	},
+	"scripts": {
+		"build": "tsup --format esm --dts",
+		"dev": "tsup --format esm --dts --watch",
+		"lint": "biome lint .",
+		"lint:fix": "biome check --apply .",
+		"format": "biome format .",
+		"format:fix": "biome format --write ."
+	}
 }
diff --git a/packages/plugin-ferePro/README.md b/packages/plugin-ferePro/README.md
diff --git a/packages/plugin-solana-agentkit/src/index.ts b/packages/plugin-solana-agentkit/src/index.ts
