chore!: drop Python 3.9 and adopt X|Y typing syntax (#427)

* start

* chore: drop Python 3.9 and adopt X|Y typing syntax

* rm optional

Author: anakin87

README.md

@@ -81,7 +81,7 @@ that includes it. Once it reaches the end of its lifespan, the experiment will b
 | `QueryExpander`                                                                                                                                                                                                                            | Query Expansion Component                | 0.14.3        |
 | `MultiQueryEmbeddingRetriever`                                                                                                                                                                                                             | MultiQueryEmbeddingRetriever             | 0.14.3        |
 | `MultiQueryTextRetriever`                                                                                                                                                                                                                  | MultiQueryTextRetriever                  | 0.14.3        |
-| EmbeddingBasedDocumentSplitter                                                                                                                                                                                                             | Document Splitting                       | 0.15.2        |
+| `EmbeddingBasedDocumentSplitter`                                                                                                                                                                                                             | Document Splitting                       | 0.15.2        |
 
 ### Discontinued experiments
 

haystack_experimental/chat_message_stores/in_memory.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import replace
-from typing import Any, Iterable, Optional
+from typing import Any, Iterable
 
 from haystack import default_from_dict, default_to_dict
 from haystack.dataclasses import ChatMessage, ChatRole
@@ -42,7 +42,7 @@ class InMemoryChatMessageStore:
     ```
     """
 
-    def __init__(self, skip_system_messages: bool = True, last_k: Optional[int] = 10) -> None:
+    def __init__(self, skip_system_messages: bool = True, last_k: int | None = 10) -> None:
         """
         Create an InMemoryChatMessageStore.
 
@@ -135,7 +135,7 @@ def write_messages(self, chat_history_id: str, messages: list[ChatMessage]) -> i
 
         return len(messages_to_write)
 
-    def retrieve_messages(self, chat_history_id: str, last_k: Optional[int] = None) -> list[ChatMessage]:
+    def retrieve_messages(self, chat_history_id: str, last_k: int | None = None) -> list[ChatMessage]:
         """
         Retrieves all stored chat messages.
 

haystack_experimental/chat_message_stores/types.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from typing import Any, Optional, Protocol
+from typing import Any, Protocol
 
 from haystack.dataclasses import ChatMessage
 
@@ -74,7 +74,7 @@ def delete_all_messages(self) -> None:
         """
         ...
 
-    def retrieve_messages(self, chat_history_id: str, last_k: Optional[int] = None) -> list[ChatMessage]:
+    def retrieve_messages(self, chat_history_id: str, last_k: int | None = None) -> list[ChatMessage]:
         """
         Retrieves chat messages from the ChatMessageStore.
 

haystack_experimental/components/agents/agent.py

@@ -7,7 +7,7 @@
 
 import inspect
 from dataclasses import dataclass
-from typing import Any, Optional, Union
+from typing import Any
 
 # Monkey patch Haystack's AgentSnapshot with our extended version
 import haystack.dataclasses.breakpoints as hdb
@@ -77,8 +77,8 @@ class _ExecutionContext(Haystack_ExecutionContext):
         parameter in their `run()` and `run_async()` methods.
     """
 
-    tool_execution_decisions: Optional[list[ToolExecutionDecision]] = None
-    confirmation_strategy_context: Optional[dict[str, Any]] = None
+    tool_execution_decisions: list[ToolExecutionDecision] | None = None
+    confirmation_strategy_context: dict[str, Any] | None = None
 
 
 class Agent(HaystackAgent):
@@ -136,16 +136,16 @@ def __init__(
         self,
         *,
         chat_generator: ChatGenerator,
-        tools: Optional[ToolsType] = None,
-        system_prompt: Optional[str] = None,
-        exit_conditions: Optional[list[str]] = None,
-        state_schema: Optional[dict[str, Any]] = None,
+        tools: ToolsType | None = None,
+        system_prompt: str | None = None,
+        exit_conditions: list[str] | None = None,
+        state_schema: dict[str, Any] | None = None,
         max_agent_steps: int = 100,
-        streaming_callback: Optional[StreamingCallbackT] = None,
+        streaming_callback: StreamingCallbackT | None = None,
         raise_on_tool_invocation_failure: bool = False,
-        confirmation_strategies: Optional[dict[str, ConfirmationStrategy]] = None,
-        tool_invoker_kwargs: Optional[dict[str, Any]] = None,
-        chat_message_store: Optional[ChatMessageStore] = None,
+        confirmation_strategies: dict[str, ConfirmationStrategy] | None = None,
+        tool_invoker_kwargs: dict[str, Any] | None = None,
+        chat_message_store: ChatMessageStore | None = None,
     ) -> None:
         """
         Initialize the agent component.
@@ -190,14 +190,14 @@ def __init__(
     def _initialize_fresh_execution(
         self,
         messages: list[ChatMessage],
-        streaming_callback: Optional[StreamingCallbackT],
+        streaming_callback: StreamingCallbackT | None,
         requires_async: bool,
         *,
-        system_prompt: Optional[str] = None,
-        generation_kwargs: Optional[dict[str, Any]] = None,
-        tools: Optional[Union[ToolsType, list[str]]] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
-        chat_message_store_kwargs: Optional[dict[str, Any]] = None,
+        system_prompt: str | None = None,
+        generation_kwargs: dict[str, Any] | None = None,
+        tools: ToolsType | list[str] | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
+        chat_message_store_kwargs: dict[str, Any] | None = None,
         **kwargs: dict[str, Any],
     ) -> _ExecutionContext:
         """
@@ -264,12 +264,12 @@ def _initialize_fresh_execution(
     def _initialize_from_snapshot(  # type: ignore[override]
         self,
         snapshot: AgentSnapshot,
-        streaming_callback: Optional[StreamingCallbackT],
+        streaming_callback: StreamingCallbackT | None,
         requires_async: bool,
         *,
-        generation_kwargs: Optional[dict[str, Any]] = None,
-        tools: Optional[Union[ToolsType, list[str]]] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
+        generation_kwargs: dict[str, Any] | None = None,
+        tools: ToolsType | list[str] | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
     ) -> _ExecutionContext:
         """
         Initialize execution context from an AgentSnapshot.
@@ -320,15 +320,15 @@ def _initialize_from_snapshot(  # type: ignore[override]
     def run(  # type: ignore[override]  # noqa: PLR0915 PLR0912
         self,
         messages: list[ChatMessage],
-        streaming_callback: Optional[StreamingCallbackT] = None,
+        streaming_callback: StreamingCallbackT | None = None,
         *,
-        generation_kwargs: Optional[dict[str, Any]] = None,
-        break_point: Optional[AgentBreakpoint] = None,
-        snapshot: Optional[AgentSnapshot] = None,
-        system_prompt: Optional[str] = None,
-        tools: Optional[Union[ToolsType, list[str]]] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
-        chat_message_store_kwargs: Optional[dict[str, Any]] = None,
+        generation_kwargs: dict[str, Any] | None = None,
+        break_point: AgentBreakpoint | None = None,
+        snapshot: AgentSnapshot | None = None,
+        system_prompt: str | None = None,
+        tools: ToolsType | list[str] | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
+        chat_message_store_kwargs: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> dict[str, Any]:
         """
@@ -558,15 +558,15 @@ def run(  # type: ignore[override]  # noqa: PLR0915 PLR0912
     async def run_async(  # type: ignore[override] # noqa: PLR0915
         self,
         messages: list[ChatMessage],
-        streaming_callback: Optional[StreamingCallbackT] = None,
+        streaming_callback: StreamingCallbackT | None = None,
         *,
-        generation_kwargs: Optional[dict[str, Any]] = None,
-        break_point: Optional[AgentBreakpoint] = None,
-        snapshot: Optional[AgentSnapshot] = None,
-        system_prompt: Optional[str] = None,
-        tools: Optional[Union[ToolsType, list[str]]] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
-        chat_message_store_kwargs: Optional[dict[str, Any]] = None,
+        generation_kwargs: dict[str, Any] | None = None,
+        break_point: AgentBreakpoint | None = None,
+        snapshot: AgentSnapshot | None = None,
+        system_prompt: str | None = None,
+        tools: ToolsType | list[str] | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
+        chat_message_store_kwargs: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> dict[str, Any]:
         """

haystack_experimental/components/agents/human_in_the_loop/dataclasses.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import asdict, dataclass
-from typing import Any, Optional
+from typing import Any
 
 
 @dataclass
@@ -23,8 +23,8 @@ class ConfirmationUIResult:
     """
 
     action: str  # "confirm", "reject", "modify"
-    feedback: Optional[str] = None
-    new_tool_params: Optional[dict[str, Any]] = None
+    feedback: str | None = None
+    new_tool_params: dict[str, Any] | None = None
 
 
 @dataclass
@@ -49,9 +49,9 @@ class ToolExecutionDecision:
 
     tool_name: str
     execute: bool
-    tool_call_id: Optional[str] = None
-    feedback: Optional[str] = None
-    final_tool_params: Optional[dict[str, Any]] = None
+    tool_call_id: str | None = None
+    feedback: str | None = None
+    final_tool_params: dict[str, Any] | None = None
 
     def to_dict(self) -> dict[str, Any]:
         """

haystack_experimental/components/agents/human_in_the_loop/errors.py

@@ -2,17 +2,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from typing import Optional
-
 
 class HITLBreakpointException(Exception):
     """
     Exception raised when a tool execution is paused by a ConfirmationStrategy (e.g. BreakpointConfirmationStrategy).
     """
 
-    def __init__(
-        self, message: str, tool_name: str, snapshot_file_path: str, tool_call_id: Optional[str] = None
-    ) -> None:
+    def __init__(self, message: str, tool_name: str, snapshot_file_path: str, tool_call_id: str | None = None) -> None:
         """
         Initialize the HITLBreakpointException.
 

haystack_experimental/components/agents/human_in_the_loop/strategies.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import replace
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from haystack.components.agents.state import State
 from haystack.components.tools.tool_invoker import ToolInvoker
@@ -52,8 +52,8 @@ def run(
         tool_name: str,
         tool_description: str,
         tool_params: dict[str, Any],
-        tool_call_id: Optional[str] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
+        tool_call_id: str | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
     ) -> ToolExecutionDecision:
         """
         Run the human-in-the-loop strategy for a given tool and its parameters.
@@ -125,8 +125,8 @@ async def run_async(
         tool_name: str,
         tool_description: str,
         tool_params: dict[str, Any],
-        tool_call_id: Optional[str] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
+        tool_call_id: str | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
     ) -> ToolExecutionDecision:
         """
         Async version of run. Calls the sync run() method by default.
@@ -210,8 +210,8 @@ def run(
         tool_name: str,
         tool_description: str,
         tool_params: dict[str, Any],
-        tool_call_id: Optional[str] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
+        tool_call_id: str | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
     ) -> ToolExecutionDecision:
         """
         Run the breakpoint confirmation strategy for a given tool and its parameters.
@@ -248,8 +248,8 @@ async def run_async(
         tool_name: str,
         tool_description: str,
         tool_params: dict[str, Any],
-        tool_call_id: Optional[str] = None,
-        confirmation_strategy_context: Optional[dict[str, Any]] = None,
+        tool_call_id: str | None = None,
+        confirmation_strategy_context: dict[str, Any] | None = None,
     ) -> ToolExecutionDecision:
         """
         Async version of run. Calls the sync run() method.
@@ -304,7 +304,7 @@ def _prepare_tool_args(
     tool: Tool,
     tool_call_arguments: dict[str, Any],
     state: State,
-    streaming_callback: Optional[StreamingCallbackT] = None,
+    streaming_callback: StreamingCallbackT | None = None,
     enable_streaming_passthrough: bool = False,
 ) -> dict[str, Any]:
     """

haystack_experimental/components/agents/human_in_the_loop/types.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from typing import Any, Optional, Protocol
+from typing import Any, Protocol
 
 from haystack.core.serialization import default_from_dict, default_to_dict
 
@@ -67,8 +67,8 @@ def run(
         tool_name: str,
         tool_description: str,
         tool_params: dict[str, Any],
-        tool_call_id: Optional[str] = None,
-        **kwargs: Optional[dict[str, Any]],
+        tool_call_id: str | None = None,
+        **kwargs: dict[str, Any] | None,
     ) -> ToolExecutionDecision:
         """
         Run the confirmation strategy for a given tool and its parameters.
@@ -92,8 +92,8 @@ async def run_async(
         tool_name: str,
         tool_description: str,
         tool_params: dict[str, Any],
-        tool_call_id: Optional[str] = None,
-        **kwargs: Optional[dict[str, Any]],
+        tool_call_id: str | None = None,
+        **kwargs: dict[str, Any] | None,
     ) -> ToolExecutionDecision:
         """
         Async version of run. Run the confirmation strategy for a given tool and its parameters.

haystack_experimental/components/agents/human_in_the_loop/user_interfaces.py

@@ -4,7 +4,7 @@
 
 import json
 from threading import Lock
-from typing import Any, Optional
+from typing import Any
 
 from haystack.core.serialization import default_to_dict
 from rich.console import Console
@@ -20,7 +20,7 @@
 class RichConsoleUI(ConfirmationUI):
     """Rich console interface for user interaction."""
 
-    def __init__(self, console: Optional[Console] = None):
+    def __init__(self, console: Console | None = None):
         self.console = console or Console()
 
     def get_user_confirmation(

haystack_experimental/components/generators/chat/openai.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import replace
-from typing import Any, Optional
+from typing import Any
 
 from haystack import component
 from haystack.components.generators.chat.openai import OpenAIChatGenerator as BaseOpenAIChatGenerator
@@ -56,12 +56,12 @@ class OpenAIChatGenerator(BaseOpenAIChatGenerator):
     def run(
         self,
         messages: list[ChatMessage],
-        streaming_callback: Optional[StreamingCallbackT] = None,
-        generation_kwargs: Optional[dict[str, Any]] = None,
+        streaming_callback: StreamingCallbackT | None = None,
+        generation_kwargs: dict[str, Any] | None = None,
         *,
-        tools: Optional[ToolsType] = None,
-        tools_strict: Optional[bool] = None,
-        hallucination_score_config: Optional[HallucinationScoreConfig] = None,
+        tools: ToolsType | None = None,
+        tools_strict: bool | None = None,
+        hallucination_score_config: HallucinationScoreConfig | None = None,
     ) -> dict[str, list[ChatMessage]]:
         """
         Invokes chat completion based on the provided messages and generation parameters.
@@ -123,12 +123,12 @@ def run(
     async def run_async(
         self,
         messages: list[ChatMessage],
-        streaming_callback: Optional[StreamingCallbackT] = None,
-        generation_kwargs: Optional[dict[str, Any]] = None,
+        streaming_callback: StreamingCallbackT | None = None,
+        generation_kwargs: dict[str, Any] | None = None,
         *,
-        tools: Optional[ToolsType] = None,
-        tools_strict: Optional[bool] = None,
-        hallucination_score_config: Optional[HallucinationScoreConfig] = None,
+        tools: ToolsType | None = None,
+        tools_strict: bool | None = None,
+        hallucination_score_config: HallucinationScoreConfig | None = None,
     ) -> dict[str, list[ChatMessage]]:
         """
         Asynchronously invokes chat completion based on the provided messages and generation parameters.