Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

move embeddings to schema #10696

Merged
merged 2 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/experimental/langchain_experimental/sql/vector_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
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
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
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

Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/chains/hyde/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/chains/router/embedding_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/aleph_alpha.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/awa.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/bedrock.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
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)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/clarifai.py
Original file line number Diff line number Diff line change
@@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/cohere.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/dashscope.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/deepinfra.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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"
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/edenai.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/elasticsearch.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from elasticsearch import Elasticsearch
from elasticsearch.client import MlClient

from langchain.embeddings.base import Embeddings
from langchain.schema.embeddings import Embeddings


class ElasticsearchEmbeddings(Embeddings):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/embaas.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/ernie.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/fake.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/google_palm.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/gpt4all.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/huggingface.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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"
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/huggingface_hub.py
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/jina.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/llamacpp.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/localai.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/minimax.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/mlflow_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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]]:
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/modelscope_hub.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/mosaicml.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/nlpcloud.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/octoai_embeddings.py
Original file line number Diff line number Diff line change
@@ -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: "
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/ollama.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/sagemaker_endpoint.py
Original file line number Diff line number Diff line change
@@ -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]]]):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/self_hosted.py
Original file line number Diff line number Diff line change
@@ -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]]:
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/spacy_embeddings.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/tensorflow_hub.py
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/vertexai.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/embeddings/xinference.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down