From 62d45a552f4681363d12a4de9f97355ad67d4ee4 Mon Sep 17 00:00:00 2001
From: ochafik <ochafik@google.com>
Date: Tue, 28 Jan 2025 09:47:41 +0000
Subject: [PATCH] Disable slow tests where appropriate, + nits

---
 .github/workflows/server.yml                 | 2 +-
 common/chat-handler.cpp                      | 4 ++--
 examples/server/tests/unit/test_tool_call.py | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index ed1c357a5..0cbc3d640 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -205,7 +205,7 @@ jobs:
         run: |
           cd examples/server/tests
           $env:PYTHONIOENCODING = ":replace"
-          pytest -v -x
+          pytest -v -x -m "not slow"
 
       - name: Slow tests
         id: server_integration_tests_slow
diff --git a/common/chat-handler.cpp b/common/chat-handler.cpp
index 9aad9cc72..802132b47 100644
--- a/common/chat-handler.cpp
+++ b/common/chat-handler.cpp
@@ -623,7 +623,7 @@ static common_chat_data common_chat_init_functionary_v3_2_tool_call(const common
     return data;
 }
 
-static common_chat_data common_chat_init_functionary_v3_llama_3_1_tool_call(const common_chat_template & tmpl, const struct common_chat_params & params) {
+static common_chat_data common_chat_init_functionary_v3_1_llama_3_1_tool_call(const common_chat_template & tmpl, const struct common_chat_params & params) {
     // ./tests/chat/templates/meetkai-functionary-medium-v3.1.jinja
     // https://github.com/MeetKai/functionary/blob/main/tests/prompt_test_v3-llama3.1.txt
     common_chat_data data;
@@ -818,7 +818,7 @@ common_chat_data common_chat_init(const common_chat_template & tmpl, const struc
     }
     if (src.find("<|start_header_id|>") != std::string::npos
         && src.find("<function=") != std::string::npos) {
-        return common_chat_init_functionary_v3_llama_3_1_tool_call(tmpl, params);
+        return common_chat_init_functionary_v3_1_llama_3_1_tool_call(tmpl, params);
     }
     if (src.find("<|start_header_id|>ipython<|end_header_id|>") != std::string::npos) {
         auto uses_python_tag = src.find("<|python_tag|>") != std::string::npos;
diff --git a/examples/server/tests/unit/test_tool_call.py b/examples/server/tests/unit/test_tool_call.py
index 86358d7d1..810bbb9e6 100644
--- a/examples/server/tests/unit/test_tool_call.py
+++ b/examples/server/tests/unit/test_tool_call.py
@@ -1,5 +1,4 @@
 import pytest
-from openai import OpenAI
 from utils import *
 
 server: ServerProcess