Merge branch 'main' into github_repo_forker_tool_integration

Author: srini047

.github/workflows/llama_cpp.yml

@@ -50,11 +50,9 @@ jobs:
       - name: Install Hatch
         run: pip install --upgrade hatch
 
-    # TODO: Once this integration is properly typed, use hatch run test:types
-    # https://github.com/deepset-ai/haystack-core-integrations/issues/1771
       - name: Lint
         if: matrix.python-version == '3.9' && runner.os == 'Linux'
-        run: hatch run fmt-check && hatch run lint:typing
+        run: hatch run fmt-check && hatch run test:types
 
       - name: Generate docs
         if: matrix.python-version == '3.9' && runner.os == 'Linux'

.github/workflows/mongodb_atlas.yml

@@ -46,11 +46,9 @@ jobs:
       - name: Install Hatch
         run: pip install --upgrade hatch
 
-    # TODO: Once this integration is properly typed, use hatch run test:types
-    # https://github.com/deepset-ai/haystack-core-integrations/issues/1771
       - name: Lint
         if: matrix.python-version == '3.9' && runner.os == 'Linux'
-        run: hatch run fmt-check && hatch run lint:typing
+        run: hatch run fmt-check && hatch run test:types
 
       - name: Generate docs
         if: matrix.python-version == '3.9' && runner.os == 'Linux'

.github/workflows/nvidia.yml

@@ -51,11 +51,9 @@ jobs:
       - name: Install Hatch
         run: pip install --upgrade hatch
 
-    # TODO: Once this integration is properly typed, use hatch run test:types
-    # https://github.com/deepset-ai/haystack-core-integrations/issues/1771
       - name: Lint
         if: matrix.python-version == '3.9' && runner.os == 'Linux'
-        run: hatch run fmt-check && hatch run lint:typing
+        run: hatch run fmt-check && hatch run test:types
 
       - name: Generate docs
         if: matrix.python-version == '3.9' && runner.os == 'Linux'

.github/workflows/weaviate.yml

@@ -44,11 +44,9 @@ jobs:
       - name: Install Hatch
         run: pip install --upgrade hatch
 
-    # TODO: Once this integration is properly typed, use hatch run test:types
-    # https://github.com/deepset-ai/haystack-core-integrations/issues/1771
       - name: Lint
         if: matrix.python-version == '3.9' && runner.os == 'Linux'
-        run: hatch run fmt-check && hatch run lint:typing
+        run: hatch run fmt-check && hatch run test:types
 
       - name: Run Weaviate container
         run: docker compose up -d

integrations/astra/src/haystack_integrations/document_stores/astra/astra_client.py

