Merge branch 'develop' into logger-improvement

Author: JoeyKhd

.env.example

@@ -15,8 +15,8 @@ VITE_SERVER_PORT=${SERVER_PORT}
 SUPABASE_URL=
 SUPABASE_ANON_KEY=
 
-# Remote character url (optional)
-REMOTE_CHARACTER_URL=
+# Comma separated list of remote character urls (optional)
+REMOTE_CHARACTER_URLS=
 
 ###############################
 #### Client Configurations ####
@@ -87,6 +87,13 @@ EMBEDDING_OPENAI_MODEL= # Default: text-embedding-3-small
 IMAGE_OPENAI_MODEL=     # Default: dall-e-3
 USE_OPENAI_EMBEDDING=   # Set to TRUE for OpenAI/1536, leave blank for local
 
+# Atoma SDK Configuration
+ATOMASDK_BEARER_AUTH=           # Atoma SDK Bearer Auth token
+ATOMA_API_URL=                  # Default: https://api.atoma.network/v1
+SMALL_ATOMA_MODEL=              # Default: meta-llama/Llama-3.3-70B-Instruct
+MEDIUM_ATOMA_MODEL=             # Default: meta-llama/Llama-3.3-70B-Instruct
+LARGE_ATOMA_MODEL=              # Default: meta-llama/Llama-3.3-70B-Instruct
+
 # Eternal AI's Decentralized Inference API
 ETERNALAI_URL=
 ETERNALAI_MODEL=                    # Default: "NousResearch/Hermes-3-Llama-3.1-70B-FP8"
@@ -366,7 +373,7 @@ SQUID_SDK_URL=https://apiplus.squidrouter.com # Default: https://apiplus.squidro
 SQUID_INTEGRATOR_ID=                          # get integrator id through https://docs.squidrouter.com/
 SQUID_EVM_ADDRESS=
 SQUID_EVM_PRIVATE_KEY=
-SQUID_API_THROTTLE_INTERVAL= # Default: 0; Used to throttle API calls to avoid rate limiting (in ms)
+SQUID_API_THROTTLE_INTERVAL=1000 # Default: 1000; Used to throttle API calls to avoid rate limiting (in ms)
 
 # TEE Configuration
 # TEE_MODE options:

agent/src/index.ts

@@ -87,7 +87,7 @@ import { openWeatherPlugin } from "@elizaos/plugin-open-weather";
 import { quaiPlugin } from "@elizaos/plugin-quai";
 import { sgxPlugin } from "@elizaos/plugin-sgx";
 import { solanaPlugin } from "@elizaos/plugin-solana";
-import { solanaAgentkitPlguin } from "@elizaos/plugin-solana-agentkit";
+import { solanaAgentkitPlugin } from "@elizaos/plugin-solana-agentkit";
 import { squidRouterPlugin } from "@elizaos/plugin-squid-router";
 import { stargazePlugin } from "@elizaos/plugin-stargaze";
 import { storyPlugin } from "@elizaos/plugin-story";
@@ -245,12 +245,15 @@ async function loadCharacter(filePath: string): Promise<Character> {
     return jsonToCharacter(filePath, character);
 }
 
