feat: Vertex AI plain generateContent is now functioning

Author: avastmick

.gitignore

@@ -16,6 +16,8 @@ Cargo.lock
 # Sensitive or local environment variables
 .env
 
-# Added by cargo
+# Local test files
+request.json
 
+# Added by cargo
 /target

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "google-generative-ai-rs"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 authors = ["Mick Clarke <avastmick@outlook.com>"]
 license = "MIT"

README.md

@@ -30,7 +30,7 @@ Please see [contributing](CONTRIBUTING.md) for the rules; they are standard thou
 
 I do my best to release working code.
 
-Status today is: *"Happy path for both public and Vertex AI endpoints work for Gemini, but some things are NOT working. See Issue #12"*
+Status today is: *"Happy path for both public and Vertex AI endpoints work for Gemini, but some things may be fragile."*
 
 ## Outline tasks
 

examples/vertex_text_request.rs

@@ -1,12 +1,12 @@
+use log::info;
 use std::env;
-use std::io::{stdout, Write};
 
 use google_generative_ai_rs::v1::{
     api::Client,
-    gemini::{request::Request, response::GeminiResponse, Content, Part, Role},
+    gemini::{request::Request, Content, Part, ResponseType, Role},
 };
 
-/// Simple text request using Vertex AI API endpoint and GCP application default credentials (ADC) authn
+/// Simple text request using the public API and an API key for authn
 ///
 /// You'll need to install the GCP cli tools and set up your GCP project and region.
 ///
@@ -15,19 +15,22 @@ use google_generative_ai_rs::v1::{
 /// gcloud init
 /// gcloud auth application-default login
 /// ```
-/// Note: right now there seems to be no non-streamed URL for the Vertex AI endpoint, so we're using the streamed URL only
 ///
 /// To run:
 /// ```
-/// GCP_REGION_NAME=[THE REGION WHERE YOUR ENDPOINT IS HOSTED] GCP_PROJECT_ID=[YOUR GCP PROJECT_ID] RUST_LOG=info cargo run --package google-generative-ai-rs --example vertex_text_request
+/// GCP_REGION_NAME=[THE REGION WHERE YOUR ENDPOINT IS HOSTED] GCP_PROJECT_ID=[YOUR GCP PROJECT_ID] RUST_LOG=info cargo run --package google-generative-ai-rs  --example vertex_text_request
 /// ``
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let region = env::var("GCP_REGION_NAME").unwrap().to_string();
     let project_id = env::var("GCP_PROJECT_ID").unwrap().to_string();
 
-    let client = Client::new_from_region_project_id(region.to_string(), project_id.to_string());
+    let client = Client::new_from_region_project_id_response_type(
+        region.to_string(),
+        project_id.to_string(),
+        ResponseType::GenerateContent,
+    );
 
     let txt_request = Request {
         contents: vec![Content {
@@ -46,26 +49,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let response = client.post(30, &txt_request).await?;
 
-    println!("output streaming content");
-
-    if let Some(stream_response) = response.streamed() {
-        if let Some(json_stream) = stream_response.response_stream {
-            Client::for_each_async(json_stream, move |response: GeminiResponse| async move {
-                let mut lock = stdout().lock();
-                write!(
-                    lock,
-                    "{}",
-                    response.candidates[0].content.parts[0]
-                        .text
-                        .clone()
-                        .unwrap()
-                        .as_str()
-                )
-                .unwrap();
-            })
-            .await
-        }
-    }
+    info!("{:#?}", response);
 
     Ok(())
 }

examples/vertex_text_request_stream.rs

@@ -0,0 +1,69 @@
+use std::env;
+use std::io::{stdout, Write};
+
+use google_generative_ai_rs::v1::{
+    api::Client,
+    gemini::{request::Request, response::GeminiResponse, Content, Part, Role},
+};
+
+/// Streamed text request using Vertex AI API endpoint and GCP application default credentials (ADC) authn
+///
+/// You'll need to install the GCP cli tools and set up your GCP project and region.
+///
+/// The ensure you locally authenticated with GCP using the following commands:
+/// ```
+/// gcloud init
+/// gcloud auth application-default login
+/// ```
+/// To run:
+/// ```
+/// GCP_REGION_NAME=[THE REGION WHERE YOUR ENDPOINT IS HOSTED] GCP_PROJECT_ID=[YOUR GCP PROJECT_ID] RUST_LOG=info cargo run --package google-generative-ai-rs --example vertex_text_request
+/// ``
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    env_logger::init();
+    let region = env::var("GCP_REGION_NAME").unwrap().to_string();
+    let project_id = env::var("GCP_PROJECT_ID").unwrap().to_string();
+
+    let client = Client::new_from_region_project_id(region.to_string(), project_id.to_string());
+
+    let txt_request = Request {
+        contents: vec![Content {
+            role: Role::User,
+            parts: vec![Part {
+                text: Some("Give me a recipe for banana bread.".to_string()),
+                inline_data: None,
+                file_data: None,
+                video_metadata: None,
+            }],
+        }],
+        tools: vec![],
+        safety_settings: vec![],
+        generation_config: None,
+    };
+
+    let response = client.post(30, &txt_request).await?;
+
+    println!("output streaming content");
+
+    if let Some(stream_response) = response.streamed() {
+        if let Some(json_stream) = stream_response.response_stream {
+            Client::for_each_async(json_stream, move |response: GeminiResponse| async move {
+                let mut lock = stdout().lock();
+                write!(
+                    lock,
+                    "{}",
+                    response.candidates[0].content.parts[0]
+                        .text
+                        .clone()
+                        .unwrap()
+                        .as_str()
+                )
+                .unwrap();
+            })
+            .await
+        }
+    }
+
+    Ok(())
+}