Skip to content

Commit

Permalink
Revert #1138
Browse files Browse the repository at this point in the history
This appears to be causing failing builds. We think it's
because the gcp-sdk-auth depend on reqwest with non native tls
but need more time to investigate
  • Loading branch information
baxen committed Feb 13, 2025
1 parent 9287eae commit 65f73cb
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 293 deletions.
6 changes: 0 additions & 6 deletions crates/goose-server/src/routes/providers_and_keys.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,5 @@
"description": "Connect to Azure OpenAI Service",
"models": ["gpt-4o", "gpt-4o-mini"],
"required_keys": ["AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOYMENT_NAME"]
},
"vertex_ai": {
"name": "Vertex AI",
"description": "Access variety of AI models through Vertex AI",
"models": ["claude-3-5-sonnet-v2@20241022", "claude-3-5-sonnet@20240620"],
"required_keys": ["VERTEXAI_PROJECT_ID", "VERTEXAI_REGION"]
}
}
1 change: 0 additions & 1 deletion crates/goose/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ mcp-core = { path = "../mcp-core" }
anyhow = "1.0"
thiserror = "1.0"
futures = "0.3"
gcp-sdk-auth = "0.1.1"
reqwest = { version = "0.12.9", features = [
"rustls-tls",
"json",
Expand Down
3 changes: 0 additions & 3 deletions crates/goose/src/providers/factory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use super::{
ollama::OllamaProvider,
openai::OpenAiProvider,
openrouter::OpenRouterProvider,
vertexai::VertexAIProvider,
};
use crate::model::ModelConfig;
use anyhow::Result;
Expand All @@ -25,7 +24,6 @@ pub fn providers() -> Vec<ProviderMetadata> {
OllamaProvider::metadata(),
OpenAiProvider::metadata(),
OpenRouterProvider::metadata(),
VertexAIProvider::metadata(),
]
}

Expand All @@ -40,7 +38,6 @@ pub fn create(name: &str, model: ModelConfig) -> Result<Box<dyn Provider + Send
"ollama" => Ok(Box::new(OllamaProvider::from_env(model)?)),
"openrouter" => Ok(Box::new(OpenRouterProvider::from_env(model)?)),
"google" => Ok(Box::new(GoogleProvider::from_env(model)?)),
"vertex_ai" => Ok(Box::new(VertexAIProvider::from_env(model)?)),
_ => Err(anyhow::anyhow!("Unknown provider: {}", name)),
}
}
1 change: 0 additions & 1 deletion crates/goose/src/providers/formats/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ pub mod anthropic;
pub mod bedrock;
pub mod google;
pub mod openai;
pub mod vertexai;
67 changes: 0 additions & 67 deletions crates/goose/src/providers/formats/vertexai.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/goose/src/providers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ pub mod ollama;
pub mod openai;
pub mod openrouter;
pub mod utils;
pub mod vertexai;

pub use factory::{create, providers};
189 changes: 0 additions & 189 deletions crates/goose/src/providers/vertexai.rs

This file was deleted.

14 changes: 0 additions & 14 deletions crates/goose/tests/truncate_agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use goose::agents::AgentFactory;
use goose::message::Message;
use goose::model::ModelConfig;
use goose::providers::base::Provider;
use goose::providers::vertexai::VertexAIProvider;
use goose::providers::{anthropic::AnthropicProvider, databricks::DatabricksProvider};
use goose::providers::{
azure::AzureProvider, bedrock::BedrockProvider, ollama::OllamaProvider, openai::OpenAiProvider,
Expand All @@ -25,7 +24,6 @@ enum ProviderType {
Groq,
Ollama,
OpenRouter,
VertexAI,
}

impl ProviderType {
Expand All @@ -44,7 +42,6 @@ impl ProviderType {
ProviderType::Groq => &["GROQ_API_KEY"],
ProviderType::Ollama => &[],
ProviderType::OpenRouter => &["OPENROUTER_API_KEY"],
ProviderType::VertexAI => &["VERTEXAI_PROJECT_ID", "VERTEXAI_REGION"],
}
}

Expand Down Expand Up @@ -77,7 +74,6 @@ impl ProviderType {
ProviderType::Groq => Box::new(GroqProvider::from_env(model_config)?),
ProviderType::Ollama => Box::new(OllamaProvider::from_env(model_config)?),
ProviderType::OpenRouter => Box::new(OpenRouterProvider::from_env(model_config)?),
ProviderType::VertexAI => Box::new(VertexAIProvider::from_env(model_config)?),
})
}
}
Expand Down Expand Up @@ -294,14 +290,4 @@ mod tests {
})
.await
}

#[tokio::test]
async fn test_truncate_agent_with_vertexai() -> Result<()> {
run_test_with_config(TestConfig {
provider_type: ProviderType::VertexAI,
model: "claude-3-5-sonnet-v2@20241022",
context_window: 200_000,
})
.await
}
}
2 changes: 0 additions & 2 deletions ui/desktop/src/components/settings/api_keys/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ export function isSecretKey(keyName: string): boolean {
'OLLAMA_HOST',
'AZURE_OPENAI_ENDPOINT',
'AZURE_OPENAI_DEPLOYMENT_NAME',
'VERTEXAI_PROJECT_ID',
'VERTEXAI_REGION',
];
return !nonSecretKeys.includes(keyName);
}
Expand Down
Loading

0 comments on commit 65f73cb

Please sign in to comment.