Retry mechanism in MotleyTool (#88)

* Tool retry mechanism

* Move REPL tool

examples/Advanced output handling.ipynb

@@ -31,8 +31,8 @@
     "from motleycrew.tasks import SimpleTask\n",
     "from motleycrew.common.exceptions import InvalidOutput\n",
     "\n",
-    "from motleycrew.tools import PythonREPLTool\n",
-    "from motleycrew.tools import LLMTool\n",
+    "from motleycrew.tools.code import PythonREPLTool\n",
+    "from motleycrew.tools.llm_tool import LLMTool\n",
     "from motleycrew.tools import MotleyTool"
    ]
   },

examples/Math via python code with a single agent.ipynb

@@ -50,7 +50,7 @@
     "\n",
     "from motleycrew import MotleyCrew\n",
     "from motleycrew.agents.crewai import CrewAIMotleyAgent\n",
-    "from motleycrew.tools import PythonREPLTool\n",
+    "from motleycrew.tools.code import PythonREPLTool\n",
     "from motleycrew.common import configure_logging\n",
     "from motleycrew.tasks import SimpleTask\n",
     "\n",

examples/Using AutoGen with motleycrew.ipynb

@@ -117,7 +117,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from motleycrew.tools import AutoGenChatTool\n",
+    "from motleycrew.tools.autogen_chat_tool import AutoGenChatTool\n",
     "\n",
     "knowledge_retrieval_tool = AutoGenChatTool(\n",
     "    name=\"retrieve_knowledge_by_topic\",\n",

examples/old/math_crewai.py

@@ -4,7 +4,7 @@
 from motleycrew.agents.crewai import CrewAIMotleyAgent
 from motleycrew.common import configure_logging
 from motleycrew.tasks import SimpleTask
-from motleycrew.tools import PythonREPLTool
+from motleycrew.tools.code import PythonREPLTool
 
 
 def main():

motleycrew/applications/research_agent/question_answerer.py

@@ -10,7 +10,8 @@
 from motleycrew.applications.research_agent.question import Question
 from motleycrew.common.utils import print_passthrough
 from motleycrew.storage import MotleyGraphStore
-from motleycrew.tools import LLMTool, MotleyTool
+from motleycrew.tools import MotleyTool
+from motleycrew.tools.llm_tool import LLMTool
 
 _default_prompt = PromptTemplate.from_template(
     """

motleycrew/applications/research_agent/question_prioritizer.py

@@ -6,7 +6,8 @@
 
 from motleycrew.applications.research_agent.question import Question
 from motleycrew.common.utils import print_passthrough
-from motleycrew.tools import LLMTool, MotleyTool
+from motleycrew.tools import MotleyTool
+from motleycrew.tools.llm_tool import LLMTool
 
 
 class QuestionPrioritizerTool(MotleyTool):

motleycrew/common/defaults.py

@@ -1,5 +1,4 @@
-from motleycrew.common.enums import GraphStoreType
-from motleycrew.common.enums import LLMProvider
+from motleycrew.common.enums import GraphStoreType, LLMProvider
 
 
 class Defaults:
@@ -20,6 +19,7 @@ class Defaults:
         "aider": "pip install aider-chat",
         "pglast": "pip install pglast",
         "crewai_tools": "pip install 'crewai[tools]'",
+        "replicate": "pip install replicate",
     }
 
     DEFAULT_NUM_THREADS = 4

motleycrew/tools/__init__.py

@@ -1,15 +1,5 @@
 """MotleyTool class and tools library."""
 
-from motleycrew.tools.tool import MotleyTool
-from motleycrew.tools.tool import DirectOutput
+from motleycrew.tools.tool import DirectOutput, MotleyTool, RetryConfig
 
-from .autogen_chat_tool import AutoGenChatTool
-from .code.postgresql_linter import PostgreSQLLinterTool
-from .code.python_linter import PythonLinterTool
-from .html_render_tool import HTMLRenderTool
-from .image.dall_e import DallEImageGeneratorTool
-from .llm_tool import LLMTool
-from .mermaid_evaluator_tool import MermaidEvaluatorTool
-from .python_repl import PythonREPLTool
-
-__all__ = ["MotleyTool"]
+__all__ = ["MotleyTool", "RetryConfig", "DirectOutput"]

motleycrew/tools/code/__init__.py

@@ -0,0 +1,6 @@
+from .aider_tool import AiderTool
+from .postgresql_linter import PostgreSQLLinterTool
+from .python_linter import PythonLinterTool
+from .python_repl import PythonREPLTool
+
+__all__ = ["PythonLinterTool", "PostgreSQLLinterTool", "AiderTool", "PythonREPLTool"]

motleycrew/tools/python_repl.py → motleycrew/tools/code/python_repl.py

@@ -4,7 +4,7 @@
 from langchain_experimental.utilities import PythonREPL
 from pydantic import BaseModel, Field
 
-from .tool import MotleyTool
+from ..tool import MotleyTool
 
 
 class PythonREPLTool(MotleyTool):

motleycrew/tools/image/__init__.py

@@ -0,0 +1,4 @@
+from .dall_e import DallEImageGeneratorTool
+from .replicate_tool import ReplicateImageGeneratorTool
+
+__all__ = ["DallEImageGeneratorTool", "ReplicateImageGeneratorTool"]

motleycrew/tools/image/dall_e.py

@@ -1,3 +1,4 @@
+import os
 from typing import List, Optional
 
 from langchain.agents import Tool
@@ -94,12 +95,15 @@ def run_dalle_and_save_images(
 
     prompt_value = dall_e_prompt.invoke({"text": description})
 
-    dalle_api = DallEAPIWrapper(
+    dalle_api = DallEAPIWrapper.model_construct(
         model=model,
         quality=quality,
         size=size,
         model_kwargs={"style": style} if (model == "dall-e-3" and style) else {},
+        openai_api_key=os.getenv("OPENAI_API_KEY"),
+        # TODO: remove this after https://github.com/langchain-ai/langchain/issues/26941 is fixed
     )
+    dalle_api.validate_environment()
 
     dalle_result = dalle_api.run(prompt_value.text)
     logger.info("Dall-E API output: %s", dalle_result)

motleycrew/tools/image/replicate_tool.py

@@ -1,14 +1,20 @@
 from typing import List, Optional
 
-import replicate
 from langchain.agents import Tool
 from pydantic import BaseModel, Field
 
 import motleycrew.common.utils as motley_utils
 from motleycrew.common import logger
+from motleycrew.common.utils import ensure_module_is_installed
 from motleycrew.tools.image.download_image import download_url_to_directory
 from motleycrew.tools.tool import MotleyTool
 
+try:
+    import replicate
+except ImportError:
+    replicate = None
+
+
 model_map = {
     "sdxl": "stability-ai/sdxl:39ed52f2a78e934b3ba6e2a89f5b1c712de7dfea535525255b1aa35c5565e08b",
     "flux-pro": "black-forest-labs/flux-pro",
@@ -64,6 +70,8 @@ def __init__(
         :param images_directory: the directory to save the images to
         :param kwargs: model-specific parameters, from pages such as https://replicate.com/black-forest-labs/flux-dev/api/schema
         """
+        ensure_module_is_installed("replicate")
+
         self.model_name = model_name
         self.kwargs = kwargs
         langchain_tool = create_replicate_image_generator_langchain_tool(