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.

Sign up for GitHub

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

merge from main #21

Merged
merged 10 commits into from
Nov 10, 2024
Merged

merge from main #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0c5617
Support system prompt and google models
parzival418 Nov 9, 2024
09095cc
Remove system prompt since already implemented.
parzival418 Nov 9, 2024
c7e9bf0
Update env example and readme with gemini key
parzival418 Nov 9, 2024
ada9486
fix respnse parsing?
lalalune Nov 9, 2024
9a04908
Merge pull request #246 from Oneirocom/google-and-system-prompt
lalalune Nov 10, 2024
f4dbc3e
Working PostGres Adapter
cvartanian Nov 10, 2024
0fbec0f
Merge pull request #248 from MarcoMandar/main
lalalune Nov 10, 2024
76d33f7
Merge pull request #247 from ai16z/fix-pg-adapter
lalalune Nov 10, 2024
9fb49b5
add auto lock
lalalune Nov 10, 2024
2b12018
Merge branch 'main' of https://github.com/ai16z/eliza into shaw/trust
lalalune Nov 10, 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
1 change: 1 addition & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ 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

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading