From b44ad1a2f789277374949a453972b30b40f581ed Mon Sep 17 00:00:00 2001 From: anakin87 Date: Mon, 12 Jan 2026 12:47:25 +0100 Subject: [PATCH 1/2] chore!: support X|Y typing and llama-stack>=0.4.0 --- integrations/llama_stack/pyproject.toml | 2 +- .../llama_stack/chat/chat_generator.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/integrations/llama_stack/pyproject.toml b/integrations/llama_stack/pyproject.toml index ea96a7fdc6..d811e1d412 100644 --- a/integrations/llama_stack/pyproject.toml +++ b/integrations/llama_stack/pyproject.toml @@ -20,7 +20,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] -dependencies = ["haystack-ai>=2.19.0", "llama-stack>=0.2.17"] +dependencies = ["haystack-ai>=2.22.0", "llama-stack>=0.4.0"] [project.urls] Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/llama-stack#readme" diff --git a/integrations/llama_stack/src/haystack_integrations/components/generators/llama_stack/chat/chat_generator.py b/integrations/llama_stack/src/haystack_integrations/components/generators/llama_stack/chat/chat_generator.py index 82a638b858..0a00edf76a 100644 --- a/integrations/llama_stack/src/haystack_integrations/components/generators/llama_stack/chat/chat_generator.py +++ b/integrations/llama_stack/src/haystack_integrations/components/generators/llama_stack/chat/chat_generator.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -from typing import Any, Optional +from typing import Any from haystack import component, default_from_dict, default_to_dict, logging from haystack.components.generators.chat import OpenAIChatGenerator @@ -59,15 +59,15 @@ def __init__( self, *, model: str, - api_base_url: str = "http://localhost:8321/v1/openai/v1", - organization: Optional[str] = None, - streaming_callback: Optional[StreamingCallbackT] = None, - generation_kwargs: Optional[dict[str, Any]] = None, - timeout: Optional[int] = None, - tools: Optional[ToolsType] = None, + api_base_url: str = "http://localhost:8321/v1", + organization: str | None = None, + streaming_callback: StreamingCallbackT | None = None, + generation_kwargs: dict[str, Any] | None = None, + timeout: int | None = None, + tools: ToolsType | None = None, tools_strict: bool = False, - max_retries: Optional[int] = None, - http_client_kwargs: Optional[dict[str, Any]] = None, + max_retries: int | None = None, + http_client_kwargs: dict[str, Any] | None = None, ): """ Creates an instance of LlamaStackChatGenerator. To use this chat generator, From 5b81bf94f71d58f4428c403f13b069a18425eea0 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Mon, 12 Jan 2026 12:52:43 +0100 Subject: [PATCH 2/2] fix tests --- .../llama_stack/tests/test_llama_stack_chat_generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/llama_stack/tests/test_llama_stack_chat_generator.py b/integrations/llama_stack/tests/test_llama_stack_chat_generator.py index 4fcaa8c3f0..e9dc87ecbd 100644 --- a/integrations/llama_stack/tests/test_llama_stack_chat_generator.py +++ b/integrations/llama_stack/tests/test_llama_stack_chat_generator.py @@ -105,7 +105,7 @@ class TestLlamaStackChatGenerator: def test_init_default(self): component = LlamaStackChatGenerator(model="ollama/llama3.2:3b") assert component.model == "ollama/llama3.2:3b" - assert component.api_base_url == "http://localhost:8321/v1/openai/v1" + assert component.api_base_url == "http://localhost:8321/v1" assert component.streaming_callback is None assert not component.generation_kwargs @@ -134,7 +134,7 @@ def test_to_dict_default( expected_params = { "model": "ollama/llama3.2:3b", "streaming_callback": None, - "api_base_url": "http://localhost:8321/v1/openai/v1", + "api_base_url": "http://localhost:8321/v1", "generation_kwargs": {}, "timeout": None, "max_retries": None,