From 3f85854f68c9a4d43e6686a603b0f1281db2b343 Mon Sep 17 00:00:00 2001 From: Richard Anthony Hein Date: Tue, 13 Aug 2024 21:16:40 +0000 Subject: [PATCH] updated langchain version and usage --- playground/agents/3rd_party_agents/langchain.py | 9 +++++---- .../demos/langchain_example/langchain_example.py | 2 +- .../multi_agent_collaboration/debate_example.py | 6 +++--- requirements.txt | 12 ++++++++---- swarms/models/openai_embeddings.py | 2 +- swarms/models/palm.py | 2 +- swarms/prompts/base.py | 4 ++-- 7 files changed, 21 insertions(+), 16 deletions(-) diff --git a/playground/agents/3rd_party_agents/langchain.py b/playground/agents/3rd_party_agents/langchain.py index f28c3001..94ba5616 100644 --- a/playground/agents/3rd_party_agents/langchain.py +++ b/playground/agents/3rd_party_agents/langchain.py @@ -1,12 +1,13 @@ from typing import List, Optional -from langchain.agents import AgentExecutor, LLMSingleActionAgent, Tool +from langchain.agents import AgentExecutor, LLMSingleActionAgent from langchain.chains import LLMChain -from langchain.llms import OpenAI -from langchain.prompts import StringPromptTemplate -from langchain.tools import DuckDuckGoSearchRun from swarms import Agent +from langchain_community.llms import OpenAI +from langchain_community.tools import DuckDuckGoSearchRun +from langchain_core.prompts import StringPromptTemplate +from langchain_core.tools import Tool class LangchainAgentWrapper(Agent): diff --git a/playground/demos/langchain_example/langchain_example.py b/playground/demos/langchain_example/langchain_example.py index 0e47684e..684b8e86 100644 --- a/playground/demos/langchain_example/langchain_example.py +++ b/playground/demos/langchain_example/langchain_example.py @@ -1,9 +1,9 @@ import os from dotenv import load_dotenv -from langchain.llms import OpenAIChat from swarms import Agent +from langchain_community.llms import OpenAIChat # Loading environment variables from .env file load_dotenv() diff --git a/playground/structs/swarms/multi_agent_collaboration/debate_example.py b/playground/structs/swarms/multi_agent_collaboration/debate_example.py index e05c6fe2..0db4ce8e 100644 --- a/playground/structs/swarms/multi_agent_collaboration/debate_example.py +++ b/playground/structs/swarms/multi_agent_collaboration/debate_example.py @@ -2,12 +2,12 @@ from typing import Callable, List import numpy as np import tenacity -from langchain.chat_models import ChatOpenAI from langchain.output_parsers import RegexParser -from langchain.prompts import PromptTemplate -from langchain.schema import HumanMessage, SystemMessage from swarms import Worker +from langchain_community.chat_models import ChatOpenAI +from langchain_core.messages import HumanMessage, SystemMessage +from langchain_core.prompts import PromptTemplate class DialogueAgent: diff --git a/requirements.txt b/requirements.txt index 341d8329..f99105e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,10 @@ torch>=2.1.1,<3.0 transformers>=4.39.0,<5.0.0 asyncio>=3.4.3,<4.0 -langchain-community==0.0.29 -langchain-experimental==0.0.55 +langchain +langchain-core +langchain-openai +langchain-fireworks backoff==2.2.1 toml pypdf==4.1.0 @@ -27,7 +29,9 @@ mypy-protobuf>=3.0.0 pytest>=8.1.1 termcolor>=2.4.0 pandas>=2.2.2 -fastapi>=0.110.1 +fastapi[standard] networkx swarms-memory -pre-commit \ No newline at end of file +pre-commit +vllm +strenum \ No newline at end of file diff --git a/swarms/models/openai_embeddings.py b/swarms/models/openai_embeddings.py index 0193f0cc..5fbd818e 100644 --- a/swarms/models/openai_embeddings.py +++ b/swarms/models/openai_embeddings.py @@ -1,4 +1,4 @@ -from langchain_community.embeddings.openai import OpenAIEmbeddings +from langchain_openai.embeddings import OpenAIEmbeddings __all__ = [ "OpenAIEmbeddings", diff --git a/swarms/models/palm.py b/swarms/models/palm.py index 301ce1bd..4d2245ed 100644 --- a/swarms/models/palm.py +++ b/swarms/models/palm.py @@ -1,4 +1,4 @@ -from langchain_community.llms.google_palm import GooglePalm +from langchain_community.llms import GooglePalm __all__ = [ "GooglePalm", diff --git a/swarms/prompts/base.py b/swarms/prompts/base.py index d104f468..dc69bd1b 100644 --- a/swarms/prompts/base.py +++ b/swarms/prompts/base.py @@ -6,9 +6,10 @@ from typing import TYPE_CHECKING, Any, Sequence from pydantic import Field from swarms.utils.serializable import Serializable +from langchain_core.prompts import ChatPromptTemplate if TYPE_CHECKING: - from langchain.prompts.chat import ChatPromptTemplate + pass def get_buffer_string( @@ -86,7 +87,6 @@ class BaseMessage(Serializable): return True def __add__(self, other: Any) -> ChatPromptTemplate: - from langchain.prompts.chat import ChatPromptTemplate prompt = ChatPromptTemplate(messages=[self]) return prompt + other