From ac67422a3d0ddac9fda59a6506fcd5eacce2677e Mon Sep 17 00:00:00 2001 From: Bagatur <22008038+baskaryan@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:48:43 -0800 Subject: [PATCH] IMPROVEMENT: import Document from core (#13905) --- libs/langchain/langchain/agents/react/base.py | 2 +- libs/langchain/langchain/chains/combine_documents/base.py | 2 +- .../langchain/chains/combine_documents/map_reduce.py | 2 +- .../langchain/chains/combine_documents/map_rerank.py | 2 +- libs/langchain/langchain/chains/combine_documents/reduce.py | 2 +- libs/langchain/langchain/chains/combine_documents/refine.py | 2 +- libs/langchain/langchain/chains/combine_documents/stuff.py | 2 +- libs/langchain/langchain/chains/mapreduce.py | 2 +- libs/langchain/langchain/chains/qa_with_sources/base.py | 2 +- libs/langchain/langchain/chains/qa_with_sources/retrieval.py | 2 +- libs/langchain/langchain/chains/qa_with_sources/vector_db.py | 2 +- libs/langchain/langchain/chains/router/embedding_router.py | 2 +- libs/langchain/langchain/docstore/base.py | 2 +- libs/langchain/langchain/docstore/in_memory.py | 3 ++- libs/langchain/langchain/docstore/wikipedia.py | 3 ++- libs/langchain/langchain/document_loaders/acreom.py | 3 ++- libs/langchain/langchain/document_loaders/airbyte.py | 2 +- libs/langchain/langchain/document_loaders/airbyte_json.py | 3 ++- libs/langchain/langchain/document_loaders/airtable.py | 3 ++- libs/langchain/langchain/document_loaders/apify_dataset.py | 2 +- libs/langchain/langchain/document_loaders/arcgis_loader.py | 3 ++- libs/langchain/langchain/document_loaders/arxiv.py | 3 ++- libs/langchain/langchain/document_loaders/assemblyai.py | 3 ++- libs/langchain/langchain/document_loaders/async_html.py | 2 +- libs/langchain/langchain/document_loaders/azlyrics.py | 3 ++- .../document_loaders/azure_blob_storage_container.py | 3 ++- .../langchain/document_loaders/azure_blob_storage_file.py | 3 ++- .../langchain/document_loaders/baiducloud_bos_directory.py | 3 ++- .../langchain/document_loaders/baiducloud_bos_file.py | 3 ++- libs/langchain/langchain/document_loaders/bibtex.py | 3 ++- libs/langchain/langchain/document_loaders/bigquery.py | 3 ++- libs/langchain/langchain/document_loaders/bilibili.py | 2 +- libs/langchain/langchain/document_loaders/blackboard.py | 3 ++- libs/langchain/langchain/document_loaders/blockchain.py | 2 +- libs/langchain/langchain/document_loaders/brave_search.py | 3 ++- libs/langchain/langchain/document_loaders/browserless.py | 2 +- libs/langchain/langchain/document_loaders/chatgpt.py | 3 ++- libs/langchain/langchain/document_loaders/chromium.py | 3 ++- .../langchain/document_loaders/college_confidential.py | 3 ++- libs/langchain/langchain/document_loaders/confluence.py | 2 +- libs/langchain/langchain/document_loaders/conllu.py | 3 ++- libs/langchain/langchain/document_loaders/csv_loader.py | 3 ++- libs/langchain/langchain/document_loaders/cube_semantic.py | 2 +- libs/langchain/langchain/document_loaders/datadog_logs.py | 3 ++- libs/langchain/langchain/document_loaders/dataframe.py | 3 ++- libs/langchain/langchain/document_loaders/diffbot.py | 2 +- libs/langchain/langchain/document_loaders/directory.py | 3 ++- libs/langchain/langchain/document_loaders/discord.py | 3 ++- libs/langchain/langchain/document_loaders/docugami.py | 2 +- libs/langchain/langchain/document_loaders/dropbox.py | 2 +- libs/langchain/langchain/document_loaders/duckdb_loader.py | 3 ++- libs/langchain/langchain/document_loaders/email.py | 3 ++- libs/langchain/langchain/document_loaders/embaas.py | 2 +- libs/langchain/langchain/document_loaders/etherscan.py | 2 +- libs/langchain/langchain/document_loaders/evernote.py | 3 ++- libs/langchain/langchain/document_loaders/facebook_chat.py | 3 ++- libs/langchain/langchain/document_loaders/fauna.py | 3 ++- libs/langchain/langchain/document_loaders/figma.py | 3 ++- libs/langchain/langchain/document_loaders/gcs_directory.py | 3 ++- libs/langchain/langchain/document_loaders/gcs_file.py | 3 ++- libs/langchain/langchain/document_loaders/geodataframe.py | 3 ++- libs/langchain/langchain/document_loaders/git.py | 3 ++- libs/langchain/langchain/document_loaders/gitbook.py | 3 ++- libs/langchain/langchain/document_loaders/github.py | 2 +- .../langchain/document_loaders/google_speech_to_text.py | 3 ++- libs/langchain/langchain/document_loaders/googledrive.py | 2 +- libs/langchain/langchain/document_loaders/gutenberg.py | 3 ++- libs/langchain/langchain/document_loaders/hn.py | 3 ++- libs/langchain/langchain/document_loaders/html_bs.py | 3 ++- .../langchain/document_loaders/hugging_face_dataset.py | 3 ++- libs/langchain/langchain/document_loaders/ifixit.py | 2 +- libs/langchain/langchain/document_loaders/image_captions.py | 2 +- libs/langchain/langchain/document_loaders/imsdb.py | 3 ++- libs/langchain/langchain/document_loaders/iugu.py | 3 ++- libs/langchain/langchain/document_loaders/json_loader.py | 3 ++- libs/langchain/langchain/document_loaders/larksuite.py | 3 ++- libs/langchain/langchain/document_loaders/mastodon.py | 3 ++- libs/langchain/langchain/document_loaders/max_compute.py | 3 ++- libs/langchain/langchain/document_loaders/mediawikidump.py | 3 ++- libs/langchain/langchain/document_loaders/merge.py | 3 ++- libs/langchain/langchain/document_loaders/mhtml.py | 3 ++- libs/langchain/langchain/document_loaders/modern_treasury.py | 3 ++- libs/langchain/langchain/document_loaders/mongodb.py | 3 ++- libs/langchain/langchain/document_loaders/news.py | 3 ++- libs/langchain/langchain/document_loaders/notebook.py | 3 ++- libs/langchain/langchain/document_loaders/notion.py | 3 ++- libs/langchain/langchain/document_loaders/notiondb.py | 2 +- libs/langchain/langchain/document_loaders/nuclia.py | 3 ++- libs/langchain/langchain/document_loaders/obs_directory.py | 3 ++- libs/langchain/langchain/document_loaders/obs_file.py | 3 ++- libs/langchain/langchain/document_loaders/obsidian.py | 2 +- libs/langchain/langchain/document_loaders/onedrive.py | 2 +- libs/langchain/langchain/document_loaders/onedrive_file.py | 2 +- libs/langchain/langchain/document_loaders/onenote.py | 2 +- libs/langchain/langchain/document_loaders/open_city_data.py | 3 ++- libs/langchain/langchain/document_loaders/parsers/docai.py | 2 +- libs/langchain/langchain/document_loaders/parsers/grobid.py | 2 +- libs/langchain/langchain/document_loaders/parsers/html/bs4.py | 3 ++- .../document_loaders/parsers/language/language_parser.py | 3 ++- libs/langchain/langchain/document_loaders/pdf.py | 2 +- libs/langchain/langchain/document_loaders/polars_dataframe.py | 3 ++- libs/langchain/langchain/document_loaders/psychic.py | 3 ++- libs/langchain/langchain/document_loaders/pubmed.py | 3 ++- .../langchain/langchain/document_loaders/pyspark_dataframe.py | 3 ++- libs/langchain/langchain/document_loaders/quip.py | 3 ++- libs/langchain/langchain/document_loaders/readthedocs.py | 3 ++- .../langchain/document_loaders/recursive_url_loader.py | 2 +- libs/langchain/langchain/document_loaders/reddit.py | 3 ++- libs/langchain/langchain/document_loaders/roam.py | 3 ++- libs/langchain/langchain/document_loaders/rspace.py | 3 ++- libs/langchain/langchain/document_loaders/rss.py | 3 ++- libs/langchain/langchain/document_loaders/s3_directory.py | 3 ++- libs/langchain/langchain/document_loaders/sharepoint.py | 2 +- libs/langchain/langchain/document_loaders/slack_directory.py | 3 ++- libs/langchain/langchain/document_loaders/snowflake_loader.py | 3 ++- libs/langchain/langchain/document_loaders/spreedly.py | 3 ++- libs/langchain/langchain/document_loaders/srt.py | 3 ++- libs/langchain/langchain/document_loaders/stripe.py | 3 ++- libs/langchain/langchain/document_loaders/telegram.py | 3 ++- .../langchain/document_loaders/tencent_cos_directory.py | 3 ++- libs/langchain/langchain/document_loaders/tencent_cos_file.py | 3 ++- libs/langchain/langchain/document_loaders/text.py | 3 ++- libs/langchain/langchain/document_loaders/tomarkdown.py | 2 +- libs/langchain/langchain/document_loaders/toml.py | 3 ++- libs/langchain/langchain/document_loaders/trello.py | 3 ++- libs/langchain/langchain/document_loaders/twitter.py | 3 ++- libs/langchain/langchain/document_loaders/unstructured.py | 3 ++- libs/langchain/langchain/document_loaders/url.py | 3 ++- libs/langchain/langchain/document_loaders/url_playwright.py | 3 ++- libs/langchain/langchain/document_loaders/url_selenium.py | 3 ++- libs/langchain/langchain/document_loaders/weather.py | 3 ++- libs/langchain/langchain/document_loaders/web_base.py | 2 +- libs/langchain/langchain/document_loaders/whatsapp_chat.py | 3 ++- libs/langchain/langchain/document_loaders/wikipedia.py | 3 ++- libs/langchain/langchain/document_loaders/word_document.py | 2 +- libs/langchain/langchain/document_loaders/youtube.py | 2 +- libs/langchain/langchain/retrievers/arcee.py | 2 +- libs/langchain/langchain/retrievers/elastic_search_bm25.py | 2 +- libs/langchain/langchain/retrievers/embedchain.py | 3 ++- .../langchain/retrievers/google_cloud_documentai_warehouse.py | 2 +- libs/langchain/langchain/retrievers/kendra.py | 2 +- libs/langchain/langchain/retrievers/weaviate_hybrid_search.py | 2 +- libs/langchain/langchain/text_splitter.py | 4 +--- libs/langchain/langchain/vectorstores/analyticdb.py | 2 +- libs/langchain/langchain/vectorstores/annoy.py | 2 +- libs/langchain/langchain/vectorstores/astradb.py | 2 +- libs/langchain/langchain/vectorstores/atlas.py | 3 +-- libs/langchain/langchain/vectorstores/awadb.py | 2 +- libs/langchain/langchain/vectorstores/azure_cosmos_db.py | 2 +- libs/langchain/langchain/vectorstores/azuresearch.py | 2 +- libs/langchain/langchain/vectorstores/bageldb.py | 3 +-- .../langchain/vectorstores/baiducloud_vector_search.py | 3 +-- libs/langchain/langchain/vectorstores/cassandra.py | 2 +- libs/langchain/langchain/vectorstores/chroma.py | 2 +- libs/langchain/langchain/vectorstores/clarifai.py | 3 +-- libs/langchain/langchain/vectorstores/clickhouse.py | 3 +-- libs/langchain/langchain/vectorstores/dashvector.py | 2 +- libs/langchain/langchain/vectorstores/deeplake.py | 2 +- libs/langchain/langchain/vectorstores/dingo.py | 2 +- .../langchain/langchain/vectorstores/elastic_vector_search.py | 2 +- libs/langchain/langchain/vectorstores/elasticsearch.py | 2 +- libs/langchain/langchain/vectorstores/epsilla.py | 3 +-- libs/langchain/langchain/vectorstores/faiss.py | 2 +- libs/langchain/langchain/vectorstores/hippo.py | 3 +-- libs/langchain/langchain/vectorstores/hologres.py | 2 +- libs/langchain/langchain/vectorstores/lancedb.py | 3 +-- libs/langchain/langchain/vectorstores/marqo.py | 3 +-- libs/langchain/langchain/vectorstores/meilisearch.py | 2 +- libs/langchain/langchain/vectorstores/milvus.py | 2 +- libs/langchain/langchain/vectorstores/momento_vector_index.py | 2 +- libs/langchain/langchain/vectorstores/mongodb_atlas.py | 2 +- libs/langchain/langchain/vectorstores/myscale.py | 3 +-- libs/langchain/langchain/vectorstores/neo4j_vector.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 | 3 +-- 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 | 3 +-- libs/langchain/langchain/vectorstores/starrocks.py | 3 +-- 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/tiledb.py | 2 +- libs/langchain/langchain/vectorstores/typesense.py | 2 +- libs/langchain/langchain/vectorstores/usearch.py | 2 +- libs/langchain/langchain/vectorstores/utils.py | 2 +- libs/langchain/langchain/vectorstores/vald.py | 2 +- libs/langchain/langchain/vectorstores/vearch.py | 3 +-- libs/langchain/langchain/vectorstores/vespa.py | 2 +- libs/langchain/langchain/vectorstores/weaviate.py | 2 +- libs/langchain/langchain/vectorstores/xata.py | 3 +-- libs/langchain/langchain/vectorstores/zep.py | 3 +-- .../document_loaders/test_pyspark_dataframe_loader.py | 3 ++- .../integration_tests/document_loaders/test_rocksetdb.py | 3 ++- libs/langchain/tests/integration_tests/llms/test_vertexai.py | 2 +- .../retrievers/test_weaviate_hybrid_search.py | 2 +- .../tests/integration_tests/vectorstores/test_analyticdb.py | 3 ++- .../tests/integration_tests/vectorstores/test_annoy.py | 2 +- .../tests/integration_tests/vectorstores/test_awadb.py | 3 ++- .../integration_tests/vectorstores/test_azure_cosmos_db.py | 2 +- .../tests/integration_tests/vectorstores/test_bagel.py | 3 ++- .../vectorstores/test_baiducloud_vector_search.py | 3 ++- .../tests/integration_tests/vectorstores/test_cassandra.py | 3 ++- .../tests/integration_tests/vectorstores/test_chroma.py | 2 +- .../tests/integration_tests/vectorstores/test_clarifai.py | 3 ++- .../tests/integration_tests/vectorstores/test_clickhouse.py | 3 ++- .../tests/integration_tests/vectorstores/test_deeplake.py | 2 +- .../vectorstores/test_elastic_vector_search.py | 2 +- .../integration_tests/vectorstores/test_elasticsearch.py | 2 +- .../tests/integration_tests/vectorstores/test_hippo.py | 3 ++- .../tests/integration_tests/vectorstores/test_hologres.py | 3 ++- .../tests/integration_tests/vectorstores/test_marqo.py | 2 +- .../tests/integration_tests/vectorstores/test_meilisearch.py | 2 +- .../tests/integration_tests/vectorstores/test_milvus.py | 3 ++- .../vectorstores/test_momento_vector_index.py | 2 +- .../integration_tests/vectorstores/test_mongodb_atlas.py | 2 +- .../tests/integration_tests/vectorstores/test_myscale.py | 3 ++- .../tests/integration_tests/vectorstores/test_neo4jvector.py | 3 ++- .../tests/integration_tests/vectorstores/test_opensearch.py | 2 +- .../tests/integration_tests/vectorstores/test_pgvector.py | 2 +- .../tests/integration_tests/vectorstores/test_pinecone.py | 2 +- .../tests/integration_tests/vectorstores/test_redis.py | 2 +- .../tests/integration_tests/vectorstores/test_rocksetdb.py | 3 ++- .../tests/integration_tests/vectorstores/test_scann.py | 2 +- .../integration_tests/vectorstores/test_singlestoredb.py | 2 +- .../tests/integration_tests/vectorstores/test_sqlitevss.py | 2 +- .../tests/integration_tests/vectorstores/test_tair.py | 3 ++- .../integration_tests/vectorstores/test_tencentvectordb.py | 3 ++- .../tests/integration_tests/vectorstores/test_tiledb.py | 2 +- .../integration_tests/vectorstores/test_timescalevector.py | 3 ++- .../tests/integration_tests/vectorstores/test_usearch.py | 2 +- .../tests/integration_tests/vectorstores/test_vald.py | 3 ++- .../tests/integration_tests/vectorstores/test_vearch.py | 2 +- .../tests/integration_tests/vectorstores/test_vectara.py | 3 ++- .../tests/integration_tests/vectorstores/test_weaviate.py | 2 +- .../tests/integration_tests/vectorstores/test_xata.py | 3 ++- .../tests/integration_tests/vectorstores/test_zilliz.py | 3 ++- libs/langchain/tests/unit_tests/agents/test_react.py | 2 +- .../tests/unit_tests/chains/test_combine_documents.py | 2 +- libs/langchain/tests/unit_tests/docstore/test_inmemory.py | 2 +- .../tests/unit_tests/document_loaders/test_confluence.py | 2 +- .../tests/unit_tests/document_loaders/test_csv_loader.py | 3 ++- .../tests/unit_tests/document_loaders/test_github.py | 2 +- .../tests/unit_tests/document_loaders/test_json_loader.py | 2 +- .../tests/unit_tests/document_loaders/test_mongodb.py | 2 +- .../tests/unit_tests/document_loaders/test_onenote.py | 2 +- .../tests/unit_tests/document_loaders/test_psychic.py | 2 +- libs/langchain/tests/unit_tests/test_text_splitter.py | 2 +- libs/langchain/tests/unit_tests/vectorstores/test_faiss.py | 2 +- libs/langchain/tests/unit_tests/vectorstores/test_utils.py | 2 +- 255 files changed, 371 insertions(+), 273 deletions(-) diff --git a/libs/langchain/langchain/agents/react/base.py b/libs/langchain/langchain/agents/react/base.py index 3cb5ba203f3..8279cf89c74 100644 --- a/libs/langchain/langchain/agents/react/base.py +++ b/libs/langchain/langchain/agents/react/base.py @@ -1,6 +1,7 @@ """Chain that implements the ReAct paper from https://arxiv.org/pdf/2210.03629.pdf.""" from typing import Any, List, Optional, Sequence +from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field @@ -13,7 +14,6 @@ from langchain.agents.react.wiki_prompt import WIKI_PROMPT from langchain.agents.tools import Tool from langchain.agents.utils import validate_tools_single_input from langchain.docstore.base import Docstore -from langchain.docstore.document import Document from langchain.tools.base import BaseTool diff --git a/libs/langchain/langchain/chains/combine_documents/base.py b/libs/langchain/langchain/chains/combine_documents/base.py index 23192de2abc..9dd964db71a 100644 --- a/libs/langchain/langchain/chains/combine_documents/base.py +++ b/libs/langchain/langchain/chains/combine_documents/base.py @@ -3,6 +3,7 @@ from abc import ABC, abstractmethod from typing import Any, Dict, List, Optional, Tuple, Type +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Field, create_model from langchain_core.runnables.config import RunnableConfig @@ -11,7 +12,6 @@ from langchain.callbacks.manager import ( CallbackManagerForChainRun, ) from langchain.chains.base import Chain -from langchain.docstore.document import Document from langchain.text_splitter import RecursiveCharacterTextSplitter, TextSplitter diff --git a/libs/langchain/langchain/chains/combine_documents/map_reduce.py b/libs/langchain/langchain/chains/combine_documents/map_reduce.py index 02672804e5b..cd7bf3f0b7e 100644 --- a/libs/langchain/langchain/chains/combine_documents/map_reduce.py +++ b/libs/langchain/langchain/chains/combine_documents/map_reduce.py @@ -4,6 +4,7 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Tuple, Type +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Extra, create_model, root_validator from langchain_core.runnables.config import RunnableConfig @@ -11,7 +12,6 @@ from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.reduce import ReduceDocumentsChain from langchain.chains.llm import LLMChain -from langchain.docstore.document import Document class MapReduceDocumentsChain(BaseCombineDocumentsChain): diff --git a/libs/langchain/langchain/chains/combine_documents/map_rerank.py b/libs/langchain/langchain/chains/combine_documents/map_rerank.py index f051bad2e32..a0f673621ca 100644 --- a/libs/langchain/langchain/chains/combine_documents/map_rerank.py +++ b/libs/langchain/langchain/chains/combine_documents/map_rerank.py @@ -4,13 +4,13 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Sequence, Tuple, Type, Union, cast +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Extra, create_model, root_validator from langchain_core.runnables.config import RunnableConfig from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.llm import LLMChain -from langchain.docstore.document import Document from langchain.output_parsers.regex import RegexParser diff --git a/libs/langchain/langchain/chains/combine_documents/reduce.py b/libs/langchain/langchain/chains/combine_documents/reduce.py index ea402033f56..775f5c352cf 100644 --- a/libs/langchain/langchain/chains/combine_documents/reduce.py +++ b/libs/langchain/langchain/chains/combine_documents/reduce.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Any, Callable, List, Optional, Protocol, Tuple +from langchain_core.documents import Document from langchain_core.pydantic_v1 import Extra from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain -from langchain.docstore.document import Document class CombineDocsProtocol(Protocol): diff --git a/libs/langchain/langchain/chains/combine_documents/refine.py b/libs/langchain/langchain/chains/combine_documents/refine.py index de9cded41da..fb9da0eb6d1 100644 --- a/libs/langchain/langchain/chains/combine_documents/refine.py +++ b/libs/langchain/langchain/chains/combine_documents/refine.py @@ -4,6 +4,7 @@ from __future__ import annotations from typing import Any, Dict, List, Tuple +from langchain_core.documents import Document from langchain_core.prompts import BasePromptTemplate, format_document from langchain_core.prompts.prompt import PromptTemplate from langchain_core.pydantic_v1 import Extra, Field, root_validator @@ -13,7 +14,6 @@ from langchain.chains.combine_documents.base import ( BaseCombineDocumentsChain, ) from langchain.chains.llm import LLMChain -from langchain.docstore.document import Document def _get_default_document_prompt() -> PromptTemplate: diff --git a/libs/langchain/langchain/chains/combine_documents/stuff.py b/libs/langchain/langchain/chains/combine_documents/stuff.py index fb52465306b..a30d4a0e90b 100644 --- a/libs/langchain/langchain/chains/combine_documents/stuff.py +++ b/libs/langchain/langchain/chains/combine_documents/stuff.py @@ -2,6 +2,7 @@ from typing import Any, Dict, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.prompts import BasePromptTemplate, format_document from langchain_core.prompts.prompt import PromptTemplate from langchain_core.pydantic_v1 import Extra, Field, root_validator @@ -11,7 +12,6 @@ from langchain.chains.combine_documents.base import ( BaseCombineDocumentsChain, ) from langchain.chains.llm import LLMChain -from langchain.docstore.document import Document def _get_default_document_prompt() -> PromptTemplate: diff --git a/libs/langchain/langchain/chains/mapreduce.py b/libs/langchain/langchain/chains/mapreduce.py index dd5bf90e259..f8e29b58aa7 100644 --- a/libs/langchain/langchain/chains/mapreduce.py +++ b/libs/langchain/langchain/chains/mapreduce.py @@ -7,6 +7,7 @@ from __future__ import annotations from typing import Any, Dict, List, Mapping, Optional +from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra @@ -18,7 +19,6 @@ from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.map_reduce import MapReduceDocumentsChain from langchain.chains.combine_documents.stuff import StuffDocumentsChain from langchain.chains.llm import LLMChain -from langchain.docstore.document import Document from langchain.text_splitter import TextSplitter diff --git a/libs/langchain/langchain/chains/qa_with_sources/base.py b/libs/langchain/langchain/chains/qa_with_sources/base.py index 966f9e1362d..2144824a092 100644 --- a/libs/langchain/langchain/chains/qa_with_sources/base.py +++ b/libs/langchain/langchain/chains/qa_with_sources/base.py @@ -7,6 +7,7 @@ import re from abc import ABC, abstractmethod from typing import Any, Dict, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra, root_validator @@ -27,7 +28,6 @@ from langchain.chains.qa_with_sources.map_reduce_prompt import ( EXAMPLE_PROMPT, QUESTION_PROMPT, ) -from langchain.docstore.document import Document class BaseQAWithSourcesChain(Chain, ABC): diff --git a/libs/langchain/langchain/chains/qa_with_sources/retrieval.py b/libs/langchain/langchain/chains/qa_with_sources/retrieval.py index 8fb0e6206f3..a2b5c562652 100644 --- a/libs/langchain/langchain/chains/qa_with_sources/retrieval.py +++ b/libs/langchain/langchain/chains/qa_with_sources/retrieval.py @@ -2,6 +2,7 @@ from typing import Any, Dict, List +from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field from langchain_core.retrievers import BaseRetriever @@ -11,7 +12,6 @@ from langchain.callbacks.manager import ( ) from langchain.chains.combine_documents.stuff import StuffDocumentsChain from langchain.chains.qa_with_sources.base import BaseQAWithSourcesChain -from langchain.docstore.document import Document class RetrievalQAWithSourcesChain(BaseQAWithSourcesChain): diff --git a/libs/langchain/langchain/chains/qa_with_sources/vector_db.py b/libs/langchain/langchain/chains/qa_with_sources/vector_db.py index 2d5c98d1899..6feddc5bb77 100644 --- a/libs/langchain/langchain/chains/qa_with_sources/vector_db.py +++ b/libs/langchain/langchain/chains/qa_with_sources/vector_db.py @@ -3,6 +3,7 @@ import warnings from typing import Any, Dict, List +from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field, root_validator from langchain_core.vectorstores import VectorStore @@ -12,7 +13,6 @@ from langchain.callbacks.manager import ( ) from langchain.chains.combine_documents.stuff import StuffDocumentsChain from langchain.chains.qa_with_sources.base import BaseQAWithSourcesChain -from langchain.docstore.document import Document class VectorDBQAWithSourcesChain(BaseQAWithSourcesChain): diff --git a/libs/langchain/langchain/chains/router/embedding_router.py b/libs/langchain/langchain/chains/router/embedding_router.py index 7b43584e941..a7efd41a5df 100644 --- a/libs/langchain/langchain/chains/router/embedding_router.py +++ b/libs/langchain/langchain/chains/router/embedding_router.py @@ -2,13 +2,13 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Sequence, Tuple, Type +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.pydantic_v1 import Extra from langchain_core.vectorstores import VectorStore from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.router.base import RouterChain -from langchain.docstore.document import Document class EmbeddingRouterChain(RouterChain): diff --git a/libs/langchain/langchain/docstore/base.py b/libs/langchain/langchain/docstore/base.py index b4f366fbaa5..709c443f01f 100644 --- a/libs/langchain/langchain/docstore/base.py +++ b/libs/langchain/langchain/docstore/base.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from typing import Dict, List, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document class Docstore(ABC): diff --git a/libs/langchain/langchain/docstore/in_memory.py b/libs/langchain/langchain/docstore/in_memory.py index 6832483dd24..080ab3c5dce 100644 --- a/libs/langchain/langchain/docstore/in_memory.py +++ b/libs/langchain/langchain/docstore/in_memory.py @@ -1,8 +1,9 @@ """Simple in memory docstore in the form of a dict.""" from typing import Dict, List, Optional, Union +from langchain_core.documents import Document + from langchain.docstore.base import AddableMixin, Docstore -from langchain.docstore.document import Document class InMemoryDocstore(Docstore, AddableMixin): diff --git a/libs/langchain/langchain/docstore/wikipedia.py b/libs/langchain/langchain/docstore/wikipedia.py index 85d160a0151..6b2f34d68af 100644 --- a/libs/langchain/langchain/docstore/wikipedia.py +++ b/libs/langchain/langchain/docstore/wikipedia.py @@ -3,8 +3,9 @@ from typing import Union +from langchain_core.documents import Document + from langchain.docstore.base import Docstore -from langchain.docstore.document import Document class Wikipedia(Docstore): diff --git a/libs/langchain/langchain/document_loaders/acreom.py b/libs/langchain/langchain/document_loaders/acreom.py index 740f3797a91..4d8744e64b7 100644 --- a/libs/langchain/langchain/document_loaders/acreom.py +++ b/libs/langchain/langchain/document_loaders/acreom.py @@ -2,7 +2,8 @@ import re from pathlib import Path from typing import Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/airbyte.py b/libs/langchain/langchain/document_loaders/airbyte.py index 0369ad67d28..1cf3fc87779 100644 --- a/libs/langchain/langchain/document_loaders/airbyte.py +++ b/libs/langchain/langchain/document_loaders/airbyte.py @@ -1,8 +1,8 @@ from typing import Any, Callable, Iterator, List, Mapping, Optional +from langchain_core.documents import Document from langchain_core.utils.utils import guard_import -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader RecordHandler = Callable[[Any, Optional[str]], Document] diff --git a/libs/langchain/langchain/document_loaders/airbyte_json.py b/libs/langchain/langchain/document_loaders/airbyte_json.py index 02bcb9e50ef..e7f19e9baaf 100644 --- a/libs/langchain/langchain/document_loaders/airbyte_json.py +++ b/libs/langchain/langchain/document_loaders/airbyte_json.py @@ -1,7 +1,8 @@ import json from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import stringify_dict diff --git a/libs/langchain/langchain/document_loaders/airtable.py b/libs/langchain/langchain/document_loaders/airtable.py index 0bec883597b..02dce6e9762 100644 --- a/libs/langchain/langchain/document_loaders/airtable.py +++ b/libs/langchain/langchain/document_loaders/airtable.py @@ -1,6 +1,7 @@ from typing import Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/apify_dataset.py b/libs/langchain/langchain/document_loaders/apify_dataset.py index 3cde43faf10..3c0b3479e73 100644 --- a/libs/langchain/langchain/document_loaders/apify_dataset.py +++ b/libs/langchain/langchain/document_loaders/apify_dataset.py @@ -1,8 +1,8 @@ from typing import Any, Callable, Dict, List +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, root_validator -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/arcgis_loader.py b/libs/langchain/langchain/document_loaders/arcgis_loader.py index 5f08d7e58bf..9f21e463e12 100644 --- a/libs/langchain/langchain/document_loaders/arcgis_loader.py +++ b/libs/langchain/langchain/document_loaders/arcgis_loader.py @@ -8,7 +8,8 @@ import warnings from datetime import datetime, timezone from typing import TYPE_CHECKING, Any, Iterator, List, Optional, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/arxiv.py b/libs/langchain/langchain/document_loaders/arxiv.py index a3da66223d8..0600f928670 100644 --- a/libs/langchain/langchain/document_loaders/arxiv.py +++ b/libs/langchain/langchain/document_loaders/arxiv.py @@ -1,6 +1,7 @@ from typing import Any, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.arxiv import ArxivAPIWrapper diff --git a/libs/langchain/langchain/document_loaders/assemblyai.py b/libs/langchain/langchain/document_loaders/assemblyai.py index d7b7ecb9be6..86e6ab4558f 100644 --- a/libs/langchain/langchain/document_loaders/assemblyai.py +++ b/libs/langchain/langchain/document_loaders/assemblyai.py @@ -3,7 +3,8 @@ from __future__ import annotations from enum import Enum from typing import TYPE_CHECKING, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/async_html.py b/libs/langchain/langchain/document_loaders/async_html.py index d7ae3f2f90d..39e2ec67166 100644 --- a/libs/langchain/langchain/document_loaders/async_html.py +++ b/libs/langchain/langchain/document_loaders/async_html.py @@ -6,8 +6,8 @@ from typing import Any, Dict, Iterator, List, Optional, Union, cast import aiohttp import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/azlyrics.py b/libs/langchain/langchain/document_loaders/azlyrics.py index df355899e88..5d0730ccf55 100644 --- a/libs/langchain/langchain/document_loaders/azlyrics.py +++ b/libs/langchain/langchain/document_loaders/azlyrics.py @@ -1,6 +1,7 @@ from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/azure_blob_storage_container.py b/libs/langchain/langchain/document_loaders/azure_blob_storage_container.py index 45126626f73..5824005ea8a 100644 --- a/libs/langchain/langchain/document_loaders/azure_blob_storage_container.py +++ b/libs/langchain/langchain/document_loaders/azure_blob_storage_container.py @@ -1,6 +1,7 @@ from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.azure_blob_storage_file import ( AzureBlobStorageFileLoader, ) diff --git a/libs/langchain/langchain/document_loaders/azure_blob_storage_file.py b/libs/langchain/langchain/document_loaders/azure_blob_storage_file.py index 264e7f39ed4..6be95d06176 100644 --- a/libs/langchain/langchain/document_loaders/azure_blob_storage_file.py +++ b/libs/langchain/langchain/document_loaders/azure_blob_storage_file.py @@ -2,7 +2,8 @@ import os import tempfile from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader diff --git a/libs/langchain/langchain/document_loaders/baiducloud_bos_directory.py b/libs/langchain/langchain/document_loaders/baiducloud_bos_directory.py index 05ca220dd5b..77912a87f47 100644 --- a/libs/langchain/langchain/document_loaders/baiducloud_bos_directory.py +++ b/libs/langchain/langchain/document_loaders/baiducloud_bos_directory.py @@ -1,6 +1,7 @@ from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/baiducloud_bos_file.py b/libs/langchain/langchain/document_loaders/baiducloud_bos_file.py index a5cd78e4f26..24fe19e8b85 100644 --- a/libs/langchain/langchain/document_loaders/baiducloud_bos_file.py +++ b/libs/langchain/langchain/document_loaders/baiducloud_bos_file.py @@ -3,7 +3,8 @@ import os import tempfile from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader diff --git a/libs/langchain/langchain/document_loaders/bibtex.py b/libs/langchain/langchain/document_loaders/bibtex.py index 1e32ff6b178..bf1744eb05e 100644 --- a/libs/langchain/langchain/document_loaders/bibtex.py +++ b/libs/langchain/langchain/document_loaders/bibtex.py @@ -3,7 +3,8 @@ import re from pathlib import Path from typing import Any, Iterator, List, Mapping, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.bibtex import BibtexparserWrapper diff --git a/libs/langchain/langchain/document_loaders/bigquery.py b/libs/langchain/langchain/document_loaders/bigquery.py index 37f5440f9fd..934e3445d96 100644 --- a/libs/langchain/langchain/document_loaders/bigquery.py +++ b/libs/langchain/langchain/document_loaders/bigquery.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.vertexai import get_client_info diff --git a/libs/langchain/langchain/document_loaders/bilibili.py b/libs/langchain/langchain/document_loaders/bilibili.py index e22ac20f8d9..be8fc232d4e 100644 --- a/libs/langchain/langchain/document_loaders/bilibili.py +++ b/libs/langchain/langchain/document_loaders/bilibili.py @@ -4,8 +4,8 @@ import warnings from typing import List, Tuple import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/blackboard.py b/libs/langchain/langchain/document_loaders/blackboard.py index a1690eeb991..32bf34e316f 100644 --- a/libs/langchain/langchain/document_loaders/blackboard.py +++ b/libs/langchain/langchain/document_loaders/blackboard.py @@ -4,7 +4,8 @@ from pathlib import Path from typing import Any, List, Optional, Tuple from urllib.parse import unquote -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.directory import DirectoryLoader from langchain.document_loaders.pdf import PyPDFLoader from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/blockchain.py b/libs/langchain/langchain/document_loaders/blockchain.py index c79f67d96a8..91d0028ff63 100644 --- a/libs/langchain/langchain/document_loaders/blockchain.py +++ b/libs/langchain/langchain/document_loaders/blockchain.py @@ -5,8 +5,8 @@ from enum import Enum from typing import List, Optional import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/brave_search.py b/libs/langchain/langchain/document_loaders/brave_search.py index e3a4821457d..7b9af2dc021 100644 --- a/libs/langchain/langchain/document_loaders/brave_search.py +++ b/libs/langchain/langchain/document_loaders/brave_search.py @@ -1,6 +1,7 @@ from typing import Iterator, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.brave_search import BraveSearchWrapper diff --git a/libs/langchain/langchain/document_loaders/browserless.py b/libs/langchain/langchain/document_loaders/browserless.py index 326e7e303ac..391d3388af3 100644 --- a/libs/langchain/langchain/document_loaders/browserless.py +++ b/libs/langchain/langchain/document_loaders/browserless.py @@ -1,8 +1,8 @@ from typing import Iterator, List, Union import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/chatgpt.py b/libs/langchain/langchain/document_loaders/chatgpt.py index 35d638d6b3f..3afca847991 100644 --- a/libs/langchain/langchain/document_loaders/chatgpt.py +++ b/libs/langchain/langchain/document_loaders/chatgpt.py @@ -2,7 +2,8 @@ import datetime import json from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/chromium.py b/libs/langchain/langchain/document_loaders/chromium.py index fa757f2b001..7222c258dbc 100644 --- a/libs/langchain/langchain/document_loaders/chromium.py +++ b/libs/langchain/langchain/document_loaders/chromium.py @@ -2,7 +2,8 @@ import asyncio import logging from typing import Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/college_confidential.py b/libs/langchain/langchain/document_loaders/college_confidential.py index d93a53c8462..1931cef59c1 100644 --- a/libs/langchain/langchain/document_loaders/college_confidential.py +++ b/libs/langchain/langchain/document_loaders/college_confidential.py @@ -1,6 +1,7 @@ from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/confluence.py b/libs/langchain/langchain/document_loaders/confluence.py index cb17c0f4b2d..0738e2b6c6a 100644 --- a/libs/langchain/langchain/document_loaders/confluence.py +++ b/libs/langchain/langchain/document_loaders/confluence.py @@ -4,6 +4,7 @@ from io import BytesIO from typing import Any, Callable, Dict, List, Optional, Union import requests +from langchain_core.documents import Document from tenacity import ( before_sleep_log, retry, @@ -11,7 +12,6 @@ from tenacity import ( wait_exponential, ) -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/conllu.py b/libs/langchain/langchain/document_loaders/conllu.py index a9170c932d0..cc4ba936c17 100644 --- a/libs/langchain/langchain/document_loaders/conllu.py +++ b/libs/langchain/langchain/document_loaders/conllu.py @@ -1,7 +1,8 @@ import csv from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/csv_loader.py b/libs/langchain/langchain/document_loaders/csv_loader.py index 2de47417a54..23f4fecf33e 100644 --- a/libs/langchain/langchain/document_loaders/csv_loader.py +++ b/libs/langchain/langchain/document_loaders/csv_loader.py @@ -2,7 +2,8 @@ import csv from io import TextIOWrapper from typing import Any, Dict, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.helpers import detect_file_encodings from langchain.document_loaders.unstructured import ( diff --git a/libs/langchain/langchain/document_loaders/cube_semantic.py b/libs/langchain/langchain/document_loaders/cube_semantic.py index 91364a92827..5e26829dc43 100644 --- a/libs/langchain/langchain/document_loaders/cube_semantic.py +++ b/libs/langchain/langchain/document_loaders/cube_semantic.py @@ -4,8 +4,8 @@ import time from typing import List import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/datadog_logs.py b/libs/langchain/langchain/document_loaders/datadog_logs.py index a79d7975c0b..cdc7b3fba4c 100644 --- a/libs/langchain/langchain/document_loaders/datadog_logs.py +++ b/libs/langchain/langchain/document_loaders/datadog_logs.py @@ -1,7 +1,8 @@ from datetime import datetime, timedelta from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/dataframe.py b/libs/langchain/langchain/document_loaders/dataframe.py index 261426a3ceb..18636443480 100644 --- a/libs/langchain/langchain/document_loaders/dataframe.py +++ b/libs/langchain/langchain/document_loaders/dataframe.py @@ -1,6 +1,7 @@ from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/diffbot.py b/libs/langchain/langchain/document_loaders/diffbot.py index 3c2bf4c7aa4..b6ba845f403 100644 --- a/libs/langchain/langchain/document_loaders/diffbot.py +++ b/libs/langchain/langchain/document_loaders/diffbot.py @@ -2,8 +2,8 @@ import logging from typing import Any, List import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/directory.py b/libs/langchain/langchain/document_loaders/directory.py index bd6ae0bbb1d..ba6791e4682 100644 --- a/libs/langchain/langchain/document_loaders/directory.py +++ b/libs/langchain/langchain/document_loaders/directory.py @@ -4,7 +4,8 @@ import random from pathlib import Path from typing import Any, List, Optional, Type, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.html_bs import BSHTMLLoader from langchain.document_loaders.text import TextLoader diff --git a/libs/langchain/langchain/document_loaders/discord.py b/libs/langchain/langchain/document_loaders/discord.py index a9b5b935705..73585dfecc9 100644 --- a/libs/langchain/langchain/document_loaders/discord.py +++ b/libs/langchain/langchain/document_loaders/discord.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/docugami.py b/libs/langchain/langchain/document_loaders/docugami.py index 850f08fa1aa..05a3bb8cfba 100644 --- a/libs/langchain/langchain/document_loaders/docugami.py +++ b/libs/langchain/langchain/document_loaders/docugami.py @@ -6,9 +6,9 @@ from pathlib import Path from typing import Any, Dict, List, Mapping, Optional, Sequence, Union import requests +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, root_validator -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader TD_NAME = "{http://www.w3.org/1999/xhtml}td" diff --git a/libs/langchain/langchain/document_loaders/dropbox.py b/libs/langchain/langchain/document_loaders/dropbox.py index f7cb81c8968..7a6d7dea7d6 100644 --- a/libs/langchain/langchain/document_loaders/dropbox.py +++ b/libs/langchain/langchain/document_loaders/dropbox.py @@ -11,9 +11,9 @@ import tempfile from pathlib import Path from typing import Any, Dict, List, Optional +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, root_validator -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/duckdb_loader.py b/libs/langchain/langchain/document_loaders/duckdb_loader.py index 11d64ce969b..a0cdd29d844 100644 --- a/libs/langchain/langchain/document_loaders/duckdb_loader.py +++ b/libs/langchain/langchain/document_loaders/duckdb_loader.py @@ -1,6 +1,7 @@ from typing import Dict, List, Optional, cast -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/email.py b/libs/langchain/langchain/document_loaders/email.py index 16b80647f1f..76bcbaff77a 100644 --- a/libs/langchain/langchain/document_loaders/email.py +++ b/libs/langchain/langchain/document_loaders/email.py @@ -1,7 +1,8 @@ import os from typing import Any, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import ( UnstructuredFileLoader, diff --git a/libs/langchain/langchain/document_loaders/embaas.py b/libs/langchain/langchain/document_loaders/embaas.py index 8c1025f55f3..6f4fc800a12 100644 --- a/libs/langchain/langchain/document_loaders/embaas.py +++ b/libs/langchain/langchain/document_loaders/embaas.py @@ -3,10 +3,10 @@ import warnings from typing import Any, Dict, Iterator, List, Optional import requests +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, root_validator, validator from typing_extensions import NotRequired, TypedDict -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseBlobParser, BaseLoader from langchain.document_loaders.blob_loaders import Blob from langchain.text_splitter import TextSplitter diff --git a/libs/langchain/langchain/document_loaders/etherscan.py b/libs/langchain/langchain/document_loaders/etherscan.py index eed6df98e2d..779c084a981 100644 --- a/libs/langchain/langchain/document_loaders/etherscan.py +++ b/libs/langchain/langchain/document_loaders/etherscan.py @@ -3,8 +3,8 @@ import re from typing import Iterator, List import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/evernote.py b/libs/langchain/langchain/document_loaders/evernote.py index 0f0f6743423..7f01b6c2527 100644 --- a/libs/langchain/langchain/document_loaders/evernote.py +++ b/libs/langchain/langchain/document_loaders/evernote.py @@ -8,7 +8,8 @@ from base64 import b64decode from time import strptime from typing import Any, Dict, Iterator, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/facebook_chat.py b/libs/langchain/langchain/document_loaders/facebook_chat.py index fa5a5ba4686..dfa666e0163 100644 --- a/libs/langchain/langchain/document_loaders/facebook_chat.py +++ b/libs/langchain/langchain/document_loaders/facebook_chat.py @@ -3,7 +3,8 @@ import json from pathlib import Path from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/fauna.py b/libs/langchain/langchain/document_loaders/fauna.py index 3c949a70638..a1fa3336b5b 100644 --- a/libs/langchain/langchain/document_loaders/fauna.py +++ b/libs/langchain/langchain/document_loaders/fauna.py @@ -1,6 +1,7 @@ from typing import Iterator, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/figma.py b/libs/langchain/langchain/document_loaders/figma.py index 5f424be4f70..602a1f18aeb 100644 --- a/libs/langchain/langchain/document_loaders/figma.py +++ b/libs/langchain/langchain/document_loaders/figma.py @@ -2,7 +2,8 @@ import json import urllib.request from typing import Any, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import stringify_dict diff --git a/libs/langchain/langchain/document_loaders/gcs_directory.py b/libs/langchain/langchain/document_loaders/gcs_directory.py index f427dcf5a28..0036af61456 100644 --- a/libs/langchain/langchain/document_loaders/gcs_directory.py +++ b/libs/langchain/langchain/document_loaders/gcs_directory.py @@ -1,6 +1,7 @@ from typing import Callable, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.gcs_file import GCSFileLoader from langchain.utilities.vertexai import get_client_info diff --git a/libs/langchain/langchain/document_loaders/gcs_file.py b/libs/langchain/langchain/document_loaders/gcs_file.py index 468812217cd..48019a27552 100644 --- a/libs/langchain/langchain/document_loaders/gcs_file.py +++ b/libs/langchain/langchain/document_loaders/gcs_file.py @@ -2,7 +2,8 @@ import os import tempfile from typing import Callable, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader from langchain.utilities.vertexai import get_client_info diff --git a/libs/langchain/langchain/document_loaders/geodataframe.py b/libs/langchain/langchain/document_loaders/geodataframe.py index e621d2fa990..cd988b7c677 100644 --- a/libs/langchain/langchain/document_loaders/geodataframe.py +++ b/libs/langchain/langchain/document_loaders/geodataframe.py @@ -1,6 +1,7 @@ from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/git.py b/libs/langchain/langchain/document_loaders/git.py index 14a8849c7e8..a25e4eb76b2 100644 --- a/libs/langchain/langchain/document_loaders/git.py +++ b/libs/langchain/langchain/document_loaders/git.py @@ -1,7 +1,8 @@ import os from typing import Callable, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/gitbook.py b/libs/langchain/langchain/document_loaders/gitbook.py index 073d32c776f..aa1fd862045 100644 --- a/libs/langchain/langchain/document_loaders/gitbook.py +++ b/libs/langchain/langchain/document_loaders/gitbook.py @@ -1,7 +1,8 @@ from typing import Any, List, Optional from urllib.parse import urljoin, urlparse -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/github.py b/libs/langchain/langchain/document_loaders/github.py index 01eb3a0e3d5..ad942657063 100644 --- a/libs/langchain/langchain/document_loaders/github.py +++ b/libs/langchain/langchain/document_loaders/github.py @@ -3,9 +3,9 @@ from datetime import datetime from typing import Dict, Iterator, List, Literal, Optional, Union import requests +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, root_validator, validator -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/document_loaders/google_speech_to_text.py b/libs/langchain/langchain/document_loaders/google_speech_to_text.py index effb4766330..4c86389c06b 100644 --- a/libs/langchain/langchain/document_loaders/google_speech_to_text.py +++ b/libs/langchain/langchain/document_loaders/google_speech_to_text.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.vertexai import get_client_info diff --git a/libs/langchain/langchain/document_loaders/googledrive.py b/libs/langchain/langchain/document_loaders/googledrive.py index fe88882e8ea..7781c3b1e7a 100644 --- a/libs/langchain/langchain/document_loaders/googledrive.py +++ b/libs/langchain/langchain/document_loaders/googledrive.py @@ -11,9 +11,9 @@ import os from pathlib import Path from typing import Any, Dict, List, Optional, Sequence, Union +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, root_validator, validator -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader SCOPES = ["https://www.googleapis.com/auth/drive.readonly"] diff --git a/libs/langchain/langchain/document_loaders/gutenberg.py b/libs/langchain/langchain/document_loaders/gutenberg.py index f1280ef651e..8a318b2afd8 100644 --- a/libs/langchain/langchain/document_loaders/gutenberg.py +++ b/libs/langchain/langchain/document_loaders/gutenberg.py @@ -1,6 +1,7 @@ from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/hn.py b/libs/langchain/langchain/document_loaders/hn.py index a5f21b1f6f0..99f5577fdf2 100644 --- a/libs/langchain/langchain/document_loaders/hn.py +++ b/libs/langchain/langchain/document_loaders/hn.py @@ -1,6 +1,7 @@ from typing import Any, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/html_bs.py b/libs/langchain/langchain/document_loaders/html_bs.py index 85a5d7ad8f4..ad527079695 100644 --- a/libs/langchain/langchain/document_loaders/html_bs.py +++ b/libs/langchain/langchain/document_loaders/html_bs.py @@ -1,7 +1,8 @@ import logging from typing import Dict, List, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/hugging_face_dataset.py b/libs/langchain/langchain/document_loaders/hugging_face_dataset.py index b21f96d1e8a..3caf0fb3060 100644 --- a/libs/langchain/langchain/document_loaders/hugging_face_dataset.py +++ b/libs/langchain/langchain/document_loaders/hugging_face_dataset.py @@ -1,6 +1,7 @@ from typing import Iterator, List, Mapping, Optional, Sequence, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/ifixit.py b/libs/langchain/langchain/document_loaders/ifixit.py index 3507334c566..0e56f88257b 100644 --- a/libs/langchain/langchain/document_loaders/ifixit.py +++ b/libs/langchain/langchain/document_loaders/ifixit.py @@ -1,8 +1,8 @@ from typing import List, Optional import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/image_captions.py b/libs/langchain/langchain/document_loaders/image_captions.py index a5179a685b1..5b1dd61312d 100644 --- a/libs/langchain/langchain/document_loaders/image_captions.py +++ b/libs/langchain/langchain/document_loaders/image_captions.py @@ -2,8 +2,8 @@ from io import BytesIO from typing import Any, List, Tuple, Union import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/imsdb.py b/libs/langchain/langchain/document_loaders/imsdb.py index acf0e1b59be..9a81c452a42 100644 --- a/libs/langchain/langchain/document_loaders/imsdb.py +++ b/libs/langchain/langchain/document_loaders/imsdb.py @@ -1,6 +1,7 @@ from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.web_base import WebBaseLoader diff --git a/libs/langchain/langchain/document_loaders/iugu.py b/libs/langchain/langchain/document_loaders/iugu.py index c8ee3c35113..cb8e9cee7cc 100644 --- a/libs/langchain/langchain/document_loaders/iugu.py +++ b/libs/langchain/langchain/document_loaders/iugu.py @@ -2,7 +2,8 @@ import json import urllib.request from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import get_from_env, stringify_dict diff --git a/libs/langchain/langchain/document_loaders/json_loader.py b/libs/langchain/langchain/document_loaders/json_loader.py index f5b2e43a71d..785f7e1a358 100644 --- a/libs/langchain/langchain/document_loaders/json_loader.py +++ b/libs/langchain/langchain/document_loaders/json_loader.py @@ -2,7 +2,8 @@ import json from pathlib import Path from typing import Any, Callable, Dict, List, Optional, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/larksuite.py b/libs/langchain/langchain/document_loaders/larksuite.py index 1b94ca01752..b721f34173c 100644 --- a/libs/langchain/langchain/document_loaders/larksuite.py +++ b/libs/langchain/langchain/document_loaders/larksuite.py @@ -2,7 +2,8 @@ import json import urllib.request from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/mastodon.py b/libs/langchain/langchain/document_loaders/mastodon.py index 3ed70e0de1c..26c955f4cb9 100644 --- a/libs/langchain/langchain/document_loaders/mastodon.py +++ b/libs/langchain/langchain/document_loaders/mastodon.py @@ -3,7 +3,8 @@ from __future__ import annotations import os from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/max_compute.py b/libs/langchain/langchain/document_loaders/max_compute.py index d75439634bc..63e3777ae3d 100644 --- a/libs/langchain/langchain/document_loaders/max_compute.py +++ b/libs/langchain/langchain/document_loaders/max_compute.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import Any, Iterator, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.max_compute import MaxComputeAPIWrapper diff --git a/libs/langchain/langchain/document_loaders/mediawikidump.py b/libs/langchain/langchain/document_loaders/mediawikidump.py index 83e0911ab5b..67309f0fc6b 100644 --- a/libs/langchain/langchain/document_loaders/mediawikidump.py +++ b/libs/langchain/langchain/document_loaders/mediawikidump.py @@ -2,7 +2,8 @@ import logging from pathlib import Path from typing import List, Optional, Sequence, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/merge.py b/libs/langchain/langchain/document_loaders/merge.py index 496a404b131..94680e5734f 100644 --- a/libs/langchain/langchain/document_loaders/merge.py +++ b/libs/langchain/langchain/document_loaders/merge.py @@ -1,6 +1,7 @@ from typing import Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/mhtml.py b/libs/langchain/langchain/document_loaders/mhtml.py index efe1030c243..cde159fa9b8 100644 --- a/libs/langchain/langchain/document_loaders/mhtml.py +++ b/libs/langchain/langchain/document_loaders/mhtml.py @@ -2,7 +2,8 @@ import email import logging from typing import Dict, List, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/modern_treasury.py b/libs/langchain/langchain/document_loaders/modern_treasury.py index 21607ba1c89..809865d81fc 100644 --- a/libs/langchain/langchain/document_loaders/modern_treasury.py +++ b/libs/langchain/langchain/document_loaders/modern_treasury.py @@ -3,7 +3,8 @@ import urllib.request from base64 import b64encode from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import get_from_env, stringify_value diff --git a/libs/langchain/langchain/document_loaders/mongodb.py b/libs/langchain/langchain/document_loaders/mongodb.py index 7f48f88cd67..3f82c9d4fd6 100644 --- a/libs/langchain/langchain/document_loaders/mongodb.py +++ b/libs/langchain/langchain/document_loaders/mongodb.py @@ -2,7 +2,8 @@ import asyncio import logging from typing import Dict, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/news.py b/libs/langchain/langchain/document_loaders/news.py index 2709a8cd103..2a0a372d0ee 100644 --- a/libs/langchain/langchain/document_loaders/news.py +++ b/libs/langchain/langchain/document_loaders/news.py @@ -2,7 +2,8 @@ import logging from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/notebook.py b/libs/langchain/langchain/document_loaders/notebook.py index 77a01b6c45c..7ef1b5f0cc1 100644 --- a/libs/langchain/langchain/document_loaders/notebook.py +++ b/libs/langchain/langchain/document_loaders/notebook.py @@ -3,7 +3,8 @@ import json from pathlib import Path from typing import Any, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/notion.py b/libs/langchain/langchain/document_loaders/notion.py index d1081301ade..b8e918f990e 100644 --- a/libs/langchain/langchain/document_loaders/notion.py +++ b/libs/langchain/langchain/document_loaders/notion.py @@ -1,7 +1,8 @@ from pathlib import Path from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/notiondb.py b/libs/langchain/langchain/document_loaders/notiondb.py index e24d6fe555c..d1dbeb4a563 100644 --- a/libs/langchain/langchain/document_loaders/notiondb.py +++ b/libs/langchain/langchain/document_loaders/notiondb.py @@ -1,8 +1,8 @@ from typing import Any, Dict, List, Optional import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader NOTION_BASE_URL = "https://api.notion.com/v1" diff --git a/libs/langchain/langchain/document_loaders/nuclia.py b/libs/langchain/langchain/document_loaders/nuclia.py index 218c11f6338..797f8717a85 100644 --- a/libs/langchain/langchain/document_loaders/nuclia.py +++ b/libs/langchain/langchain/document_loaders/nuclia.py @@ -2,7 +2,8 @@ import json import uuid from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.tools.nuclia.tool import NucliaUnderstandingAPI diff --git a/libs/langchain/langchain/document_loaders/obs_directory.py b/libs/langchain/langchain/document_loaders/obs_directory.py index b7af3e330b1..a9bc932012e 100644 --- a/libs/langchain/langchain/document_loaders/obs_directory.py +++ b/libs/langchain/langchain/document_loaders/obs_directory.py @@ -1,7 +1,8 @@ # coding:utf-8 from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.obs_file import OBSFileLoader diff --git a/libs/langchain/langchain/document_loaders/obs_file.py b/libs/langchain/langchain/document_loaders/obs_file.py index 69a63808e4a..89407968e28 100644 --- a/libs/langchain/langchain/document_loaders/obs_file.py +++ b/libs/langchain/langchain/document_loaders/obs_file.py @@ -4,7 +4,8 @@ import os import tempfile from typing import Any, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader diff --git a/libs/langchain/langchain/document_loaders/obsidian.py b/libs/langchain/langchain/document_loaders/obsidian.py index 3d7f455e86e..85a64860d11 100644 --- a/libs/langchain/langchain/document_loaders/obsidian.py +++ b/libs/langchain/langchain/document_loaders/obsidian.py @@ -4,8 +4,8 @@ from pathlib import Path from typing import List import yaml +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/onedrive.py b/libs/langchain/langchain/document_loaders/onedrive.py index ab221c5d485..922aeb01123 100644 --- a/libs/langchain/langchain/document_loaders/onedrive.py +++ b/libs/langchain/langchain/document_loaders/onedrive.py @@ -4,9 +4,9 @@ from __future__ import annotations import logging from typing import TYPE_CHECKING, Iterator, List, Optional, Sequence, Union +from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field -from langchain.docstore.document import Document from langchain.document_loaders.base_o365 import ( O365BaseLoader, _FileType, diff --git a/libs/langchain/langchain/document_loaders/onedrive_file.py b/libs/langchain/langchain/document_loaders/onedrive_file.py index 9c7f4cab171..955ed766aee 100644 --- a/libs/langchain/langchain/document_loaders/onedrive_file.py +++ b/libs/langchain/langchain/document_loaders/onedrive_file.py @@ -3,9 +3,9 @@ from __future__ import annotations import tempfile from typing import TYPE_CHECKING, List +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Field -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader diff --git a/libs/langchain/langchain/document_loaders/onenote.py b/libs/langchain/langchain/document_loaders/onenote.py index c093703af72..2617a1a0164 100644 --- a/libs/langchain/langchain/document_loaders/onenote.py +++ b/libs/langchain/langchain/document_loaders/onenote.py @@ -3,8 +3,8 @@ from pathlib import Path from typing import Dict, Iterator, List, Optional import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.pydantic_v1 import BaseModel, BaseSettings, Field, FilePath, SecretStr diff --git a/libs/langchain/langchain/document_loaders/open_city_data.py b/libs/langchain/langchain/document_loaders/open_city_data.py index 60384cf47cb..416170d9e35 100644 --- a/libs/langchain/langchain/document_loaders/open_city_data.py +++ b/libs/langchain/langchain/document_loaders/open_city_data.py @@ -1,6 +1,7 @@ from typing import Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/parsers/docai.py b/libs/langchain/langchain/document_loaders/parsers/docai.py index b8b6a7a26be..60ef5bc52dc 100644 --- a/libs/langchain/langchain/document_loaders/parsers/docai.py +++ b/libs/langchain/langchain/document_loaders/parsers/docai.py @@ -10,9 +10,9 @@ import time from dataclasses import dataclass from typing import TYPE_CHECKING, Iterator, List, Optional, Sequence +from langchain_core.documents import Document from langchain_core.utils.iter import batch_iterate -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseBlobParser from langchain.document_loaders.blob_loaders import Blob from langchain.utilities.vertexai import get_client_info diff --git a/libs/langchain/langchain/document_loaders/parsers/grobid.py b/libs/langchain/langchain/document_loaders/parsers/grobid.py index ea21ac8a49e..3ffa6fcf86e 100644 --- a/libs/langchain/langchain/document_loaders/parsers/grobid.py +++ b/libs/langchain/langchain/document_loaders/parsers/grobid.py @@ -2,8 +2,8 @@ import logging from typing import Dict, Iterator, List, Union import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseBlobParser from langchain.document_loaders.blob_loaders import Blob diff --git a/libs/langchain/langchain/document_loaders/parsers/html/bs4.py b/libs/langchain/langchain/document_loaders/parsers/html/bs4.py index 334c1689e5b..ae56b71e975 100644 --- a/libs/langchain/langchain/document_loaders/parsers/html/bs4.py +++ b/libs/langchain/langchain/document_loaders/parsers/html/bs4.py @@ -3,7 +3,8 @@ import logging from typing import Any, Dict, Iterator, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseBlobParser from langchain.document_loaders.blob_loaders import Blob diff --git a/libs/langchain/langchain/document_loaders/parsers/language/language_parser.py b/libs/langchain/langchain/document_loaders/parsers/language/language_parser.py index 534f151e397..f3ec30114cf 100644 --- a/libs/langchain/langchain/document_loaders/parsers/language/language_parser.py +++ b/libs/langchain/langchain/document_loaders/parsers/language/language_parser.py @@ -1,6 +1,7 @@ from typing import Any, Dict, Iterator, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseBlobParser from langchain.document_loaders.blob_loaders import Blob from langchain.document_loaders.parsers.language.cobol import CobolSegmenter diff --git a/libs/langchain/langchain/document_loaders/pdf.py b/libs/langchain/langchain/document_loaders/pdf.py index ff250370649..e013fc0e446 100644 --- a/libs/langchain/langchain/document_loaders/pdf.py +++ b/libs/langchain/langchain/document_loaders/pdf.py @@ -10,8 +10,8 @@ from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Union from urllib.parse import urlparse import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.blob_loaders import Blob from langchain.document_loaders.parsers.pdf import ( diff --git a/libs/langchain/langchain/document_loaders/polars_dataframe.py b/libs/langchain/langchain/document_loaders/polars_dataframe.py index 6ece942df49..b44e94fd62c 100644 --- a/libs/langchain/langchain/document_loaders/polars_dataframe.py +++ b/libs/langchain/langchain/document_loaders/polars_dataframe.py @@ -1,6 +1,7 @@ from typing import Any, Iterator -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.dataframe import BaseDataFrameLoader diff --git a/libs/langchain/langchain/document_loaders/psychic.py b/libs/langchain/langchain/document_loaders/psychic.py index 88db3cdd059..af5670c5ef5 100644 --- a/libs/langchain/langchain/document_loaders/psychic.py +++ b/libs/langchain/langchain/document_loaders/psychic.py @@ -1,6 +1,7 @@ from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/pubmed.py b/libs/langchain/langchain/document_loaders/pubmed.py index 71d98907310..2d5513387c6 100644 --- a/libs/langchain/langchain/document_loaders/pubmed.py +++ b/libs/langchain/langchain/document_loaders/pubmed.py @@ -1,6 +1,7 @@ from typing import Iterator, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.pubmed import PubMedAPIWrapper diff --git a/libs/langchain/langchain/document_loaders/pyspark_dataframe.py b/libs/langchain/langchain/document_loaders/pyspark_dataframe.py index cee1e65492a..929f50c0c34 100644 --- a/libs/langchain/langchain/document_loaders/pyspark_dataframe.py +++ b/libs/langchain/langchain/document_loaders/pyspark_dataframe.py @@ -3,7 +3,8 @@ import logging import sys from typing import TYPE_CHECKING, Any, Iterator, List, Optional, Tuple -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__file__) diff --git a/libs/langchain/langchain/document_loaders/quip.py b/libs/langchain/langchain/document_loaders/quip.py index 3277babd040..23299467e86 100644 --- a/libs/langchain/langchain/document_loaders/quip.py +++ b/libs/langchain/langchain/document_loaders/quip.py @@ -6,7 +6,8 @@ from io import BytesIO from typing import List, Optional, Sequence from xml.etree.ElementTree import ElementTree -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/readthedocs.py b/libs/langchain/langchain/document_loaders/readthedocs.py index 2eed19931f1..7d06bedf778 100644 --- a/libs/langchain/langchain/document_loaders/readthedocs.py +++ b/libs/langchain/langchain/document_loaders/readthedocs.py @@ -3,7 +3,8 @@ from __future__ import annotations from pathlib import Path from typing import TYPE_CHECKING, Any, Iterator, List, Optional, Sequence, Tuple, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/recursive_url_loader.py b/libs/langchain/langchain/document_loaders/recursive_url_loader.py index dc6a66df814..e817d97e2df 100644 --- a/libs/langchain/langchain/document_loaders/recursive_url_loader.py +++ b/libs/langchain/langchain/document_loaders/recursive_url_loader.py @@ -15,8 +15,8 @@ from typing import ( ) import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.utils.html import extract_sub_links diff --git a/libs/langchain/langchain/document_loaders/reddit.py b/libs/langchain/langchain/document_loaders/reddit.py index 544624a84c6..3f64bc68d18 100644 --- a/libs/langchain/langchain/document_loaders/reddit.py +++ b/libs/langchain/langchain/document_loaders/reddit.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, Iterable, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/roam.py b/libs/langchain/langchain/document_loaders/roam.py index df2e4882f4f..d9d4d6aef5d 100644 --- a/libs/langchain/langchain/document_loaders/roam.py +++ b/libs/langchain/langchain/document_loaders/roam.py @@ -1,7 +1,8 @@ from pathlib import Path from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/rspace.py b/libs/langchain/langchain/document_loaders/rspace.py index 4921cb34e65..e283355c7b7 100644 --- a/libs/langchain/langchain/document_loaders/rspace.py +++ b/libs/langchain/langchain/document_loaders/rspace.py @@ -1,7 +1,8 @@ import os from typing import Any, Dict, Iterator, List, Optional, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders import PyPDFLoader from langchain.document_loaders.base import BaseLoader from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/document_loaders/rss.py b/libs/langchain/langchain/document_loaders/rss.py index 750b8bcccbc..2daeeca4be0 100644 --- a/libs/langchain/langchain/document_loaders/rss.py +++ b/libs/langchain/langchain/document_loaders/rss.py @@ -1,7 +1,8 @@ import logging from typing import Any, Iterator, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.news import NewsURLLoader diff --git a/libs/langchain/langchain/document_loaders/s3_directory.py b/libs/langchain/langchain/document_loaders/s3_directory.py index 1363c826471..0f6201b44b8 100644 --- a/libs/langchain/langchain/document_loaders/s3_directory.py +++ b/libs/langchain/langchain/document_loaders/s3_directory.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, List, Optional, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.s3_file import S3FileLoader diff --git a/libs/langchain/langchain/document_loaders/sharepoint.py b/libs/langchain/langchain/document_loaders/sharepoint.py index bb5924f9d09..91d592afdc2 100644 --- a/libs/langchain/langchain/document_loaders/sharepoint.py +++ b/libs/langchain/langchain/document_loaders/sharepoint.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import Iterator, List, Optional, Sequence +from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field -from langchain.docstore.document import Document from langchain.document_loaders.base_o365 import ( O365BaseLoader, _FileType, diff --git a/libs/langchain/langchain/document_loaders/slack_directory.py b/libs/langchain/langchain/document_loaders/slack_directory.py index 899f4eebd98..334123e29d0 100644 --- a/libs/langchain/langchain/document_loaders/slack_directory.py +++ b/libs/langchain/langchain/document_loaders/slack_directory.py @@ -3,7 +3,8 @@ import zipfile from pathlib import Path from typing import Dict, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/snowflake_loader.py b/libs/langchain/langchain/document_loaders/snowflake_loader.py index 51d98180a71..ff1b5dc2da5 100644 --- a/libs/langchain/langchain/document_loaders/snowflake_loader.py +++ b/libs/langchain/langchain/document_loaders/snowflake_loader.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import Any, Dict, Iterator, List, Optional, Tuple -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/spreedly.py b/libs/langchain/langchain/document_loaders/spreedly.py index e95518d106a..2bf13dccc71 100644 --- a/libs/langchain/langchain/document_loaders/spreedly.py +++ b/libs/langchain/langchain/document_loaders/spreedly.py @@ -2,7 +2,8 @@ import json import urllib.request from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import stringify_dict diff --git a/libs/langchain/langchain/document_loaders/srt.py b/libs/langchain/langchain/document_loaders/srt.py index d110b628f77..d1491e7c204 100644 --- a/libs/langchain/langchain/document_loaders/srt.py +++ b/libs/langchain/langchain/document_loaders/srt.py @@ -1,6 +1,7 @@ from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/stripe.py b/libs/langchain/langchain/document_loaders/stripe.py index 95ea8615e9d..03f24ab4cab 100644 --- a/libs/langchain/langchain/document_loaders/stripe.py +++ b/libs/langchain/langchain/document_loaders/stripe.py @@ -2,7 +2,8 @@ import json import urllib.request from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import get_from_env, stringify_dict diff --git a/libs/langchain/langchain/document_loaders/telegram.py b/libs/langchain/langchain/document_loaders/telegram.py index 86e857cd37b..27ee86220a1 100644 --- a/libs/langchain/langchain/document_loaders/telegram.py +++ b/libs/langchain/langchain/document_loaders/telegram.py @@ -5,7 +5,8 @@ import json from pathlib import Path from typing import TYPE_CHECKING, Dict, List, Optional, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.text_splitter import RecursiveCharacterTextSplitter diff --git a/libs/langchain/langchain/document_loaders/tencent_cos_directory.py b/libs/langchain/langchain/document_loaders/tencent_cos_directory.py index e4a8ded85f0..fdae129feac 100644 --- a/libs/langchain/langchain/document_loaders/tencent_cos_directory.py +++ b/libs/langchain/langchain/document_loaders/tencent_cos_directory.py @@ -1,6 +1,7 @@ from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.tencent_cos_file import TencentCOSFileLoader diff --git a/libs/langchain/langchain/document_loaders/tencent_cos_file.py b/libs/langchain/langchain/document_loaders/tencent_cos_file.py index 664efde2cfe..c3dc5d285da 100644 --- a/libs/langchain/langchain/document_loaders/tencent_cos_file.py +++ b/libs/langchain/langchain/document_loaders/tencent_cos_file.py @@ -2,7 +2,8 @@ import os import tempfile from typing import Any, Iterator, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader diff --git a/libs/langchain/langchain/document_loaders/text.py b/libs/langchain/langchain/document_loaders/text.py index 2bc23c01bbb..78a3ab1609c 100644 --- a/libs/langchain/langchain/document_loaders/text.py +++ b/libs/langchain/langchain/document_loaders/text.py @@ -1,7 +1,8 @@ import logging from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.helpers import detect_file_encodings diff --git a/libs/langchain/langchain/document_loaders/tomarkdown.py b/libs/langchain/langchain/document_loaders/tomarkdown.py index 1ffbf3ed00c..ccde0a9abee 100644 --- a/libs/langchain/langchain/document_loaders/tomarkdown.py +++ b/libs/langchain/langchain/document_loaders/tomarkdown.py @@ -3,8 +3,8 @@ from __future__ import annotations from typing import Iterator, List import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/toml.py b/libs/langchain/langchain/document_loaders/toml.py index b0916508d69..6a209dcb91b 100644 --- a/libs/langchain/langchain/document_loaders/toml.py +++ b/libs/langchain/langchain/document_loaders/toml.py @@ -2,7 +2,8 @@ import json from pathlib import Path from typing import Iterator, List, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/trello.py b/libs/langchain/langchain/document_loaders/trello.py index f199a68295d..1a4b5e31806 100644 --- a/libs/langchain/langchain/document_loaders/trello.py +++ b/libs/langchain/langchain/document_loaders/trello.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, List, Literal, Optional, Tuple -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utils import get_from_env diff --git a/libs/langchain/langchain/document_loaders/twitter.py b/libs/langchain/langchain/document_loaders/twitter.py index 3c681dcf93f..b418cb3a34f 100644 --- a/libs/langchain/langchain/document_loaders/twitter.py +++ b/libs/langchain/langchain/document_loaders/twitter.py @@ -2,7 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Sequence, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/unstructured.py b/libs/langchain/langchain/document_loaders/unstructured.py index 2be29461d23..e92582aa7d5 100644 --- a/libs/langchain/langchain/document_loaders/unstructured.py +++ b/libs/langchain/langchain/document_loaders/unstructured.py @@ -3,7 +3,8 @@ import collections from abc import ABC, abstractmethod from typing import IO, Any, Callable, Dict, List, Optional, Sequence, Union -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/url.py b/libs/langchain/langchain/document_loaders/url.py index 90874a3dfb2..46866163d59 100644 --- a/libs/langchain/langchain/document_loaders/url.py +++ b/libs/langchain/langchain/document_loaders/url.py @@ -2,7 +2,8 @@ import logging from typing import Any, List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/url_playwright.py b/libs/langchain/langchain/document_loaders/url_playwright.py index 7aa60cf1883..325cabe3464 100644 --- a/libs/langchain/langchain/document_loaders/url_playwright.py +++ b/libs/langchain/langchain/document_loaders/url_playwright.py @@ -4,7 +4,8 @@ import logging from abc import ABC, abstractmethod from typing import TYPE_CHECKING, List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader if TYPE_CHECKING: diff --git a/libs/langchain/langchain/document_loaders/url_selenium.py b/libs/langchain/langchain/document_loaders/url_selenium.py index a82fa27176d..e6d6059626f 100644 --- a/libs/langchain/langchain/document_loaders/url_selenium.py +++ b/libs/langchain/langchain/document_loaders/url_selenium.py @@ -6,7 +6,8 @@ from typing import TYPE_CHECKING, List, Literal, Optional, Union if TYPE_CHECKING: from selenium.webdriver import Chrome, Firefox -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/weather.py b/libs/langchain/langchain/document_loaders/weather.py index 4481cced78d..0ccfb0fe259 100644 --- a/libs/langchain/langchain/document_loaders/weather.py +++ b/libs/langchain/langchain/document_loaders/weather.py @@ -4,7 +4,8 @@ from __future__ import annotations from datetime import datetime from typing import Iterator, List, Optional, Sequence -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.openweathermap import OpenWeatherMapAPIWrapper diff --git a/libs/langchain/langchain/document_loaders/web_base.py b/libs/langchain/langchain/document_loaders/web_base.py index 4cbaabd2268..3fd41249637 100644 --- a/libs/langchain/langchain/document_loaders/web_base.py +++ b/libs/langchain/langchain/document_loaders/web_base.py @@ -6,8 +6,8 @@ from typing import Any, Dict, Iterator, List, Optional, Sequence, Union import aiohttp import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/document_loaders/whatsapp_chat.py b/libs/langchain/langchain/document_loaders/whatsapp_chat.py index 561f62b743d..56080dd842c 100644 --- a/libs/langchain/langchain/document_loaders/whatsapp_chat.py +++ b/libs/langchain/langchain/document_loaders/whatsapp_chat.py @@ -2,7 +2,8 @@ import re from pathlib import Path from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader diff --git a/libs/langchain/langchain/document_loaders/wikipedia.py b/libs/langchain/langchain/document_loaders/wikipedia.py index 7140a824744..dee0df04e1d 100644 --- a/libs/langchain/langchain/document_loaders/wikipedia.py +++ b/libs/langchain/langchain/document_loaders/wikipedia.py @@ -1,6 +1,7 @@ from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.base import BaseLoader from langchain.utilities.wikipedia import WikipediaAPIWrapper diff --git a/libs/langchain/langchain/document_loaders/word_document.py b/libs/langchain/langchain/document_loaders/word_document.py index 9feef9a07af..4e424a2291f 100644 --- a/libs/langchain/langchain/document_loaders/word_document.py +++ b/libs/langchain/langchain/document_loaders/word_document.py @@ -6,8 +6,8 @@ from typing import List from urllib.parse import urlparse import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader from langchain.document_loaders.unstructured import UnstructuredFileLoader diff --git a/libs/langchain/langchain/document_loaders/youtube.py b/libs/langchain/langchain/document_loaders/youtube.py index 817c7036bbc..a9fc21c2e92 100644 --- a/libs/langchain/langchain/document_loaders/youtube.py +++ b/libs/langchain/langchain/document_loaders/youtube.py @@ -6,10 +6,10 @@ from pathlib import Path from typing import Any, Dict, List, Optional, Sequence, Union from urllib.parse import parse_qs, urlparse +from langchain_core.documents import Document from langchain_core.pydantic_v1 import root_validator from langchain_core.pydantic_v1.dataclasses import dataclass -from langchain.docstore.document import Document from langchain.document_loaders.base import BaseLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/retrievers/arcee.py b/libs/langchain/langchain/retrievers/arcee.py index e6b168c8f9a..faf014eaf31 100644 --- a/libs/langchain/langchain/retrievers/arcee.py +++ b/libs/langchain/langchain/retrievers/arcee.py @@ -1,10 +1,10 @@ from typing import Any, Dict, List, Optional +from langchain_core.documents import Document from langchain_core.pydantic_v1 import Extra, root_validator from langchain_core.retrievers import BaseRetriever from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document from langchain.utilities.arcee import ArceeWrapper, DALMFilter from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/retrievers/elastic_search_bm25.py b/libs/langchain/langchain/retrievers/elastic_search_bm25.py index 975b5f2aea0..4e782578b4d 100644 --- a/libs/langchain/langchain/retrievers/elastic_search_bm25.py +++ b/libs/langchain/langchain/retrievers/elastic_search_bm25.py @@ -5,10 +5,10 @@ from __future__ import annotations import uuid from typing import Any, Iterable, List +from langchain_core.documents import Document from langchain_core.retrievers import BaseRetriever from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document class ElasticSearchBM25Retriever(BaseRetriever): diff --git a/libs/langchain/langchain/retrievers/embedchain.py b/libs/langchain/langchain/retrievers/embedchain.py index 3de589cd6ef..6154de9763b 100644 --- a/libs/langchain/langchain/retrievers/embedchain.py +++ b/libs/langchain/langchain/retrievers/embedchain.py @@ -4,8 +4,9 @@ from __future__ import annotations from typing import Any, Iterable, List, Optional +from langchain_core.documents import Document + from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document from langchain.schema import BaseRetriever diff --git a/libs/langchain/langchain/retrievers/google_cloud_documentai_warehouse.py b/libs/langchain/langchain/retrievers/google_cloud_documentai_warehouse.py index 6d205bd1e22..573c561ce7d 100644 --- a/libs/langchain/langchain/retrievers/google_cloud_documentai_warehouse.py +++ b/libs/langchain/langchain/retrievers/google_cloud_documentai_warehouse.py @@ -1,11 +1,11 @@ """Retriever wrapper for Google Cloud Document AI Warehouse.""" from typing import TYPE_CHECKING, Any, Dict, List, Optional +from langchain_core.documents import Document from langchain_core.pydantic_v1 import root_validator from langchain_core.retrievers import BaseRetriever from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document from langchain.utilities.vertexai import get_client_info from langchain.utils import get_from_dict_or_env diff --git a/libs/langchain/langchain/retrievers/kendra.py b/libs/langchain/langchain/retrievers/kendra.py index 2256c7d914e..f2800573df5 100644 --- a/libs/langchain/langchain/retrievers/kendra.py +++ b/libs/langchain/langchain/retrievers/kendra.py @@ -2,11 +2,11 @@ import re from abc import ABC, abstractmethod from typing import Any, Callable, Dict, List, Literal, Optional, Sequence, Union +from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Extra, root_validator, validator from langchain_core.retrievers import BaseRetriever from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document def clean_excerpt(excerpt: str) -> str: diff --git a/libs/langchain/langchain/retrievers/weaviate_hybrid_search.py b/libs/langchain/langchain/retrievers/weaviate_hybrid_search.py index a00db19af7b..52ac335b599 100644 --- a/libs/langchain/langchain/retrievers/weaviate_hybrid_search.py +++ b/libs/langchain/langchain/retrievers/weaviate_hybrid_search.py @@ -3,11 +3,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, cast from uuid import uuid4 +from langchain_core.documents import Document from langchain_core.pydantic_v1 import root_validator from langchain_core.retrievers import BaseRetriever from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document class WeaviateHybridSearchRetriever(BaseRetriever): diff --git a/libs/langchain/langchain/text_splitter.py b/libs/langchain/langchain/text_splitter.py index 43f15ecca32..45b8daa9699 100644 --- a/libs/langchain/langchain/text_splitter.py +++ b/libs/langchain/langchain/text_splitter.py @@ -51,9 +51,7 @@ from typing import ( ) import requests -from langchain_core.documents import BaseDocumentTransformer - -from langchain.docstore.document import Document +from langchain_core.documents import BaseDocumentTransformer, Document logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/analyticdb.py b/libs/langchain/langchain/vectorstores/analyticdb.py index 335b680154a..636536e4372 100644 --- a/libs/langchain/langchain/vectorstores/analyticdb.py +++ b/libs/langchain/langchain/vectorstores/analyticdb.py @@ -12,10 +12,10 @@ try: except ImportError: from sqlalchemy.ext.declarative import declarative_base +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_dict_or_env _LANGCHAIN_DEFAULT_EMBEDDING_DIM = 1536 diff --git a/libs/langchain/langchain/vectorstores/annoy.py b/libs/langchain/langchain/vectorstores/annoy.py index ea0332b8540..d737ba71024 100644 --- a/libs/langchain/langchain/vectorstores/annoy.py +++ b/libs/langchain/langchain/vectorstores/annoy.py @@ -8,11 +8,11 @@ from pathlib import Path from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore from langchain.docstore.base import Docstore -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/astradb.py b/libs/langchain/langchain/vectorstores/astradb.py index 156b13245ef..3716fa854cc 100644 --- a/libs/langchain/langchain/vectorstores/astradb.py +++ b/libs/langchain/langchain/vectorstores/astradb.py @@ -17,11 +17,11 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.utils.iter import batch_iterate from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance ADBVST = TypeVar("ADBVST", bound="AstraDB") diff --git a/libs/langchain/langchain/vectorstores/atlas.py b/libs/langchain/langchain/vectorstores/atlas.py index 96de8a90b07..a0fc20c3298 100644 --- a/libs/langchain/langchain/vectorstores/atlas.py +++ b/libs/langchain/langchain/vectorstores/atlas.py @@ -5,11 +5,10 @@ import uuid from typing import Any, Iterable, List, Optional, Type import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/awadb.py b/libs/langchain/langchain/vectorstores/awadb.py index ed4685016ab..02d018f9372 100644 --- a/libs/langchain/langchain/vectorstores/awadb.py +++ b/libs/langchain/langchain/vectorstores/awadb.py @@ -5,10 +5,10 @@ import uuid from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Set, Tuple, Type import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/azure_cosmos_db.py b/libs/langchain/langchain/vectorstores/azure_cosmos_db.py index 91a3536fe3b..156b729fe2d 100644 --- a/libs/langchain/langchain/vectorstores/azure_cosmos_db.py +++ b/libs/langchain/langchain/vectorstores/azure_cosmos_db.py @@ -16,8 +16,8 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document -from langchain.docstore.document import Document 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 d65a84b24a3..73c96f738ae 100644 --- a/libs/langchain/langchain/vectorstores/azuresearch.py +++ b/libs/langchain/langchain/vectorstores/azuresearch.py @@ -17,6 +17,7 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.pydantic_v1 import root_validator from langchain_core.retrievers import BaseRetriever @@ -26,7 +27,6 @@ from langchain.callbacks.manager import ( AsyncCallbackManagerForRetrieverRun, CallbackManagerForRetrieverRun, ) -from langchain.docstore.document import Document from langchain.utils import get_from_env logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/bageldb.py b/libs/langchain/langchain/vectorstores/bageldb.py index 9d298ebd29b..38a2aba798f 100644 --- a/libs/langchain/langchain/vectorstores/bageldb.py +++ b/libs/langchain/langchain/vectorstores/bageldb.py @@ -18,12 +18,11 @@ if TYPE_CHECKING: import bagel.config from bagel.api.types import ID, OneOrMany, Where, WhereDocument +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.utils import xor_args from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - DEFAULT_K = 5 diff --git a/libs/langchain/langchain/vectorstores/baiducloud_vector_search.py b/libs/langchain/langchain/vectorstores/baiducloud_vector_search.py index f56250d8973..a687bf0bb2d 100644 --- a/libs/langchain/langchain/vectorstores/baiducloud_vector_search.py +++ b/libs/langchain/langchain/vectorstores/baiducloud_vector_search.py @@ -12,11 +12,10 @@ from typing import ( Union, ) +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: from elasticsearch import Elasticsearch diff --git a/libs/langchain/langchain/vectorstores/cassandra.py b/libs/langchain/langchain/vectorstores/cassandra.py index e64dd4971bf..e0a3081a35e 100644 --- a/libs/langchain/langchain/vectorstores/cassandra.py +++ b/libs/langchain/langchain/vectorstores/cassandra.py @@ -20,10 +20,10 @@ import numpy as np if typing.TYPE_CHECKING: from cassandra.cluster import Session +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance CVST = TypeVar("CVST", bound="Cassandra") diff --git a/libs/langchain/langchain/vectorstores/chroma.py b/libs/langchain/langchain/vectorstores/chroma.py index d086b881a74..1bb5fc5fd0e 100644 --- a/libs/langchain/langchain/vectorstores/chroma.py +++ b/libs/langchain/langchain/vectorstores/chroma.py @@ -16,11 +16,11 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.utils import xor_args from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/clarifai.py b/libs/langchain/langchain/vectorstores/clarifai.py index 3b3728bb832..f78565ef553 100644 --- a/libs/langchain/langchain/vectorstores/clarifai.py +++ b/libs/langchain/langchain/vectorstores/clarifai.py @@ -7,11 +7,10 @@ from concurrent.futures import ThreadPoolExecutor from typing import Any, Iterable, List, Optional, Tuple import requests +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/clickhouse.py b/libs/langchain/langchain/vectorstores/clickhouse.py index d8565045758..4b8628daf7a 100644 --- a/libs/langchain/langchain/vectorstores/clickhouse.py +++ b/libs/langchain/langchain/vectorstores/clickhouse.py @@ -6,12 +6,11 @@ from hashlib import sha1 from threading import Thread from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.pydantic_v1 import BaseSettings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/dashvector.py b/libs/langchain/langchain/vectorstores/dashvector.py index 4eaed018a96..9af461bebc1 100644 --- a/libs/langchain/langchain/vectorstores/dashvector.py +++ b/libs/langchain/langchain/vectorstores/dashvector.py @@ -11,10 +11,10 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_env 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 bf1b5612cc1..316e58d7d3e 100644 --- a/libs/langchain/langchain/vectorstores/deeplake.py +++ b/libs/langchain/langchain/vectorstores/deeplake.py @@ -14,10 +14,10 @@ try: except ImportError: _DEEPLAKE_INSTALLED = False +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/dingo.py b/libs/langchain/langchain/vectorstores/dingo.py index 1059019e58a..a915192b3fd 100644 --- a/libs/langchain/langchain/vectorstores/dingo.py +++ b/libs/langchain/langchain/vectorstores/dingo.py @@ -5,10 +5,10 @@ import uuid from typing import Any, Iterable, List, Optional, Tuple import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/elastic_vector_search.py b/libs/langchain/langchain/vectorstores/elastic_vector_search.py index 7b8ae5a4228..c833aa4014c 100644 --- a/libs/langchain/langchain/vectorstores/elastic_vector_search.py +++ b/libs/langchain/langchain/vectorstores/elastic_vector_search.py @@ -15,10 +15,10 @@ from typing import ( ) from langchain_core._api import deprecated +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_dict_or_env if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/elasticsearch.py b/libs/langchain/langchain/vectorstores/elasticsearch.py index 7bb01f051ac..4af8395de80 100644 --- a/libs/langchain/langchain/vectorstores/elasticsearch.py +++ b/libs/langchain/langchain/vectorstores/elasticsearch.py @@ -15,10 +15,10 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import DistanceStrategy, maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/epsilla.py b/libs/langchain/langchain/vectorstores/epsilla.py index 0a06f702747..be2896ad1df 100644 --- a/libs/langchain/langchain/vectorstores/epsilla.py +++ b/libs/langchain/langchain/vectorstores/epsilla.py @@ -5,11 +5,10 @@ import logging import uuid from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Type +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: from pyepsilla import vectordb diff --git a/libs/langchain/langchain/vectorstores/faiss.py b/libs/langchain/langchain/vectorstores/faiss.py index 7b68c164023..367a3815e38 100644 --- a/libs/langchain/langchain/vectorstores/faiss.py +++ b/libs/langchain/langchain/vectorstores/faiss.py @@ -22,11 +22,11 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore from langchain.docstore.base import AddableMixin, Docstore -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore from langchain.vectorstores.utils import DistanceStrategy, maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/hippo.py b/libs/langchain/langchain/vectorstores/hippo.py index b995617f956..fd01098b876 100644 --- a/libs/langchain/langchain/vectorstores/hippo.py +++ b/libs/langchain/langchain/vectorstores/hippo.py @@ -3,11 +3,10 @@ from __future__ import annotations import logging from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: from transwarp_hippo_api.hippo_client import HippoClient diff --git a/libs/langchain/langchain/vectorstores/hologres.py b/libs/langchain/langchain/vectorstores/hologres.py index 08fd5c46eb0..1739a4b9b87 100644 --- a/libs/langchain/langchain/vectorstores/hologres.py +++ b/libs/langchain/langchain/vectorstores/hologres.py @@ -5,10 +5,10 @@ import logging import uuid from typing import Any, Dict, Iterable, List, Optional, Tuple, Type +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_dict_or_env ADA_TOKEN_COUNT = 1536 diff --git a/libs/langchain/langchain/vectorstores/lancedb.py b/libs/langchain/langchain/vectorstores/lancedb.py index 57b5a118602..4ca68c92ca6 100644 --- a/libs/langchain/langchain/vectorstores/lancedb.py +++ b/libs/langchain/langchain/vectorstores/lancedb.py @@ -3,11 +3,10 @@ from __future__ import annotations import uuid from typing import Any, Iterable, List, Optional +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - class LanceDB(VectorStore): """`LanceDB` vector store. diff --git a/libs/langchain/langchain/vectorstores/marqo.py b/libs/langchain/langchain/vectorstores/marqo.py index 2e465513713..daa0f46949f 100644 --- a/libs/langchain/langchain/vectorstores/marqo.py +++ b/libs/langchain/langchain/vectorstores/marqo.py @@ -15,11 +15,10 @@ from typing import ( Union, ) +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: import marqo diff --git a/libs/langchain/langchain/vectorstores/meilisearch.py b/libs/langchain/langchain/vectorstores/meilisearch.py index 9924a6ecd0d..2505cd3fcf9 100644 --- a/libs/langchain/langchain/vectorstores/meilisearch.py +++ b/libs/langchain/langchain/vectorstores/meilisearch.py @@ -3,10 +3,10 @@ from __future__ import annotations import uuid from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple, Type +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_env if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/milvus.py b/libs/langchain/langchain/vectorstores/milvus.py index a25b140d685..7fc7b96344a 100644 --- a/libs/langchain/langchain/vectorstores/milvus.py +++ b/libs/langchain/langchain/vectorstores/milvus.py @@ -5,10 +5,10 @@ from typing import Any, Iterable, List, Optional, Tuple, Union from uuid import uuid4 import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/momento_vector_index.py b/libs/langchain/langchain/vectorstores/momento_vector_index.py index dfcb09f713f..8368fd6fc15 100644 --- a/libs/langchain/langchain/vectorstores/momento_vector_index.py +++ b/libs/langchain/langchain/vectorstores/momento_vector_index.py @@ -11,10 +11,10 @@ from typing import ( ) from uuid import uuid4 +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_env from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/mongodb_atlas.py b/libs/langchain/langchain/vectorstores/mongodb_atlas.py index 146c8d5cf55..3d33d301544 100644 --- a/libs/langchain/langchain/vectorstores/mongodb_atlas.py +++ b/libs/langchain/langchain/vectorstores/mongodb_atlas.py @@ -15,10 +15,10 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/myscale.py b/libs/langchain/langchain/vectorstores/myscale.py index 4b55f4aa157..e5a18576cde 100644 --- a/libs/langchain/langchain/vectorstores/myscale.py +++ b/libs/langchain/langchain/vectorstores/myscale.py @@ -6,12 +6,11 @@ from hashlib import sha1 from threading import Thread from typing import Any, Dict, Iterable, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.pydantic_v1 import BaseSettings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - logger = logging.getLogger() diff --git a/libs/langchain/langchain/vectorstores/neo4j_vector.py b/libs/langchain/langchain/vectorstores/neo4j_vector.py index 38563872951..50bd14a9d82 100644 --- a/libs/langchain/langchain/vectorstores/neo4j_vector.py +++ b/libs/langchain/langchain/vectorstores/neo4j_vector.py @@ -15,10 +15,10 @@ from typing import ( Type, ) +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_env from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/pgembedding.py b/libs/langchain/langchain/vectorstores/pgembedding.py index 82073150398..d2a4086085d 100644 --- a/libs/langchain/langchain/vectorstores/pgembedding.py +++ b/libs/langchain/langchain/vectorstores/pgembedding.py @@ -14,10 +14,10 @@ try: except ImportError: from sqlalchemy.ext.declarative import declarative_base +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_dict_or_env Base = declarative_base() # type: Any diff --git a/libs/langchain/langchain/vectorstores/pgvector.py b/libs/langchain/langchain/vectorstores/pgvector.py index 08497e0d3e8..e1a58e81afd 100644 --- a/libs/langchain/langchain/vectorstores/pgvector.py +++ b/libs/langchain/langchain/vectorstores/pgvector.py @@ -30,10 +30,10 @@ try: except ImportError: from sqlalchemy.ext.declarative import declarative_base +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_dict_or_env 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 9d0df1e7e99..0b306b4b55e 100644 --- a/libs/langchain/langchain/vectorstores/pinecone.py +++ b/libs/langchain/langchain/vectorstores/pinecone.py @@ -6,11 +6,11 @@ import warnings from typing import TYPE_CHECKING, Any, Callable, Iterable, List, Optional, Tuple, Union import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.utils.iter import batch_iterate from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import DistanceStrategy, maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/qdrant.py b/libs/langchain/langchain/vectorstores/qdrant.py index acd0e06b6ee..09cba48911f 100644 --- a/libs/langchain/langchain/vectorstores/qdrant.py +++ b/libs/langchain/langchain/vectorstores/qdrant.py @@ -23,10 +23,10 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/redis/base.py b/libs/langchain/langchain/vectorstores/redis/base.py index 658c2975cb0..7c45fa94484 100644 --- a/libs/langchain/langchain/vectorstores/redis/base.py +++ b/libs/langchain/langchain/vectorstores/redis/base.py @@ -23,11 +23,11 @@ from typing import ( import numpy as np import yaml from langchain_core._api import deprecated +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore, VectorStoreRetriever from langchain.callbacks.manager import CallbackManagerForRetrieverRun -from langchain.docstore.document import Document 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 9b6610c3a7d..31290c74255 100644 --- a/libs/langchain/langchain/vectorstores/rocksetdb.py +++ b/libs/langchain/langchain/vectorstores/rocksetdb.py @@ -4,11 +4,10 @@ import logging from enum import Enum from typing import Any, Iterable, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/scann.py b/libs/langchain/langchain/vectorstores/scann.py index 4542be10316..efa94d96afd 100644 --- a/libs/langchain/langchain/vectorstores/scann.py +++ b/libs/langchain/langchain/vectorstores/scann.py @@ -7,11 +7,11 @@ from pathlib import Path from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore from langchain.docstore.base import AddableMixin, Docstore -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/langchain/vectorstores/singlestoredb.py b/libs/langchain/langchain/vectorstores/singlestoredb.py index 9a96b6fdfa6..4bd2f97d305 100644 --- a/libs/langchain/langchain/vectorstores/singlestoredb.py +++ b/libs/langchain/langchain/vectorstores/singlestoredb.py @@ -12,11 +12,11 @@ from typing import ( Type, ) +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore, VectorStoreRetriever from sqlalchemy.pool import QueuePool -from langchain.docstore.document import Document from langchain.vectorstores.utils import DistanceStrategy DEFAULT_DISTANCE_STRATEGY = DistanceStrategy.DOT_PRODUCT diff --git a/libs/langchain/langchain/vectorstores/sklearn.py b/libs/langchain/langchain/vectorstores/sklearn.py index f7aef920abb..8209577f93d 100644 --- a/libs/langchain/langchain/vectorstores/sklearn.py +++ b/libs/langchain/langchain/vectorstores/sklearn.py @@ -10,11 +10,11 @@ from abc import ABC, abstractmethod from typing import Any, Dict, Iterable, List, Literal, Optional, Tuple, Type from uuid import uuid4 +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.utils import guard_import from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance DEFAULT_K = 4 # Number of Documents to return. diff --git a/libs/langchain/langchain/vectorstores/sqlitevss.py b/libs/langchain/langchain/vectorstores/sqlitevss.py index 2ee5e3d9b1d..28d29e86a3a 100644 --- a/libs/langchain/langchain/vectorstores/sqlitevss.py +++ b/libs/langchain/langchain/vectorstores/sqlitevss.py @@ -13,11 +13,10 @@ from typing import ( Type, ) +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: import sqlite3 diff --git a/libs/langchain/langchain/vectorstores/starrocks.py b/libs/langchain/langchain/vectorstores/starrocks.py index 31d51779db0..568daf0d4a4 100644 --- a/libs/langchain/langchain/vectorstores/starrocks.py +++ b/libs/langchain/langchain/vectorstores/starrocks.py @@ -6,12 +6,11 @@ from hashlib import sha1 from threading import Thread from typing import Any, Dict, Iterable, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.pydantic_v1 import BaseSettings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - logger = logging.getLogger() DEBUG = False diff --git a/libs/langchain/langchain/vectorstores/supabase.py b/libs/langchain/langchain/vectorstores/supabase.py index 682b8bf4b74..57affb1c120 100644 --- a/libs/langchain/langchain/vectorstores/supabase.py +++ b/libs/langchain/langchain/vectorstores/supabase.py @@ -15,10 +15,10 @@ from typing import ( ) import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/tair.py b/libs/langchain/langchain/vectorstores/tair.py index a4dd92016d0..4e4a96c76d7 100644 --- a/libs/langchain/langchain/vectorstores/tair.py +++ b/libs/langchain/langchain/vectorstores/tair.py @@ -5,10 +5,10 @@ import logging import uuid from typing import Any, Iterable, List, Optional, Type +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_dict_or_env logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/tencentvectordb.py b/libs/langchain/langchain/vectorstores/tencentvectordb.py index c17ab9351c2..3379f7fd65e 100644 --- a/libs/langchain/langchain/vectorstores/tencentvectordb.py +++ b/libs/langchain/langchain/vectorstores/tencentvectordb.py @@ -7,11 +7,11 @@ import time from typing import Any, Dict, Iterable, List, Optional, Tuple import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.utils import guard_import from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/vectorstores/tiledb.py b/libs/langchain/langchain/vectorstores/tiledb.py index f2ba02034d6..a38dcc74f9f 100644 --- a/libs/langchain/langchain/vectorstores/tiledb.py +++ b/libs/langchain/langchain/vectorstores/tiledb.py @@ -7,10 +7,10 @@ import sys from typing import Any, Dict, Iterable, List, Mapping, Optional, Tuple import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance INDEX_METRICS = frozenset(["euclidean"]) diff --git a/libs/langchain/langchain/vectorstores/typesense.py b/libs/langchain/langchain/vectorstores/typesense.py index f8f5a687c7e..cd24b1537e3 100644 --- a/libs/langchain/langchain/vectorstores/typesense.py +++ b/libs/langchain/langchain/vectorstores/typesense.py @@ -3,10 +3,10 @@ from __future__ import annotations import uuid from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Tuple, Union +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.utils import get_from_env if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/usearch.py b/libs/langchain/langchain/vectorstores/usearch.py index 463e32a7463..d93ddfabbee 100644 --- a/libs/langchain/langchain/vectorstores/usearch.py +++ b/libs/langchain/langchain/vectorstores/usearch.py @@ -3,11 +3,11 @@ from __future__ import annotations from typing import Any, Dict, Iterable, List, Optional, Tuple import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore from langchain.docstore.base import AddableMixin, Docstore -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore diff --git a/libs/langchain/langchain/vectorstores/utils.py b/libs/langchain/langchain/vectorstores/utils.py index 7006379a791..bdb9b0bd825 100644 --- a/libs/langchain/langchain/vectorstores/utils.py +++ b/libs/langchain/langchain/vectorstores/utils.py @@ -4,8 +4,8 @@ from enum import Enum from typing import List, Tuple, Type import numpy as np +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.utils.math import cosine_similarity diff --git a/libs/langchain/langchain/vectorstores/vald.py b/libs/langchain/langchain/vectorstores/vald.py index e0d4ebc1a3c..a10bd2ea1b7 100644 --- a/libs/langchain/langchain/vectorstores/vald.py +++ b/libs/langchain/langchain/vectorstores/vald.py @@ -4,10 +4,10 @@ from __future__ import annotations from typing import Any, Iterable, List, Optional, Tuple, Type import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance diff --git a/libs/langchain/langchain/vectorstores/vearch.py b/libs/langchain/langchain/vectorstores/vearch.py index bec007fcdc7..5fac20f7b8a 100644 --- a/libs/langchain/langchain/vectorstores/vearch.py +++ b/libs/langchain/langchain/vectorstores/vearch.py @@ -6,11 +6,10 @@ import uuid from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple, Type import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: import vearch diff --git a/libs/langchain/langchain/vectorstores/vespa.py b/libs/langchain/langchain/vectorstores/vespa.py index 28f9ee1b4b7..a969a68dc4c 100644 --- a/libs/langchain/langchain/vectorstores/vespa.py +++ b/libs/langchain/langchain/vectorstores/vespa.py @@ -2,9 +2,9 @@ from __future__ import annotations from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings -from langchain.docstore.document import Document from langchain.vectorstores.base import VectorStore, VectorStoreRetriever diff --git a/libs/langchain/langchain/vectorstores/weaviate.py b/libs/langchain/langchain/vectorstores/weaviate.py index 3ef7b28fb59..dc7ea7e5253 100644 --- a/libs/langchain/langchain/vectorstores/weaviate.py +++ b/libs/langchain/langchain/vectorstores/weaviate.py @@ -15,10 +15,10 @@ from typing import ( from uuid import uuid4 import numpy as np +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document from langchain.vectorstores.utils import maximal_marginal_relevance if TYPE_CHECKING: diff --git a/libs/langchain/langchain/vectorstores/xata.py b/libs/langchain/langchain/vectorstores/xata.py index e81bfe6b150..bb2c0645369 100644 --- a/libs/langchain/langchain/vectorstores/xata.py +++ b/libs/langchain/langchain/vectorstores/xata.py @@ -4,11 +4,10 @@ import time from itertools import repeat from typing import Any, Dict, Iterable, List, Optional, Tuple, Type +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - class XataVectorStore(VectorStore): """`Xata` vector store. diff --git a/libs/langchain/langchain/vectorstores/zep.py b/libs/langchain/langchain/vectorstores/zep.py index 45343977549..5348dd8ac6e 100644 --- a/libs/langchain/langchain/vectorstores/zep.py +++ b/libs/langchain/langchain/vectorstores/zep.py @@ -5,11 +5,10 @@ import warnings from dataclasses import asdict, dataclass from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain.docstore.document import Document - if TYPE_CHECKING: from zep_python.document import Document as ZepDocument from zep_python.document import DocumentCollection diff --git a/libs/langchain/tests/integration_tests/document_loaders/test_pyspark_dataframe_loader.py b/libs/langchain/tests/integration_tests/document_loaders/test_pyspark_dataframe_loader.py index 74bdb3e291f..0d979939e08 100644 --- a/libs/langchain/tests/integration_tests/document_loaders/test_pyspark_dataframe_loader.py +++ b/libs/langchain/tests/integration_tests/document_loaders/test_pyspark_dataframe_loader.py @@ -1,7 +1,8 @@ import random import string -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.pyspark_dataframe import PySparkDataFrameLoader diff --git a/libs/langchain/tests/integration_tests/document_loaders/test_rocksetdb.py b/libs/langchain/tests/integration_tests/document_loaders/test_rocksetdb.py index 21a58764f3e..c1d2edd0a19 100644 --- a/libs/langchain/tests/integration_tests/document_loaders/test_rocksetdb.py +++ b/libs/langchain/tests/integration_tests/document_loaders/test_rocksetdb.py @@ -1,7 +1,8 @@ import logging import os -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders import RocksetLoader logger = logging.getLogger(__name__) diff --git a/libs/langchain/tests/integration_tests/llms/test_vertexai.py b/libs/langchain/tests/integration_tests/llms/test_vertexai.py index 6ddb7044874..bcc8ec273a9 100644 --- a/libs/langchain/tests/integration_tests/llms/test_vertexai.py +++ b/libs/langchain/tests/integration_tests/llms/test_vertexai.py @@ -11,11 +11,11 @@ import os from typing import Optional import pytest +from langchain_core.documents import Document from langchain_core.outputs import LLMResult from pytest_mock import MockerFixture from langchain.chains.summarize import load_summarize_chain -from langchain.docstore.document import Document from langchain.llms import VertexAI, VertexAIModelGarden diff --git a/libs/langchain/tests/integration_tests/retrievers/test_weaviate_hybrid_search.py b/libs/langchain/tests/integration_tests/retrievers/test_weaviate_hybrid_search.py index 93c1a34f1aa..bba27061a1a 100644 --- a/libs/langchain/tests/integration_tests/retrievers/test_weaviate_hybrid_search.py +++ b/libs/langchain/tests/integration_tests/retrievers/test_weaviate_hybrid_search.py @@ -6,8 +6,8 @@ from typing import Generator, Union from uuid import uuid4 import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.retrievers.weaviate_hybrid_search import WeaviateHybridSearchRetriever logging.basicConfig(level=logging.DEBUG) diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_analyticdb.py b/libs/langchain/tests/integration_tests/vectorstores/test_analyticdb.py index c8ce1c9bb0e..7b1d8282adc 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_analyticdb.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_analyticdb.py @@ -2,7 +2,8 @@ import os from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.analyticdb import AnalyticDB from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_annoy.py b/libs/langchain/tests/integration_tests/vectorstores/test_annoy.py index ff7131bcaf5..819dde07da3 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_annoy.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_annoy.py @@ -2,8 +2,8 @@ import tempfile import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore from langchain.vectorstores.annoy import Annoy from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_awadb.py b/libs/langchain/tests/integration_tests/vectorstores/test_awadb.py index b643f682de7..37185bf2aa6 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_awadb.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_awadb.py @@ -1,5 +1,6 @@ """Test AwaDB functionality.""" -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import AwaDB from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_azure_cosmos_db.py b/libs/langchain/tests/integration_tests/vectorstores/test_azure_cosmos_db.py index cf93703991b..760fe667adb 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_azure_cosmos_db.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_azure_cosmos_db.py @@ -5,8 +5,8 @@ from time import sleep from typing import Any, Generator, Optional, Union import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.embeddings import OpenAIEmbeddings from langchain.vectorstores.azure_cosmos_db import ( AzureCosmosDBVectorSearch, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_bagel.py b/libs/langchain/tests/integration_tests/vectorstores/test_bagel.py index 0a268dd0ae2..0a3f990e21b 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_bagel.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_bagel.py @@ -1,4 +1,5 @@ -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Bagel from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_baiducloud_vector_search.py b/libs/langchain/tests/integration_tests/vectorstores/test_baiducloud_vector_search.py index 8176a392a1b..f52bc1e117d 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_baiducloud_vector_search.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_baiducloud_vector_search.py @@ -1,7 +1,8 @@ """Test BESVectorStore functionality.""" from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import BESVectorStore from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_cassandra.py b/libs/langchain/tests/integration_tests/vectorstores/test_cassandra.py index bbe6189d48f..84f21ff4f7e 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_cassandra.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_cassandra.py @@ -2,7 +2,8 @@ import time from typing import List, Optional, Type -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Cassandra from tests.integration_tests.vectorstores.fake_embeddings import ( AngularTwoDimensionalEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_chroma.py b/libs/langchain/tests/integration_tests/vectorstores/test_chroma.py index abaa03adbe5..948d25f8f84 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_chroma.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_chroma.py @@ -3,8 +3,8 @@ import uuid import pytest import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.embeddings import FakeEmbeddings as Fak from langchain.vectorstores import Chroma from tests.integration_tests.vectorstores.fake_embeddings import ( diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_clarifai.py b/libs/langchain/tests/integration_tests/vectorstores/test_clarifai.py index efca85fa18b..aadb58d25ee 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_clarifai.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_clarifai.py @@ -1,7 +1,8 @@ """Test Clarifai vector store functionality.""" import time -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Clarifai diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_clickhouse.py b/libs/langchain/tests/integration_tests/vectorstores/test_clickhouse.py index 00e08dfd1ba..997d2f09739 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_clickhouse.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_clickhouse.py @@ -1,5 +1,6 @@ """Test ClickHouse functionality.""" -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Clickhouse, ClickhouseSettings from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_deeplake.py b/libs/langchain/tests/integration_tests/vectorstores/test_deeplake.py index 5e943d5cf4e..ae348e79a46 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_deeplake.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_deeplake.py @@ -1,8 +1,8 @@ """Test Deep Lake functionality.""" import pytest +from langchain_core.documents import Document from pytest import FixtureRequest -from langchain.docstore.document import Document from langchain.vectorstores import DeepLake from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_elastic_vector_search.py b/libs/langchain/tests/integration_tests/vectorstores/test_elastic_vector_search.py index b5188f5b99b..b770af33d67 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_elastic_vector_search.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_elastic_vector_search.py @@ -5,8 +5,8 @@ import uuid from typing import Generator, List, Union import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.embeddings import OpenAIEmbeddings from langchain.vectorstores.elastic_vector_search import ElasticVectorSearch from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_elasticsearch.py b/libs/langchain/tests/integration_tests/vectorstores/test_elasticsearch.py index 80d5fb7eb6b..e6b01f755c1 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_elasticsearch.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_elasticsearch.py @@ -6,8 +6,8 @@ import uuid from typing import Any, Dict, Generator, List, Union import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.elasticsearch import ElasticsearchStore from tests.integration_tests.vectorstores.fake_embeddings import ( ConsistentFakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_hippo.py b/libs/langchain/tests/integration_tests/vectorstores/test_hippo.py index b3c3c60df44..be00d245045 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_hippo.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_hippo.py @@ -1,7 +1,8 @@ """Test Hippo functionality.""" from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.hippo import Hippo from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_hologres.py b/libs/langchain/tests/integration_tests/vectorstores/test_hologres.py index 1e115753179..ccc1e03501a 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_hologres.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_hologres.py @@ -2,7 +2,8 @@ import os from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.hologres import Hologres from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_marqo.py b/libs/langchain/tests/integration_tests/vectorstores/test_marqo.py index 94549735a67..46186ce21ed 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_marqo.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_marqo.py @@ -2,8 +2,8 @@ from typing import Dict import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.marqo import Marqo DEFAULT_MARQO_URL = "http://localhost:8882" diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_meilisearch.py b/libs/langchain/tests/integration_tests/vectorstores/test_meilisearch.py index 1041ad315b6..8434c9fca03 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_meilisearch.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_meilisearch.py @@ -3,8 +3,8 @@ from typing import TYPE_CHECKING, Generator import pytest import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores import Meilisearch from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_milvus.py b/libs/langchain/tests/integration_tests/vectorstores/test_milvus.py index 38db31d63f0..614b3c036de 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_milvus.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_milvus.py @@ -1,7 +1,8 @@ """Test Milvus functionality.""" from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Milvus from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_momento_vector_index.py b/libs/langchain/tests/integration_tests/vectorstores/test_momento_vector_index.py index 59e70aaa80a..7689088ac51 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_momento_vector_index.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_momento_vector_index.py @@ -3,8 +3,8 @@ import uuid from typing import Iterator, List import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.embeddings import OpenAIEmbeddings from langchain.vectorstores import MomentoVectorIndex 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 a8cf5a13584..b5139720f38 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_mongodb_atlas.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_mongodb_atlas.py @@ -6,9 +6,9 @@ from time import sleep from typing import Any import pytest +from langchain_core.documents import Document from langchain_core.embeddings import Embeddings -from langchain.docstore.document import Document from langchain.vectorstores.mongodb_atlas import MongoDBAtlasVectorSearch INDEX_NAME = "langchain-test-index" diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_myscale.py b/libs/langchain/tests/integration_tests/vectorstores/test_myscale.py index ea1b39e9236..87d620da756 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_myscale.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_myscale.py @@ -1,5 +1,6 @@ """Test MyScale functionality.""" -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import MyScale, MyScaleSettings from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_neo4jvector.py b/libs/langchain/tests/integration_tests/vectorstores/test_neo4jvector.py index 7fa287285be..3449190aca6 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_neo4jvector.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_neo4jvector.py @@ -2,7 +2,8 @@ import os from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.neo4j_vector import Neo4jVector, SearchType from langchain.vectorstores.utils import DistanceStrategy from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_opensearch.py b/libs/langchain/tests/integration_tests/vectorstores/test_opensearch.py index 76573cdc22c..e8ade01556a 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_opensearch.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_opensearch.py @@ -1,8 +1,8 @@ """Test OpenSearch functionality.""" import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.opensearch_vector_search import ( PAINLESS_SCRIPTING_SEARCH, SCRIPT_SCORING_SEARCH, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_pgvector.py b/libs/langchain/tests/integration_tests/vectorstores/test_pgvector.py index b0dc5b27b75..6fe9fc6cb7a 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_pgvector.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_pgvector.py @@ -2,9 +2,9 @@ import os from typing import List +from langchain_core.documents import Document from sqlalchemy.orm import Session -from langchain.docstore.document import Document from langchain.vectorstores.pgvector import PGVector from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_pinecone.py b/libs/langchain/tests/integration_tests/vectorstores/test_pinecone.py index 66fd3929b80..f3bc09fc86e 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_pinecone.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_pinecone.py @@ -6,8 +6,8 @@ from typing import TYPE_CHECKING, List import numpy as np import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.embeddings import OpenAIEmbeddings from langchain.vectorstores.pinecone import Pinecone diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_redis.py b/libs/langchain/tests/integration_tests/vectorstores/test_redis.py index 4b4cced03cd..8dc267ac549 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_redis.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_redis.py @@ -3,8 +3,8 @@ import os from typing import Any, Dict, List, Optional import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.redis import ( Redis, RedisFilter, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_rocksetdb.py b/libs/langchain/tests/integration_tests/vectorstores/test_rocksetdb.py index e62b8e86532..72ba69effc1 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_rocksetdb.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_rocksetdb.py @@ -1,7 +1,8 @@ import logging import os -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.rocksetdb import Rockset from tests.integration_tests.vectorstores.fake_embeddings import ( ConsistentFakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_scann.py b/libs/langchain/tests/integration_tests/vectorstores/test_scann.py index 71d07a112be..1da4194eae5 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_scann.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_scann.py @@ -4,8 +4,8 @@ import tempfile import numpy as np import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore from langchain.vectorstores.scann import ScaNN, dependable_scann_import, normalize from langchain.vectorstores.utils import DistanceStrategy diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_singlestoredb.py b/libs/langchain/tests/integration_tests/vectorstores/test_singlestoredb.py index c68ed47180a..7ffef33a3e0 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_singlestoredb.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_singlestoredb.py @@ -3,8 +3,8 @@ from typing import List import numpy as np import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.singlestoredb import SingleStoreDB from langchain.vectorstores.utils import DistanceStrategy from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_sqlitevss.py b/libs/langchain/tests/integration_tests/vectorstores/test_sqlitevss.py index 0896706d892..0798a5e0f76 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_sqlitevss.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_sqlitevss.py @@ -1,8 +1,8 @@ from typing import List, Optional import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores import SQLiteVSS from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_tair.py b/libs/langchain/tests/integration_tests/vectorstores/test_tair.py index 73c4b8e6c5c..6a0f7c5be4f 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_tair.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_tair.py @@ -1,6 +1,7 @@ """Test tair functionality.""" -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.tair import Tair from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_tencentvectordb.py b/libs/langchain/tests/integration_tests/vectorstores/test_tencentvectordb.py index 53970997c17..93fa44cb68d 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_tencentvectordb.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_tencentvectordb.py @@ -2,7 +2,8 @@ import time from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import TencentVectorDB from langchain.vectorstores.tencentvectordb import ConnectionParams from tests.integration_tests.vectorstores.fake_embeddings import ( diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_tiledb.py b/libs/langchain/tests/integration_tests/vectorstores/test_tiledb.py index 2f02eb8c193..70609f1122a 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_tiledb.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_tiledb.py @@ -2,8 +2,8 @@ from pathlib import Path import numpy as np import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.tiledb import TileDB from tests.integration_tests.vectorstores.fake_embeddings import ( ConsistentFakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_timescalevector.py b/libs/langchain/tests/integration_tests/vectorstores/test_timescalevector.py index cc7eae6c0c2..84b9f4f5111 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_timescalevector.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_timescalevector.py @@ -3,7 +3,8 @@ import os from datetime import datetime, timedelta from typing import List -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.timescalevector import TimescaleVector from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_usearch.py b/libs/langchain/tests/integration_tests/vectorstores/test_usearch.py index 88a7764508c..4752338ff1f 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_usearch.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_usearch.py @@ -1,7 +1,7 @@ """Test USearch functionality.""" import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.usearch import USearch from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_vald.py b/libs/langchain/tests/integration_tests/vectorstores/test_vald.py index 2a9da02a7f1..0c175b3bd49 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_vald.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_vald.py @@ -2,7 +2,8 @@ import time from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Vald from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_vearch.py b/libs/langchain/tests/integration_tests/vectorstores/test_vearch.py index 759dffbe1ac..f19a182fc7d 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_vearch.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_vearch.py @@ -1,6 +1,6 @@ # flake8: noqa -from langchain.docstore.document import Document +from langchain_core.documents import Document from langchain.vectorstores.vearch import Vearch from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_vectara.py b/libs/langchain/tests/integration_tests/vectorstores/test_vectara.py index 2e79001a1c5..8a9ad80ac4b 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_vectara.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_vectara.py @@ -1,7 +1,8 @@ import tempfile import urllib.request -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores.vectara import Vectara from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_weaviate.py b/libs/langchain/tests/integration_tests/vectorstores/test_weaviate.py index 0f8487285a4..e14dd82d5dd 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_weaviate.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_weaviate.py @@ -5,8 +5,8 @@ import uuid from typing import Generator, Union import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.embeddings.openai import OpenAIEmbeddings from langchain.vectorstores.weaviate import Weaviate from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_xata.py b/libs/langchain/tests/integration_tests/vectorstores/test_xata.py index a4aed366543..b3e20bd864e 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_xata.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_xata.py @@ -6,7 +6,8 @@ https://python.langchain.com/docs/integrations/vectorstores/xata """ import os -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.embeddings.openai import OpenAIEmbeddings from langchain.vectorstores.xata import XataVectorStore diff --git a/libs/langchain/tests/integration_tests/vectorstores/test_zilliz.py b/libs/langchain/tests/integration_tests/vectorstores/test_zilliz.py index 5080e222865..a4d5a38bce7 100644 --- a/libs/langchain/tests/integration_tests/vectorstores/test_zilliz.py +++ b/libs/langchain/tests/integration_tests/vectorstores/test_zilliz.py @@ -1,7 +1,8 @@ """Test Zilliz functionality.""" from typing import List, Optional -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.vectorstores import Zilliz from tests.integration_tests.vectorstores.fake_embeddings import ( FakeEmbeddings, diff --git a/libs/langchain/tests/unit_tests/agents/test_react.py b/libs/langchain/tests/unit_tests/agents/test_react.py index 81ab3f464dd..05cc6a5af96 100644 --- a/libs/langchain/tests/unit_tests/agents/test_react.py +++ b/libs/langchain/tests/unit_tests/agents/test_react.py @@ -3,12 +3,12 @@ from typing import Union from langchain_core.agents import AgentAction +from langchain_core.documents import Document from langchain_core.prompts.prompt import PromptTemplate from langchain.agents.react.base import ReActChain, ReActDocstoreAgent from langchain.agents.tools import Tool from langchain.docstore.base import Docstore -from langchain.docstore.document import Document from langchain.llms.fake import FakeListLLM _PAGE_CONTENT = """This is a page about LangChain. diff --git a/libs/langchain/tests/unit_tests/chains/test_combine_documents.py b/libs/langchain/tests/unit_tests/chains/test_combine_documents.py index 70265b4a93e..4dbb4b745ee 100644 --- a/libs/langchain/tests/unit_tests/chains/test_combine_documents.py +++ b/libs/langchain/tests/unit_tests/chains/test_combine_documents.py @@ -3,6 +3,7 @@ from typing import Any, List import pytest +from langchain_core.documents import Document from langchain_core.prompts import PromptTemplate, format_document from langchain.chains.combine_documents.reduce import ( @@ -10,7 +11,6 @@ from langchain.chains.combine_documents.reduce import ( split_list_of_docs, ) from langchain.chains.qa_with_sources import load_qa_with_sources_chain -from langchain.docstore.document import Document from tests.unit_tests.llms.fake_llm import FakeLLM diff --git a/libs/langchain/tests/unit_tests/docstore/test_inmemory.py b/libs/langchain/tests/unit_tests/docstore/test_inmemory.py index 300b154427d..20d765ad198 100644 --- a/libs/langchain/tests/unit_tests/docstore/test_inmemory.py +++ b/libs/langchain/tests/unit_tests/docstore/test_inmemory.py @@ -1,7 +1,7 @@ """Test in memory docstore.""" import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_confluence.py b/libs/langchain/tests/unit_tests/document_loaders/test_confluence.py index 0048a8fba41..0336be88d7f 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_confluence.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_confluence.py @@ -4,8 +4,8 @@ from unittest.mock import MagicMock, patch import pytest import requests +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.confluence import ConfluenceLoader, ContentFormat diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_csv_loader.py b/libs/langchain/tests/unit_tests/document_loaders/test_csv_loader.py index aae62298b1a..60632bcf700 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_csv_loader.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_csv_loader.py @@ -1,6 +1,7 @@ from pathlib import Path -from langchain.docstore.document import Document +from langchain_core.documents import Document + from langchain.document_loaders.csv_loader import CSVLoader diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_github.py b/libs/langchain/tests/unit_tests/document_loaders/test_github.py index 097589329a5..c33ac8613e3 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_github.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_github.py @@ -1,7 +1,7 @@ import pytest +from langchain_core.documents import Document from pytest_mock import MockerFixture -from langchain.docstore.document import Document from langchain.document_loaders.github import GitHubIssuesLoader diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_json_loader.py b/libs/langchain/tests/unit_tests/document_loaders/test_json_loader.py index a96facc4171..d339f5dcfd9 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_json_loader.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_json_loader.py @@ -2,10 +2,10 @@ import io from typing import Any, Dict import pytest +from langchain_core.documents import Document from pytest import raises from pytest_mock import MockerFixture -from langchain.docstore.document import Document from langchain.document_loaders.json_loader import JSONLoader pytestmark = pytest.mark.requires("jq") diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_mongodb.py b/libs/langchain/tests/unit_tests/document_loaders/test_mongodb.py index 802c49893d5..c30b5c5d5cc 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_mongodb.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_mongodb.py @@ -2,8 +2,8 @@ from typing import Dict, List from unittest.mock import AsyncMock, MagicMock, patch import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.mongodb import MongodbLoader diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_onenote.py b/libs/langchain/tests/unit_tests/document_loaders/test_onenote.py index 3aefde43f12..1706eaef2dc 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_onenote.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_onenote.py @@ -4,9 +4,9 @@ from unittest.mock import Mock import pytest from _pytest.monkeypatch import MonkeyPatch +from langchain_core.documents import Document from pytest_mock import MockerFixture -from langchain.docstore.document import Document from langchain.document_loaders.onenote import OneNoteLoader diff --git a/libs/langchain/tests/unit_tests/document_loaders/test_psychic.py b/libs/langchain/tests/unit_tests/document_loaders/test_psychic.py index 962ef69bd74..0f86b9abe10 100644 --- a/libs/langchain/tests/unit_tests/document_loaders/test_psychic.py +++ b/libs/langchain/tests/unit_tests/document_loaders/test_psychic.py @@ -2,8 +2,8 @@ from typing import Dict from unittest.mock import MagicMock, patch import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.document_loaders.psychic import PsychicLoader diff --git a/libs/langchain/tests/unit_tests/test_text_splitter.py b/libs/langchain/tests/unit_tests/test_text_splitter.py index e6951ef67fb..8edf76892b0 100644 --- a/libs/langchain/tests/unit_tests/test_text_splitter.py +++ b/libs/langchain/tests/unit_tests/test_text_splitter.py @@ -3,8 +3,8 @@ import re from typing import List import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.text_splitter import ( CharacterTextSplitter, Language, diff --git a/libs/langchain/tests/unit_tests/vectorstores/test_faiss.py b/libs/langchain/tests/unit_tests/vectorstores/test_faiss.py index df57289448e..33a47665b99 100644 --- a/libs/langchain/tests/unit_tests/vectorstores/test_faiss.py +++ b/libs/langchain/tests/unit_tests/vectorstores/test_faiss.py @@ -4,8 +4,8 @@ import math import tempfile import pytest +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.docstore.in_memory import InMemoryDocstore from langchain.vectorstores.faiss import FAISS from tests.integration_tests.vectorstores.fake_embeddings import FakeEmbeddings diff --git a/libs/langchain/tests/unit_tests/vectorstores/test_utils.py b/libs/langchain/tests/unit_tests/vectorstores/test_utils.py index 907ed2cde30..a195db1a803 100644 --- a/libs/langchain/tests/unit_tests/vectorstores/test_utils.py +++ b/libs/langchain/tests/unit_tests/vectorstores/test_utils.py @@ -1,7 +1,7 @@ """Test vector store utility functions.""" import numpy as np +from langchain_core.documents import Document -from langchain.docstore.document import Document from langchain.vectorstores.utils import ( filter_complex_metadata, maximal_marginal_relevance,