+function commaSeparatedStringToArray(commaSeparated: string): string[] {
+    return commaSeparated?.split(",").map(value => value.trim())
+}
+
+
 export async function loadCharacters(
     charactersArg: string
 ): Promise<Character[]> {
-    let characterPaths = charactersArg
-        ?.split(",")
-        .map((filePath) => filePath.trim());
+    let characterPaths = commaSeparatedStringToArray(charactersArg)
     const loadedCharacters: Character[] = [];
 
     if (characterPaths?.length > 0) {
@@ -322,17 +325,16 @@ export async function loadCharacters(
         }
     }
 
-    if (loadedCharacters.length === 0) {
-        if (
-            process.env.REMOTE_CHARACTER_URL != "" &&
-            process.env.REMOTE_CHARACTER_URL.startsWith("http")
-        ) {
-            const character = await loadCharacterFromUrl(
-                process.env.REMOTE_CHARACTER_URL
-            );
+    if (hasValidRemoteUrls()) {
+        elizaLogger.info("Loading characters from remote URLs");
+        let characterUrls = commaSeparatedStringToArray(process.env.REMOTE_CHARACTER_URLS)
+        for (const characterUrl of characterUrls) {
+            const character = await loadCharacterFromUrl(characterUrl);
             loadedCharacters.push(character);
         }
+    }
 
+    if (loadedCharacters.length === 0) {
         elizaLogger.info("No characters found, using default character");
         loadedCharacters.push(defaultCharacter);
     }
@@ -474,6 +476,11 @@ export function getTokenForProvider(
                 character.settings?.secrets?.VENICE_API_KEY ||
                 settings.VENICE_API_KEY
             );
+        case ModelProviderName.ATOMA:
+            return (
+                character.settings?.secrets?.ATOMASDK_BEARER_AUTH ||
+                settings.ATOMASDK_BEARER_AUTH
+            );
         case ModelProviderName.AKASH_CHAT_API:
             return (
                 character.settings?.secrets?.AKASH_CHAT_API_KEY ||
@@ -786,7 +793,7 @@ export async function createAgent(
                 ? solanaPlugin
                 : null,
             getSecret(character, "SOLANA_PRIVATE_KEY")
-                ? solanaAgentkitPlguin
+                ? solanaAgentkitPlugin
                 : null,
             getSecret(character, "AUTONOME_JWT_TOKEN") ? autonomePlugin : null,
             (getSecret(character, "NEAR_ADDRESS") ||
@@ -1099,14 +1106,21 @@ const checkPortAvailable = (port: number): Promise<boolean> => {
     });
 };
 
+
+const hasValidRemoteUrls = () =>
+    process.env.REMOTE_CHARACTER_URLS &&
+    process.env.REMOTE_CHARACTER_URLS !== "" &&
+    process.env.REMOTE_CHARACTER_URLS.startsWith("http");
+
+
 const startAgents = async () => {
     const directClient = new DirectClient();
     let serverPort = parseInt(settings.SERVER_PORT || "3000");
     const args = parseArguments();
     let charactersArg = args.characters || args.character;
     let characters = [defaultCharacter];
 
-    if (charactersArg) {
+    if (charactersArg || hasValidRemoteUrls()) {
         characters = await loadCharacters(charactersArg);
     }
 

client/src/lib/api.ts

@@ -25,7 +25,7 @@ const fetcher = async ({
 
     if (method === "POST") {
         if (body instanceof FormData) {
-            // @ts-expect-error - Supressing potentially undefined options header
+            // @ts-expect-error - Suppressing potentially undefined options header
             delete options.headers["Content-Type"];
             options.body = body;
         } else {

docs/community/index.md

@@ -27,7 +27,7 @@ ElizaOS empowers developers of all skill levels to harness the potential of AI a
 
 ## Governance
 
-ai16z originates as being an AI agent led DAO. Similar to how we can influence the autonomous agents on memecoins to buy, we intend to bring similar functionality for token holders to actively participate in the decision-making process and shape the future of the project. Community members can pitch ideas, provide insights, and influence investment strategies based on their expertise and track record.
+ai16z originates as being an AI agent-led DAO. Similar to how we can influence the autonomous agents on memecoins to buy, we intend to bring similar functionality for token holders to actively participate in the decision-making process and shape the future of the project. Community members can pitch ideas, provide insights, and influence investment strategies based on their expertise and track record.
 
 ## Explore and Contribute
 

docs/docs/core/actions.md

@@ -164,7 +164,7 @@ interface Action {
 - **validate**: Determines if the action can be executed
 - **handler**: Implements the action's behavior
 - **examples**: Demonstrates proper usage patterns
-- **suppressInitialMessage**: When true, suppresses the initial response message before processing the action. Useful for actions that generate their own responses (like image generation)
+- **suppressInitialMessage**: When true, suppress the initial response message before processing the action. Useful for actions that generate their own responses (like image generation)
 
 ---
 
@@ -179,7 +179,7 @@ const continueAction: Action = {
     name: "CONTINUE",
     similes: ["ELABORATE", "KEEP_TALKING"],
     description:
-        "Used when the message requires a follow-up. Don't use when the conversation is finished.",
+        "Used when the message requires a follow-up. Don't use it when the conversation is finished.",
     validate: async (runtime, message) => {
         // Validation logic
         return true;

docs/docs/quickstart.md

@@ -130,7 +130,7 @@ You set which model to use inside the character JSON file
     pnpm start --character="characters/trump.character.json"
     ```
 
-    You can also load multiple characters with the characters option with a comma separated list:
+    You can also load multiple characters with the characters option with a comma-separated list:
 
     ```bash
     pnpm start --characters="characters/trump.character.json,characters/tate.character.json"

packages/client-direct/src/api.ts

@@ -109,7 +109,7 @@ export function createApiRouter(
         };
         if (!agentId) return;
 
-        let agent: AgentRuntime = agents.get(agentId);
+        const agent: AgentRuntime = agents.get(agentId);
 
         if (agent) {
             agent.stop();
@@ -127,7 +127,7 @@ export function createApiRouter(
         };
         if (!agentId) return;
 
-        let agent: AgentRuntime = agents.get(agentId);
+        const agent: AgentRuntime = agents.get(agentId);
 
         // update character
         if (agent) {

packages/client-instagram/eslint.config.mjs

@@ -0,0 +1,3 @@
+import eslintGlobalConfig from "../../eslint.config.mjs";
+
+export default [...eslintGlobalConfig];

packages/client-instagram/src/index.ts

@@ -6,50 +6,52 @@ import { InstagramInteractionService } from "./services/interaction";
 import { InstagramPostService } from "./services/post";
 
 export const InstagramClientInterface: Client = {
-  async start(runtime: IAgentRuntime) {
-    try {
-      // Validate configuration
-      const config = await validateInstagramConfig(runtime);
-      elizaLogger.log("Instagram client configuration validated");
-
-      // Initialize client and get initial state
-      const state = await initializeClient(runtime, config);
-      elizaLogger.log("Instagram client initialized");
-
-      // Create services
-      const postService = new InstagramPostService(runtime, state);
-      const interactionService = new InstagramInteractionService(runtime, state);
-
-      // Start services
-      if (!config.INSTAGRAM_DRY_RUN) {
-        await postService.start();
-        elizaLogger.log("Instagram post service started");
-
-        if (config.INSTAGRAM_ENABLE_ACTION_PROCESSING) {
-          await interactionService.start();
-          elizaLogger.log("Instagram interaction service started");
+    async start(runtime: IAgentRuntime) {
+        try {
+            // Validate configuration
+            const config = await validateInstagramConfig(runtime);
+            elizaLogger.log("Instagram client configuration validated");
+
+            // Initialize client and get initial state
+            const state = await initializeClient(runtime, config);
+            elizaLogger.log("Instagram client initialized");
+
+            // Create services
+            const postService = new InstagramPostService(runtime, state);
+            const interactionService = new InstagramInteractionService(
+                runtime,
+                state
+            );
+
+            // Start services
+            if (!config.INSTAGRAM_DRY_RUN) {
+                await postService.start();
+                elizaLogger.log("Instagram post service started");
+
+                if (config.INSTAGRAM_ENABLE_ACTION_PROCESSING) {
+                    await interactionService.start();
+                    elizaLogger.log("Instagram interaction service started");
+                }
+            } else {
+                elizaLogger.log("Instagram client running in dry-run mode");
+            }
+
+            // Return manager instance
+            return {
+                post: postService,
+                interaction: interactionService,
+                state,
+            };
+        } catch (error) {
+            elizaLogger.error("Failed to start Instagram client:", error);
+            throw error;
         }
-      } else {
-        elizaLogger.log("Instagram client running in dry-run mode");
-      }
-
-      // Return manager instance
-      return {
-        post: postService,
-        interaction: interactionService,
-        state
-      };
-
-    } catch (error) {
-      elizaLogger.error("Failed to start Instagram client:", error);
-      throw error;
-    }
-  },
-
-  async stop(runtime: IAgentRuntime) {
-    elizaLogger.log("Stopping Instagram client services...");
-    // Cleanup will be handled by the services themselves
-  }
+    },
+
+    async stop(_runtime: IAgentRuntime) {
+        elizaLogger.log("Stopping Instagram client services...");
+        // Cleanup will be handled by the services themselves
+    },
 };
 
-export default InstagramClientInterface;
+export default InstagramClientInterface;