fix: only attempt xml deserialization if native tools format is not supported or disabled

Author: evilsocket

nerve-core/src/agent/generator/groq.rs

@@ -170,7 +170,7 @@ impl Client for GroqClient {
 
         let mut request = builder::RequestBuilder::new(self.model.clone()).with_stream(false);
 
-        if state.lock().await.native_tools_support {
+        if state.lock().await.use_native_tools_format {
             let mut tools = vec![];
 
             for group in state.lock().await.get_namespaces() {

nerve-core/src/agent/generator/ollama.rs

@@ -117,7 +117,7 @@ impl Client for OllamaClient {
         // Generate tools vector.
         let mut tools = vec![];
 
-        if state.lock().await.native_tools_support {
+        if state.lock().await.use_native_tools_format {
             for group in state.lock().await.get_namespaces() {
                 for action in &group.actions {
                     let mut required = vec![];

nerve-core/src/agent/generator/openai.rs

@@ -59,7 +59,7 @@ impl OpenAIClient {
         let mut tools = vec![];
 
         // if native tool calls are supported (and XML was not forced)
-        if state.lock().await.native_tools_support {
+        if state.lock().await.use_native_tools_format {
             // for every namespace available to the model
             for group in state.lock().await.get_namespaces() {
                 // for every action of the namespace

nerve-core/src/agent/mod.rs

@@ -104,7 +104,7 @@ pub struct Agent {
     task_timeout: Option<Duration>,
 
     serializer: serialization::Strategy,
-    force_strategy: bool,
+    use_native_tools_format: bool,
 }
 
 impl Agent {
@@ -117,7 +117,7 @@ impl Agent {
         force_strategy: bool,
         max_iterations: usize,
     ) -> Result<Self> {
-        let use_native_tools_support = if force_strategy {
+        let use_native_tools_format = if force_strategy {
             log::info!("using {:?} serialization strategy", &serializer);
             false
         } else {
@@ -142,7 +142,7 @@ impl Agent {
                 task,
                 embedder,
                 max_iterations,
-                use_native_tools_support,
+                use_native_tools_format,
             )
             .await?,
         ));
@@ -153,7 +153,7 @@ impl Agent {
             state,
             max_history,
             task_timeout,
-            force_strategy,
+            use_native_tools_format,
             serializer,
         })
     }
@@ -372,7 +372,7 @@ impl Agent {
         let (response, tool_calls) = self.generator.chat(self.state.clone(), &options).await?;
 
         // parse the model response into invocations
-        let invocations = if tool_calls.is_empty() || self.force_strategy {
+        let invocations = if !self.use_native_tools_format {
             // use our own parsing strategy
             self.serializer.try_parse(response.trim())?
         } else {

nerve-core/src/agent/serialization/mod.rs

@@ -97,7 +97,7 @@ impl Strategy {
         let storages = storages.join("\n\n");
         let guidance = task.guidance()?;
 
-        let available_actions = if state.native_tools_support {
+        let available_actions = if state.use_native_tools_format {
             // model supports tool calls, no need to add actions to the system prompt
             "".to_string()
         } else {

nerve-core/src/agent/state/mod.rs

@@ -40,7 +40,7 @@ pub struct State {
     // runtime metrics
     pub metrics: Metrics,
     // model support stool
-    pub native_tools_support: bool,
+    pub use_native_tools_format: bool,
 }
 
 pub type SharedState = Arc<tokio::sync::Mutex<State>>;
@@ -51,7 +51,7 @@ impl State {
         task: Box<dyn Task>,
         embedder: Box<dyn mini_rag::Embedder>,
         max_iterations: usize,
-        native_tools_support: bool,
+        use_native_tools_format: bool,
     ) -> Result<Self> {
         let complete = false;
         let mut variables = HashMap::new();
@@ -169,7 +169,7 @@ impl State {
             metrics,
             rag,
             events_tx,
-            native_tools_support,
+            use_native_tools_format,
         })
     }