Skip to content

Commit 9ebb51a

Browse files
author
Kye
committed
clean up
Former-commit-id: ec8b8be
1 parent c52a92f commit 9ebb51a

File tree

9 files changed

+26
-41
lines changed

9 files changed

+26
-41
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Swarming AI Agents (Swarms)
1+
## Swarms of Autonomous AI Agents
22

33
![Swarming banner](images/swarms.png)
44

swarms/agents/prompts/chains/llm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
NoOpOutputParser,
2525
PromptValue,
2626
)
27-
from langchain.schema.language_model import BaseLanguageModel
27+
from langchain.base_language import BaseLanguageModel
2828

2929

3030
class LLMChain(Chain):

swarms/agents/tools/core/code_interpreter/main.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
from io import BytesIO
88
from typing import Any, List, Optional, Sequence, Tuple, Union
99

10-
from pydantic import BaseModel, BaseSettings, root_validator
11-
1210
from langchain.agents import AgentExecutor, BaseSingleActionAgent
1311
from langchain.base_language import BaseLanguageModel
1412
from langchain.callbacks import AsyncIteratorCallbackHandler
@@ -36,8 +34,7 @@
3634
)
3735
from langchain.tools import BaseTool, StructuredTool
3836
from langchain.tools.convert_to_openai import format_tool_to_openai_function
39-
40-
37+
from pydantic import BaseModel, BaseSettings, root_validator
4138

