From 379985b001ae4874dbf3a4819b8903e3eb0bc626 Mon Sep 17 00:00:00 2001 From: Kye Date: Thu, 3 Aug 2023 11:02:47 -0400 Subject: [PATCH] worker node clean up with all tools from 1 place --- swarms/agents/tools/autogpt.py | 9 +++++++++ swarms/workers/worker_node.py | 24 ++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/swarms/agents/tools/autogpt.py b/swarms/agents/tools/autogpt.py index 011bcd8f..6df6e686 100644 --- a/swarms/agents/tools/autogpt.py +++ b/swarms/agents/tools/autogpt.py @@ -10,6 +10,11 @@ from langchain.agents import tool from langchain.agents.agent_toolkits.pandas.base import create_pandas_dataframe_agent from langchain.docstore.document import Document +from langchain.chains.qa_with_sources.loading import load_qa_with_sources_chain +from langchain.tools.human.tool import HumanInputRun +from langchain.memory.chat_message_histories import FileChatMessageHistory + + ROOT_DIR = "./data/" from langchain.chains.qa_with_sources.loading import BaseCombineDocumentsChain @@ -17,6 +22,10 @@ from langchain.text_splitter import RecursiveCharacterTextSplitter from langchain.tools import BaseTool, DuckDuckGoSearchRun from pydantic import Field +from langchain.tools.file_management.read import ReadFileTool +from langchain.tools.file_management.write import WriteFileTool + + @contextmanager def pushd(new_dir): diff --git a/swarms/workers/worker_node.py b/swarms/workers/worker_node.py index c0a128f5..bbc7e415 100644 --- a/swarms/workers/worker_node.py +++ b/swarms/workers/worker_node.py @@ -1,26 +1,23 @@ import logging -from typing import Optional, List, Union +from typing import List, Optional, Union import faiss from langchain.agents import Tool -from langchain.chains.qa_with_sources.loading import load_qa_with_sources_chain from langchain.chat_models import ChatOpenAI from langchain.docstore import InMemoryDocstore from langchain.embeddings import OpenAIEmbeddings from langchain.experimental.autonomous_agents.autogpt.agent import AutoGPT -from langchain.memory.chat_message_histories import FileChatMessageHistory -from langchain.tools import DuckDuckGoSearchRun -from langchain.tools.file_management.read import ReadFileTool -from langchain.tools.file_management.write import WriteFileTool from langchain.vectorstores import FAISS -# from langchain.tools.human.tool import HumanInputRun -from swarms.agents.tools.main import WebpageQATool, process_csv - - -logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s') - - +from swarms.agents.tools.autogpt import ( + FileChatMessageHistory, + ReadFileTool, + WebpageQATool, + WriteFileTool, + load_qa_with_sources_chain, + process_csv, + web_search, +) ROOT_DIR = "./data/" @@ -160,7 +157,6 @@ class WorkerNode: try: logging.info('Creating WorkerNode') llm = self.initialize_llm(llm_class) - web_search = DuckDuckGoSearchRun() tools = [ web_search,