From 7b353698f98744ee91471b93a5f99fa0d9c3e553 Mon Sep 17 00:00:00 2001 From: Kye Date: Tue, 4 Jul 2023 19:38:09 -0400 Subject: [PATCH] 5.4 --- api/container.py | 2 +- setup.py | 2 +- swarms/agents/swarms.py | 3 +-- swarms/agents/workers/agents.py | 2 +- swarms/tools/__init__.py | 2 +- swarms/tools/main.py | 4 ++-- swarms/utils/__init__.py | 6 +++--- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/api/container.py b/api/container.py index 4d9d92aa..6c591a01 100644 --- a/api/container.py +++ b/api/container.py @@ -7,7 +7,7 @@ from typing import Dict, List from fastapi.templating import Jinja2Templates from swarms.agents.workers.agents import AgentManager -from swarms.utils import BaseHandler, FileHandler, FileType, StaticUploader, CsvToDataframe +from swarms.utils.utils import BaseHandler, FileHandler, FileType, StaticUploader, CsvToDataframe from swarms.tools.main import BaseToolSet, ExitConversation, RequestsGet, CodeEditor, Terminal diff --git a/setup.py b/setup.py index 57522c41..ac50dad4 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages setup( name = 'swarms', packages = find_packages(exclude=[]), - version = '0.5.2', + version = '0.5.3', license='MIT', description = 'Swarms - Pytorch', author = 'Kye Gomez', diff --git a/swarms/agents/swarms.py b/swarms/agents/swarms.py index 6fcc12ac..056e8475 100644 --- a/swarms/agents/swarms.py +++ b/swarms/agents/swarms.py @@ -47,8 +47,7 @@ from langchain.tools.human.tool import HumanInputRun # from swarms.agents.workers.auto_agent import MultiModalVisualAgent # from swarms.agents.workers import multimodal_agent_tool -from swarms.tools import Terminal, CodeWriter, CodeEditor, process_csv, WebpageQATool -from swarms.tools import math_tool +from swarms.tools import Terminal, CodeWriter, CodeEditor, process_csv, WebpageQATool, math_tool openai_api_key = os.environ["OPENAI_API_KEY"] diff --git a/swarms/agents/workers/agents.py b/swarms/agents/workers/agents.py index f96955ec..15926eb5 100644 --- a/swarms/agents/workers/agents.py +++ b/swarms/agents/workers/agents.py @@ -224,7 +224,7 @@ from langchain.callbacks.base import BaseCallbackHandler from langchain.schema import AgentAction, AgentFinish, LLMResult from celery import Task -from swarms.utils import ANSI, Color, Style, dim_multiline, logger +from swarms.utils.utils import ANSI, Color, Style, dim_multiline, logger class EVALCallbackHandler(BaseCallbackHandler): diff --git a/swarms/tools/__init__.py b/swarms/tools/__init__.py index de5a3134..28dc9089 100644 --- a/swarms/tools/__init__.py +++ b/swarms/tools/__init__.py @@ -1,2 +1,2 @@ # from swarms.agents.workers import multimodal_agent_tool -from swarms.tools.main import Terminal, CodeWriter, CodeEditor, process_csv, WebpageQATool, math_tool, HumanInputRun, ReadFileTool, WriteFileTool, BaseTool, DuckDuckGoSearchRun +# from swarms.tools.main import Terminal, CodeWriter, CodeEditor, process_csv, WebpageQATool, math_tool, HumanInputRun, ReadFileTool, WriteFileTool, BaseTool, DuckDuckGoSearchRun \ No newline at end of file diff --git a/swarms/tools/main.py b/swarms/tools/main.py index bda92bec..470381ec 100644 --- a/swarms/tools/main.py +++ b/swarms/tools/main.py @@ -23,7 +23,7 @@ from bs4 import BeautifulSoup # from logger import logger -from swarms.utils import logger +from swarms.utils.logger import logger class ToolScope(Enum): GLOBAL = "global" @@ -435,7 +435,7 @@ import time from datetime import datetime from typing import Dict, List -from swarms.utils import ANSI, Color, Style # test +from swarms.utils.utils import ANSI, Color, Style # test class Terminal(BaseToolSet): def __init__(self): diff --git a/swarms/utils/__init__.py b/swarms/utils/__init__.py index aaa41159..97fa3db4 100644 --- a/swarms/utils/__init__.py +++ b/swarms/utils/__init__.py @@ -1,3 +1,3 @@ -from swarms.utils.ansi import Code, Color, Style, ANSI, dim_multiline -from swarms.utils.logger import logger -from swarms.utils.utils import FileType, AbstractUploader, StaticUploader, BaseHandler, FileHandler, CsvToDataframe \ No newline at end of file +# from swarms.utils.ansi import Code, Color, Style, ANSI, dim_multiline +# from swarms.utils.logger import logger +# from swarms.utils.utils import FileType, AbstractUploader, StaticUploader, BaseHandler, FileHandler, CsvToDataframe \ No newline at end of file