Merge branch 'main' into feat/add-count-filtering-to-ElasticSearchDocumentStore

Author: davidsbatista

integrations/azure_ai_search/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Changelog
 
+## [integrations/azure_ai_search-v3.0.0] - 2026-01-09
+
+
+### 🧹 Chores
+
+- Make fmt command more forgiving (#2671)
+- [**breaking**] Azure_ai_search - drop Python 3.9 and use X|Y typing (#2695)
+
 ## [integrations/azure_ai_search-v2.3.3] - 2025-12-10
 
 ### 🚀 Features
 
-- Adding `update_by_filter()` and `delete_by_filter()` to `AzureAISearchDocument Store` (#2586)
+- Adding updated/delete by filter + tests to `AzureAISearchDocument Store` (#2586)
 
 
 ### 🧪 Testing

integrations/azure_ai_search/pyproject.toml

@@ -7,23 +7,22 @@ name = "azure-ai-search-haystack"
 dynamic = ["version"]
 description = 'Haystack 2.x Document Store for Azure AI Search'
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "Apache-2.0"
 keywords = []
 authors = [{ name = "deepset", email = "info@deepset.ai" }]
 classifiers = [
   "License :: OSI Approved :: Apache Software License",
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai>=2.11.0", "azure-search-documents>=11.5", "azure-identity"]
+dependencies = ["haystack-ai>=2.22.0", "azure-search-documents>=11.5", "azure-identity"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/azure_ai_search#readme"
@@ -80,7 +79,6 @@ allow-direct-references = true
 
 
 [tool.ruff]
-target-version = "py39"
 line-length = 120
 
 [tool.ruff.lint]
@@ -127,10 +125,6 @@ ignore = [
   "PLR0913",
   "PLR0915",
 ]
-unfixable = [
-  # Don't touch unused imports
-  "F401",
-]
 exclude = ["example"]
 
 [tool.ruff.lint.isort]

integrations/azure_ai_search/src/haystack_integrations/components/retrievers/azure_ai_search/bm25_retriever.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 from haystack import Document, component, default_from_dict, default_to_dict, logging
 from haystack.document_stores.types import FilterPolicy
@@ -21,9 +21,9 @@ def __init__(
         self,
         *,
         document_store: AzureAISearchDocumentStore,
-        filters: Optional[dict[str, Any]] = None,
+        filters: dict[str, Any] | None = None,
         top_k: int = 10,
-        filter_policy: Union[str, FilterPolicy] = FilterPolicy.REPLACE,
+        filter_policy: str | FilterPolicy = FilterPolicy.REPLACE,
         **kwargs: Any,
     ):
         """
@@ -97,7 +97,7 @@ def from_dict(cls, data: dict[str, Any]) -> "AzureAISearchBM25Retriever":
 
     @component.output_types(documents=list[Document])
     def run(
-        self, query: str, filters: Optional[dict[str, Any]] = None, top_k: Optional[int] = None
+        self, query: str, filters: dict[str, Any] | None = None, top_k: int | None = None
     ) -> dict[str, list[Document]]:
         """Retrieve documents from the AzureAISearchDocumentStore.
 

integrations/azure_ai_search/src/haystack_integrations/components/retrievers/azure_ai_search/embedding_retriever.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 from haystack import Document, component, default_from_dict, default_to_dict, logging
 from haystack.document_stores.types import FilterPolicy
@@ -21,9 +21,9 @@ def __init__(
         self,
         *,
         document_store: AzureAISearchDocumentStore,
-        filters: Optional[dict[str, Any]] = None,
+        filters: dict[str, Any] | None = None,
         top_k: int = 10,
-        filter_policy: Union[str, FilterPolicy] = FilterPolicy.REPLACE,
+        filter_policy: str | FilterPolicy = FilterPolicy.REPLACE,
         **kwargs: Any,
     ):
         """
@@ -94,7 +94,7 @@ def from_dict(cls, data: dict[str, Any]) -> "AzureAISearchEmbeddingRetriever":
 
     @component.output_types(documents=list[Document])
     def run(
-        self, query_embedding: list[float], filters: Optional[dict[str, Any]] = None, top_k: Optional[int] = None
+        self, query_embedding: list[float], filters: dict[str, Any] | None = None, top_k: int | None = None
     ) -> dict[str, list[Document]]:
         """Retrieve documents from the AzureAISearchDocumentStore.
 

integrations/azure_ai_search/src/haystack_integrations/components/retrievers/azure_ai_search/hybrid_retriever.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 from haystack import Document, component, default_from_dict, default_to_dict, logging
 from haystack.document_stores.types import FilterPolicy
@@ -21,9 +21,9 @@ def __init__(
         self,
         *,
         document_store: AzureAISearchDocumentStore,
-        filters: Optional[dict[str, Any]] = None,
+        filters: dict[str, Any] | None = None,
         top_k: int = 10,
-        filter_policy: Union[str, FilterPolicy] = FilterPolicy.REPLACE,
+        filter_policy: str | FilterPolicy = FilterPolicy.REPLACE,
         **kwargs: Any,
     ):
         """
@@ -100,8 +100,8 @@ def run(
         self,
         query: str,
         query_embedding: list[float],
-        filters: Optional[dict[str, Any]] = None,
-        top_k: Optional[int] = None,
+        filters: dict[str, Any] | None = None,
+        top_k: int | None = None,
     ) -> dict[str, list[Document]]:
         """Retrieve documents from the AzureAISearchDocumentStore.
 

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

@@ -4,7 +4,7 @@
 
 import logging as python_logging
 from datetime import datetime
-from typing import Any, Optional, Union
+from typing import Any
 
 from azure.core.credentials import AzureKeyCredential
 from azure.core.exceptions import (
@@ -100,8 +100,8 @@ def __init__(
         azure_endpoint: Secret = Secret.from_env_var("AZURE_AI_SEARCH_ENDPOINT", strict=True),  # noqa: B008
         index_name: str = "default",
         embedding_dimension: int = 768,
-        metadata_fields: Optional[dict[str, Union[SearchField, type]]] = None,
-        vector_search_configuration: Optional[VectorSearch] = None,
+        metadata_fields: dict[str, SearchField | type] | None = None,
+        vector_search_configuration: VectorSearch | None = None,
         include_search_metadata: bool = False,
         **index_creation_kwargs: Any,
     ):
@@ -148,8 +148,8 @@ def __init__(
 
         For more information on parameters, see the [official Azure AI Search documentation](https://learn.microsoft.com/en-us/azure/search/).
         """
-        self._client: Optional[SearchClient] = None
-        self._index_client: Optional[SearchIndexClient] = None
+        self._client: SearchClient | None = None
+        self._index_client: SearchIndexClient | None = None
         self._index_fields = []  # type: list[Any]  # stores all fields in the final schema of index
         self._api_key = api_key
         self._azure_endpoint = azure_endpoint
@@ -202,7 +202,7 @@ def client(self) -> SearchClient:
 
     @staticmethod
     def _normalize_metadata_index_fields(
-        metadata_fields: Optional[dict[str, Union[SearchField, type]]],
+        metadata_fields: dict[str, SearchField | type] | None,
     ) -> dict[str, SearchField]:
         """Create a list of index fields for storing metadata values."""
 
@@ -516,7 +516,7 @@ def search_documents(self, search_text: str = "*", top_k: int = 10) -> list[Docu
         result = self.client.search(search_text=search_text, top=top_k)
         return self._convert_search_result_to_documents(list(result))
 
-    def filter_documents(self, filters: Optional[dict[str, Any]] = None) -> list[Document]:
+    def filter_documents(self, filters: dict[str, Any] | None = None) -> list[Document]:
         """
         Returns the documents that match the provided filters.
         Filters should be given as a dictionary supporting filtering by metadata. For details on
@@ -567,7 +567,7 @@ def _convert_search_result_to_documents(self, azure_docs: list[dict[str, Any]])
             documents.append(doc)
         return documents
 
-    def _index_exists(self, index_name: Optional[str]) -> bool:
+    def _index_exists(self, index_name: str | None) -> bool:
         """
         Check if the index exists in the Azure AI Search service.
 
@@ -614,7 +614,7 @@ def _embedding_retrieval(
         query_embedding: list[float],
         *,
         top_k: int = 10,
-        filters: Optional[str] = None,
+        filters: str | None = None,
         **kwargs: Any,
     ) -> list[Document]:
         """
@@ -648,7 +648,7 @@ def _bm25_retrieval(
         self,
         query: str,
         top_k: int = 10,
-        filters: Optional[str] = None,
+        filters: str | None = None,
         **kwargs: Any,
     ) -> list[Document]:
         """
@@ -681,7 +681,7 @@ def _hybrid_retrieval(
         query: str,
         query_embedding: list[float],
         top_k: int = 10,
-        filters: Optional[str] = None,
+        filters: str | None = None,
         **kwargs: Any,
     ) -> list[Document]:
         """

integrations/azure_ai_search/tests/test_document_store.py

@@ -243,7 +243,7 @@ def _assert_documents_are_equal(received: list[Document], expected: list[Documen
     sorted_expected = sorted(expected, key=lambda doc: doc.id)
     assert len(sorted_received) == len(sorted_expected)
 
-    for received_doc, expected_doc in zip(sorted_received, sorted_expected):
+    for received_doc, expected_doc in zip(sorted_received, sorted_expected, strict=True):
         # Compare all attributes except score
         assert received_doc.id == expected_doc.id
         assert received_doc.content == expected_doc.content

integrations/cometapi/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [integrations/cometapi-v2.0.0] - 2026-01-09
+
+### 🧹 Chores
+
+- Remove Readme API CI workflow and configs (#2573)
+- Make fmt command more forgiving (#2671)
+- [**breaking**] Cometapi - drop Python 3.9 and use X|Y typing (#2697)
+
+
 ## [integrations/cometapi-v1.1.0] - 2025-11-26
 
 ### 🚀 Features

integrations/cometapi/pyproject.toml

@@ -7,7 +7,7 @@ name = "cometapi-haystack"
 dynamic = ["version"]
 description = 'Use Comet API with Haystack to build AI applications with 500+ AI models.'
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "Apache-2.0"
 keywords = []
 authors = [
@@ -18,15 +18,14 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License",
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai>=2.13.2",]
+dependencies = ["haystack-ai>=2.22.0",]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/cometapi#readme"
@@ -85,7 +84,6 @@ module = [
 ignore_missing_imports = true
 
 [tool.ruff]
-target-version = "py39"
 line-length = 120
 
 [tool.ruff.lint]
@@ -138,10 +136,6 @@ ignore = [
   # Allow function call argument defaults e.g. `Secret.from_env_var`
   "B008",
 ]
-unfixable = [
-  # Don't touch unused imports
-  "F401",
-]
 
 [tool.ruff.lint.isort]
 known-first-party = ["haystack_integrations"]

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

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 from haystack.components.generators.chat import OpenAIChatGenerator
 from haystack.dataclasses import StreamingCallbackT
@@ -34,13 +34,13 @@ def __init__(
         *,
         api_key: Secret = Secret.from_env_var("COMET_API_KEY"),
         model: str = "gpt-5-mini",
-        streaming_callback: Optional[StreamingCallbackT] = None,
-        generation_kwargs: Optional[dict[str, Any]] = None,
-        timeout: Optional[int] = None,
-        max_retries: Optional[int] = None,
-        tools: Optional[Union[list[Union[Tool, Toolset]], Toolset]] = None,
+        streaming_callback: StreamingCallbackT | None = None,
+        generation_kwargs: dict[str, Any] | None = None,
+        timeout: int | None = None,
+        max_retries: int | None = None,
+        tools: list[Tool | Toolset] | Toolset | None = None,
         tools_strict: bool = False,
-        http_client_kwargs: Optional[dict[str, Any]] = None,
+        http_client_kwargs: dict[str, Any] | None = None,
     ):
         api_base_url = "https://api.cometapi.com/v1"