Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/check_install_libraries' into ch…
Browse files Browse the repository at this point in the history
…eck_install_libraries

# Conflicts:
#	motleycrew/tools/tool.py
  • Loading branch information
User committed May 15, 2024
2 parents a426c47 + 14ead73 commit 670ca3e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions motleycrew/tools/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

from langchain.tools import BaseTool

try:
from llama_index.core.tools import BaseTool as LlamaIndex__BaseTool
from llama_index.core.tools import FunctionTool as LlamaIndex__FunctionTool
except ImportError:
pass

from motleycrew.common.utils import ensure_module_is_installed
try:
from llama_index.core.tools import BaseTool as LlamaIndex__BaseTool
from llama_index.core.tools import FunctionTool as LlamaIndex__FunctionTool
Expand Down

0 comments on commit 670ca3e

Please sign in to comment.