chore: apply pr comments

0xPlaygrounds · Feb 11, 2025 · 97448c4 · 97448c4
1 parent 3e13b71
commit 97448c4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 30 deletions.
diff --git a/rig-core/examples/multi_turn_agent.rs b/rig-core/examples/multi_turn_agent.rs
@@ -53,7 +53,6 @@ impl<M: rig::completion::CompletionModel> MultiTurnAgent<M> {
 
                         let ToolCall {
                             id,
-                            index: _,
                             function: ToolFunction { name, arguments },
                         } = content;
 

diff --git a/rig-core/src/completion/message.rs b/rig-core/src/completion/message.rs
@@ -71,8 +71,6 @@ pub enum ToolResultContent {
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct ToolCall {
     pub id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub index: Option<usize>,
     pub function: ToolFunction,
 }
 
@@ -302,7 +300,6 @@ impl AssistantContent {
     ) -> Self {
         AssistantContent::ToolCall(ToolCall {
             id: id.into(),
-            index: None,
             function: ToolFunction {
                 name: name.into(),
                 arguments,

diff --git a/rig-core/src/providers/anthropic/completion.rs b/rig-core/src/providers/anthropic/completion.rs
@@ -292,15 +292,13 @@ impl From<message::AssistantContent> for Content {
     fn from(text: message::AssistantContent) -> Self {
         match text {
             message::AssistantContent::Text(message::Text { text }) => Content::Text { text },
-            message::AssistantContent::ToolCall(message::ToolCall {
-                id,
-                index: _,
-                function,
-            }) => Content::ToolUse {
-                id,
-                name: function.name,
-                input: function.arguments,
-            },
+            message::AssistantContent::ToolCall(message::ToolCall { id, function }) => {
+                Content::ToolUse {
+                    id,
+                    name: function.name,
+                    input: function.arguments,
+                }
+            }
         }
     }
 }
@@ -933,11 +931,7 @@ mod tests {
                 assert_eq!(content.len(), 1);
 
                 match content.first() {
-                    message::AssistantContent::ToolCall(message::ToolCall {
-                        id,
-                        index: _,
-                        function,
-                    }) => {
+                    message::AssistantContent::ToolCall(message::ToolCall { id, function }) => {
                         assert_eq!(id, "toolu_01A09q90qw90lq917835lq9");
                         assert_eq!(function.name, "get_weather");
                         assert_eq!(function.arguments, json!({"location": "San Francisco, CA"}));

diff --git a/rig-core/src/providers/deepseek.rs b/rig-core/src/providers/deepseek.rs
@@ -58,7 +58,7 @@ impl Client {
                     headers
                 })
                 .build()
-                .expect("DeeSeek reqwest client should build"),
+                .expect("DeepSeek reqwest client should build"),
         }
     }
 
@@ -177,7 +177,8 @@ impl From<message::ToolCall> for ToolCall {
     fn from(tool_call: message::ToolCall) -> Self {
         Self {
             id: tool_call.id,
-            index: tool_call.index.unwrap_or_default(),
+            // TODO: update index when we have it
+            index: 0,
             r#type: ToolType::Function,
             function: Function {
                 name: tool_call.function.name,

diff --git a/rig-core/src/providers/gemini/completion.rs b/rig-core/src/providers/gemini/completion.rs
@@ -515,7 +515,6 @@ pub mod gemini_api_types {
         fn from(function_call: FunctionCall) -> Self {
             Self {
                 id: function_call.name.clone(),
-                index: None,
                 function: message::ToolFunction {
                     name: function_call.name,
                     arguments: function_call.args,

diff --git a/rig-core/src/providers/openai.rs b/rig-core/src/providers/openai.rs
@@ -22,7 +22,7 @@ use crate::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
+use serde_json::json;
 
 // ================================================================
 // Main OpenAI Client
@@ -710,7 +710,6 @@ impl From<ToolCall> for message::ToolCall {
     fn from(tool_call: ToolCall) -> Self {
         Self {
             id: tool_call.id,
-            index: None,
             function: message::ToolFunction {
                 name: tool_call.function.name,
                 arguments: tool_call.function.arguments,
@@ -928,10 +927,10 @@ impl completion::CompletionModel for CompletionModel {
             .await?;
 
         if response.status().is_success() {
-            let t: Value = response.json().await?;
-            tracing::debug!(target: "rig", "OpenAI completion success: {}", serde_json::to_string_pretty(&t).unwrap());
+            let t = response.text().await?;
+            tracing::debug!(target: "rig", "OpenAI completion error: {}", t);
 
-            match serde_json::from_value::<ApiResponse<CompletionResponse>>(t)? {
+            match serde_json::from_str::<ApiResponse<CompletionResponse>>(&t)? {
                 ApiResponse::Ok(response) => {
                     tracing::info!(target: "rig",
                         "OpenAI completion token usage: {:?}",
@@ -942,10 +941,7 @@ impl completion::CompletionModel for CompletionModel {
                 ApiResponse::Err(err) => Err(CompletionError::ProviderError(err.message)),
             }
         } else {
-            let t = response.text().await?;
-            tracing::debug!(target: "rig", "OpenAI completion error: {}", &t);
-
-            Err(CompletionError::ProviderError(t))
+            Err(CompletionError::ProviderError(response.text().await?))
         }
     }
 }