Update GCP Auth to 0.12

Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 deadqueue = "0.2"
 futures-util = "0.3"
-gcp_auth = "0.11"
+gcp_auth = "0.12"
 reqwest = { version = "0.12", features = ["json", "gzip"] }
 reqwest-eventsource = "0.6"
 serde = { version = "1", features = ["derive"] }

examples/conversation.rs

@@ -1,15 +1,13 @@
-use std::{sync::Arc, time::Duration};
-
 use console::style;
 use dialoguer::{theme::ColorfulTheme, Input};
 use gemini_rs::prelude::*;
+use std::time::Duration;
 
-use gcp_auth::AuthenticationManager;
 use indicatif::{ProgressBar, ProgressStyle};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let authentication_manager = Arc::new(AuthenticationManager::new().await?);
+    let authentication_manager = gcp_auth::provider().await?;
     let api_endpoint = std::env::var("API_ENDPOINT")?;
     let project_id = std::env::var("PROJECT_ID")?;
     let location_id = std::env::var("LOCATION_ID")?;

examples/count-tokens.rs

@@ -1,12 +1,8 @@
-use std::sync::Arc;
-
 use gemini_rs::prelude::*;
 
-use gcp_auth::AuthenticationManager;
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let authentication_manager = Arc::new(AuthenticationManager::new().await?);
+    let authentication_manager = gcp_auth::provider().await?;
     let api_endpoint = std::env::var("API_ENDPOINT")?;
     let project_id = std::env::var("PROJECT_ID")?;
     let location_id = std::env::var("LOCATION_ID")?;

examples/system_instruction.rs

@@ -1,13 +1,9 @@
-use std::sync::Arc;
-
 use gemini_rs::prelude::*;
 
-use gcp_auth::AuthenticationManager;
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     tracing_subscriber::fmt().init();
-    let authentication_manager = Arc::new(AuthenticationManager::new().await?);
+    let authentication_manager = gcp_auth::provider().await?;
     let api_endpoint = std::env::var("API_ENDPOINT")?;
     let project_id = std::env::var("PROJECT_ID")?;
     let location_id = std::env::var("LOCATION_ID")?;

examples/text-embedding.rs

@@ -1,12 +1,8 @@
-use std::sync::Arc;
-
 use gemini_rs::prelude::*;
 
-use gcp_auth::AuthenticationManager;
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let authentication_manager = Arc::new(AuthenticationManager::new().await?);
+    let authentication_manager = gcp_auth::provider().await?;
     let api_endpoint = std::env::var("API_ENDPOINT")?;
     let project_id = std::env::var("PROJECT_ID")?;
     let location_id = std::env::var("LOCATION_ID")?;

examples/text-from-text-streaming.rs

@@ -1,12 +1,8 @@
-use std::sync::Arc;
-
 use gemini_rs::prelude::*;
 
-use gcp_auth::AuthenticationManager;
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let authentication_manager = Arc::new(AuthenticationManager::new().await?);
+    let authentication_manager = gcp_auth::provider().await?;
     let api_endpoint = std::env::var("API_ENDPOINT")?;
     let project_id = std::env::var("PROJECT_ID")?;
     let location_id = std::env::var("LOCATION_ID")?;

examples/text-from-text.rs

@@ -1,12 +1,8 @@
-use std::sync::Arc;
-
 use gemini_rs::prelude::*;
 
-use gcp_auth::AuthenticationManager;
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let authentication_manager = Arc::new(AuthenticationManager::new().await?);
+    let authentication_manager = gcp_auth::provider().await?;
     let api_endpoint = std::env::var("API_ENDPOINT")?;
     let project_id = std::env::var("PROJECT_ID")?;
     let location_id = std::env::var("LOCATION_ID")?;

src/token_provider.rs

@@ -1,7 +1,5 @@
 use std::sync::Arc;
 
-use gcp_auth::AuthenticationManager;
-
 use crate::error::Result;
 
 pub trait TokenProvider {
@@ -9,18 +7,10 @@ pub trait TokenProvider {
         -> impl std::future::Future<Output = Result<String>> + Send;
 }
 
-impl TokenProvider for Arc<AuthenticationManager> {
+impl TokenProvider for Arc<dyn gcp_auth::TokenProvider> {
     async fn get_token(&self, scope: &[&str]) -> Result<String> {
-        match AuthenticationManager::get_token(self, scope).await {
-            Ok(token) => Ok(token.as_str().to_string()),
-            Err(e) => Err(e.into()),
-        }
-    }
-}
-
-impl TokenProvider for AuthenticationManager {
-    async fn get_token(&self, scope: &[&str]) -> Result<String> {
-        match AuthenticationManager::get_token(self, scope).await {
+        let token = self.token(scope).await;
+        match token {
             Ok(token) => Ok(token.as_str().to_string()),
             Err(e) => Err(e.into()),
         }