chore: llama.cpp - gently handle the removal of ChatMessage.from_function (#1298)

Author: anakin87

integrations/llama_cpp/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai", "llama-cpp-python>=0.2.87"]
+dependencies = ["haystack-ai>=2.9.0", "llama-cpp-python>=0.2.87"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/llama_cpp#readme"

integrations/llama_cpp/src/haystack_integrations/components/generators/llama_cpp/chat/chat_generator.py

@@ -138,11 +138,7 @@ def run(self, messages: List[ChatMessage], generation_kwargs: Optional[Dict[str,
                 name = tool_calls[0]["function"]["name"]
 
             reply = ChatMessage.from_assistant(choice["message"]["content"], meta=meta)
-            if name:
-                if hasattr(reply, "_name"):
-                    reply._name = name  # new ChatMessage
-                elif hasattr(reply, "name"):
-                    reply.name = name  # legacy ChatMessage
+            reply._name = name or None
             replies.append(reply)
 
         return {"replies": replies}

integrations/llama_cpp/tests/test_chat_generator.py

@@ -40,12 +40,12 @@ def test_convert_message_to_llamacpp_format():
     message = ChatMessage.from_user("I have a question")
     assert _convert_message_to_llamacpp_format(message) == {"role": "user", "content": "I have a question"}
 
-    message = ChatMessage.from_function("Function call", "function_name")
-    converted_message = _convert_message_to_llamacpp_format(message)
-
-    assert converted_message["role"] in ("function", "tool")
-    assert converted_message["name"] == "function_name"
-    assert converted_message["content"] == "Function call"
+    if hasattr(ChatMessage, "from_function"):
+        message = ChatMessage.from_function("Function call", "function_name")
+        converted_message = _convert_message_to_llamacpp_format(message)
+        assert converted_message["role"] in ("function", "tool")
+        assert converted_message["name"] == "function_name"
+        assert converted_message["content"] == "Function call"
 
 
 class TestLlamaCppChatGenerator:
@@ -420,19 +420,20 @@ def test_function_call_and_execute(self, generator):
         assert "tool_calls" in first_reply.meta
         tool_calls = first_reply.meta["tool_calls"]
 
-        for tool_call in tool_calls:
-            function_name = tool_call["function"]["name"]
-            function_args = json.loads(tool_call["function"]["arguments"])
-            assert function_name in available_functions
-            function_response = available_functions[function_name](**function_args)
-            function_message = ChatMessage.from_function(function_response, function_name)
-            messages.append(function_message)
-
-        second_response = generator.run(messages=messages)
-        assert "replies" in second_response
-        assert len(second_response["replies"]) > 0
-        assert any("San Francisco" in reply.text for reply in second_response["replies"])
-        assert any("72" in reply.text for reply in second_response["replies"])
+        if hasattr(ChatMessage, "from_function"):
+            for tool_call in tool_calls:
+                function_name = tool_call["function"]["name"]
+                function_args = json.loads(tool_call["function"]["arguments"])
+                assert function_name in available_functions
+                function_response = available_functions[function_name](**function_args)
+                function_message = ChatMessage.from_function(function_response, function_name)
+                messages.append(function_message)
+
+            second_response = generator.run(messages=messages)
+            assert "replies" in second_response
+            assert len(second_response["replies"]) > 0
+            assert any("San Francisco" in reply.text for reply in second_response["replies"])
+            assert any("72" in reply.text for reply in second_response["replies"])
 
 
 class TestLlamaCppChatGeneratorChatML: