Commit 59ed5f14 by tinywell

chore: Update langchain imports to langchain_core

parent 78a9f4b0
...@@ -9,7 +9,7 @@ from src.server.qa import QA ...@@ -9,7 +9,7 @@ from src.server.qa import QA
from src.pgdb.knowledge.similarity import VectorStore_FAISS from src.pgdb.knowledge.similarity import VectorStore_FAISS
from src.llm.ernie_with_sdk import ChatERNIESerLLM from src.llm.ernie_with_sdk import ChatERNIESerLLM
from qianfan import ChatCompletion from qianfan import ChatCompletion
from langchain.prompts import PromptTemplate from langchain_core.prompts import PromptTemplate
from src.controller.request import ( from src.controller.request import (
RegisterRequest, RegisterRequest,
LoginRequest, LoginRequest,
......
import sys import sys
sys.path.append('../') sys.path.append('../')
from fastapi import FastAPI, Header,Query from fastapi import FastAPI, Header,Query
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
...@@ -9,7 +10,7 @@ import json ...@@ -9,7 +10,7 @@ import json
from src.pgdb.chat.crud import CRUD from src.pgdb.chat.crud import CRUD
from src.pgdb.knowledge.similarity import VectorStore_FAISS from src.pgdb.knowledge.similarity import VectorStore_FAISS
from src.server.qa import QA from src.server.qa import QA
from langchain.prompts import PromptTemplate from langchain_core.prompts import PromptTemplate
from langchain_openai import ChatOpenAI from langchain_openai import ChatOpenAI
from src.controller.request import ( from src.controller.request import (
PhoneLoginRequest, PhoneLoginRequest,
......
...@@ -3,7 +3,7 @@ import sys ...@@ -3,7 +3,7 @@ import sys
sys.path.append('../') sys.path.append('../')
import gradio as gr import gradio as gr
from langchain.prompts import PromptTemplate from langchain_core.prompts import PromptTemplate
from src.llm.chatglm import ChatGLMSerLLM from src.llm.chatglm import ChatGLMSerLLM
from src.llm.ernie_with_sdk import ChatERNIESerLLM from src.llm.ernie_with_sdk import ChatERNIESerLLM
......
...@@ -7,9 +7,10 @@ import torch ...@@ -7,9 +7,10 @@ import torch
from transformers import AutoTokenizer, AutoModel, AutoConfig from transformers import AutoTokenizer, AutoModel, AutoConfig
import langchain import langchain
from langchain.llms.base import BaseLLM, LLM from langchain_core.language_models import BaseLLM, LLM
from langchain.cache import InMemoryCache from langchain_community.cache import InMemoryCache
from langchain.callbacks.manager import CallbackManagerForLLMRun, Callbacks, AsyncCallbackManagerForLLMRun from langchain.callbacks.manager import Callbacks
from langchain_core.callbacks import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
import aiohttp import aiohttp
import asyncio import asyncio
......
...@@ -7,10 +7,11 @@ import torch ...@@ -7,10 +7,11 @@ import torch
from transformers import AutoTokenizer, AutoModel, AutoConfig from transformers import AutoTokenizer, AutoModel, AutoConfig
import langchain import langchain
from langchain.llms.base import BaseLLM, LLM from langchain_core.language_models import BaseLLM, LLM
from langchain_openai import OpenAI from langchain_openai import OpenAI
from langchain.cache import InMemoryCache from langchain_community.cache import InMemoryCache
from langchain.callbacks.manager import CallbackManagerForLLMRun, Callbacks, AsyncCallbackManagerForLLMRun from langchain.callbacks.manager import Callbacks
from langchain_core.callbacks import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
class ChatGLMSerLLM(OpenAI): class ChatGLMSerLLM(OpenAI):
......
...@@ -2,10 +2,11 @@ import logging ...@@ -2,10 +2,11 @@ import logging
import os import os
from typing import Any, Dict, List, Mapping, Optional from typing import Any, Dict, List, Mapping, Optional
from langchain.llms.base import BaseLLM, LLM from langchain_core.language_models import BaseLLM, LLM
from langchain.schema import LLMResult from langchain_core.outputs import LLMResult
from langchain.utils import get_from_dict_or_env from langchain_core.utils import get_from_dict_or_env
from langchain.callbacks.manager import CallbackManagerForLLMRun, Callbacks from langchain.callbacks.manager import Callbacks
from langchain_core.callbacks import CallbackManagerForLLMRun
from enum import Enum from enum import Enum
......
...@@ -2,9 +2,10 @@ import os ...@@ -2,9 +2,10 @@ import os
import requests import requests
from typing import Dict, Optional, List, Any, Mapping, Iterator from typing import Dict, Optional, List, Any, Mapping, Iterator
from pydantic import root_validator from pydantic import root_validator
from langchain.llms.base import LLM from langchain_core.language_models import LLM
from langchain.cache import InMemoryCache from langchain_community.cache import InMemoryCache
from langchain.callbacks.manager import CallbackManagerForLLMRun, Callbacks, AsyncCallbackManagerForLLMRun from langchain.callbacks.manager import Callbacks
from langchain_core.callbacks import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
import qianfan import qianfan
from qianfan import ChatCompletion from qianfan import ChatCompletion
......
from langchain.text_splitter import CharacterTextSplitter
import re import re
from typing import List from typing import List
from src.loader.config import SENTENCE_SIZE from src.loader.config import SENTENCE_SIZE
from langchain_text_splitters import CharacterTextSplitter
class ChineseTextSplitter(CharacterTextSplitter): class ChineseTextSplitter(CharacterTextSplitter):
......
...@@ -6,7 +6,7 @@ from langchain_community.document_loaders import UnstructuredFileLoader, TextLoa ...@@ -6,7 +6,7 @@ from langchain_community.document_loaders import UnstructuredFileLoader, TextLoa
from .config import SENTENCE_SIZE, ZH_TITLE_ENHANCE from .config import SENTENCE_SIZE, ZH_TITLE_ENHANCE
from .chinese_text_splitter import ChineseTextSplitter from .chinese_text_splitter import ChineseTextSplitter
from .zh_title_enhance import zh_title_enhance from .zh_title_enhance import zh_title_enhance
from langchain.schema import Document from langchain_core.documents import Document
from typing import List from typing import List
from src.loader.callback import BaseCallback from src.loader.callback import BaseCallback
import re import re
......
from typing import List from typing import List
from langchain.docstore.document import Document from langchain_core.documents import Document
import re import re
......
...@@ -3,7 +3,7 @@ import sys ...@@ -3,7 +3,7 @@ import sys
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
import json import json
from typing import List, Tuple from typing import List, Tuple
from langchain.schema import Document from langchain_core.documents import Document
from src.pgdb.knowledge.pgsqldocstore import PgSqlDocstore, str2hash_base64 from src.pgdb.knowledge.pgsqldocstore import PgSqlDocstore, str2hash_base64
sys.path.append("../") sys.path.append("../")
......
...@@ -5,12 +5,12 @@ from os import path ...@@ -5,12 +5,12 @@ from os import path
sys.path.append(path.dirname(path.abspath(__file__))) sys.path.append(path.dirname(path.abspath(__file__)))
from typing import List, Union, Dict, Optional from typing import List, Union, Dict, Optional
from langchain.docstore.base import AddableMixin, Docstore from langchain_community.docstore.base import AddableMixin, Docstore
from k_db import PostgresDB from k_db import PostgresDB
from .txt_doc_table import TxtDoc from .txt_doc_table import TxtDoc
from .vec_txt_table import TxtVector from .vec_txt_table import TxtVector
import json, hashlib, base64 import json, hashlib, base64
from langchain.schema import Document from langchain_core.documents import Document
def str2hash_base64(inp: str) -> str: def str2hash_base64(inp: str) -> str:
......
...@@ -6,25 +6,24 @@ from os import path ...@@ -6,25 +6,24 @@ from os import path
import copy import copy
from typing import List, OrderedDict, Any, Optional, Tuple, Dict from typing import List, OrderedDict, Any, Optional, Tuple, Dict
from src.pgdb.knowledge.pgsqldocstore import InMemorySecondaryDocstore from src.pgdb.knowledge.pgsqldocstore import InMemorySecondaryDocstore
from langchain.vectorstores.faiss import FAISS from langchain_community.vectorstores import FAISS
from langchain.schema import Document from langchain_core.documents import Document
from src.pgdb.knowledge.pgsqldocstore import PgSqlDocstore from src.pgdb.knowledge.pgsqldocstore import PgSqlDocstore
from langchain.embeddings.huggingface import ( from langchain.embeddings.huggingface import (
HuggingFaceEmbeddings, HuggingFaceEmbeddings,
) )
import math import math
import faiss import faiss
from langchain.vectorstores.utils import DistanceStrategy from langchain_community.vectorstores.utils import DistanceStrategy
from langchain.vectorstores.base import VectorStoreRetriever from langchain_core.vectorstores import VectorStoreRetriever
from langchain.callbacks.manager import ( from langchain_core.callbacks import (
AsyncCallbackManagerForRetrieverRun, AsyncCallbackManagerForRetrieverRun,
CallbackManagerForRetrieverRun, CallbackManagerForRetrieverRun,
) )
from src.loader import load from src.loader import load
from langchain.embeddings.base import Embeddings from langchain_core.embeddings import Embeddings
from src.pgdb.knowledge.callback import DocumentCallback, DefaultDocumentCallback from src.pgdb.knowledge.callback import DocumentCallback, DefaultDocumentCallback
import operator import operator
from langchain.vectorstores.utils import DistanceStrategy
import numpy as np import numpy as np
sys.path.append("../") sys.path.append("../")
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import sys import sys
import time import time
from langchain.chains import LLMChain from langchain.chains import LLMChain
from langchain.prompts import PromptTemplate from langchain_core.prompts import PromptTemplate
from typing import Awaitable from typing import Awaitable
import asyncio import asyncio
from langchain.callbacks import AsyncIteratorCallbackHandler from langchain.callbacks import AsyncIteratorCallbackHandler
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment