ollama-haystack 2.4.1__tar.gz → 2.4.2__tar.gz

{ollama_haystack-2.4.1 → ollama_haystack-2.4.2}/CHANGELOG.md

@@ -1,286 +1,204 @@
 # Changelog
 
-## [integrations/ollama-v2.4.0] - 2025-04-04
-
+## [integrations/ollama-v2.4.1] - 2025-04-10
 
 ### 🚀 Features
 
+- Add `streaming_callback` to run methods of OllamaGenerator and OllamaChatGenerator (#1636)
 
-- Adapt Ollama metadata to OpenAI format; support Ollama in Langfuse (#1577)
+### 🧹 Chores
 
+- Update ChatGenerators with `deserialize_tools_or_toolset_inplace` (#1623)
 
-### 🧪 Testing
 
+## [integrations/ollama-v2.4.0] - 2025-04-04
 
-- Update tool serialization in tests to include `inputs_from_state` and `outputs_to_state` (#1581)
+### 🚀 Features
 
+- Adapt Ollama metadata to OpenAI format; support Ollama in Langfuse (#1577)
 
-### ⚙️ CI
+### 🧪 Testing
 
+- Update tool serialization in tests to include `inputs_from_state` and `outputs_to_state` (#1581)
 
-- Review testing workflows (#1541)
+### ⚙️ CI
 
+- Review testing workflows (#1541)
 
 ### 🧹 Chores
 
-
 - Remove Python 3.8 support (#1421)
 
-
 ### 🌀 Miscellaneous
 
-
-
 - Chore: remove `jsonschema` dependency from `default` environment (#1368)
-
 - Test: Update tests to check for `outputs_to_string` in Tool when running haystack-ai>=2.12 (#1585)
 
 ## [integrations/ollama-v2.3.0] - 2025-01-29
 
-
 ### 🚀 Features
 
-
 - Add `response_format` param to `OllamaChatGenerator` (#1326)
 
 
-
 ## [integrations/ollama-v2.2.0] - 2025-01-16
 
-
 ### 🚀 Features
 
-
 - Ollama - add support for tools (#1294)
 
 
-
 ## [integrations/ollama-v2.1.2] - 2024-12-18
 
-
 ### 🐛 Bug Fixes
 
-
 - Make Ollama Chat Generator compatible with new ChatMessage (#1256)
 
 
-
 ## [integrations/ollama-v2.1.1] - 2024-12-10
 
-
 ### 🌀 Miscellaneous
 
-
-
 - Chore: use `text` instead of `content` for `ChatMessage` in Ollama (#1239)
 
 ## [integrations/ollama-v2.1.0] - 2024-11-28
 
-
 ### 🚀 Features
 
-
 - `OllamaDocumentEmbedder` - allow batching embeddings (#1224)
 
-
 ### 🌀 Miscellaneous
 
-
 - Chore: update changelog for `ollama-haystack==2.0.0` (#1214)
-
 - Chore: use class methods to create `ChatMessage` (#1222)
 
 ## [integrations/ollama-v2.0.0] - 2024-11-22
 
-
 ### 🐛 Bug Fixes
 
-
 - Adapt to Ollama client 0.4.0 (#1209)
 
-
 ### ⚙️ CI
 
-
 - Adopt uv as installer (#1142)
 
 
-
 ## [integrations/ollama-v1.1.0] - 2024-10-11
 
-
 ### 🚀 Features
 
-
 - Add `keep_alive` parameter to Ollama Generators (#1131)
 
-
 ### 🧹 Chores
 
-
 - Update ruff linting scripts and settings (#1105)
 
 
-
 ## [integrations/ollama-v1.0.1] - 2024-09-26
 
-
 ### 🐛 Bug Fixes
 
-
 - Ollama Chat Generator - add missing `to_dict` and `from_dict` methods (#1110)
 
 
-
 ## [integrations/ollama-v1.0.0] - 2024-09-07
 
-
 ### 🐛 Bug Fixes
 
-
 - Chat roles for model responses in chat generators (#1030)
 
-
 ### 🚜 Refactor
 
-
 - [**breaking**] Use ollama python library instead of calling the API with `requests` (#1059)
 
-
 ### 🧪 Testing
 
-
 - Do not retry tests in `hatch run test` command (#954)
 
-
 ### ⚙️ CI
 
-
 - Retry tests to reduce flakyness (#836)
 
-
 ### 🧹 Chores
 
-
 - Update ruff invocation to include check parameter (#853)
 
-
 ### 🌀 Miscellaneous
 
-
-
 - Ci: install `pytest-rerunfailures` where needed; add retry config to `test-cov` script (#845)
-
 - Chore: ollama - ruff update, don't ruff tests (#985)
 
 ## [integrations/ollama-v0.0.7] - 2024-05-31
 
-
 ### 🚀 Features
 
-
 - Add streaming support to OllamaChatGenerator (#757)
 
-
 ### 🌀 Miscellaneous
 
-
 - Chore: add license classifiers (#680)
-
 - Chore: change the pydoc renderer class (#718)
 
 ## [integrations/ollama-v0.0.6] - 2024-04-18
 
-
 ### 📚 Documentation
 
-
 - Disable-class-def (#556)
 
-
 ### 🧹 Chores
 
-
 - Update docstrings (#499)
 
-
 ### 🌀 Miscellaneous
 
-
 - Update API docs adding embedders (#494)
-
 - Change testing workflow (#551)
-
 - Remove references to Python 3.7 (#601)
-
 - Add ollama embedder example (#669)
-
 - Fix: change ollama output name to 'meta' (#670)
 
 ## [integrations/ollama-v0.0.5] - 2024-02-28
 
-
 ### 🐛 Bug Fixes
 
-
 - Fix order of API docs (#447)
 
-
 ### 📚 Documentation
 
-
 - Update category slug (#442)
 
-
 ### 🧹 Chores
 
-
 - Use `serialize_callable` instead of `serialize_callback_handler` in Ollama (#461)
 
-
 ### 🌀 Miscellaneous
 
-
 - Ollama document embedder (#400)
-
 - Changed Default Ollama Embedding models to supported model: nomic-embed-text (#490)
 
 ## [integrations/ollama-v0.0.4] - 2024-02-12
 
-
 ### 🌀 Miscellaneous
 
-
 - Ollama: add license (#219)
-
 - Generate api docs (#332)
-
 - Ollama Text Embedder with new format (#252)
-
 - Support for streaming ollama generator (#280)
 
 ## [integrations/ollama-v0.0.3] - 2024-01-16
 
-
 ### 🌀 Miscellaneous
 
-
 - Docs: Ollama docstrings update (#171)
-
 - Add example of OllamaGenerator (#170)
-
 - Ollama Chat Generator (#176)
-
 - Ollama: improve test (#191)
-
 - Mount Ollama in haystack_integrations (#216)
 
 ## [integrations/ollama-v0.0.1] - 2024-01-03
 
-
 ### 🌀 Miscellaneous
 
-
 - Ollama Integration (#132)
 
 <!-- generated by git-cliff -->

{ollama_haystack-2.4.1 → ollama_haystack-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollama-haystack
-Version: 2.4.1
+Version: 2.4.2
 Summary: An integration between the Ollama LLM framework and Haystack
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/ollama#readme
 Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues

{ollama_haystack-2.4.1 → ollama_haystack-2.4.2}/src/haystack_integrations/components/generators/ollama/chat/chat_generator.py

@@ -271,10 +271,16 @@ class OllamaChatGenerator:
             if streaming_callback is not None:
                 streaming_callback(chunk_delta)
 
-        replies = [ChatMessage.from_assistant("".join([c.content for c in chunks]))]
-        meta = {key: value for key, value in chunks[0].meta.items() if key != "message"}
+        # Create the ChatMessage with the combined content
+        combined_text = "".join([c.content for c in chunks])
+        reply = ChatMessage.from_assistant(combined_text)
 
-        return {"replies": replies, "meta": [meta]}
+        # Convert the last chunk's metadata to OpenAI format and attach it to the ChatMessage
+        if chunks:
+            meta = _convert_ollama_meta_to_openai_format(chunks[-1].meta)
+            reply._meta = meta
+
+        return {"replies": [reply]}
 
     @component.output_types(replies=List[ChatMessage])
     def run(

{ollama_haystack-2.4.1 → ollama_haystack-2.4.2}/tests/test_chat_generator.py

@@ -418,6 +418,14 @@ class TestOllamaChatGenerator:
         assert result["replies"][0].text == "first chunk second chunk"
         assert result["replies"][0].role == "assistant"
 
+        # Verify metadata is properly processed and includes usage information
+        assert hasattr(result["replies"][0], "_meta")
+        assert result["replies"][0]._meta["done"] is True
+        assert "usage" in result["replies"][0]._meta
+        assert result["replies"][0]._meta["usage"]["prompt_tokens"] == 26
+        assert result["replies"][0]._meta["usage"]["completion_tokens"] == 282
+        assert result["replies"][0]._meta["usage"]["total_tokens"] == 308
+
     @patch("haystack_integrations.components.generators.ollama.chat.chat_generator.Client")
     def test_run_streaming_at_runtime(self, mock_client):
         streaming_callback_called = False
@@ -463,6 +471,14 @@ class TestOllamaChatGenerator:
         assert result["replies"][0].text == "first chunk second chunk"
         assert result["replies"][0].role == "assistant"
 
+        # Verify metadata is properly processed and includes usage information
+        assert hasattr(result["replies"][0], "_meta")
+        assert result["replies"][0]._meta["done"] is True
+        assert "usage" in result["replies"][0]._meta
+        assert result["replies"][0]._meta["usage"]["prompt_tokens"] == 26
+        assert result["replies"][0]._meta["usage"]["completion_tokens"] == 282
+        assert result["replies"][0]._meta["usage"]["total_tokens"] == 308
+
     def test_run_fail_with_tools_and_streaming(self, tools):
         component = OllamaChatGenerator(tools=tools, streaming_callback=print_streaming_chunk)