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

Jump to bottom

Add Google Gemini support #575

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Google Gemini support #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions sgpt/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"CHAT_CACHE_LENGTH": int(os.getenv("CHAT_CACHE_LENGTH", "100")),
"CACHE_LENGTH": int(os.getenv("CHAT_CACHE_LENGTH", "100")),
"REQUEST_TIMEOUT": int(os.getenv("REQUEST_TIMEOUT", "60")),
"DEFAULT_MODEL": os.getenv("DEFAULT_MODEL", "gpt-4-1106-preview"),
"DEFAULT_MODEL": os.getenv("DEFAULT_MODEL", "gemini/gemini-1.5-flash"),
"DEFAULT_COLOR": os.getenv("DEFAULT_COLOR", "magenta"),
"ROLE_STORAGE_PATH": os.getenv("ROLE_STORAGE_PATH", str(ROLE_STORAGE_PATH)),
"DEFAULT_EXECUTE_SHELL_CMD": os.getenv("DEFAULT_EXECUTE_SHELL_CMD", "false"),
Expand All @@ -33,7 +33,7 @@
"SHOW_FUNCTIONS_OUTPUT": os.getenv("SHOW_FUNCTIONS_OUTPUT", "false"),
"API_BASE_URL": os.getenv("API_BASE_URL", "default"),
"PRETTIFY_MARKDOWN": os.getenv("PRETTIFY_MARKDOWN", "true"),
"USE_LITELLM": os.getenv("USE_LITELLM", "false"),
"USE_LITELLM": os.getenv("USE_LITELLM", "true"),
# New features might add their own config variables here.
}

Expand All @@ -57,6 +57,10 @@ def __init__(self, config_path: Path, **defaults: Any):
if not defaults.get("OPENAI_API_KEY") and not os.getenv("OPENAI_API_KEY"):
__api_key = getpass(prompt="Please enter your OpenAI API key: ")
defaults["OPENAI_API_KEY"] = __api_key
# Don't write Gemini API key to config file if it is in the environment.
if not defaults.get("GEMINI_API_KEY") and not os.getenv("GEMINI_API_KEY"):
__api_key = getpass(prompt="Please enter your Gemini API key: ")
defaults["GEMINI_API_KEY"] = __api_key
super().__init__(**defaults)
self._write()

Expand Down
4 changes: 2 additions & 2 deletions sgpt/handlers/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use_litellm = cfg.get("USE_LITELLM") == "true"
additional_kwargs = {
"timeout": int(cfg.get("REQUEST_TIMEOUT")),
"api_key": cfg.get("OPENAI_API_KEY"),
"base_url": None if base_url == "default" else base_url,
}

Expand All @@ -25,7 +24,7 @@
else:
from openai import OpenAI

client = OpenAI(**additional_kwargs) # type: ignore
client = OpenAI(**additional_kwargs, api_key=cfg.get("OPENAI_API_KEY")) # type: ignore
completion = client.chat.completions.create
additional_kwargs = {}

Expand Down Expand Up @@ -103,6 +102,7 @@ def get_completion(
messages=messages,
functions=functions,
stream=True,
api_key=cfg.get("GEMINI_API_KEY") if model.startswith("gemini") else cfg.get("OPENAI_API_KEY"),
**additional_kwargs,
)

Expand Down