Merge branch 'master' of github.com:chatchat-space/LangGraph-Chatchat into feature/api

Author: yuehua-s

chatchat-server/chatchat/server/localai_embeddings.py

@@ -17,7 +17,7 @@
 
 from langchain_community.utils.openai import is_openai_v1
 from langchain_core.embeddings import Embeddings
-from pydantic import BaseModel, Field, model_validator
+from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
 from langchain_core.utils import get_from_dict_or_env, get_pydantic_field_names
 from tenacity import (
     AsyncRetrying,
@@ -171,9 +171,9 @@ class LocalAIEmbeddings(BaseModel, Embeddings):
     class Config:
         """Configuration for this pydantic object."""
 
-        populate_by_name = True
+        allow_population_by_field_name = True
 
-    @model_validator(mode='before')
+    @root_validator(pre=True)
     def build_extra(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         """Build extra kwargs from additional params that were passed in."""
         all_required_field_names = get_pydantic_field_names(cls)
@@ -199,7 +199,7 @@ def build_extra(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         values["model_kwargs"] = extra
         return values
 
-    @model_validator(mode='after')
+    @root_validator()
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values["openai_api_key"] = get_from_dict_or_env(

chatchat-server/chatchat/server/utils.py

@@ -259,7 +259,7 @@ def get_Embeddings(
     embed_model: str = None,
     local_wrap: bool = False,  # use local wrapped api
 ) -> Embeddings:
-    from langchain_ollama import OllamaEmbeddings
+    from langchain_community.embeddings import OllamaEmbeddings
     from langchain_openai import OpenAIEmbeddings
 
     from chatchat.server.localai_embeddings import (