fix merge conflicts

Author: madjin

.env.example

@@ -4,6 +4,8 @@ DISCORD_API_TOKEN= # Bot token
 OPENAI_API_KEY=sk-* # OpenAI API key, starting with sk-
 REDPILL_API_KEY= # REDPILL API Key
 GROQ_API_KEY=gsk_*
+OPENROUTER_API_KEY=
+GOOGLE_GENERATIVE_AI_API_KEY= # Gemini API key
 
 ELEVENLABS_XI_API_KEY= # API key from elevenlabs
 
@@ -27,6 +29,16 @@ X_SERVER_URL=
 XAI_API_KEY=
 XAI_MODEL=
 
+#Leave blank to use local embeddings 
+USE_OPENAI_EMBEDDING=  #TRUE
+
+#OpenRouter (Use one model for everything or set individual for small, medium, large tasks)
+#leave blank to use defaults hermes 70b for small tasks & 405b for medium/large tasks
+OPENROUTER_MODEL=
+SMALL_OPENROUTER_MODEL= 
+MEDIUM_OLLAMA_MODEL= 
+LARGE_OLLAMA_MODEL= 
+
 
 #Set to Use for New OLLAMA provider 
 OLLAMA_SERVER_URL=   #Leave blank for default localhost:11434
@@ -37,10 +49,6 @@ SMALL_OLLAMA_MODEL=         #default llama3.2
 MEDIUM_OLLAMA_MODEL=        #default herems3
 LARGE_OLLAMA_MODEL=         #default hermes3:70b
 
-#to still use the original LOCALLLAMA provider but with ollama
-LOCAL_LLAMA_PROVIDER= #"OLLAMA" #Leave blank for LLAMA-CPP or add OLLAMA
-
-
 # For asking Claude stuff
 ANTHROPIC_API_KEY=
 
@@ -51,6 +59,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
+BASE_MINT=So11111111111111111111111111111111111111112
 RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 

.github/workflows/ci.yaml

@@ -27,11 +27,11 @@ jobs:
 
             - name: Create test env file
               run: |
-                  echo "TEST_DATABASE_CLIENT=sqlite" > core/.env.test
-                  echo "NODE_ENV=test" >> core/.env.test
+                  echo "TEST_DATABASE_CLIENT=sqlite" > packages/core/.env.test
+                  echo "NODE_ENV=test" >> packages/core/.env.test
 
             - name: Run tests
-              run: cd core && pnpm test
+              run: cd packages/core && pnpm test
 
             - name: Build packages
               run: pnpm run build

README.md

@@ -83,6 +83,7 @@ DISCORD_APPLICATION_ID=
 DISCORD_API_TOKEN= # Bot token
 OPENAI_API_KEY=sk-* # OpenAI API key, starting with sk-
 ELEVENLABS_XI_API_KEY= # API key from elevenlabs
+GOOGLE_GENERATIVE_AI_API_KEY= # Gemini API key
 
 # ELEVENLABS SETTINGS
 ELEVENLABS_MODEL_ID=eleven_multilingual_v2

docs/README_CN.md

@@ -30,7 +30,7 @@
 
 ### 编辑.env文件
 
-- -   将 .env.example 复制为 .env 并填写适当的值
+- - 将 .env.example 复制为 .env 并填写适当的值
 - 编辑推特环境并输入你的推特账号和密码
 
 ### 编辑角色文件