Fix tool call3 (#3086)

* Fixing the tool calling convention.

* Update tehe doc.

* Fixing some corner cases.

* Fixing the tool call id.

* Fmt.

* Snapshot update with the new updated tool_call_id.

* More qwen2.

Author: Narsil

Cargo.toml

@@ -29,7 +29,7 @@ homepage = "https://github.com/huggingface/text-generation-inference"
 [workspace.dependencies]
 base64 = "0.22.0"
 tokenizers = { version = "0.20.0", features = ["http"] }
-hf-hub = { version = "0.4.1", features = ["tokio"] }
+hf-hub = { version = "0.4.2", features = ["tokio"] }
 metrics = { version = "0.23.0" }
 metrics-exporter-prometheus = { version = "0.15.1", features = [] }
 minijinja = { version = "2.2.0", features = ["json"] }

docs/openapi.json

@@ -2148,9 +2148,6 @@
       },
       "StreamOptions": {
         "type": "object",
-        "required": [
-          "include_usage"
-        ],
         "properties": {
           "include_usage": {
             "type": "boolean",

integration-tests/models/__snapshots__/test_tools_llama/test_flash_llama_grammar_tools_auto_nostream.json

@@ -10,7 +10,7 @@
         "tool_calls": [
           {
             "function": {
-              "arguments": "{\"format\":\"fahrenheit\",\"location\":\"Brooklyn, NY\"}",
+              "arguments": "{\"location\":\"Brooklyn, NY\",\"format\":\"fahrenheit\"}",
               "description": null,
               "name": "get_current_weather"
             },
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "created": 1741263682,
+  "created": 1741372434,
   "id": "",
   "model": "meta-llama/Llama-3.1-8B-Instruct",
   "object": "chat.completion",

integration-tests/models/__snapshots__/test_tools_llama/test_flash_llama_grammar_tools_choice_nostream.json

@@ -10,7 +10,7 @@
         "tool_calls": [
           {
             "function": {
-              "arguments": "{\"format\":\"fahrenheit\",\"location\":\"Brooklyn, NY\"}",
+              "arguments": "{\"location\":\"Brooklyn, NY\",\"format\":\"fahrenheit\"}",
               "description": null,
               "name": "get_current_weather"
             },
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "created": 1741263684,
+  "created": 1741372657,
   "id": "",
   "model": "meta-llama/Llama-3.1-8B-Instruct",
   "object": "chat.completion",