Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge Develop into Main #1356

Merged
merged 41 commits into from
Dec 22, 2024
Merged
Changes from 2 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
018d6ad
fix: add lint script for plugin evm and fix lint errors
nicky-ru Dec 17, 2024
f8a1a90
Merge branch 'develop' into develop
nicky-ru Dec 19, 2024
d35c3c2
remove TWITTER_COOKIES env var
ChristopherTrimboli Dec 20, 2024
0fc2f8f
Merge branch 'develop' into develop
odilitime Dec 20, 2024
4f32e04
reset trump clients
ChristopherTrimboli Dec 20, 2024
3622a7d
reset lock file
ChristopherTrimboli Dec 20, 2024
dbbde8a
Merge remote-tracking branch 'upstream/develop' into twitter-cookies
ChristopherTrimboli Dec 20, 2024
8bb90f2
Merge pull request #1301 from ai16z/main
shakkernerd Dec 21, 2024
cedb9b9
no token needed for gaianet
suicidalgoofy Dec 21, 2024
c675e9d
Merge pull request #1306 from suicidalgoofy/main
monilpat Dec 21, 2024
7c11963
Merge branch 'develop' into develop
monilpat Dec 21, 2024
b139995
Merge pull request #1171 from nicky-ru/develop
monilpat Dec 21, 2024
13c926d
Merge branch 'develop' into twitter-cookies
monilpat Dec 21, 2024
06e7527
Merge pull request #1288 from ChristopherTrimboli/twitter-cookies
monilpat Dec 21, 2024
2afa2b0
fix: update turbo to fix "cannot find package" error
oxSaturn Dec 21, 2024
258789d
Merge pull request #1307 from oxSaturn/fix/cannot-find-package
monilpat Dec 21, 2024
7d81e39
fix: set default value for cache store
oxSaturn Dec 21, 2024
0c0c785
fix: support google
oxSaturn Dec 21, 2024
2f56c95
Merge pull request #1308 from oxSaturn/fix/set-default-cache-store
monilpat Dec 21, 2024
f6d08cc
chore: bump agent-twitter-client version to v0.0.17
shakkernerd Dec 21, 2024
285725e
Merge branch 'develop' into fix/support-google
monilpat Dec 21, 2024
5c1fe07
Merge pull request #1310 from oxSaturn/fix/support-google
monilpat Dec 21, 2024
a91ea90
Merge branch 'develop' into chore/client_twitter
monilpat Dec 21, 2024
1bbba90
chore: pnpm lock file
shakkernerd Dec 21, 2024
faf7163
Merge pull request #1311 from ai16z/chore/client_twitter
shakkernerd Dec 21, 2024
6551ac3
fix: use MAX_TWEET_LENGTH from setting
oxSaturn Dec 21, 2024
7b609df
Merge pull request #1323 from oxSaturn/fix/max-tweet-length
monilpat Dec 21, 2024
4446a66
fix: Add OLLAMA model to the getTokenForProvider class
amirkhonov Dec 21, 2024
cba5d50
fix: postgres adapter schema
ryanleecode Dec 21, 2024
0dc60c8
Merge pull request #1338 from amirkhonov/develop
monilpat Dec 21, 2024
245692f
Merge branch 'develop' into fix/postgres-adapter-schema
monilpat Dec 21, 2024
e15dd54
Merge pull request #1345 from ryanleecode/fix/postgres-adapter-schema
monilpat Dec 21, 2024
37b1f04
fix: change max cast length to the current max cast length
0x330a Dec 21, 2024
d3030f0
refactor: reference the max cast length in the content trimming proce…
0x330a Dec 21, 2024
86194df
Merge branch 'develop' into main
0x330a Dec 21, 2024
b9d819e
Merge pull request #1347 from 0x330a/main
monilpat Dec 21, 2024
318a3a5
elizaOS
lalalune Dec 22, 2024
0044ce9
chore: ai16z -> elizaOS
shakkernerd Dec 22, 2024
f45396f
revert discord url
madjin Dec 22, 2024
4d6a7a1
Merge pull request #1355 from elizaOS/elizaos_discord
shakkernerd Dec 22, 2024
d3f8e8b
Merge pull request #1352 from elizaOS/elizaos
lalalune Dec 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion agent/src/index.ts
Original file line number Diff line number Diff line change
@@ -214,9 +214,11 @@ export function getTokenForProvider(
character: Character
): string {
switch (provider) {
// no key needed for llama_local
// no key needed for llama_local or gaianet
case ModelProviderName.LLAMALOCAL:
return "";
case ModelProviderName.GAIANET:
return "";
case ModelProviderName.OPENAI:
return (
character.settings?.secrets?.OPENAI_API_KEY ||
Loading