fix command r7b's nothink w/ official template

Author: ochafik

common/chat.cpp

@@ -934,6 +934,8 @@ static common_chat_params common_chat_params_init_command_r7b(const common_chat_
         } else {
             data.thinking_forced_open = true;
         }
+    } else if (!inputs.enable_thinking && string_ends_with(data.prompt, "<|CHATBOT_TOKEN|>")) {
+        data.prompt += "<|START_THINKING|><|END_THINKING|>";
     }
 
     data.grammar_lazy = inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_REQUIRED;

tools/server/tests/unit/test_template.py

@@ -36,8 +36,8 @@ def create_server():
     ("Qwen-QwQ-32B", False,  "<|im_start|>assistant\n<think>\n"),
     ("Qwen-QwQ-32B", True, "<|im_start|>assistant\n<think>\n</think>"),
 
-    ("CohereForAI-c4ai-command-r7b-12-2024-tool_use-think", False,  "<|START_THINKING|>"),
-    ("CohereForAI-c4ai-command-r7b-12-2024-tool_use-think", True, "<|START_THINKING|><|END_THINKING|>"),
+    ("CohereForAI-c4ai-command-r7b-12-2024-tool_use", False,  "<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>"),
+    ("CohereForAI-c4ai-command-r7b-12-2024-tool_use", True, "<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|><|START_THINKING|><|END_THINKING|>"),
 ])
 def test_nothink(template_name: str, nothink: bool, expected_end: str, tools: list[dict]):
     global server