feat: Enhance content generation with structured messages and logging

Signed-off-by: Eden Reich <eden.reich@gmail.com>

Author: edenreich

README.md

@@ -20,29 +20,36 @@ Run `cargo add inference-gateway-sdk`.
 ### Creating a Client
 
 ```rust
-use inference_gateway_rust_sdk::{InferenceGatewayClient, Provider};
+use inference_gateway_rust_sdk::{InferenceGatewayClient, Provider, Message};
+use log::{info, error};
 use std::error::Error;
 
 fn main() -> Result<(), Box<dyn Error>> {
+    env_logger::init();
+
     let client = InferenceGatewayClient::new("http://localhost:8080");
 
     // List available models
     let models = client.list_models()?;
     for provider_models in models {
-        println!("Provider: {}", provider_models.provider);
+        info!("Provider: {:?}", provider_models.provider);
         for model in provider_models.models {
-            println!("  Model: {}", model.id);
+            info!("Model: {:?}", model.id);
         }
     }
 
-    // Generate content
     let response = client.generate_content(
         Provider::Ollama,
         "llama2",
-        "Tell me a joke"
+        messages: vec![
+            Message {
+                role: "user".to_string(),
+                content: "Tell me a joke".to_string(),
+            }
+        ]
     )?;
-    println!("Response: {}", response.response);
 
+    info!("Response: {:?}", response);
     Ok(())
 }
 ```
@@ -52,11 +59,13 @@ fn main() -> Result<(), Box<dyn Error>> {
 To list available models, use the `list_models` method:
 
 ```rust
+use log::info;
+
 let models = client.list_models()?;
 for provider_models in models {
-    println!("Provider: {}", provider_models.provider);
+    info!("Provider: {:?}", provider_models.provider);
     for model in provider_models.models {
-        println!("  Model: {}", model.id);
+        info!("Model: {:?}", model.id);
     }
 }
 ```
@@ -66,13 +75,21 @@ for provider_models in models {
 To generate content using a model, use the `generate_content` method:
 
 ```rust
+use log::info;
+
 let response = client.generate_content(
     Provider::Ollama,
     "llama2",
-    "Tell me a joke"
+    messages: vec![
+        Message {
+            role: "user".to_string(),
+            content: "Tell me a joke".to_string(),
+        }
+    ]
 )?;
-println!("Provider: {}", response.provider);
-println!("Response: {}", response.response);
+
+info!("Provider: {:?}", response.provider);
+info!("Response: {:?}", response.response);
 ```
 
 ### Health Check

src/lib.rs

@@ -40,16 +40,28 @@ impl fmt::Display for Provider {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Message {
+    pub role: String,
+    pub content: String,
+}
+
 #[derive(Debug, Serialize)]
 struct GenerateRequest {
     model: String,
-    prompt: String,
+    messages: Vec<Message>,
 }
 
 #[derive(Debug, Deserialize)]
 pub struct GenerateResponse {
     pub provider: String,
-    pub response: String,
+    pub response: ResponseContent,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ResponseContent {
+    pub role: String,
+    pub model: String,
 }
 
 pub struct InferenceGatewayClient {
@@ -76,16 +88,15 @@ impl InferenceGatewayClient {
         &self,
         provider: Provider,
         model: &str,
-        prompt: &str,
+        messages: Vec<Message>,
     ) -> Result<GenerateResponse, Box<dyn Error>> {
         let url = format!("{}/llms/{}/generate", self.base_url, provider);
         let request = GenerateRequest {
             model: model.to_string(),
-            prompt: prompt.to_string(),
+            messages,
         };
 
         let response = self.client.post(&url).json(&request).send()?.json()?;
-
         Ok(response)
     }
 
@@ -126,16 +137,21 @@ mod tests {
             .mock("POST", "/llms/ollama/generate")
             .with_status(200)
             .with_header("content-type", "application/json")
-            .with_body(r#"{"provider":"ollama","response":"Generated text"}"#)
+            .with_body(r#"{"provider":"ollama","response":{"role":"assistant","model":"llama2"}}"#)
             .create();
 
         let client = InferenceGatewayClient::new(&server.url());
+        let messages = vec![Message {
+            role: "user".to_string(),
+            content: "Hello".to_string(),
+        }];
         let response = client
-            .generate_content(Provider::Ollama, "llama2", "Hello")
+            .generate_content(Provider::Ollama, "llama2", messages)
             .unwrap();
 
         assert_eq!(response.provider, "ollama");
-        assert_eq!(response.response, "Generated text");
+        assert_eq!(response.response.role, "assistant");
+        assert_eq!(response.response.model, "llama2");
         mock.assert();
     }