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

feat(llm): support Gemini provider #272

Merged
merged 1 commit into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions docs/providers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ To select a provider and model, run ``gptme`` with the ``--model`` flag set to `
gptme --model openai/gpt-4o "hello"
gptme --model anthropic "hello" # if model part unspecified, will fall back to the provider default
gptme --model openrouter/meta-llama/llama-3.1-70b-instruct "hello"
gptme --model gemini/gemini-1.5-flash-latest "hello"
gptme --model local/llama3.2:1b "hello"

On first startup, if ``--model`` is not set, and no API keys are set in the config or environment it will be prompted for. It will then auto-detect the provider, and save the key in the configuration file.
Expand Down Expand Up @@ -43,6 +44,15 @@ To use OpenRouter, set your API key:

export OPENROUTER_API_KEY="your-api-key"

Gemini
----------

To use Gemini, set your API key:

.. code-block:: sh

export GEMINI_API_KEY="your-api-key"

Groq
----

Expand Down
1 change: 1 addition & 0 deletions gptme/eval/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ def main(
"anthropic/claude-3-5-sonnet-20241022",
"anthropic/claude-3-5-haiku-20241022",
"openrouter/meta-llama/llama-3.1-405b-instruct",
"gemini/gemini-1.5-flash-latest",
]

results_files = []
Expand Down
5 changes: 3 additions & 2 deletions gptme/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def cleanup_logging():


def _prompt_api_key() -> tuple[str, str, str]: # pragma: no cover
api_key = input("Your OpenAI, Anthropic, or OpenRouter API key: ").strip()
api_key = input("Your OpenAI, Anthropic, OpenRouter, or Gemini API key: ").strip()
if (found_model_tuple := get_model_from_api_key(api_key)) is not None:
return found_model_tuple
else:
Expand All @@ -102,12 +102,13 @@ def _prompt_api_key() -> tuple[str, str, str]: # pragma: no cover

def ask_for_api_key(): # pragma: no cover
"""Interactively ask user for API key"""
console.print("No API key set for OpenAI, Anthropic, or OpenRouter.")
console.print("No API key set for OpenAI, Anthropic, OpenRouter, or Gemini.")
console.print(
"""You can get one at:
- OpenAI: https://platform.openai.com/account/api-keys
- Anthropic: https://console.anthropic.com/settings/keys
- OpenRouter: https://openrouter.ai/settings/keys
- Gemini: https://aistudio.google.com/app/apikey
"""
)
# Save to config
Expand Down
5 changes: 5 additions & 0 deletions gptme/llm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ def _client_to_provider() -> Provider:
return "openai"
elif "openrouter" in openai_client.base_url.host:
return "openrouter"
elif "gemini" in openai_client.base_url.host:
return "gemini"
else:
return "azure"
elif anthropic_client:
Expand Down Expand Up @@ -252,6 +254,9 @@ def guess_model_from_config() -> Provider | None:
elif config.get_env("OPENROUTER_API_KEY"):
console.log("Found OpenRouter API key, using OpenRouter provider")
return "openrouter"
elif config.get_env("GEMINI_API_KEY"):
console.log("Found Gemini API key, using Gemini provider")
return "gemini"

return None

Expand Down
3 changes: 3 additions & 0 deletions gptme/llm/llm_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ def init(provider: Provider, config: Config):
elif provider == "openrouter":
api_key = config.get_env_required("OPENROUTER_API_KEY")
openai = OpenAI(api_key=api_key, base_url="https://openrouter.ai/api/v1")
elif provider == "gemini":
api_key = config.get_env_required("GEMINI_API_KEY")
openai = OpenAI(api_key=api_key, base_url="https://generativelanguage.googleapis.com/v1beta")
elif provider == "xai":
api_key = config.get_env_required("XAI_API_KEY")
openai = OpenAI(api_key=api_key, base_url="https://api.x.ai/v1")
Expand Down
19 changes: 17 additions & 2 deletions gptme/llm/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

# available providers
Provider = Literal[
"openai", "anthropic", "azure", "openrouter", "groq", "xai", "deepseek", "local"
"openai", "anthropic", "azure", "openrouter", "gemini", "groq", "xai", "deepseek", "local"
]
PROVIDERS: list[Provider] = cast(list[Provider], get_args(Provider))
PROVIDERS_OPENAI: list[Provider]
PROVIDERS_OPENAI = ["openai", "azure", "openrouter", "xai", "groq", "deepseek", "local"]
PROVIDERS_OPENAI = ["openai", "azure", "openrouter", "gemini", "xai", "groq", "deepseek", "local"]


@dataclass(frozen=True)
Expand Down Expand Up @@ -90,6 +90,17 @@ class _ModelDictMeta(TypedDict):
"price_output": 1.25,
},
},
# https://ai.google.dev/gemini-api/docs/models/gemini#gemini-1.5-flash
# https://ai.google.dev/pricing#1_5flash
"gemini": {
"gemini-1.5-flash-latest": {
"context": 1_048_576,
"max_output": 8192,
"price_input": 0.15,
"price_output": 0.60,
"supports_vision": True,
},
},
"local": {},
}

Expand Down Expand Up @@ -137,6 +148,8 @@ def get_recommended_model(provider: Provider) -> str: # pragma: no cover
return "gpt-4o"
elif provider == "openrouter":
return "meta-llama/llama-3.1-405b-instruct"
elif provider == "gemini":
return "gemini-1.5-flash-latest"
elif provider == "anthropic":
return "claude-3-5-sonnet-20241022"
else:
Expand All @@ -148,6 +161,8 @@ def get_summary_model(provider: Provider) -> str: # pragma: no cover
return "gpt-4o-mini"
elif provider == "openrouter":
return "meta-llama/llama-3.1-8b-instruct"
elif provider == "gemini":
return "gemini-1.5-flash-latest"
elif provider == "anthropic":
return "claude-3-haiku-20240307"
else:
Expand Down
Loading