fix: Move deserialize_tools_inplace to original import path (#9301)

* Fix for preserving import path

* Move deserialize_tools_inplace back to original import path

* Add reno

* Make mypy happy

* Remove unused import

Author: sjrl

haystack/components/generators/openai_dalle.py

@@ -127,9 +127,14 @@ def run(
         response = self.client.images.generate(
             model=self.model, prompt=prompt, size=size, quality=quality, response_format=response_format, n=1
         )
-        image: Image = response.data[0]
-        image_str = image.url or image.b64_json or ""
-        return {"images": [image_str], "revised_prompt": image.revised_prompt or ""}
+        if response.data is not None:
+            image: Image = response.data[0]
+            image_str = image.url or image.b64_json or ""
+            revised_prompt = image.revised_prompt or ""
+        else:
+            image_str = ""
+            revised_prompt = ""
+        return {"images": [image_str], "revised_prompt": revised_prompt}
 
     def to_dict(self) -> Dict[str, Any]:
         """

haystack/tools/__init__.py

@@ -6,9 +6,9 @@
 
 # ruff: noqa: I001 (ignore import order as we need to import Tool before ComponentTool)
 from .from_function import create_tool_from_function, tool
-from .tool import Tool, _check_duplicate_tool_names
+from .tool import Tool, _check_duplicate_tool_names, deserialize_tools_inplace
 from .component_tool import ComponentTool
-from .serde_utils import deserialize_tools_or_toolset_inplace, serialize_tools_or_toolset, deserialize_tools_inplace
+from .serde_utils import deserialize_tools_or_toolset_inplace, serialize_tools_or_toolset
 from .toolset import Toolset
 
 __all__ = [

haystack/tools/serde_utils.py

@@ -2,24 +2,27 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import warnings
-from typing import Any, Dict, List, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Union
 
 from haystack.core.errors import DeserializationError
 from haystack.core.serialization import import_class_by_name
-from haystack.tools.tool import Tool
-from haystack.tools.toolset import Toolset
+
+if TYPE_CHECKING:
+    from haystack.tools.tool import Tool
+    from haystack.tools.toolset import Toolset
 
 
 def serialize_tools_or_toolset(
-    tools: Union[Toolset, List[Tool], None],
+    tools: Union["Toolset", List["Tool"], None],
 ) -> Union[Dict[str, Any], List[Dict[str, Any]], None]:
     """
     Serialize a Toolset or a list of Tools to a dictionary or a list of tool dictionaries.
 
     :param tools: A Toolset, a list of Tools, or None
     :returns: A dictionary, a list of tool dictionaries, or None if tools is None
     """
+    from haystack.tools.toolset import Toolset
+
     if tools is None:
         return None
     if isinstance(tools, Toolset):
@@ -36,6 +39,9 @@ def deserialize_tools_or_toolset_inplace(data: Dict[str, Any], key: str = "tools
     :param key:
         The key in the dictionary where the list of Tools or Toolset is stored.
     """
+    from haystack.tools.tool import Tool
+    from haystack.tools.toolset import Toolset
+
     if key in data:
         serialized_tools = data[key]
 
@@ -72,22 +78,3 @@ def deserialize_tools_or_toolset_inplace(data: Dict[str, Any], key: str = "tools
             deserialized_tools.append(tool_class.from_dict(tool))
 
         data[key] = deserialized_tools
-
-
-def deserialize_tools_inplace(data: Dict[str, Any], key: str = "tools"):
-    """
-    Deserialize a list of Tools or a Toolset in a dictionary inplace.
-
-    Deprecated in favor of `deserialize_tools_or_toolset_inplace`. It will be removed in Haystack 2.14.0.
-
-    :param data:
-        The dictionary with the serialized data.
-    :param key:
-        The key in the dictionary where the list of Tools or Toolset is stored.
-    """
-    warnings.warn(
-        "`deserialize_tools_inplace` is deprecated and will be removed in Haystack 2.14.0. "
-        "Use `deserialize_tools_or_toolset_inplace` instead.",
-        DeprecationWarning,
-    )
-    deserialize_tools_or_toolset_inplace(data, key)

haystack/tools/tool.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+import warnings
 from dataclasses import asdict, dataclass
 from typing import Any, Callable, Dict, List, Optional
 
@@ -10,6 +11,7 @@
 
 from haystack.core.serialization import generate_qualified_class_name
 from haystack.tools.errors import ToolInvocationError
+from haystack.tools.serde_utils import deserialize_tools_or_toolset_inplace
 from haystack.utils import deserialize_callable, serialize_callable
 
 
@@ -173,3 +175,22 @@ def _check_duplicate_tool_names(tools: Optional[List[Tool]]) -> None:
     duplicate_tool_names = {name for name in tool_names if tool_names.count(name) > 1}
     if duplicate_tool_names:
         raise ValueError(f"Duplicate tool names found: {duplicate_tool_names}")
+
+
+def deserialize_tools_inplace(data: Dict[str, Any], key: str = "tools"):
+    """
+    Deserialize a list of Tools or a Toolset in a dictionary inplace.
+
+    Deprecated in favor of `deserialize_tools_or_toolset_inplace`. It will be removed in Haystack 2.14.0.
+
+    :param data:
+        The dictionary with the serialized data.
+    :param key:
+        The key in the dictionary where the list of Tools or Toolset is stored.
+    """
+    warnings.warn(
+        "`deserialize_tools_inplace` is deprecated and will be removed in Haystack 2.14.0. "
+        "Use `deserialize_tools_or_toolset_inplace` instead.",
+        DeprecationWarning,
+    )
+    deserialize_tools_or_toolset_inplace(data, key)

releasenotes/notes/move-deserialize_tools_inplace-b379fd7465eeb1b8.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Move deserialize_tools_inplace back to original import path of from haystack.tools.tool import deserialize_tools_inplace.