Remove the extra "tools" layer

Author: oskarhane

examples/customize/llms/openai_tool_calls.py

@@ -17,7 +17,7 @@
 
 from neo4j_graphrag.llm import OpenAILLM
 from neo4j_graphrag.llm.types import ToolCallResponse
-from neo4j_graphrag.tools.tool import (
+from neo4j_graphrag.tool import (
     Tool,
     ObjectParameter,
     StringParameter,

examples/customize/llms/vertexai_tool_calls.py

@@ -11,7 +11,7 @@
 
 from neo4j_graphrag.llm import VertexAILLM
 from neo4j_graphrag.llm.types import ToolCallResponse
-from neo4j_graphrag.tools.tool import (
+from neo4j_graphrag.tool import (
     Tool,
     ObjectParameter,
     StringParameter,

examples/retrieve/tools/tools_retriever_example.py

@@ -33,7 +33,7 @@
 from neo4j_graphrag.retrievers.base import Retriever
 from neo4j_graphrag.retrievers.tools_retriever import ToolsRetriever
 from neo4j_graphrag.types import RawSearchResult
-from neo4j_graphrag.tools.tool import (
+from neo4j_graphrag.tool import (
     ObjectParameter,
     StringParameter,
     Tool,

src/neo4j_graphrag/llm/base.py

@@ -25,7 +25,7 @@
     DEFAULT_RATE_LIMIT_HANDLER,
 )
 
-from neo4j_graphrag.tools.tool import Tool
+from neo4j_graphrag.tool import Tool
 
 from .rate_limit import RateLimitHandler
 

src/neo4j_graphrag/llm/openai_llm.py

@@ -46,7 +46,7 @@
     UserMessage,
 )
 
-from neo4j_graphrag.tools.tool import Tool
+from neo4j_graphrag.tool import Tool
 
 if TYPE_CHECKING:
     from openai.types.chat import (

src/neo4j_graphrag/llm/vertexai_llm.py

@@ -32,7 +32,7 @@
     ToolCallResponse,
 )
 from neo4j_graphrag.message_history import MessageHistory
-from neo4j_graphrag.tools.tool import Tool
+from neo4j_graphrag.tool import Tool
 from neo4j_graphrag.types import LLMMessage
 
 try:

src/neo4j_graphrag/retrievers/base.py

@@ -44,7 +44,7 @@
 from neo4j_graphrag.utils import driver_config
 
 if TYPE_CHECKING:
-    from neo4j_graphrag.tools.tool import (
+    from neo4j_graphrag.tool import (
         ObjectParameter,
         Tool,
         ToolParameter,
@@ -214,7 +214,7 @@ def _infer_parameters_from_signature(
     ) -> "ObjectParameter":
         """Infer parameters from the get_search_results method signature."""
         # Import here to avoid circular imports
-        from neo4j_graphrag.tools.tool import (
+        from neo4j_graphrag.tool import (
             ObjectParameter,
         )
 
@@ -270,7 +270,7 @@ def _create_tool_parameter_from_type(
     ) -> Optional["ToolParameter"]:
         """Create a tool parameter from a type annotation."""
         # Import here to avoid circular imports
-        from neo4j_graphrag.tools.tool import (
+        from neo4j_graphrag.tool import (
             StringParameter,
             IntegerParameter,
             NumberParameter,
@@ -423,7 +423,7 @@ def convert_to_tool(
             Tool: A Tool object configured to use this retriever's search functionality.
         """
         # Import here to avoid circular imports
-        from neo4j_graphrag.tools.tool import Tool
+        from neo4j_graphrag.tool import Tool
 
         # Get parameters from the retriever with custom descriptions
         parameters = self.get_parameters(parameter_descriptions or {})

src/neo4j_graphrag/retrievers/tools_retriever.py

@@ -21,7 +21,7 @@
 from neo4j_graphrag.llm.base import LLMInterface
 from neo4j_graphrag.retrievers.base import Retriever
 from neo4j_graphrag.types import RawSearchResult
-from neo4j_graphrag.tools.tool import Tool
+from neo4j_graphrag.tool import Tool
 from neo4j_graphrag.types import LLMMessage
 
 

src/neo4j_graphrag/tools/tool.py src/neo4j_graphrag/tool.pysrc/neo4j_graphrag/tools/tool.py renamed to src/neo4j_graphrag/tool.py

@@ -1,6 +1,6 @@
 import pytest
 
-from neo4j_graphrag.tools.tool import Tool, ObjectParameter, StringParameter
+from neo4j_graphrag.tool import Tool, ObjectParameter, StringParameter
 
 
 class TestTool(Tool):