Fix metaclass conflict error when installing pydantic v2 and using la…

…ngchain (#555) Signed-off-by: Yasunori Fujie <fujie@ai2-jp.com> Co-authored-by: Yasunori Fujie <fuji@dmgw.net>
zilliztech · Oct 23, 2023 · 57b1827 · 57b1827
1 parent a9b94f4
commit 57b1827
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/gptcache/adapter/langchain_models.py b/gptcache/adapter/langchain_models.py
@@ -4,13 +4,11 @@
 from gptcache.core import cache
 from gptcache.manager.scalar_data.base import Answer, DataType
 from gptcache.session import Session
-from gptcache.utils import import_pydantic, import_langchain
+from gptcache.utils import import_langchain
 
-import_pydantic()
 import_langchain()
 
 # pylint: disable=C0413
-from pydantic import BaseModel
 from langchain.llms.base import LLM
 from langchain.chat_models.base import BaseChatModel
 from langchain.schema import (
@@ -27,7 +25,7 @@
 
 
 # pylint: disable=protected-access
-class LangChainLLMs(LLM, BaseModel):
+class LangChainLLMs(LLM):
     """LangChain LLM Wrapper.
 
     :param llm: LLM from langchain.llms.
@@ -127,7 +125,7 @@ def __call__(
 
 
 # pylint: disable=protected-access
-class LangChainChat(BaseChatModel, BaseModel):
+class LangChainChat(BaseChatModel):
     """LangChain LLM Wrapper.
 
     :param chat: LLM from langchain.chat_models.

diff --git a/tests/unit_tests/adapter/test_langchain_models.py b/tests/unit_tests/adapter/test_langchain_models.py
@@ -8,10 +8,9 @@
 from gptcache.adapter.api import init_similar_cache, get
 from gptcache.adapter.langchain_models import LangChainLLMs, LangChainChat, _cache_msg_data_convert
 from gptcache.processor.pre import get_prompt, last_content_without_template, get_messages_last_content
-from gptcache.utils import import_pydantic, import_langchain
+from gptcache.utils import import_langchain
 from gptcache.utils.response import get_message_from_openai_answer
 
-import_pydantic()
 import_langchain()
 
 from langchain import OpenAI, PromptTemplate

diff --git a/tests/unit_tests/embedding/test_langchain.py b/tests/unit_tests/embedding/test_langchain.py
@@ -2,7 +2,6 @@
 from gptcache.utils import import_langchain, prompt_install
 
 import_langchain()
-prompt_install("pydantic==1.10.8")
 from langchain.embeddings import FakeEmbeddings