fix: reinstated rust-tls to reqwest. Updated current model options. (#43)

Updated docs

Author: avastmick

.gitignore

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

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "google-generative-ai-rs"
-version = "0.3.3"
+version = "0.3.4"
 edition = "2021"
 authors = ["Mick Clarke <avastmick@outlook.com>"]
 license = "MIT"
@@ -18,7 +18,7 @@ env_logger = { version = "0.11" }
 futures = { version = "0.3" }
 gcp_auth = { version = "0.12" }
 log = { version = "0.4.20" }
-reqwest = { version = "0.12", default-features = false, features = ["json"] }
+reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
 reqwest-streams = { version = "0.8.2", default-features = false, features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }

README.md

@@ -5,7 +5,6 @@ An unofficial rust-based client library to interact with the Google generative A
 
 The goal is to emulate the [Google AI Python SDK](https://github.com/google/generative-ai-python) but in Rust.
 
-The initial focus will be on the [newer Gemini models](https://blog.google/technology/ai/google-gemini-ai/), but the more stable and mature models will hopefully also be supported soon.
 
 ## Usage
 
@@ -25,20 +24,24 @@ Please see [contributing](CONTRIBUTING.md) for the rules; they are standard thou
 
 ## Work status
 
-## Potentially Breaking Changes
-
-Version `0.3.0` may lead to breaking changes. This version adds in some `beta` features and I have now added a feature flag to enable these.
-
 ```
-google-generative-ai-rs = { version = "0.3.0", features = ["beta"] }
+google-generative-ai-rs = { version = "0.3.4", features = ["beta"] }
 ```
 
 Using the `beta` feature will enable the following:
 
 - `gemini-1.5-pro-latest`
+- `gemini-1.0-pro`
+- `gemini-1.5-pro-latest")`
+- `gemini-1.5-flash")`
+- `"gemini-1.5-flash-8b")`
+- `gemini-2.0-flash-exp")`
+- or custom `Model::Custom(name)`
 - system instructions
 - `json_mode`
 
+Note: `gemini-1.0-pro` is deprecated and will be unavailable from 15th February 2025.
+
 I do my best to release working code.
 
 Status today is: *"Happy path for both public and Vertex AI endpoints work for Gemini."*

examples/text_request_json.rs

@@ -1,6 +1,7 @@
 #[cfg(feature = "beta")]
 use std::env;
 
+#[cfg(feature = "beta")]
 use google_generative_ai_rs::v1::gemini::request::GenerationConfig;
 
 #[cfg(feature = "beta")]

examples/text_request_stream.rs

@@ -25,7 +25,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Either run as a standard text request or a stream generate content request
     let client = Client::new_from_model_response_type(
-        google_generative_ai_rs::v1::gemini::Model::GeminiPro,
+        google_generative_ai_rs::v1::gemini::Model::Gemini1_0Pro,
         token.clone(),
         ResponseType::StreamGenerateContent,
     );

src/v1/api.rs

@@ -405,6 +405,7 @@ impl Client {
     ) -> Result<GeminiResponse, serde_json::error::Error> {
         serde_json::from_value(json_value.clone())
     }
+
     fn get_reqwest_client(&self, timeout: u64) -> Result<reqwest::Client, GoogleAPIError> {
         let client: reqwest::Client = reqwest::Client::builder()
             .timeout(Duration::from_secs(timeout))

src/v1/gemini.rs

@@ -76,26 +76,47 @@ pub struct ModelInformationList {
 #[serde(rename_all = "kebab-case")]
 pub enum Model {
     #[default]
-    GeminiPro,
+    Gemini1_0Pro,
     #[cfg(feature = "beta")]
     #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
     Gemini1_5Pro,
-    GeminiProVision,
+    #[cfg(feature = "beta")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
+    Gemini1_5Flash,
+    #[cfg(feature = "beta")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
+    Gemini1_5Flash8B,
+    #[cfg(feature = "beta")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
+    Gemini2_0Flash,
+    #[cfg(feature = "beta")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
     Custom(String),
-    // TODO Embedding001
+    // TODO: Embedding004
 }
 impl fmt::Display for Model {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Model::GeminiPro => write!(f, "gemini-pro"),
+            Model::Gemini1_0Pro => write!(f, "gemini-1.0-pro"),
 
             #[cfg(feature = "beta")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
             Model::Gemini1_5Pro => write!(f, "gemini-1.5-pro-latest"),
+            #[cfg(feature = "beta")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
+            Model::Gemini1_5Flash => write!(f, "gemini-1.5-flash"),
+            #[cfg(feature = "beta")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
+            Model::Gemini1_5Flash8B => write!(f, "gemini-1.5-flash-8b"),
 
-            Model::GeminiProVision => write!(f, "gemini-pro-vision"),
+            #[cfg(feature = "beta")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
+            Model::Gemini2_0Flash => write!(f, "gemini-2.0-flash-exp"),
 
+            #[cfg(feature = "beta")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "beta")))]
             Model::Custom(name) => write!(f, "{}", name),
-            // TODO Model::Embedding001 => write!(f, "embedding-001"),
+            // TODO: Model::Embedding004 => write!(f, "text-embedding-004"),
         }
     }
 }