Skip to content

Commit 7918eaa

Browse files
authored
Merge branch 'develop' into develop
2 parents 69b93ec + eb140e0 commit 7918eaa

32 files changed

+1398
-284
lines changed

.env.example

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ SUPABASE_ANON_KEY=
1818
# Comma separated list of remote character urls (optional)
1919
REMOTE_CHARACTER_URLS=
2020

21+
# Logging
22+
LOG_JSON_FORMAT= # Print everything in logger as json; false by default
23+
2124
###############################
2225
#### Client Configurations ####
2326
###############################
@@ -232,8 +235,10 @@ LARGE_ANTHROPIC_MODEL= # Default: claude-3-5-sonnet-20241022
232235
HEURIST_API_KEY= # Get from https://heurist.ai/dev-access
233236
SMALL_HEURIST_MODEL= # Default: meta-llama/llama-3-70b-instruct
234237
MEDIUM_HEURIST_MODEL= # Default: meta-llama/llama-3-70b-instruct
235-
LARGE_HEURIST_MODEL= # Default: meta-llama/llama-3.1-405b-instruct
236-
HEURIST_IMAGE_MODEL= # Default: PepeXL
238+
LARGE_HEURIST_MODEL= # Default: meta-llama/llama-3.3-70b-instruct
239+
HEURIST_IMAGE_MODEL= # Default: FLUX.1-dev
240+
HEURIST_EMBEDDING_MODEL= # Default: BAAI/bge-large-en-v1.5
241+
USE_HEURIST_EMBEDDING= # Set to TRUE for HEURIST embedding, leave blank for local
237242

238243
# Gaianet Configuration
239244
GAIANET_MODEL=

agent/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { SlackClientInterface } from "@elizaos/client-slack";
1111
import { TelegramClientInterface } from "@elizaos/client-telegram";
1212
import { TwitterClientInterface } from "@elizaos/client-twitter";
1313
import { FarcasterClientInterface } from "@elizaos/client-farcaster";
14+
import { DirectClient } from "@elizaos/client-direct";
1415
// import { ReclaimAdapter } from "@elizaos/plugin-reclaim";
1516
import { PrimusAdapter } from "@elizaos/plugin-primus";
1617
import { elizaCodeinPlugin, onchainJson } from "@elizaos/plugin-iq6900";

client/src/lib/api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { type UUID, type Character } from "@elizaos/core";
22

3-
const BASE_URL = `http://localhost:${import.meta.env.VITE_SERVER_PORT}`;
3+
const BASE_URL = `http://localhost:${import.meta.env.VITE_SERVER_PORT ?? 3000}`;
44

55
const fetcher = async ({
66
url,

docs/api/classes/MemoryCacheAdapter.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
### new MemoryCacheAdapter()
1212

13-
> **new MemoryCacheAdapter**(`initalData`?): [`MemoryCacheAdapter`](MemoryCacheAdapter.md)
13+
> **new MemoryCacheAdapter**(`initialData`?): [`MemoryCacheAdapter`](MemoryCacheAdapter.md)
1414
1515
#### Parameters
1616

17-
**initalData?**: `Map`\<`string`, `string`\>
17+
**initialData?**: `Map`\<`string`, `string`\>
1818

1919
#### Returns
2020

docs/community/ai16z/degenai/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We can rebuild him
1111
- ai16z is the biggest holder of degenai (a pumpfun coin)
1212
- Current plan for ai16z still is buybacks of degenai
1313
- To-do: We need to surface this better (like a website)
14-
- DegenspartanAI also stacks his own coin as well
14+
- DegenSpartanAI also stacks his own coin as well
1515
- Shitposting while trading
1616
- He might just dump your shit
1717
- May do psyops like self fuds his own bags

packages/core/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"@ai-sdk/openai": "1.0.5",
7272
"@anthropic-ai/sdk": "0.30.1",
7373
"@fal-ai/client": "1.2.0",
74+
"@tavily/core": "^0.0.2",
7475
"@types/uuid": "10.0.0",
7576
"ai": "3.4.33",
7677
"anthropic-vertex-ai": "1.0.2",
@@ -85,7 +86,8 @@
8586
"langchain": "0.3.6",
8687
"ollama-ai-provider": "0.16.1",
8788
"openai": "4.73.0",
88-
"@tavily/core": "^0.0.2",
89+
"pino": "^9.6.0",
90+
"pino-pretty": "^13.0.0",
8991
"tinyld": "1.3.4",
9092
"together-ai": "0.7.0",
9193
"unique-names-generator": "4.7.1",

0 commit comments

Comments
 (0)