4239
remove_dl_link_prompt = ChatPromptTemplate(
4340
input_variables=["input_response"],
@@ -295,7 +292,7 @@ def __repr__(self):
295292
return f"File(name={self.name})"
296293

297294

298-
from langchain.schema import HumanMessage, AIMessage # type: ignore
295+
from langchain.schema import AIMessage, HumanMessage # type: ignore
299296

300297

301298
class UserRequest(HumanMessage):

swarms/agents/utils/Agent.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
99

1010
import yaml
11-
from pydantic import BaseModel, root_validator
12-
1311
from langchain.agents.agent_types import AgentType
12+
from langchain.base_language import BaseLanguageModel
1413
from langchain.callbacks.base import BaseCallbackManager
1514
from langchain.callbacks.manager import (
1615
AsyncCallbackManagerForToolRun,
@@ -26,9 +25,9 @@
2625
BaseOutputParser,
2726
BasePromptTemplate,
2827
)
29-
from langchain.schema.language_model import BaseLanguageModel
3028
from langchain.schema.messages import BaseMessage
3129
from langchain.tools.base import BaseTool
30+
from pydantic import BaseModel, root_validator
3231

3332
logger = logging.getLogger(__name__)
3433

swarms/agents/utils/Calback.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from typing import Any, Dict, List, Optional, Union
22

3+
from celery import Task
34
from langchain.callbacks.base import BaseCallbackHandler
45
from langchain.schema import AgentAction, AgentFinish, LLMResult
5-
from celery import Task
6+
7+
from swarms.utils.logger import logger
68

79
# from ansi import ANSI, Color, Style, dim_multiline
810
from swarms.utils.main import ANSI, Color, Style, dim_multiline
9-
from swarms.utils.logger import logger
1011

1112

1213
class EVALCallbackHandler(BaseCallbackHandler):

swarms/agents/utils/ChatOpenAI.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
"""OpenAI chat wrapper."""
22
from __future__ import annotations
33

4-
import os
54
import logging
5+
import os
66
import sys
77
from typing import Any, Callable, Dict, List, Mapping, Optional, Tuple
88

99
import openai
10-
1110
from langchain.chat_models.base import BaseChatModel
1211
from langchain.schema import (
1312
AIMessage,
@@ -18,9 +17,7 @@
1817
HumanMessage,
1918
SystemMessage,
2019
)
21-
2220
from langchain.utils import get_from_dict_or_env
23-
from swarms.utils.logger import logger
2421
from pydantic import BaseModel, Extra, Field, root_validator
2522
from tenacity import (
2623
before_sleep_log,
@@ -30,10 +27,11 @@
3027
wait_exponential,
3128
)
3229

30+
from swarms.utils.logger import logger
3331

3432
# from ansi import ANSI, Color, Style
3533
from swarms.utils.main import ANSI, Color, Style
36-
import os
34+
3735

3836
def _create_retry_decorator(llm: ChatOpenAI) -> Callable[[Any], Any]:
3937
import openai

swarms/agents/utils/ConversationalChatAgent.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
from typing import Any, List, Optional, Sequence, Tuple
21
import logging
2+
from typing import Any, List, Optional, Sequence, Tuple
33

4-
from swarms.agents.utils.Agent import Agent
4+
from langchain.agents.agent import AgentOutputParser
5+
from langchain.base_language import BaseLanguageModel
56
from langchain.callbacks.base import BaseCallbackManager
67
from langchain.chains import LLMChain
7-
from langchain.schema import BaseOutputParser
88
from langchain.prompts.base import BasePromptTemplate
99
from langchain.prompts.chat import (
1010
ChatPromptTemplate,
@@ -15,20 +15,14 @@
1515
from langchain.schema import (
1616
AgentAction,
1717
AIMessage,
18-
BaseLanguageModel,
1918
BaseMessage,
19+
BaseOutputParser,
2020
HumanMessage,
2121
)
2222
from langchain.tools.base import BaseTool
2323

24-
25-
from langchain.agents.agent import AgentOutputParser
26-
from langchain.schema import AgentAction
27-
28-
2924
from swarms.agents.prompts.prompts import EVAL_TOOL_RESPONSE
30-
31-
25+
from swarms.agents.utils.Agent import Agent
3226

3327
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
3428

swarms/agents/utils/agent_setup.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import os
22

3-
from swarms.agents.prompts.prompts import EVAL_PREFIX, EVAL_SUFFIX
4-
from swarms.agents.tools.main import BaseToolSet
5-
from swarms.agents.tools.main import ToolsFactory
6-
3+
from langchain.callbacks.base import BaseCallbackManager
74

5+
# from .ChatOpenAI import ChatOpenAI
6+
from langchain.chat_models import ChatOpenAI
87
from langchain.chat_models.base import BaseChatModel
98
from langchain.schema import BaseOutputParser
10-
from langchain.callbacks.base import BaseCallbackManager
9+
10+
from swarms.agents.prompts.prompts import EVAL_PREFIX, EVAL_SUFFIX
11+
from swarms.agents.tools.main import BaseToolSet, ToolsFactory
1112

1213
from .ConversationalChatAgent import ConversationalChatAgent
13-
# from .ChatOpenAI import ChatOpenAI
14-
from langchain.chat_models import ChatOpenAI
1514
from .output_parser import EvalOutputParser
1615

1716

18-
1917
class AgentSetup:
2018
def __init__(self, toolsets: list[BaseToolSet] = [], openai_api_key: str = None, serpapi_api_key: str = None, bing_search_url: str = None, bing_subscription_key: str = None):
2119
self.llm: BaseChatModel = None

swarms/workers/generative_worker.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
from datetime import datetime
44
from typing import Any, Dict, List, Optional
55

6+
from langchain import LLMChain
7+
from langchain.base_language import BaseLanguageModel
8+
69
############
710
from langchain.prompts import PromptTemplate
811
from langchain.retrievers import TimeWeightedVectorStoreRetriever
912
from langchain.schema import BaseMemory, Document
10-
11-
from langchain.schema.language_model import BaseLanguageModel
1213
from langchain.utils import mock_now
13-
from langchain import LLMChain
14-
from langchain.schema.language_model import BaseLanguageModel
15-
1614

1715
logger = logging.getLogger(__name__)
1816

0 commit comments

Comments
 (0)