From 12ff7800894b7710ca0b42b0455c3988c5b8b488 Mon Sep 17 00:00:00 2001 From: Harrison Chase Date: Mon, 18 Sep 2023 08:37:14 -0700 Subject: [PATCH] move embeddings to schema (#10696) --- libs/experimental/langchain_experimental/sql/vector_sql.py | 2 +- libs/langchain/langchain/cache.py | 2 +- libs/langchain/langchain/chains/hyde/base.py | 2 +- libs/langchain/langchain/chains/router/embedding_router.py | 2 +- .../document_transformers/embeddings_redundant_filter.py | 2 +- libs/langchain/langchain/embeddings/aleph_alpha.py | 2 +- libs/langchain/langchain/embeddings/awa.py | 2 +- libs/langchain/langchain/embeddings/baidu_qianfan_endpoint.py | 2 +- libs/langchain/langchain/embeddings/bedrock.py | 2 +- libs/langchain/langchain/embeddings/cache.py | 2 +- libs/langchain/langchain/embeddings/clarifai.py | 2 +- libs/langchain/langchain/embeddings/cohere.py | 2 +- libs/langchain/langchain/embeddings/dashscope.py | 2 +- libs/langchain/langchain/embeddings/deepinfra.py | 2 +- libs/langchain/langchain/embeddings/edenai.py | 2 +- libs/langchain/langchain/embeddings/elasticsearch.py | 2 +- libs/langchain/langchain/embeddings/embaas.py | 2 +- libs/langchain/langchain/embeddings/ernie.py | 2 +- libs/langchain/langchain/embeddings/fake.py | 2 +- libs/langchain/langchain/embeddings/google_palm.py | 2 +- libs/langchain/langchain/embeddings/gpt4all.py | 2 +- libs/langchain/langchain/embeddings/huggingface.py | 2 +- libs/langchain/langchain/embeddings/huggingface_hub.py | 2 +- libs/langchain/langchain/embeddings/jina.py | 2 +- libs/langchain/langchain/embeddings/llamacpp.py | 2 +- libs/langchain/langchain/embeddings/localai.py | 2 +- libs/langchain/langchain/embeddings/minimax.py | 2 +- libs/langchain/langchain/embeddings/mlflow_gateway.py | 2 +- libs/langchain/langchain/embeddings/modelscope_hub.py | 2 +- libs/langchain/langchain/embeddings/mosaicml.py | 2 +- libs/langchain/langchain/embeddings/nlpcloud.py | 2 +- libs/langchain/langchain/embeddings/octoai_embeddings.py | 2 +- libs/langchain/langchain/embeddings/ollama.py | 2 +- libs/langchain/langchain/embeddings/openai.py | 2 +- libs/langchain/langchain/embeddings/sagemaker_endpoint.py | 2 +- libs/langchain/langchain/embeddings/self_hosted.py | 2 +- libs/langchain/langchain/embeddings/spacy_embeddings.py | 2 +- libs/langchain/langchain/embeddings/tensorflow_hub.py | 2 +- libs/langchain/langchain/embeddings/vertexai.py | 2 +- libs/langchain/langchain/embeddings/xinference.py | 2 +- libs/langchain/langchain/evaluation/embedding_distance/base.py | 2 +- libs/langchain/langchain/indexes/vectorstore.py | 2 +- .../langchain/prompts/example_selector/semantic_similarity.py | 2 +- libs/langchain/langchain/retrievers/docarray.py | 2 +- .../retrievers/document_compressors/embeddings_filter.py | 2 +- libs/langchain/langchain/retrievers/knn.py | 2 +- libs/langchain/langchain/retrievers/milvus.py | 2 +- libs/langchain/langchain/retrievers/pinecone_hybrid_search.py | 2 +- libs/langchain/langchain/retrievers/svm.py | 2 +- libs/langchain/langchain/retrievers/zilliz.py | 2 +- .../langchain/{embeddings/base.py => schema/embeddings.py} | 0 libs/langchain/langchain/smith/evaluation/config.py | 2 +- .../langchain/langchain/vectorstores/alibabacloud_opensearch.py | 2 +- libs/langchain/langchain/vectorstores/analyticdb.py | 2 +- libs/langchain/langchain/vectorstores/annoy.py | 2 +- libs/langchain/langchain/vectorstores/atlas.py | 2 +- libs/langchain/langchain/vectorstores/awadb.py | 2 +- libs/langchain/langchain/vectorstores/azuresearch.py | 2 +- libs/langchain/langchain/vectorstores/bageldb.py | 2 +- libs/langchain/langchain/vectorstores/base.py | 2 +- libs/langchain/langchain/vectorstores/cassandra.py | 2 +- libs/langchain/langchain/vectorstores/chroma.py | 2 +- libs/langchain/langchain/vectorstores/clarifai.py | 2 +- libs/langchain/langchain/vectorstores/clickhouse.py | 2 +- libs/langchain/langchain/vectorstores/dashvector.py | 2 +- libs/langchain/langchain/vectorstores/deeplake.py | 2 +- libs/langchain/langchain/vectorstores/dingo.py | 2 +- libs/langchain/langchain/vectorstores/docarray/base.py | 2 +- libs/langchain/langchain/vectorstores/docarray/hnsw.py | 2 +- libs/langchain/langchain/vectorstores/docarray/in_memory.py | 2 +- libs/langchain/langchain/vectorstores/elastic_vector_search.py | 2 +- libs/langchain/langchain/vectorstores/elasticsearch.py | 2 +- libs/langchain/langchain/vectorstores/epsilla.py | 2 +- libs/langchain/langchain/vectorstores/faiss.py | 2 +- libs/langchain/langchain/vectorstores/hologres.py | 2 +- libs/langchain/langchain/vectorstores/lancedb.py | 2 +- libs/langchain/langchain/vectorstores/marqo.py | 2 +- libs/langchain/langchain/vectorstores/matching_engine.py | 2 +- libs/langchain/langchain/vectorstores/meilisearch.py | 2 +- libs/langchain/langchain/vectorstores/milvus.py | 2 +- libs/langchain/langchain/vectorstores/mongodb_atlas.py | 2 +- libs/langchain/langchain/vectorstores/myscale.py | 2 +- libs/langchain/langchain/vectorstores/neo4j_vector.py | 2 +- libs/langchain/langchain/vectorstores/nucliadb.py | 2 +- .../langchain/vectorstores/opensearch_vector_search.py | 2 +- libs/langchain/langchain/vectorstores/pgembedding.py | 2 +- libs/langchain/langchain/vectorstores/pgvector.py | 2 +- libs/langchain/langchain/vectorstores/pinecone.py | 2 +- libs/langchain/langchain/vectorstores/qdrant.py | 2 +- libs/langchain/langchain/vectorstores/redis/base.py | 2 +- libs/langchain/langchain/vectorstores/rocksetdb.py | 2 +- libs/langchain/langchain/vectorstores/scann.py | 2 +- libs/langchain/langchain/vectorstores/singlestoredb.py | 2 +- libs/langchain/langchain/vectorstores/sklearn.py | 2 +- libs/langchain/langchain/vectorstores/sqlitevss.py | 2 +- libs/langchain/langchain/vectorstores/starrocks.py | 2 +- libs/langchain/langchain/vectorstores/supabase.py | 2 +- libs/langchain/langchain/vectorstores/tair.py | 2 +- libs/langchain/langchain/vectorstores/tencentvectordb.py | 2 +- libs/langchain/langchain/vectorstores/tigris.py | 2 +- libs/langchain/langchain/vectorstores/typesense.py | 2 +- libs/langchain/langchain/vectorstores/usearch.py | 2 +- libs/langchain/langchain/vectorstores/vearch.py | 2 +- libs/langchain/langchain/vectorstores/vectara.py | 2 +- libs/langchain/langchain/vectorstores/weaviate.py | 2 +- libs/langchain/langchain/vectorstores/xata.py | 2 +- libs/langchain/langchain/vectorstores/zep.py | 2 +- libs/langchain/langchain/vectorstores/zilliz.py | 2 +- .../langchain/tests/integration_tests/cache/test_redis_cache.py | 2 +- .../tests/integration_tests/vectorstores/fake_embeddings.py | 2 +- .../vectorstores/qdrant/test_embedding_interface.py | 2 +- .../tests/integration_tests/vectorstores/test_mongodb_atlas.py | 2 +- libs/langchain/tests/unit_tests/chains/test_hyde.py | 2 +- libs/langchain/tests/unit_tests/embeddings/test_caching.py | 2 +- libs/langchain/tests/unit_tests/indexes/test_indexing.py | 2 +- .../tests/unit_tests/retrievers/test_time_weighted_retriever.py | 2 +- 116 files changed, 115 insertions(+), 115 deletions(-) rename libs/langchain/langchain/{embeddings/base.py => schema/embeddings.py} (100%) diff --git a/libs/experimental/langchain_experimental/sql/vector_sql.py b/libs/experimental/langchain_experimental/sql/vector_sql.py index 05ccb453b28..43c42f7096a 100644 --- a/libs/experimental/langchain_experimental/sql/vector_sql.py +++ b/libs/experimental/langchain_experimental/sql/vector_sql.py @@ -6,9 +6,9 @@ from typing import Any, Dict, List, Optional, Union from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.llm import LLMChain from langchain.chains.sql_database.prompt import PROMPT, SQL_PROMPTS -from langchain.embeddings.base import Embeddings from langchain.prompts.prompt import PromptTemplate from langchain.schema import BaseOutputParser, BasePromptTemplate +from langchain.schema.base import Embeddings from langchain.schema.language_model import BaseLanguageModel from langchain.tools.sql_database.prompt import QUERY_CHECKER from langchain.utilities.sql_database import SQLDatabase diff --git a/libs/langchain/langchain/cache.py b/libs/langchain/langchain/cache.py index 1d238086bff..36a3b09ad00 100644 --- a/libs/langchain/langchain/cache.py +++ b/libs/langchain/langchain/cache.py @@ -51,12 +51,12 @@ except ImportError: from sqlalchemy.ext.declarative import declarative_base -from langchain.embeddings.base import Embeddings from langchain.llms.base import LLM, get_prompts from langchain.load.dump import dumps from langchain.load.load import loads from langchain.schema import ChatGeneration, Generation from langchain.schema.cache import RETURN_VAL_TYPE, BaseCache +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_env from langchain.vectorstores.redis import Redis as RedisVectorstore diff --git a/libs/langchain/langchain/chains/hyde/base.py b/libs/langchain/langchain/chains/hyde/base.py index 75b8c50666f..2c4794e001a 100644 --- a/libs/langchain/langchain/chains/hyde/base.py +++ b/libs/langchain/langchain/chains/hyde/base.py @@ -12,8 +12,8 @@ from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.hyde.prompts import PROMPT_MAP from langchain.chains.llm import LLMChain -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import Extra +from langchain.schema.embeddings import Embeddings from langchain.schema.language_model import BaseLanguageModel diff --git a/libs/langchain/langchain/chains/router/embedding_router.py b/libs/langchain/langchain/chains/router/embedding_router.py index f2e0712f89e..6042f07a114 100644 --- a/libs/langchain/langchain/chains/router/embedding_router.py +++ b/libs/langchain/langchain/chains/router/embedding_router.py @@ -5,8 +5,8 @@ from typing import Any, Dict, List, Optional, Sequence, Tuple, Type from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.router.base import RouterChain from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import Extra +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/document_transformers/embeddings_redundant_filter.py b/libs/langchain/langchain/document_transformers/embeddings_redundant_filter.py index 51f166b8c87..c492ce6521b 100644 --- a/libs/langchain/langchain/document_transformers/embeddings_redundant_filter.py +++ b/libs/langchain/langchain/document_transformers/embeddings_redundant_filter.py @@ -3,9 +3,9 @@ from typing import Any, Callable, List, Sequence import numpy as np -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Field from langchain.schema import BaseDocumentTransformer, Document +from langchain.schema.embeddings import Embeddings from langchain.utils.math import cosine_similarity diff --git a/libs/langchain/langchain/embeddings/aleph_alpha.py b/libs/langchain/langchain/embeddings/aleph_alpha.py index eb7c28f84a1..91c71a6063e 100644 --- a/libs/langchain/langchain/embeddings/aleph_alpha.py +++ b/libs/langchain/langchain/embeddings/aleph_alpha.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/embeddings/awa.py b/libs/langchain/langchain/embeddings/awa.py index c6f844104be..f957cb299d4 100644 --- a/libs/langchain/langchain/embeddings/awa.py +++ b/libs/langchain/langchain/embeddings/awa.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings class AwaEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/baidu_qianfan_endpoint.py b/libs/langchain/langchain/embeddings/baidu_qianfan_endpoint.py index 7b024b04bda..cb3fca33e96 100644 --- a/libs/langchain/langchain/embeddings/baidu_qianfan_endpoint.py +++ b/libs/langchain/langchain/embeddings/baidu_qianfan_endpoint.py @@ -3,8 +3,8 @@ from __future__ import annotations import logging from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/bedrock.py b/libs/langchain/langchain/embeddings/bedrock.py index 6b66c0139b2..4b3e4382c8a 100644 --- a/libs/langchain/langchain/embeddings/bedrock.py +++ b/libs/langchain/langchain/embeddings/bedrock.py @@ -4,8 +4,8 @@ import os from functools import partial from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings class BedrockEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/cache.py b/libs/langchain/langchain/embeddings/cache.py index 7acdc287317..ddaa51277a2 100644 --- a/libs/langchain/langchain/embeddings/cache.py +++ b/libs/langchain/langchain/embeddings/cache.py @@ -14,8 +14,8 @@ import uuid from functools import partial from typing import Callable, List, Sequence, Union, cast -from langchain.embeddings.base import Embeddings from langchain.schema import BaseStore +from langchain.schema.embeddings import Embeddings from langchain.storage.encoder_backed import EncoderBackedStore NAMESPACE_UUID = uuid.UUID(int=1985) diff --git a/libs/langchain/langchain/embeddings/clarifai.py b/libs/langchain/langchain/embeddings/clarifai.py index 31649d368b0..8af1f6b749b 100644 --- a/libs/langchain/langchain/embeddings/clarifai.py +++ b/libs/langchain/langchain/embeddings/clarifai.py @@ -1,8 +1,8 @@ import logging from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/cohere.py b/libs/langchain/langchain/embeddings/cohere.py index 2377f416825..1c908876f9d 100644 --- a/libs/langchain/langchain/embeddings/cohere.py +++ b/libs/langchain/langchain/embeddings/cohere.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/embeddings/dashscope.py b/libs/langchain/langchain/embeddings/dashscope.py index 4c7b7f2b34c..c265e6b8e2e 100644 --- a/libs/langchain/langchain/embeddings/dashscope.py +++ b/libs/langchain/langchain/embeddings/dashscope.py @@ -18,8 +18,8 @@ from tenacity import ( wait_exponential, ) -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/deepinfra.py b/libs/langchain/langchain/embeddings/deepinfra.py index 77bfd35d61f..369b0445039 100644 --- a/libs/langchain/langchain/embeddings/deepinfra.py +++ b/libs/langchain/langchain/embeddings/deepinfra.py @@ -2,8 +2,8 @@ from typing import Any, Dict, List, Mapping, Optional import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env DEFAULT_MODEL_ID = "sentence-transformers/clip-ViT-B-32" diff --git a/libs/langchain/langchain/embeddings/edenai.py b/libs/langchain/langchain/embeddings/edenai.py index 9c22ed92fbb..0b3c9749f05 100644 --- a/libs/langchain/langchain/embeddings/edenai.py +++ b/libs/langchain/langchain/embeddings/edenai.py @@ -1,8 +1,8 @@ from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, Field, root_validator from langchain.requests import Requests +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/embeddings/elasticsearch.py b/libs/langchain/langchain/embeddings/elasticsearch.py index d7da2df07e2..412bac5be96 100644 --- a/libs/langchain/langchain/embeddings/elasticsearch.py +++ b/libs/langchain/langchain/embeddings/elasticsearch.py @@ -8,7 +8,7 @@ if TYPE_CHECKING: from elasticsearch import Elasticsearch from elasticsearch.client import MlClient -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings class ElasticsearchEmbeddings(Embeddings): diff --git a/libs/langchain/langchain/embeddings/embaas.py b/libs/langchain/langchain/embeddings/embaas.py index 011ed22ad53..530206c73ef 100644 --- a/libs/langchain/langchain/embeddings/embaas.py +++ b/libs/langchain/langchain/embeddings/embaas.py @@ -3,8 +3,8 @@ from typing import Any, Dict, List, Mapping, Optional import requests from typing_extensions import NotRequired, TypedDict -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env # Currently supported maximum batch size for embedding requests diff --git a/libs/langchain/langchain/embeddings/ernie.py b/libs/langchain/langchain/embeddings/ernie.py index 77ed2f76413..c69d7d9fc69 100644 --- a/libs/langchain/langchain/embeddings/ernie.py +++ b/libs/langchain/langchain/embeddings/ernie.py @@ -6,8 +6,8 @@ from typing import Dict, List, Optional import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/fake.py b/libs/langchain/langchain/embeddings/fake.py index 27a91142c8e..0e04879b463 100644 --- a/libs/langchain/langchain/embeddings/fake.py +++ b/libs/langchain/langchain/embeddings/fake.py @@ -3,8 +3,8 @@ from typing import List import numpy as np -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel +from langchain.schema.embeddings import Embeddings class FakeEmbeddings(Embeddings, BaseModel): diff --git a/libs/langchain/langchain/embeddings/google_palm.py b/libs/langchain/langchain/embeddings/google_palm.py index 825f60d8433..fcf83b36692 100644 --- a/libs/langchain/langchain/embeddings/google_palm.py +++ b/libs/langchain/langchain/embeddings/google_palm.py @@ -11,8 +11,8 @@ from tenacity import ( wait_exponential, ) -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/gpt4all.py b/libs/langchain/langchain/embeddings/gpt4all.py index 8ce636c5d73..318cef54152 100644 --- a/libs/langchain/langchain/embeddings/gpt4all.py +++ b/libs/langchain/langchain/embeddings/gpt4all.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings class GPT4AllEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/huggingface.py b/libs/langchain/langchain/embeddings/huggingface.py index a91d6437934..870c3965a8f 100644 --- a/libs/langchain/langchain/embeddings/huggingface.py +++ b/libs/langchain/langchain/embeddings/huggingface.py @@ -2,8 +2,8 @@ from typing import Any, Dict, List, Optional import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, Field +from langchain.schema.embeddings import Embeddings DEFAULT_MODEL_NAME = "sentence-transformers/all-mpnet-base-v2" DEFAULT_INSTRUCT_MODEL = "hkunlp/instructor-large" diff --git a/libs/langchain/langchain/embeddings/huggingface_hub.py b/libs/langchain/langchain/embeddings/huggingface_hub.py index e5204eb0efa..7bb52f3fa56 100644 --- a/libs/langchain/langchain/embeddings/huggingface_hub.py +++ b/libs/langchain/langchain/embeddings/huggingface_hub.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env DEFAULT_REPO_ID = "sentence-transformers/all-mpnet-base-v2" diff --git a/libs/langchain/langchain/embeddings/jina.py b/libs/langchain/langchain/embeddings/jina.py index 3d4a4797e6d..9008e2a5ce6 100644 --- a/libs/langchain/langchain/embeddings/jina.py +++ b/libs/langchain/langchain/embeddings/jina.py @@ -3,8 +3,8 @@ from typing import Any, Dict, List, Optional import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/embeddings/llamacpp.py b/libs/langchain/langchain/embeddings/llamacpp.py index 8c8b2628321..db3ec980934 100644 --- a/libs/langchain/langchain/embeddings/llamacpp.py +++ b/libs/langchain/langchain/embeddings/llamacpp.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, Field, root_validator +from langchain.schema.embeddings import Embeddings class LlamaCppEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/localai.py b/libs/langchain/langchain/embeddings/localai.py index ba7a82ebe56..9eb139c9628 100644 --- a/libs/langchain/langchain/embeddings/localai.py +++ b/libs/langchain/langchain/embeddings/localai.py @@ -24,8 +24,8 @@ from tenacity import ( wait_exponential, ) -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, Field, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env, get_pydantic_field_names logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/minimax.py b/libs/langchain/langchain/embeddings/minimax.py index 82402ca12b0..9b8035d904f 100644 --- a/libs/langchain/langchain/embeddings/minimax.py +++ b/libs/langchain/langchain/embeddings/minimax.py @@ -11,8 +11,8 @@ from tenacity import ( wait_exponential, ) -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/mlflow_gateway.py b/libs/langchain/langchain/embeddings/mlflow_gateway.py index 26c91cf7c7d..ad03ef30f24 100644 --- a/libs/langchain/langchain/embeddings/mlflow_gateway.py +++ b/libs/langchain/langchain/embeddings/mlflow_gateway.py @@ -2,8 +2,8 @@ from __future__ import annotations from typing import Any, Iterator, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel +from langchain.schema.embeddings import Embeddings def _chunk(texts: List[str], size: int) -> Iterator[List[str]]: diff --git a/libs/langchain/langchain/embeddings/modelscope_hub.py b/libs/langchain/langchain/embeddings/modelscope_hub.py index c652e007756..4dd27b6da61 100644 --- a/libs/langchain/langchain/embeddings/modelscope_hub.py +++ b/libs/langchain/langchain/embeddings/modelscope_hub.py @@ -1,7 +1,7 @@ from typing import Any, List, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra +from langchain.schema.embeddings import Embeddings class ModelScopeEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/mosaicml.py b/libs/langchain/langchain/embeddings/mosaicml.py index 6a3c3e11c04..d7eb9b1526b 100644 --- a/libs/langchain/langchain/embeddings/mosaicml.py +++ b/libs/langchain/langchain/embeddings/mosaicml.py @@ -2,8 +2,8 @@ from typing import Any, Dict, List, Mapping, Optional, Tuple import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/embeddings/nlpcloud.py b/libs/langchain/langchain/embeddings/nlpcloud.py index ab5372d9ead..2d558fda2a7 100644 --- a/libs/langchain/langchain/embeddings/nlpcloud.py +++ b/libs/langchain/langchain/embeddings/nlpcloud.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/embeddings/octoai_embeddings.py b/libs/langchain/langchain/embeddings/octoai_embeddings.py index dd98f3b3354..0a39bb790e5 100644 --- a/libs/langchain/langchain/embeddings/octoai_embeddings.py +++ b/libs/langchain/langchain/embeddings/octoai_embeddings.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List, Mapping, Optional -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, Field, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env DEFAULT_EMBED_INSTRUCTION = "Represent this input: " diff --git a/libs/langchain/langchain/embeddings/ollama.py b/libs/langchain/langchain/embeddings/ollama.py index c610cabdd4a..9b723d06cfd 100644 --- a/libs/langchain/langchain/embeddings/ollama.py +++ b/libs/langchain/langchain/embeddings/ollama.py @@ -2,8 +2,8 @@ from typing import Any, Dict, List, Mapping, Optional import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra +from langchain.schema.embeddings import Embeddings class OllamaEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/openai.py b/libs/langchain/langchain/embeddings/openai.py index 6ca9ed5dcf2..16e7e0f306a 100644 --- a/libs/langchain/langchain/embeddings/openai.py +++ b/libs/langchain/langchain/embeddings/openai.py @@ -25,8 +25,8 @@ from tenacity import ( wait_exponential, ) -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, Field, root_validator +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env, get_pydantic_field_names logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/embeddings/sagemaker_endpoint.py b/libs/langchain/langchain/embeddings/sagemaker_endpoint.py index ee14eca27af..f3a72ccb375 100644 --- a/libs/langchain/langchain/embeddings/sagemaker_endpoint.py +++ b/libs/langchain/langchain/embeddings/sagemaker_endpoint.py @@ -1,8 +1,8 @@ from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings from langchain.llms.sagemaker_endpoint import ContentHandlerBase from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings class EmbeddingsContentHandler(ContentHandlerBase[List[str], List[List[float]]]): diff --git a/libs/langchain/langchain/embeddings/self_hosted.py b/libs/langchain/langchain/embeddings/self_hosted.py index e83ed9e8995..1a52d916ae0 100644 --- a/libs/langchain/langchain/embeddings/self_hosted.py +++ b/libs/langchain/langchain/embeddings/self_hosted.py @@ -1,8 +1,8 @@ from typing import Any, Callable, List -from langchain.embeddings.base import Embeddings from langchain.llms import SelfHostedPipeline from langchain.pydantic_v1 import Extra +from langchain.schema.embeddings import Embeddings def _embed_documents(pipeline: Any, *args: Any, **kwargs: Any) -> List[List[float]]: diff --git a/libs/langchain/langchain/embeddings/spacy_embeddings.py b/libs/langchain/langchain/embeddings/spacy_embeddings.py index 06a6a0b5dc6..f5cd45f19d3 100644 --- a/libs/langchain/langchain/embeddings/spacy_embeddings.py +++ b/libs/langchain/langchain/embeddings/spacy_embeddings.py @@ -1,8 +1,8 @@ import importlib.util from typing import Any, Dict, List -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra, root_validator +from langchain.schema.embeddings import Embeddings class SpacyEmbeddings(BaseModel, Embeddings): diff --git a/libs/langchain/langchain/embeddings/tensorflow_hub.py b/libs/langchain/langchain/embeddings/tensorflow_hub.py index 2048163ba70..0bb9bcdc801 100644 --- a/libs/langchain/langchain/embeddings/tensorflow_hub.py +++ b/libs/langchain/langchain/embeddings/tensorflow_hub.py @@ -1,7 +1,7 @@ from typing import Any, List -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseModel, Extra +from langchain.schema.embeddings import Embeddings DEFAULT_MODEL_URL = "https://tfhub.dev/google/universal-sentence-encoder-multilingual/3" diff --git a/libs/langchain/langchain/embeddings/vertexai.py b/libs/langchain/langchain/embeddings/vertexai.py index bb1750c2855..16ac1f36cbb 100644 --- a/libs/langchain/langchain/embeddings/vertexai.py +++ b/libs/langchain/langchain/embeddings/vertexai.py @@ -1,8 +1,8 @@ from typing import Dict, List -from langchain.embeddings.base import Embeddings from langchain.llms.vertexai import _VertexAICommon from langchain.pydantic_v1 import root_validator +from langchain.schema.embeddings import Embeddings from langchain.utilities.vertexai import raise_vertex_import_error diff --git a/libs/langchain/langchain/embeddings/xinference.py b/libs/langchain/langchain/embeddings/xinference.py index 1609f2b537d..573dbd868bc 100644 --- a/libs/langchain/langchain/embeddings/xinference.py +++ b/libs/langchain/langchain/embeddings/xinference.py @@ -1,7 +1,7 @@ """Wrapper around Xinference embedding models.""" from typing import Any, List, Optional -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings class XinferenceEmbeddings(Embeddings): diff --git a/libs/langchain/langchain/evaluation/embedding_distance/base.py b/libs/langchain/langchain/evaluation/embedding_distance/base.py index 36fe252b824..f4a88b2cd49 100644 --- a/libs/langchain/langchain/evaluation/embedding_distance/base.py +++ b/libs/langchain/langchain/evaluation/embedding_distance/base.py @@ -10,11 +10,11 @@ from langchain.callbacks.manager import ( Callbacks, ) from langchain.chains.base import Chain -from langchain.embeddings.base import Embeddings from langchain.embeddings.openai import OpenAIEmbeddings from langchain.evaluation.schema import PairwiseStringEvaluator, StringEvaluator from langchain.pydantic_v1 import Field, root_validator from langchain.schema import RUN_KEY +from langchain.schema.embeddings import Embeddings from langchain.utils.math import cosine_similarity diff --git a/libs/langchain/langchain/indexes/vectorstore.py b/libs/langchain/langchain/indexes/vectorstore.py index f812754f110..5cae05c711f 100644 --- a/libs/langchain/langchain/indexes/vectorstore.py +++ b/libs/langchain/langchain/indexes/vectorstore.py @@ -3,11 +3,11 @@ from typing import Any, Dict, List, Optional, Type from langchain.chains.qa_with_sources.retrieval import RetrievalQAWithSourcesChain from langchain.chains.retrieval_qa.base import RetrievalQA from langchain.document_loaders.base import BaseLoader -from langchain.embeddings.base import Embeddings from langchain.embeddings.openai import OpenAIEmbeddings from langchain.llms.openai import OpenAI from langchain.pydantic_v1 import BaseModel, Extra, Field from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.schema.language_model import BaseLanguageModel from langchain.text_splitter import RecursiveCharacterTextSplitter, TextSplitter from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/prompts/example_selector/semantic_similarity.py b/libs/langchain/langchain/prompts/example_selector/semantic_similarity.py index 2dbd4a7d4d4..3409c1896b3 100644 --- a/libs/langchain/langchain/prompts/example_selector/semantic_similarity.py +++ b/libs/langchain/langchain/prompts/example_selector/semantic_similarity.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Type -from langchain.embeddings.base import Embeddings from langchain.prompts.example_selector.base import BaseExampleSelector from langchain.pydantic_v1 import BaseModel, Extra +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/retrievers/docarray.py b/libs/langchain/langchain/retrievers/docarray.py index 7e1796cc992..02c4f9fb3a8 100644 --- a/libs/langchain/langchain/retrievers/docarray.py +++ b/libs/langchain/langchain/retrievers/docarray.py @@ -4,8 +4,8 @@ from typing import Any, Dict, List, Optional, Union import numpy as np from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.embeddings.base import Embeddings from langchain.schema import BaseRetriever, Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/retrievers/document_compressors/embeddings_filter.py b/libs/langchain/langchain/retrievers/document_compressors/embeddings_filter.py index 115eb941fa3..3547b7d6430 100644 --- a/libs/langchain/langchain/retrievers/document_compressors/embeddings_filter.py +++ b/libs/langchain/langchain/retrievers/document_compressors/embeddings_filter.py @@ -7,12 +7,12 @@ from langchain.document_transformers.embeddings_redundant_filter import ( _get_embeddings_from_stateful_docs, get_stateful_documents, ) -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import root_validator from langchain.retrievers.document_compressors.base import ( BaseDocumentCompressor, ) from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.utils.math import cosine_similarity diff --git a/libs/langchain/langchain/retrievers/knn.py b/libs/langchain/langchain/retrievers/knn.py index 7bdaf556536..e8013972e1d 100644 --- a/libs/langchain/langchain/retrievers/knn.py +++ b/libs/langchain/langchain/retrievers/knn.py @@ -10,8 +10,8 @@ from typing import Any, List, Optional import numpy as np from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.embeddings.base import Embeddings from langchain.schema import BaseRetriever, Document +from langchain.schema.embeddings import Embeddings def create_index(contexts: List[str], embeddings: Embeddings) -> np.ndarray: diff --git a/libs/langchain/langchain/retrievers/milvus.py b/libs/langchain/langchain/retrievers/milvus.py index c749152d53e..eadc7d81236 100644 --- a/libs/langchain/langchain/retrievers/milvus.py +++ b/libs/langchain/langchain/retrievers/milvus.py @@ -3,9 +3,9 @@ import warnings from typing import Any, Dict, List, Optional from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import root_validator from langchain.schema import BaseRetriever, Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.milvus import Milvus # TODO: Update to MilvusClient + Hybrid Search when available diff --git a/libs/langchain/langchain/retrievers/pinecone_hybrid_search.py b/libs/langchain/langchain/retrievers/pinecone_hybrid_search.py index 5791aedf7cc..068a5a53c19 100644 --- a/libs/langchain/langchain/retrievers/pinecone_hybrid_search.py +++ b/libs/langchain/langchain/retrievers/pinecone_hybrid_search.py @@ -4,9 +4,9 @@ import hashlib from typing import Any, Dict, List, Optional from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import Extra, root_validator from langchain.schema import BaseRetriever, Document +from langchain.schema.embeddings import Embeddings def hash_text(text: str) -> str: diff --git a/libs/langchain/langchain/retrievers/svm.py b/libs/langchain/langchain/retrievers/svm.py index 7c30fd5f0cc..f7faabfca76 100644 --- a/libs/langchain/langchain/retrievers/svm.py +++ b/libs/langchain/langchain/retrievers/svm.py @@ -6,8 +6,8 @@ from typing import Any, Iterable, List, Optional import numpy as np from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.embeddings.base import Embeddings from langchain.schema import BaseRetriever, Document +from langchain.schema.embeddings import Embeddings def create_index(contexts: List[str], embeddings: Embeddings) -> np.ndarray: diff --git a/libs/langchain/langchain/retrievers/zilliz.py b/libs/langchain/langchain/retrievers/zilliz.py index 1da5a6b36b2..5527b0faf6d 100644 --- a/libs/langchain/langchain/retrievers/zilliz.py +++ b/libs/langchain/langchain/retrievers/zilliz.py @@ -2,9 +2,9 @@ import warnings from typing import Any, Dict, List, Optional from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import root_validator from langchain.schema import BaseRetriever, Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.zilliz import Zilliz # TODO: Update to ZillizClient + Hybrid Search when available diff --git a/libs/langchain/langchain/embeddings/base.py b/libs/langchain/langchain/schema/embeddings.py similarity index 100% rename from libs/langchain/langchain/embeddings/base.py rename to libs/langchain/langchain/schema/embeddings.py diff --git a/libs/langchain/langchain/smith/evaluation/config.py b/libs/langchain/langchain/smith/evaluation/config.py index 3f8224d7c18..62cade17fa3 100644 --- a/libs/langchain/langchain/smith/evaluation/config.py +++ b/libs/langchain/langchain/smith/evaluation/config.py @@ -4,7 +4,6 @@ from typing import Any, Dict, List, Optional, Union from langsmith import RunEvaluator -from langchain.embeddings.base import Embeddings from langchain.evaluation.criteria.eval_chain import CRITERIA_TYPE from langchain.evaluation.embedding_distance.base import ( EmbeddingDistance as EmbeddingDistanceEnum, @@ -14,6 +13,7 @@ from langchain.evaluation.string_distance.base import ( StringDistance as StringDistanceEnum, ) from langchain.pydantic_v1 import BaseModel, Field +from langchain.schema.embeddings import Embeddings from langchain.schema.language_model import BaseLanguageModel from langchain.schema.prompt_template import BasePromptTemplate diff --git a/libs/langchain/langchain/vectorstores/alibabacloud_opensearch.py b/libs/langchain/langchain/vectorstores/alibabacloud_opensearch.py index 672994bc384..f7fba6c06e7 100644 --- a/libs/langchain/langchain/vectorstores/alibabacloud_opensearch.py +++ b/libs/langchain/langchain/vectorstores/alibabacloud_opensearch.py @@ -4,8 +4,8 @@ import numbers from hashlib import sha1 from typing import Any, Dict, Iterable, List, Optional, Tuple -from langchain.embeddings.base import Embeddings from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/analyticdb.py b/libs/langchain/langchain/vectorstores/analyticdb.py index 22e8dd18a9c..c3b438f0590 100644 --- a/libs/langchain/langchain/vectorstores/analyticdb.py +++ b/libs/langchain/langchain/vectorstores/analyticdb.py @@ -13,7 +13,7 @@ except ImportError: from sqlalchemy.ext.declarative import declarative_base from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/annoy.py b/libs/langchain/langchain/vectorstores/annoy.py index 233b574f01d..28d7a295739 100644 --- a/libs/langchain/langchain/vectorstores/annoy.py +++ b/libs/langchain/langchain/vectorstores/annoy.py @@ -12,7 +12,7 @@ import numpy as np from langchain.docstore.base import Docstore from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/atlas.py b/libs/langchain/langchain/vectorstores/atlas.py index bdc86e17ecf..30231818306 100644 --- a/libs/langchain/langchain/vectorstores/atlas.py +++ b/libs/langchain/langchain/vectorstores/atlas.py @@ -7,7 +7,7 @@ from typing import Any, Iterable, List, Optional, Type import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/awadb.py b/libs/langchain/langchain/vectorstores/awadb.py index 7f5daf1710d..2a60ee9a584 100644 --- a/libs/langchain/langchain/vectorstores/awadb.py +++ b/libs/langchain/langchain/vectorstores/awadb.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Set, Tupl import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/azuresearch.py b/libs/langchain/langchain/vectorstores/azuresearch.py index 2fad466adab..da71a81bfb6 100644 --- a/libs/langchain/langchain/vectorstores/azuresearch.py +++ b/libs/langchain/langchain/vectorstores/azuresearch.py @@ -23,9 +23,9 @@ from langchain.callbacks.manager import ( CallbackManagerForRetrieverRun, ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import root_validator from langchain.schema import BaseRetriever +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/bageldb.py b/libs/langchain/langchain/vectorstores/bageldb.py index 5b4590933cc..e8869a41b36 100644 --- a/libs/langchain/langchain/vectorstores/bageldb.py +++ b/libs/langchain/langchain/vectorstores/bageldb.py @@ -19,7 +19,7 @@ if TYPE_CHECKING: from bagel.api.types import ID, OneOrMany, Where, WhereDocument from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import xor_args from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/base.py b/libs/langchain/langchain/vectorstores/base.py index 2c9ce74ee1a..2db598837a2 100644 --- a/libs/langchain/langchain/vectorstores/base.py +++ b/libs/langchain/langchain/vectorstores/base.py @@ -25,9 +25,9 @@ from langchain.callbacks.manager import ( CallbackManagerForRetrieverRun, ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import Field, root_validator from langchain.schema import BaseRetriever +from langchain.schema.embeddings import Embeddings logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/cassandra.py b/libs/langchain/langchain/vectorstores/cassandra.py index 083f8b90f6f..c8275ee97c7 100644 --- a/libs/langchain/langchain/vectorstores/cassandra.py +++ b/libs/langchain/langchain/vectorstores/cassandra.py @@ -21,7 +21,7 @@ if typing.TYPE_CHECKING: from cassandra.cluster import Session from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/chroma.py b/libs/langchain/langchain/vectorstores/chroma.py index 7994e2326db..faa64968dd1 100644 --- a/libs/langchain/langchain/vectorstores/chroma.py +++ b/libs/langchain/langchain/vectorstores/chroma.py @@ -17,7 +17,7 @@ from typing import ( import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import xor_args from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/clarifai.py b/libs/langchain/langchain/vectorstores/clarifai.py index 51d01118fd4..0b2cdfeeca2 100644 --- a/libs/langchain/langchain/vectorstores/clarifai.py +++ b/libs/langchain/langchain/vectorstores/clarifai.py @@ -9,7 +9,7 @@ from typing import Any, Iterable, List, Optional, Tuple import requests from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/clickhouse.py b/libs/langchain/langchain/vectorstores/clickhouse.py index 68de429633a..95645448314 100644 --- a/libs/langchain/langchain/vectorstores/clickhouse.py +++ b/libs/langchain/langchain/vectorstores/clickhouse.py @@ -7,8 +7,8 @@ from threading import Thread from typing import Any, Dict, Iterable, List, Optional, Tuple, Union from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseSettings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/dashvector.py b/libs/langchain/langchain/vectorstores/dashvector.py index f3559384ace..d07c6732b84 100644 --- a/libs/langchain/langchain/vectorstores/dashvector.py +++ b/libs/langchain/langchain/vectorstores/dashvector.py @@ -13,7 +13,7 @@ from typing import ( import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_env from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/deeplake.py b/libs/langchain/langchain/vectorstores/deeplake.py index c5425294e87..6b45d8d6154 100644 --- a/libs/langchain/langchain/vectorstores/deeplake.py +++ b/libs/langchain/langchain/vectorstores/deeplake.py @@ -15,7 +15,7 @@ except ImportError: _DEEPLAKE_INSTALLED = False from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/dingo.py b/libs/langchain/langchain/vectorstores/dingo.py index 8527f8a31b6..85776878cd1 100644 --- a/libs/langchain/langchain/vectorstores/dingo.py +++ b/libs/langchain/langchain/vectorstores/dingo.py @@ -7,7 +7,7 @@ from typing import Any, Iterable, List, Optional, Tuple import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/docarray/base.py b/libs/langchain/langchain/vectorstores/docarray/base.py index d3b048610b8..02cbc3c2b84 100644 --- a/libs/langchain/langchain/vectorstores/docarray/base.py +++ b/libs/langchain/langchain/vectorstores/docarray/base.py @@ -3,9 +3,9 @@ from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Tuple, Type import numpy as np -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import Field from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/docarray/hnsw.py b/libs/langchain/langchain/vectorstores/docarray/hnsw.py index e1fdc6f070f..b8d7a44475a 100644 --- a/libs/langchain/langchain/vectorstores/docarray/hnsw.py +++ b/libs/langchain/langchain/vectorstores/docarray/hnsw.py @@ -2,7 +2,7 @@ from __future__ import annotations from typing import Any, List, Literal, Optional -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.docarray.base import ( DocArrayIndex, _check_docarray_import, diff --git a/libs/langchain/langchain/vectorstores/docarray/in_memory.py b/libs/langchain/langchain/vectorstores/docarray/in_memory.py index 9c3b3dcf368..43602b2acaa 100644 --- a/libs/langchain/langchain/vectorstores/docarray/in_memory.py +++ b/libs/langchain/langchain/vectorstores/docarray/in_memory.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Dict, List, Literal, Optional -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.docarray.base import ( DocArrayIndex, _check_docarray_import, diff --git a/libs/langchain/langchain/vectorstores/elastic_vector_search.py b/libs/langchain/langchain/vectorstores/elastic_vector_search.py index 2ac7bbd71dc..6db44729503 100644 --- a/libs/langchain/langchain/vectorstores/elastic_vector_search.py +++ b/libs/langchain/langchain/vectorstores/elastic_vector_search.py @@ -17,7 +17,7 @@ from typing import ( from langchain._api import deprecated from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/elasticsearch.py b/libs/langchain/langchain/vectorstores/elasticsearch.py index d2dd7f76804..7a47dfbd40f 100644 --- a/libs/langchain/langchain/vectorstores/elasticsearch.py +++ b/libs/langchain/langchain/vectorstores/elasticsearch.py @@ -15,7 +15,7 @@ from typing import ( ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/epsilla.py b/libs/langchain/langchain/vectorstores/epsilla.py index 11609735bb2..380d8dffcab 100644 --- a/libs/langchain/langchain/vectorstores/epsilla.py +++ b/libs/langchain/langchain/vectorstores/epsilla.py @@ -6,7 +6,7 @@ import uuid from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Type from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/faiss.py b/libs/langchain/langchain/vectorstores/faiss.py index d3599f3f147..b796b8b9037 100644 --- a/libs/langchain/langchain/vectorstores/faiss.py +++ b/libs/langchain/langchain/vectorstores/faiss.py @@ -22,7 +22,7 @@ import numpy as np from langchain.docstore.base import AddableMixin, Docstore from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import DistanceStrategy, maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/hologres.py b/libs/langchain/langchain/vectorstores/hologres.py index c387612c846..b633e517c15 100644 --- a/libs/langchain/langchain/vectorstores/hologres.py +++ b/libs/langchain/langchain/vectorstores/hologres.py @@ -6,7 +6,7 @@ import uuid from typing import Any, Dict, Iterable, List, Optional, Tuple, Type from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/lancedb.py b/libs/langchain/langchain/vectorstores/lancedb.py index 1a166d4e12f..a06b93208b8 100644 --- a/libs/langchain/langchain/vectorstores/lancedb.py +++ b/libs/langchain/langchain/vectorstores/lancedb.py @@ -4,7 +4,7 @@ import uuid from typing import Any, Iterable, List, Optional from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/marqo.py b/libs/langchain/langchain/vectorstores/marqo.py index 43f7172071a..060695af85f 100644 --- a/libs/langchain/langchain/vectorstores/marqo.py +++ b/libs/langchain/langchain/vectorstores/marqo.py @@ -16,7 +16,7 @@ from typing import ( ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/matching_engine.py b/libs/langchain/langchain/vectorstores/matching_engine.py index 2bf27af6479..cf740d75688 100644 --- a/libs/langchain/langchain/vectorstores/matching_engine.py +++ b/libs/langchain/langchain/vectorstores/matching_engine.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Type from langchain.docstore.document import Document from langchain.embeddings import TensorflowHubEmbeddings -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/meilisearch.py b/libs/langchain/langchain/vectorstores/meilisearch.py index 43ab448ad18..0f6ae827c47 100644 --- a/libs/langchain/langchain/vectorstores/meilisearch.py +++ b/libs/langchain/langchain/vectorstores/meilisearch.py @@ -4,7 +4,7 @@ import uuid from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple, Type from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/milvus.py b/libs/langchain/langchain/vectorstores/milvus.py index 5ae88f893ec..aac290ebd13 100644 --- a/libs/langchain/langchain/vectorstores/milvus.py +++ b/libs/langchain/langchain/vectorstores/milvus.py @@ -7,7 +7,7 @@ from uuid import uuid4 import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/mongodb_atlas.py b/libs/langchain/langchain/vectorstores/mongodb_atlas.py index 3476c0eb5a0..b3f15a1dee4 100644 --- a/libs/langchain/langchain/vectorstores/mongodb_atlas.py +++ b/libs/langchain/langchain/vectorstores/mongodb_atlas.py @@ -17,7 +17,7 @@ from typing import ( import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/myscale.py b/libs/langchain/langchain/vectorstores/myscale.py index 81812550c74..6b6e208a364 100644 --- a/libs/langchain/langchain/vectorstores/myscale.py +++ b/libs/langchain/langchain/vectorstores/myscale.py @@ -7,8 +7,8 @@ from threading import Thread from typing import Any, Dict, Iterable, List, Optional, Tuple from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseSettings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/neo4j_vector.py b/libs/langchain/langchain/vectorstores/neo4j_vector.py index 06f262eae75..59d88b5a024 100644 --- a/libs/langchain/langchain/vectorstores/neo4j_vector.py +++ b/libs/langchain/langchain/vectorstores/neo4j_vector.py @@ -15,7 +15,7 @@ from typing import ( ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_env from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/nucliadb.py b/libs/langchain/langchain/vectorstores/nucliadb.py index 8ba9d4454c4..6f9513a66c6 100644 --- a/libs/langchain/langchain/vectorstores/nucliadb.py +++ b/libs/langchain/langchain/vectorstores/nucliadb.py @@ -1,8 +1,8 @@ import os from typing import Any, Dict, Iterable, List, Optional, Type -from langchain.embeddings.base import Embeddings from langchain.schema.document import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VST, VectorStore FIELD_TYPES = { diff --git a/libs/langchain/langchain/vectorstores/opensearch_vector_search.py b/libs/langchain/langchain/vectorstores/opensearch_vector_search.py index 319e98d92a2..6de74de297f 100644 --- a/libs/langchain/langchain/vectorstores/opensearch_vector_search.py +++ b/libs/langchain/langchain/vectorstores/opensearch_vector_search.py @@ -6,8 +6,8 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple import numpy as np -from langchain.embeddings.base import Embeddings from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/pgembedding.py b/libs/langchain/langchain/vectorstores/pgembedding.py index ecdb20a8f51..bb1bd2a4cec 100644 --- a/libs/langchain/langchain/vectorstores/pgembedding.py +++ b/libs/langchain/langchain/vectorstores/pgembedding.py @@ -10,7 +10,7 @@ from sqlalchemy.dialects.postgresql import JSON, UUID from sqlalchemy.orm import Session, declarative_base, relationship from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/pgvector.py b/libs/langchain/langchain/vectorstores/pgvector.py index 96be6c2568f..7091a7e8a3d 100644 --- a/libs/langchain/langchain/vectorstores/pgvector.py +++ b/libs/langchain/langchain/vectorstores/pgvector.py @@ -26,7 +26,7 @@ from sqlalchemy.dialects.postgresql import UUID from sqlalchemy.orm import Session, declarative_base from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/pinecone.py b/libs/langchain/langchain/vectorstores/pinecone.py index e84549f5ebb..25e0f161f53 100644 --- a/libs/langchain/langchain/vectorstores/pinecone.py +++ b/libs/langchain/langchain/vectorstores/pinecone.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Callable, Iterable, List, Optional, Tuple import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils.iter import batch_iterate from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import DistanceStrategy, maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/qdrant.py b/libs/langchain/langchain/vectorstores/qdrant.py index 76608b5206f..7326269ec0e 100644 --- a/libs/langchain/langchain/vectorstores/qdrant.py +++ b/libs/langchain/langchain/vectorstores/qdrant.py @@ -25,7 +25,7 @@ from typing import ( import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/redis/base.py b/libs/langchain/langchain/vectorstores/redis/base.py index dbca5c36b7e..3e4c31dd576 100644 --- a/libs/langchain/langchain/vectorstores/redis/base.py +++ b/libs/langchain/langchain/vectorstores/redis/base.py @@ -29,7 +29,7 @@ from langchain.callbacks.manager import ( CallbackManagerForRetrieverRun, ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utilities.redis import ( _array_to_buffer, _buffer_to_array, diff --git a/libs/langchain/langchain/vectorstores/rocksetdb.py b/libs/langchain/langchain/vectorstores/rocksetdb.py index 67447377418..d825453e881 100644 --- a/libs/langchain/langchain/vectorstores/rocksetdb.py +++ b/libs/langchain/langchain/vectorstores/rocksetdb.py @@ -5,7 +5,7 @@ from enum import Enum from typing import Any, Iterable, List, Optional, Tuple from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/scann.py b/libs/langchain/langchain/vectorstores/scann.py index a7a80e7a877..01608a89de6 100644 --- a/libs/langchain/langchain/vectorstores/scann.py +++ b/libs/langchain/langchain/vectorstores/scann.py @@ -11,7 +11,7 @@ import numpy as np from langchain.docstore.base import AddableMixin, Docstore from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/singlestoredb.py b/libs/langchain/langchain/vectorstores/singlestoredb.py index 657f8093cc8..761658ff43a 100644 --- a/libs/langchain/langchain/vectorstores/singlestoredb.py +++ b/libs/langchain/langchain/vectorstores/singlestoredb.py @@ -20,7 +20,7 @@ from langchain.callbacks.manager import ( CallbackManagerForRetrieverRun, ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore, VectorStoreRetriever from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/sklearn.py b/libs/langchain/langchain/vectorstores/sklearn.py index d4f49c96589..eb270279d3b 100644 --- a/libs/langchain/langchain/vectorstores/sklearn.py +++ b/libs/langchain/langchain/vectorstores/sklearn.py @@ -11,7 +11,7 @@ from typing import Any, Dict, Iterable, List, Literal, Optional, Tuple, Type from uuid import uuid4 from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import guard_import from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/sqlitevss.py b/libs/langchain/langchain/vectorstores/sqlitevss.py index 93b1d676494..8e0e57ac9ea 100644 --- a/libs/langchain/langchain/vectorstores/sqlitevss.py +++ b/libs/langchain/langchain/vectorstores/sqlitevss.py @@ -14,7 +14,7 @@ from typing import ( ) from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/starrocks.py b/libs/langchain/langchain/vectorstores/starrocks.py index a172d1bbb6d..fd0abe50738 100644 --- a/libs/langchain/langchain/vectorstores/starrocks.py +++ b/libs/langchain/langchain/vectorstores/starrocks.py @@ -7,8 +7,8 @@ from threading import Thread from typing import Any, Dict, Iterable, List, Optional, Tuple from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import BaseSettings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/supabase.py b/libs/langchain/langchain/vectorstores/supabase.py index 71b7c2cc8b4..437f304da62 100644 --- a/libs/langchain/langchain/vectorstores/supabase.py +++ b/libs/langchain/langchain/vectorstores/supabase.py @@ -17,7 +17,7 @@ from typing import ( import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/tair.py b/libs/langchain/langchain/vectorstores/tair.py index e55ea42834e..6efeae34d0c 100644 --- a/libs/langchain/langchain/vectorstores/tair.py +++ b/libs/langchain/langchain/vectorstores/tair.py @@ -6,7 +6,7 @@ import uuid from typing import Any, Iterable, List, Optional, Type from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/tencentvectordb.py b/libs/langchain/langchain/vectorstores/tencentvectordb.py index a4660c564c2..bd6db87c9bc 100644 --- a/libs/langchain/langchain/vectorstores/tencentvectordb.py +++ b/libs/langchain/langchain/vectorstores/tencentvectordb.py @@ -9,7 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import guard_import from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/tigris.py b/libs/langchain/langchain/vectorstores/tigris.py index 6abbfe6762f..aa574e031ad 100644 --- a/libs/langchain/langchain/vectorstores/tigris.py +++ b/libs/langchain/langchain/vectorstores/tigris.py @@ -3,8 +3,8 @@ from __future__ import annotations import itertools from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Tuple -from langchain.embeddings.base import Embeddings from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores import VectorStore if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/typesense.py b/libs/langchain/langchain/vectorstores/typesense.py index cdaaa5155e9..5ef4627f504 100644 --- a/libs/langchain/langchain/vectorstores/typesense.py +++ b/libs/langchain/langchain/vectorstores/typesense.py @@ -4,7 +4,7 @@ import uuid from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Tuple, Union from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_env from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/usearch.py b/libs/langchain/langchain/vectorstores/usearch.py index cb4e8c6eb26..946bcd40e4e 100644 --- a/libs/langchain/langchain/vectorstores/usearch.py +++ b/libs/langchain/langchain/vectorstores/usearch.py @@ -7,7 +7,7 @@ import numpy as np from langchain.docstore.base import AddableMixin, Docstore from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/vearch.py b/libs/langchain/langchain/vectorstores/vearch.py index 99706d2e983..0dbbb48ca7b 100644 --- a/libs/langchain/langchain/vectorstores/vearch.py +++ b/libs/langchain/langchain/vectorstores/vearch.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple, Ty import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/vectara.py b/libs/langchain/langchain/vectorstores/vectara.py index 603410842a8..735fd915e53 100644 --- a/libs/langchain/langchain/vectorstores/vectara.py +++ b/libs/langchain/langchain/vectorstores/vectara.py @@ -8,9 +8,9 @@ from typing import Any, Iterable, List, Optional, Tuple, Type import requests -from langchain.embeddings.base import Embeddings from langchain.pydantic_v1 import Field from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore, VectorStoreRetriever logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/weaviate.py b/libs/langchain/langchain/vectorstores/weaviate.py index 3f965212241..d2e4de01185 100644 --- a/libs/langchain/langchain/vectorstores/weaviate.py +++ b/libs/langchain/langchain/vectorstores/weaviate.py @@ -7,7 +7,7 @@ from uuid import uuid4 import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.utils import get_from_dict_or_env from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/xata.py b/libs/langchain/langchain/vectorstores/xata.py index 441fee825d8..34076a90aaf 100644 --- a/libs/langchain/langchain/vectorstores/xata.py +++ b/libs/langchain/langchain/vectorstores/xata.py @@ -5,7 +5,7 @@ from itertools import repeat from typing import Any, Dict, Iterable, List, Optional, Tuple, Type from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore diff --git a/libs/langchain/langchain/vectorstores/zep.py b/libs/langchain/langchain/vectorstores/zep.py index 98593ec91aa..28783ea4316 100644 --- a/libs/langchain/langchain/vectorstores/zep.py +++ b/libs/langchain/langchain/vectorstores/zep.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple import numpy as np from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/zilliz.py b/libs/langchain/langchain/vectorstores/zilliz.py index 9e592664e26..95757d20a67 100644 --- a/libs/langchain/langchain/vectorstores/zilliz.py +++ b/libs/langchain/langchain/vectorstores/zilliz.py @@ -3,7 +3,7 @@ from __future__ import annotations import logging from typing import Any, Dict, List, Optional -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.milvus import Milvus logger = logging.getLogger(__name__) diff --git a/libs/langchain/tests/integration_tests/cache/test_redis_cache.py b/libs/langchain/tests/integration_tests/cache/test_redis_cache.py index 77b019eff0b..e78aedd204f 100644 --- a/libs/langchain/tests/integration_tests/cache/test_redis_cache.py +++ b/libs/langchain/tests/integration_tests/cache/test_redis_cache.py @@ -6,8 +6,8 @@ import pytest import langchain from langchain.cache import RedisCache, RedisSemanticCache -from langchain.embeddings.base import Embeddings from langchain.schema import Generation, LLMResult +from langchain.schema.embeddings import Embeddings from tests.integration_tests.vectorstores.fake_embeddings import ( ConsistentFakeEmbeddings, FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/fake_embeddings.py b/libs/langchain/tests/integration_tests/vectorstores/fake_embeddings.py index d202813f20f..87ea1edc6a0 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/fake_embeddings.py +++ b/libs/langchain/tests/integration_tests/vectorstores/fake_embeddings.py @@ -2,7 +2,7 @@ import math from typing import List -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings fake_texts = ["foo", "bar", "baz"] diff --git a/libs/langchain/tests/integration_tests/vectorstores/qdrant/test_embedding_interface.py b/libs/langchain/tests/integration_tests/vectorstores/qdrant/test_embedding_interface.py index 9efc4d0c139..76fb6686555 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/qdrant/test_embedding_interface.py +++ b/libs/langchain/tests/integration_tests/vectorstores/qdrant/test_embedding_interface.py @@ -3,7 +3,7 @@ from typing import Callable, Optional import pytest -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores import Qdrant from tests.integration_tests.vectorstores.fake_embeddings import ( ConsistentFakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_mongodb_atlas.py b/libs/langchain/tests/integration_tests/vectorstores/test_mongodb_atlas.py index c57b1110182..4753dc24f26 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_mongodb_atlas.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_mongodb_atlas.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any import pytest from langchain.docstore.document import Document -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.mongodb_atlas import MongoDBAtlasVectorSearch if TYPE_CHECKING: diff --git a/libs/langchain/tests/unit_tests/chains/test_hyde.py b/libs/langchain/tests/unit_tests/chains/test_hyde.py index c7eeb32e621..c4becfde95d 100644 --- a/libs/langchain/tests/unit_tests/chains/test_hyde.py +++ b/libs/langchain/tests/unit_tests/chains/test_hyde.py @@ -9,9 +9,9 @@ from langchain.callbacks.manager import ( ) from langchain.chains.hyde.base import HypotheticalDocumentEmbedder from langchain.chains.hyde.prompts import PROMPT_MAP -from langchain.embeddings.base import Embeddings from langchain.llms.base import BaseLLM from langchain.schema import Generation, LLMResult +from langchain.schema.embeddings import Embeddings class FakeEmbeddings(Embeddings): diff --git a/libs/langchain/tests/unit_tests/embeddings/test_caching.py b/libs/langchain/tests/unit_tests/embeddings/test_caching.py index 0b2a1096db7..bcdded666d3 100644 --- a/libs/langchain/tests/unit_tests/embeddings/test_caching.py +++ b/libs/langchain/tests/unit_tests/embeddings/test_caching.py @@ -4,7 +4,7 @@ from typing import List import pytest from langchain.embeddings import CacheBackedEmbeddings -from langchain.embeddings.base import Embeddings +from langchain.schema.embeddings import Embeddings from langchain.storage.in_memory import InMemoryStore diff --git a/libs/langchain/tests/unit_tests/indexes/test_indexing.py b/libs/langchain/tests/unit_tests/indexes/test_indexing.py index eee342bf701..7783f41f07e 100644 --- a/libs/langchain/tests/unit_tests/indexes/test_indexing.py +++ b/libs/langchain/tests/unit_tests/indexes/test_indexing.py @@ -5,10 +5,10 @@ from unittest.mock import patch import pytest from langchain.document_loaders.base import BaseLoader -from langchain.embeddings.base import Embeddings from langchain.indexes import index from langchain.indexes._sql_record_manager import SQLRecordManager from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VST, VectorStore diff --git a/libs/langchain/tests/unit_tests/retrievers/test_time_weighted_retriever.py b/libs/langchain/tests/unit_tests/retrievers/test_time_weighted_retriever.py index 2075a49b5b5..dd9058d881e 100644 --- a/libs/langchain/tests/unit_tests/retrievers/test_time_weighted_retriever.py +++ b/libs/langchain/tests/unit_tests/retrievers/test_time_weighted_retriever.py @@ -5,12 +5,12 @@ from typing import Any, Iterable, List, Optional, Tuple, Type import pytest -from langchain.embeddings.base import Embeddings from langchain.retrievers.time_weighted_retriever import ( TimeWeightedVectorStoreRetriever, _get_hours_passed, ) from langchain.schema import Document +from langchain.schema.embeddings import Embeddings from langchain.vectorstores.base import VectorStore