chore: 川虎助理适配最新版本的openai和langchain

GaiZhenbiao · Dec 4, 2023 · ed2aa75 · ed2aa75
1 parent 4799527
commit ed2aa75
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/modules/models/ChuanhuAgent.py b/modules/models/ChuanhuAgent.py
@@ -13,7 +13,7 @@
 from langchain.tools import BaseTool, StructuredTool, Tool, tool
 from langchain.callbacks.stdout import StdOutCallbackHandler
 from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
-from langchain.callbacks.manager import BaseCallbackManager
+from langchain.callbacks.base import BaseCallbackManager
 from duckduckgo_search import DDGS
 from itertools import islice
 

diff --git a/modules/models/base_model.py b/modules/models/base_model.py
@@ -21,7 +21,7 @@
 from enum import Enum
 
 from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
-from langchain.callbacks.manager import BaseCallbackManager
+from langchain.callbacks.base import BaseCallbackManager
 
 from typing import Any, Dict, List, Optional, Union
 

diff --git a/modules/utils.py b/modules/utils.py
@@ -385,6 +385,7 @@ def save_file(filename, model, chatbot):
         "system": system,
         "history": history,
         "chatbot": chatbot,
+        "model_name": model.model_name,
         "single_turn": model.single_turn,
         "temperature": model.temperature,
         "top_p": model.top_p,

diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,8 @@ tqdm
 colorama
 googlesearch-python
 Pygments
-langchain==0.0.316
+openai==1.3.7
+langchain==0.0.345
 markdown
 PyPDF2
 pdfplumber
@@ -22,14 +23,13 @@ duckduckgo-search>=3.9.5
 arxiv
 wikipedia
 google.generativeai
-openai==0.28.1
 unstructured
 google-api-python-client
 tabulate
 ujson
 python-docx
 websocket_client
-pydantic==1.10.8
+pydantic==2.5.2
 google-search-results
 anthropic==0.3.11
 Pillow>=10.1.0