Resolve merge conflicts

router-protocol · Jan 21, 2025 · e3d4a10 · e3d4a10
1 parent 78ac312
commit e3d4a10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/agent/package.json b/agent/package.json
@@ -106,6 +106,7 @@
     "@elizaos/plugin-nft-collections": "workspace:*",
     "@elizaos/plugin-pyth-data": "workspace:*",
     "@elizaos/plugin-openai": "workspace:*",
+    "@elizaos/plugin-router-nitro": "workspace:*",
     "readline": "1.3.0",
     "ws": "8.18.0",
     "yargs": "17.7.2"

diff --git a/agent/src/index.ts b/agent/src/index.ts
@@ -107,6 +107,8 @@ import { echoChambersPlugin } from "@elizaos/plugin-echochambers";
 import { dexScreenerPlugin } from "@elizaos/plugin-dexscreener";
 import { pythDataPlugin } from "@elizaos/plugin-pyth-data";
 import { openaiPlugin } from '@elizaos/plugin-openai';
+import nitroPlugin from "@elizaos/plugin-router-nitro";
+
 
 import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
 import Database from "better-sqlite3";
@@ -556,7 +558,7 @@ export function getTokenForProvider(
         case ModelProviderName.ATOMA:
              return (
                  character.settings?.secrets?.ATOMASDK_BEARER_AUTH ||
-                 settings.ATOMASDK_BEARER_AUTH
+                 settings.ATOMASDK_BEARER_AUTH);
         case ModelProviderName.NVIDIA:
             return (
                 character.settings?.secrets?.NVIDIA_API_KEY ||