@@ -144,6 +144,7 @@ def __init__(
 
     def query(
         self,
+        *,
         vector: Optional[List[float]] = None,
         query_filter: Optional[Dict[str, Union[str, float, int, bool, List, dict]]] = None,
         top_k: Optional[int] = None,
@@ -317,6 +318,7 @@ def update_document(self, document: Dict, id_key: str):
 
     def delete(
         self,
+        *,
         ids: Optional[List[str]] = None,
         delete_all: Optional[bool] = None,
         filters: Optional[Dict[str, Union[str, float, int, bool, List, dict]]] = None,

integrations/astra/src/haystack_integrations/document_stores/astra/document_store.py

@@ -392,7 +392,12 @@ def search(
 
         return result
 
-    def delete_documents(self, document_ids: Optional[List[str]] = None, delete_all: Optional[bool] = None) -> None:
+    def delete_documents(
+        self,
+        document_ids: Optional[List[str]] = None,
+        *,
+        delete_all: Optional[bool] = None,
+    ) -> None:
         """
         Deletes documents from the document store.
 

integrations/astra/tests/test_document_store.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023-present Anant Corporation <support@anant.us>
 #
 # SPDX-License-Identifier: Apache-2.0
+import operator
 import os
 from typing import List
 from unittest import mock
@@ -78,8 +79,6 @@ def assert_documents_are_equal(self, received: List[Document], expected: List[Do
         This can happen for example when the Document Store sets a score to returned Documents.
         Since we can't know what the score will be, we can't compare the Documents reliably.
         """
-        import operator
-
         received.sort(key=operator.attrgetter("id"))
         expected.sort(key=operator.attrgetter("id"))
         assert received == expected

integrations/google_genai/tests/test_chat_generator.py

@@ -9,7 +9,10 @@
 from haystack.tools import Tool, Toolset
 from haystack.utils.auth import Secret
 
-from haystack_integrations.components.generators.google_genai import GoogleGenAIChatGenerator
+from haystack_integrations.components.generators.google_genai.chat.chat_generator import (
+    GoogleGenAIChatGenerator,
+    _convert_message_to_google_genai_format,
+)
 
 
 @pytest.fixture
@@ -112,11 +115,6 @@ def test_convert_message_to_google_genai_format_complex(self):
         Test that the GoogleGenAIChatGenerator can convert a complex sequence of ChatMessages to Google GenAI format.
         In particular, we check that different tool results are handled properly in sequence.
         """
-        from haystack.dataclasses import ToolCall
-
-        from haystack_integrations.components.generators.google_genai.chat.chat_generator import (
-            _convert_message_to_google_genai_format,
-        )
 
         messages = [
             ChatMessage.from_system("You are good assistant"),

integrations/llama_cpp/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [integrations/llama_cpp-v1.1.0] - 2025-06-19
+
+### 🐛 Bug Fixes
+
+- Fix llama.cpp types; add py.typed; Toolset support (#1973)
+
+### 🧪 Testing
+
+- Test llama.cpp with python 3.12 (#1601)
+
+### ⚙️ CI
+
+- Review testing workflows (#1541)
+
+### 🧹 Chores
+
+- Remove Python 3.8 support (#1421)
+- Use Haystack logging across integrations (#1484)
+- Update ChatGenerators with `deserialize_tools_or_toolset_inplace` (#1623)
+- Align core-integrations Hatch scripts (#1898)
+
+### 🌀 Miscellaneous
+
+- Chore: remove `jsonschema` dependency from `default` environment (#1368)
+
 ## [integrations/llama_cpp-v1.0.0] - 2025-02-07
 
 ### 🚀 Features

integrations/llama_cpp/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai>=2.9.0", "llama-cpp-python>=0.2.87"]
+dependencies = ["haystack-ai>=2.13.0", "llama-cpp-python>=0.2.87"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/llama_cpp#readme"
@@ -68,18 +68,13 @@ unit = 'pytest -m "not integration" {args:tests}'
 integration = 'pytest -m "integration" {args:tests}'
 all = 'pytest {args:tests}'
 cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
-types = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}"
+types = "mypy -p haystack_integrations.components.generators.llama_cpp {args}"
 
-# TODO: remove lint environment once this integration is properly typed
-# test environment should be used instead
-# https://github.com/deepset-ai/haystack-core-integrations/issues/1771
-[tool.hatch.envs.lint]
-installer = "uv"
-detached = true
-dependencies = ["pip", "black>=23.1.0", "mypy>=1.0.0", "ruff>=0.0.243"]
-
-[tool.hatch.envs.lint.scripts]
-typing = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}"
+[tool.mypy]
+install_types = true
+non_interactive = true
+check_untyped_defs = true
+disallow_incomplete_defs = true
 
 [tool.hatch.metadata]
 allow-direct-references = true
@@ -169,7 +164,3 @@ markers = [
     "integration: marks tests as slow (deselect with '-m \"not integration\"')",
 ]
 addopts = ["--import-mode=importlib"]
-
-[[tool.mypy.overrides]]
-module = ["haystack.*", "haystack_integrations.*", "pytest.*", "llama_cpp.*"]
-ignore_missing_imports = true