Skip to content
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ Once your project and credentials are configured, export environment variables t

```zsh
export VERTEX_AI_PROJECT_ID=<your-project-id>
export VERTEX_AI_LOCATION=<location-to-deploy-model>
export VERTEX_AI_LOCATION=global
```

The project location can be located under the **Region** on the [Vertex AI](https://console.cloud.google.com/vertex-ai) dashboard, as well as more details about available Gemini models.
The included Gemini models are served from the `global` location or the `us` and `eu` multi-regions. More details about available Gemini models and their supported regions are found in the [Google Cloud documentation](https://docs.cloud.google.com/vertex-ai/generative-ai/docs/models).

##### OpenAI Setup

Expand Down
27 changes: 12 additions & 15 deletions ai/providers/anthropic.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,20 @@

class AnthropicAPI(BaseAPIProvider):
MODELS: ClassVar[dict] = {
"claude-3-5-sonnet-20240620": {
"name": "Claude 3.5 Sonnet",
"claude-haiku-5-5": {
"name": "Claude Haiku 5.5",
"provider": "Anthropic",
"max_tokens": 4096, # or 8192 with the header anthropic-beta: max-tokens-3-5-sonnet-2024-07-15
"max_tokens": 16000,
},
"claude-3-sonnet-20240229": {
"name": "Claude 3 Sonnet",
"claude-opus-5-5": {
"name": "Claude Opus 5.5",
"provider": "Anthropic",
"max_tokens": 4096,
"max_tokens": 16000,
},
"claude-3-haiku-20240307": {
"name": "Claude 3 Haiku",
"claude-sonnet-5-5": {
"name": "Claude Sonnet 5.5",
"provider": "Anthropic",
"max_tokens": 4096,
},
"claude-3-opus-20240229": {
"name": "Claude 3 Opus",
"provider": "Anthropic",
"max_tokens": 4096,
"max_tokens": 16000,
},
}

Expand Down Expand Up @@ -59,7 +54,9 @@ def generate_response(self, prompt: str, system_content: str) -> str:
],
max_tokens=self.MODELS[self.current_model]["max_tokens"],
)
return response.content[0].text
return "".join(
block.text for block in response.content if block.type == "text"
)
Comment on lines +57 to +59

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👁️‍🗨️ note: Here we account for thinking in responses

except anthropic.APIConnectionError as e:
logger.error(f"Server could not be reached: {e.__cause__}")
raise
Expand Down
19 changes: 11 additions & 8 deletions ai/providers/openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,21 @@

class OpenAI_API(BaseAPIProvider):
MODELS: ClassVar[dict] = {
"gpt-4.1": {"name": "GPT-4.1", "provider": "OpenAI", "max_tokens": 10000},
"gpt-4.1-mini": {
"name": "GPT-4.1 Mini",
"gpt-6-astra": {
"name": "GPT-6 Astra",
"provider": "OpenAI",
"max_tokens": 10000,
"max_tokens": 16000,
},
"gpt-4.1-nano": {
"name": "GPT-4.1 Nano",
"gpt-6-luna": {
"name": "GPT-6 Luna",
"provider": "OpenAI",
"max_tokens": 10000,
"max_tokens": 16000,
},
"gpt-6.1-sol": {
"name": "GPT-6.1 Sol",
"provider": "OpenAI",
"max_tokens": 16000,
},
"o4-mini": {"name": "o4-mini", "provider": "OpenAI", "max_tokens": 50000},
}

def __init__(self):
Expand Down
101 changes: 26 additions & 75 deletions ai/providers/vertexai.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import os
from typing import ClassVar

import google.api_core.exceptions
import vertexai.generative_models

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📰 note: This is the deprecated package we're moving from

The Generative AI module in the Vertex AI SDK is deprecated and will no longer be available after June 24, 2026. The Google Gen AI SDK contains all the capabilities of the Vertex AI SDK, and supports many additional capabilities.

🔗 https://docs.cloud.google.com/vertex-ai/generative-ai/docs/deprecations/genai-vertexai-sdk

from google import genai
from google.genai import errors, types

from .base_provider import BaseAPIProvider

Expand All @@ -14,66 +14,31 @@
class VertexAPI(BaseAPIProvider):
VERTEX_AI_PROVIDER = "VertexAI"
MODELS: ClassVar[dict] = {
"gemini-1.5-flash-001": {
"name": "Gemini 1.5 Flash 001",
"gemini-3.5-flash-lite": {
"name": "Gemini 3.5 Flash-Lite",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"max_tokens": 16384,
"system_instruction_supported": True,
},
"gemini-1.5-flash-002": {
"name": "Gemini 1.5 Flash 002",
"gemini-3.8-flash": {
"name": "Gemini 3.8 Flash",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"max_tokens": 16384,
"system_instruction_supported": True,
},
"gemini-1.5-pro-002": {
"name": "Gemini 1.5 Pro 002",
"gemini-4-argon": {
"name": "Gemini 4 Argon",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"system_instruction_supported": True,
},
"gemini-1.5-pro-001": {
"name": "Gemini 1.5 Pro 001",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"system_instruction_supported": True,
},
"gemini-1.0-pro-002": {
"name": "Gemini 1.0 Pro 002",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"system_instruction_supported": True,
},
"gemini-1.0-pro-001": {
"name": "Gemini 1.0 Pro 001",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"system_instruction_supported": False,
},
"gemini-flash-experimental": {
"name": "Gemini Flash Experimental",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"system_instruction_supported": True,
},
"gemini-pro-experimental": {
"name": "Gemini Pro Experimental",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"system_instruction_supported": True,
},
"gemini-experimental": {
"name": "Gemini Experimental",
"provider": VERTEX_AI_PROVIDER,
"max_tokens": 8192,
"max_tokens": 16384,
"system_instruction_supported": True,
},
}

def __init__(self):
self.enabled = bool(os.environ.get("VERTEX_AI_PROJECT_ID", ""))
if self.enabled:
vertexai.init(
self.client = genai.Client(
enterprise=True,

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😻 note: This lets us remain compatible with the Vertex API I understand

project=os.environ.get("VERTEX_AI_PROJECT_ID"),
location=os.environ.get("VERTEX_AI_LOCATION"),
)
Expand All @@ -97,36 +62,22 @@ def generate_response(self, prompt: str, system_content: str) -> str:
prompt = system_content + "\n" + prompt

try:
self.client = vertexai.generative_models.GenerativeModel(
model_name=self.current_model,
generation_config={
"max_output_tokens": self.MODELS[self.current_model]["max_tokens"],
},
system_instruction=system_instruction,
)
response = self.client.generate_content(
response = self.client.models.generate_content(
model=self.current_model,
contents=prompt,
config=types.GenerateContentConfig(
max_output_tokens=self.MODELS[self.current_model]["max_tokens"],
system_instruction=system_instruction,
),
)
return "".join(part.text for part in response.candidates[0].content.parts)
return response.text

except google.api_core.exceptions.Unauthorized as e:
logger.error(f"Client is not Authorized. {e.reason}, {e.message}")
raise
except google.api_core.exceptions.Forbidden as e:
logger.error(f"Client Forbidden. {e.reason}, {e.message}")
raise
except google.api_core.exceptions.TooManyRequests as e:
logger.error(f"Too many requests. {e.reason}, {e.message}")
raise
except google.api_core.exceptions.ClientError as e:
logger.error(f"Client error: {e.reason}, {e.message}")
raise
except google.api_core.exceptions.ServerError as e:
logger.error(f"Server error: {e.reason}, {e.message}")
except errors.ClientError as e:
logger.error(f"Client error: {e.code} {e.status}, {e.message}")
raise
except google.api_core.exceptions.GoogleAPICallError as e:
logger.error(f"Error: {e.reason}, {e.message}")
except errors.ServerError as e:
logger.error(f"Server error: {e.code} {e.status}, {e.message}")
raise
except google.api_core.exceptions.GoogleAPIError as e:
logger.error(f"Unknown error. {e}")
except errors.APIError as e:
logger.error(f"Error: {e.code} {e.status}, {e.message}")
raise
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ruff==0.16.10
slack-cli-hooks==0.3.0
openai==3.26.0
anthropic==1.13.0
google-cloud-aiplatform==2.4.0
google-genai==2.30.1
Loading