Skip to content

Commit

Permalink
REFACTOR: combine core documents files (#13733)
Browse files Browse the repository at this point in the history
  • Loading branch information
baskaryan committed Nov 22, 2023
1 parent 14d4fb9 commit 32d087f
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 27 deletions.
4 changes: 4 additions & 0 deletions libs/core/langchain_core/documents/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from langchain_core.documents.base import Document
from langchain_core.documents.transformers import BaseDocumentTransformer

__all__ = ["Document", "BaseDocumentTransformer"]
File renamed without changes.
Empty file.
7 changes: 7 additions & 0 deletions libs/core/tests/unit_tests/documents/test_imports.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from langchain_core.documents import __all__

EXPECTED_ALL = ["Document", "BaseDocumentTransformer"]


def test_all_imports() -> None:
assert set(__all__) == set(EXPECTED_ALL)
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any, Iterator, List, Sequence, cast

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document


class BeautifulSoupTransformer(BaseDocumentTransformer):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any, List, Optional, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document

from langchain.utils import get_from_env

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any, Optional, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document

from langchain.utils import get_from_env

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any, Optional, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document

from langchain.utils import get_from_env

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
from typing import Any, Callable, List, Sequence

import numpy as np
from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document
from langchain_core.embeddings import Embeddings
from langchain_core.pydantic_v1 import BaseModel, Field

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any, Optional, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document

from langchain.utilities.vertexai import get_client_info

Expand Down
3 changes: 1 addition & 2 deletions libs/langchain/langchain/document_transformers/html2text.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document


class Html2TextTransformer(BaseDocumentTransformer):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"""Reorder documents"""
from typing import Any, List, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document
from langchain_core.pydantic_v1 import BaseModel


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import uuid
from typing import Any, Sequence

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document

from langchain.tools.nuclia.tool import NucliaUnderstandingAPI

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"""Document transformers that use OpenAI Functions models"""
from typing import Any, Dict, Optional, Sequence, Type, Union

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document
from langchain_core.language_models import BaseLanguageModel
from langchain_core.prompts import ChatPromptTemplate
from langchain_core.pydantic_v1 import BaseModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
from inspect import signature
from typing import List, Optional, Sequence, Union

from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document
from langchain_core.pydantic_v1 import BaseModel

from langchain.callbacks.manager import Callbacks
Expand Down
3 changes: 1 addition & 2 deletions libs/langchain/langchain/schema/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
from langchain_core.agents import AgentAction, AgentFinish
from langchain_core.caches import BaseCache
from langchain_core.chat_history import BaseChatMessageHistory
from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document
from langchain_core.exceptions import LangChainException, OutputParserException
from langchain_core.memory import BaseMemory
from langchain_core.messages import (
Expand Down
3 changes: 1 addition & 2 deletions libs/langchain/langchain/schema/document.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentTransformer, Document

__all__ = ["Document", "BaseDocumentTransformer"]
2 changes: 1 addition & 1 deletion libs/langchain/langchain/text_splitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
)

import requests
from langchain_core.document_transformers import BaseDocumentTransformer
from langchain_core.documents import BaseDocumentTransformer

from langchain.docstore.document import Document

Expand Down

0 comments on commit 32d087f

Please sign in to comment.