From acf87d81fbd41b10363b36913bb31b6f3be3d727 Mon Sep 17 00:00:00 2001 From: Shakker Nerd Date: Tue, 31 Dec 2024 14:59:05 +0000 Subject: [PATCH 1/6] feat: include priority to plugin-tee build --- turbo.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/turbo.json b/turbo.json index 2f404476cb..d0aa3b96de 100644 --- a/turbo.json +++ b/turbo.json @@ -16,7 +16,10 @@ }, "@elizaos/plugin-solana#build": { "outputs": ["dist/**"], - "dependsOn": ["@elizaos/plugin-trustdb#build"] + "dependsOn": [ + "@elizaos/plugin-trustdb#build", + "@elizaos/plugin-tee#build" + ] }, "@elizaos/plugin-nft-generation#build": { "outputs": ["dist/**"], From e565f9810217fe91170fbc6c6924f5c27db2c8ad Mon Sep 17 00:00:00 2001 From: Shakker Nerd Date: Tue, 31 Dec 2024 14:59:35 +0000 Subject: [PATCH 2/6] chore: remove build cache with clean command --- scripts/clean.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/clean.sh b/scripts/clean.sh index 5bc2eef840..7bb40b6e70 100644 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -5,7 +5,8 @@ cd "$(dirname "$0")"/.. echo "Cleanup started." # Find and remove node_modules directories, dist directories. find . -type d -name "node_modules" -exec rm -rf {} + \ - -o -type d -name "dist" -exec rm -rf {} + + -o -type d -name "dist" -exec rm -rf {} + \ + -o -type d -name ".turbo" -exec rm -rf {} + # Remove core cache rm -rf ./packages/core/cache From 79738194207e2d1dfac4507e4168cf2b6d7331dd Mon Sep 17 00:00:00 2001 From: Shakker Nerd Date: Tue, 31 Dec 2024 15:02:30 +0000 Subject: [PATCH 3/6] chore: changes to settings --- packages/core/src/settings.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/core/src/settings.ts b/packages/core/src/settings.ts index f6e42a1add..274f637f66 100644 --- a/packages/core/src/settings.ts +++ b/packages/core/src/settings.ts @@ -3,6 +3,10 @@ import fs from "fs"; import path from "path"; import elizaLogger from "./logger.ts"; +console.log("I AM STARTING AGENT...."); +elizaLogger.log("LET US GOOOOOOOOOOOOOOOOOOOOOO"); +elizaLogger.log("I AM IN SETTINGSSSSSSSS"); + elizaLogger.info("Loading embedding settings:", { USE_OPENAI_EMBEDDING: process.env.USE_OPENAI_EMBEDDING, USE_OLLAMA_EMBEDDING: process.env.USE_OLLAMA_EMBEDDING, @@ -156,10 +160,10 @@ function parseNamespacedSettings(env: Settings): NamespacedSettings { for (const [key, value] of Object.entries(env)) { if (!value) continue; - const [namespace, ...rest] = key.split('.'); + const [namespace, ...rest] = key.split("."); if (!namespace || rest.length === 0) continue; - const settingKey = rest.join('.'); + const settingKey = rest.join("."); namespaced[namespace] = namespaced[namespace] || {}; namespaced[namespace][settingKey] = value; } From a93839c86dac43dbf0df8df2dff2d9544471ec18 Mon Sep 17 00:00:00 2001 From: Shakker Nerd Date: Tue, 31 Dec 2024 15:03:56 +0000 Subject: [PATCH 4/6] fix: add @tavily/core to external libs (almost took my life) --- packages/core/tsup.config.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/tsup.config.ts b/packages/core/tsup.config.ts index 1ff744633b..cca094e999 100644 --- a/packages/core/tsup.config.ts +++ b/packages/core/tsup.config.ts @@ -9,8 +9,8 @@ export default defineConfig({ platform: "node", target: "node18", bundle: true, - splitting: true, // Add this for better code splitting - dts: true, // Generate declaration files + splitting: true, // Add this for better code splitting + dts: true, // Generate declaration files external: [ "dotenv", // Externalize dotenv to prevent bundling "fs", // Externalize fs to use Node.js built-in module @@ -18,5 +18,6 @@ export default defineConfig({ "http", "https", // Add other modules you want to externalize + "@tavily/core", ], }); From bfcdc7be2a69fd1c0eaa47a2d1e4bac38ef0326a Mon Sep 17 00:00:00 2001 From: Shakker Nerd Date: Tue, 31 Dec 2024 15:07:09 +0000 Subject: [PATCH 5/6] chore: remove logs --- packages/core/src/settings.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/core/src/settings.ts b/packages/core/src/settings.ts index 274f637f66..54992d778e 100644 --- a/packages/core/src/settings.ts +++ b/packages/core/src/settings.ts @@ -3,10 +3,6 @@ import fs from "fs"; import path from "path"; import elizaLogger from "./logger.ts"; -console.log("I AM STARTING AGENT...."); -elizaLogger.log("LET US GOOOOOOOOOOOOOOOOOOOOOO"); -elizaLogger.log("I AM IN SETTINGSSSSSSSS"); - elizaLogger.info("Loading embedding settings:", { USE_OPENAI_EMBEDDING: process.env.USE_OPENAI_EMBEDDING, USE_OLLAMA_EMBEDDING: process.env.USE_OLLAMA_EMBEDDING, From 9126cb17d6b4dd3f55e9867260b616dc8ded0145 Mon Sep 17 00:00:00 2001 From: Shakker Nerd Date: Tue, 31 Dec 2024 15:07:34 +0000 Subject: [PATCH 6/6] chore: console -> elizaLogger --- packages/core/src/settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/settings.ts b/packages/core/src/settings.ts index 54992d778e..d403d16379 100644 --- a/packages/core/src/settings.ts +++ b/packages/core/src/settings.ts @@ -93,7 +93,7 @@ export function loadEnvConfig(): Settings { const result = config(envPath ? { path: envPath } : {}); if (!result.error) { - console.log(`Loaded .env file from: ${envPath}`); + elizaLogger.log(`Loaded .env file from: ${envPath}`); } // Parse namespaced settings