fix: consolidate changes and remove old tool type

Author: drbh

docs/openapi.json

@@ -2114,12 +2114,18 @@
       "ToolType": {
         "oneOf": [
           {
-            "type": "object",
-            "default": null,
-            "nullable": true
+            "type": "string",
+            "description": "Means the model can pick between generating a message or calling one or more tools.",
+            "enum": [
+              "auto"
+            ]
           },
           {
-            "type": "string"
+            "type": "string",
+            "description": "Means the model will not call any tool and instead generates a message.",
+            "enum": [
+              "none"
+            ]
           },
           {
             "type": "object",
@@ -2131,13 +2137,10 @@
                 "$ref": "#/components/schemas/FunctionName"
               }
             }
-          },
-          {
-            "type": "object",
-            "default": null,
-            "nullable": true
           }
-        ]
+        ],
+        "description": "Controls which (if any) tool is called by the model.",
+        "example": "auto"
       },
       "Url": {
         "type": "object",

router/src/lib.rs

@@ -993,8 +993,7 @@ pub struct ToolChoice(pub Option<ToolType>);
 enum ToolTypeDeserializer {
     Null,
     String(String),
-    ToolType(ToolType),
-    TypedChoice(TypedChoice), //this is the OpenAI schema
+    ToolType(TypedChoice),
 }
 
 impl From<ToolTypeDeserializer> for ToolChoice {
@@ -1006,10 +1005,9 @@ impl From<ToolTypeDeserializer> for ToolChoice {
                 "auto" => ToolChoice(Some(ToolType::OneOf)),
                 _ => ToolChoice(Some(ToolType::Function(FunctionName { name: s }))),
             },
-            ToolTypeDeserializer::TypedChoice(TypedChoice::Function { function }) => {
+            ToolTypeDeserializer::ToolType(TypedChoice::Function { function }) => {
                 ToolChoice(Some(ToolType::Function(function)))
             }
-            ToolTypeDeserializer::ToolType(tool_type) => ToolChoice(Some(tool_type)),
         }
     }
 }
@@ -1640,10 +1638,6 @@ mod tests {
         let de_named: TestRequest = serde_json::from_str(named).unwrap();
         assert_eq!(de_named.tool_choice, ref_choice);
 
-        let old_named = r#"{"tool_choice":{"function":{"name":"myfn"}}}"#;
-        let de_old_named: TestRequest = serde_json::from_str(old_named).unwrap();
-        assert_eq!(de_old_named.tool_choice, ref_choice);
-
         let openai_named = r#"{"tool_choice":{"type":"function","function":{"name":"myfn"}}}"#;
         let de_openai_named: TestRequest = serde_json::from_str(openai_named).unwrap();