Skip to content
Merged
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
31 changes: 30 additions & 1 deletion crates/goose/src/providers/google.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
use super::api_client::{ApiClient, AuthMethod};
use super::base::MessageStream;
use super::errors::ProviderError;
use super::openai_compatible::handle_status;
use super::openai_compatible::{handle_status, map_http_error_to_provider_error};
use super::retry::ProviderRetry;
use super::utils::RequestLog;
use crate::conversation::message::Message;

use crate::model::ModelConfig;
use crate::providers::base::{ConfigKey, Provider, ProviderDef, ProviderMetadata};
use crate::providers::formats::google::{create_request, response_to_streaming_message};
use crate::providers::inventory::{config_secret_value, InventoryIdentityInput};
use anyhow::Result;
use async_stream::try_stream;
use async_trait::async_trait;
Expand Down Expand Up @@ -135,6 +136,27 @@ impl ProviderDef for GoogleProvider {
) -> BoxFuture<'static, Result<Self::Provider>> {
Box::pin(Self::from_env(model))
}

fn supports_inventory_refresh() -> bool {
true
}

fn inventory_identity() -> Result<InventoryIdentityInput> {
let config = crate::config::Config::global();
let mut identity = InventoryIdentityInput::new(GOOGLE_PROVIDER_NAME, GOOGLE_PROVIDER_NAME)
.with_public(
"host",
config
.get_param::<String>("GOOGLE_HOST")
.unwrap_or_else(|_| GOOGLE_API_HOST.to_string()),
);

if let Some(api_key) = config_secret_value(config, "GOOGLE_API_KEY") {
identity = identity.with_secret("api_key", api_key);
}

Ok(identity)
}
}

#[async_trait]
Expand All @@ -153,6 +175,13 @@ impl Provider for GoogleProvider {
.request(None, "v1beta/models")
.response_get()
.await?;
let status = response.status();
if !status.is_success() {
let body = response.text().await.unwrap_or_default();
let payload = serde_json::from_str::<serde_json::Value>(&body).ok();
return Err(map_http_error_to_provider_error(status, payload));
}

let json: serde_json::Value = response.json().await?;
let arr = json
.get("models")
Expand Down
Loading