Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libs/langchain/langchain/agents/initialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
from langchain._api.deprecation import AGENT_DEPRECATION_WARNING
from langchain.agents.agent import AgentExecutor
from langchain.agents.agent_types import AgentType
from langchain.agents.loading import AGENT_TO_CLASS, load_agent
from langchain.agents.loading import load_agent
from langchain.agents.types import AGENT_TO_CLASS


@deprecated(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
)
from langchain_core.prompts import BasePromptTemplate
from langchain_core.prompts.chat import (
BaseMessagePromptTemplate,
ChatPromptTemplate,
HumanMessagePromptTemplate,
MessagesPlaceholder,
)
from langchain_core.prompts.message import BaseMessagePromptTemplate
from langchain_core.runnables import Runnable, RunnablePassthrough
from langchain_core.tools import BaseTool
from langchain_core.utils.function_calling import convert_to_openai_function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
)
from langchain_core.prompts import BasePromptTemplate
from langchain_core.prompts.chat import (
BaseMessagePromptTemplate,
ChatPromptTemplate,
HumanMessagePromptTemplate,
MessagesPlaceholder,
)
from langchain_core.prompts.message import BaseMessagePromptTemplate
from langchain_core.tools import BaseTool
from pydantic import model_validator
from typing_extensions import Self
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/agents/output_parsers/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from langchain_core.agents import AgentAction, AgentFinish
from langchain_core.exceptions import OutputParserException
from langchain_core.output_parsers.json import parse_json_markdown
from langchain_core.utils.json import parse_json_markdown

from langchain.agents.agent import AgentOutputParser

Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/callbacks/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from typing import TYPE_CHECKING, Any

from langchain_core.callbacks import Callbacks
from langchain_core.callbacks.manager import (
AsyncCallbackManager,
AsyncCallbackManagerForChainGroup,
Expand All @@ -18,7 +19,6 @@
CallbackManagerForLLMRun,
CallbackManagerForRetrieverRun,
CallbackManagerForToolRun,
Callbacks,
ParentRunManager,
RunManager,
ahandle_event,
Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain/callbacks/tracers/base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Base interfaces for tracing runs."""

from langchain_core.tracers.base import BaseTracer, TracerException
from langchain_core.exceptions import TracerException
from langchain_core.tracers.base import BaseTracer

__all__ = ["BaseTracer", "TracerException"]
2 changes: 1 addition & 1 deletion libs/langchain/langchain/chains/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ensure_config,
run_in_executor,
)
from langchain_core.runnables.utils import create_model
from langchain_core.utils.pydantic import create_model
from pydantic import (
BaseModel,
ConfigDict,
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/chains/combine_documents/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from langchain_core.documents import Document
from langchain_core.prompts import BasePromptTemplate, PromptTemplate
from langchain_core.runnables.config import RunnableConfig
from langchain_core.runnables.utils import create_model
from langchain_core.utils.pydantic import create_model
from langchain_text_splitters import RecursiveCharacterTextSplitter, TextSplitter
from pydantic import BaseModel, Field

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from langchain_core.callbacks import Callbacks
from langchain_core.documents import Document
from langchain_core.runnables.config import RunnableConfig
from langchain_core.runnables.utils import create_model
from langchain_core.utils.pydantic import create_model
from pydantic import BaseModel, ConfigDict, model_validator

from langchain.chains.combine_documents.base import BaseCombineDocumentsChain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from langchain_core.callbacks import Callbacks
from langchain_core.documents import Document
from langchain_core.runnables.config import RunnableConfig
from langchain_core.runnables.utils import create_model
from langchain_core.utils.pydantic import create_model
from pydantic import BaseModel, ConfigDict, model_validator
from typing_extensions import Self

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
)

from langchain_core.agents import AgentAction
from langchain_core.callbacks import Callbacks
from langchain_core.callbacks.manager import (
AsyncCallbackManagerForChainRun,
CallbackManagerForChainRun,
Callbacks,
)
from langchain_core.exceptions import OutputParserException
from langchain_core.language_models import BaseLanguageModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import re
from typing import Any, Optional, Union

from langchain_core.callbacks.manager import Callbacks
from langchain_core.callbacks import Callbacks
from langchain_core.language_models import BaseLanguageModel
from langchain_core.output_parsers import BaseOutputParser
from langchain_core.prompts.prompt import PromptTemplate
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/evaluation/criteria/eval_chain.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from enum import Enum
from typing import Any, Optional, Union

from langchain_core.callbacks.manager import Callbacks
from langchain_core.callbacks import Callbacks
from langchain_core.language_models import BaseLanguageModel
from langchain_core.output_parsers import BaseOutputParser
from langchain_core.prompts import BasePromptTemplate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from importlib import util
from typing import Any, Optional

from langchain_core.callbacks import Callbacks
from langchain_core.callbacks.manager import (
AsyncCallbackManagerForChainRun,
CallbackManagerForChainRun,
Callbacks,
)
from langchain_core.embeddings import Embeddings
from langchain_core.utils import pre_init
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/evaluation/qa/eval_chain.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from collections.abc import Sequence
from typing import Any, Optional

from langchain_core.callbacks.manager import Callbacks
from langchain_core.callbacks import Callbacks
from langchain_core.language_models import BaseLanguageModel
from langchain_core.prompts import PromptTemplate
from pydantic import ConfigDict
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/evaluation/scoring/eval_chain.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import re
from typing import Any, Optional, Union

from langchain_core.callbacks.manager import Callbacks
from langchain_core.callbacks import Callbacks
from langchain_core.language_models import BaseLanguageModel
from langchain_core.output_parsers import BaseOutputParser
from langchain_core.prompts.prompt import PromptTemplate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from enum import Enum
from typing import Any, Callable, Optional

from langchain_core.callbacks import Callbacks
from langchain_core.callbacks.manager import (
AsyncCallbackManagerForChainRun,
CallbackManagerForChainRun,
Callbacks,
)
from langchain_core.utils import pre_init
from pydantic import Field
Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain/memory/buffer.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from typing import Any, Optional

from langchain_core._api import deprecated
from langchain_core.memory import BaseMemory
from langchain_core.messages import BaseMessage, get_buffer_string
from langchain_core.utils import pre_init

from langchain.memory.chat_memory import BaseChatMemory, BaseMemory
from langchain.memory.chat_memory import BaseChatMemory
from langchain.memory.utils import get_prompt_input_key


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain/memory/vectorstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

from langchain_core._api import deprecated
from langchain_core.documents import Document
from langchain_core.memory import BaseMemory
from langchain_core.vectorstores import VectorStoreRetriever
from pydantic import Field

from langchain.memory.chat_memory import BaseMemory
from langchain.memory.utils import get_prompt_input_key


Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain/prompts/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from langchain_core.prompts.chat import (
AIMessagePromptTemplate,
BaseChatPromptTemplate,
BaseMessagePromptTemplate,
BaseStringMessagePromptTemplate,
ChatMessagePromptTemplate,
ChatPromptTemplate,
Expand Down Expand Up @@ -34,3 +33,5 @@
"MessageLike",
"MessageLikeRepresentation",
]

from langchain_core.prompts.message import BaseMessagePromptTemplate
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@
AsyncCallbackManagerForRetrieverRun,
CallbackManagerForRetrieverRun,
)
from langchain_core.documents import Document
from langchain_core.documents import BaseDocumentCompressor, Document
from langchain_core.retrievers import BaseRetriever, RetrieverLike
from pydantic import ConfigDict

from langchain.retrievers.document_compressors.base import (
BaseDocumentCompressor,
)


class ContextualCompressionRetriever(BaseRetriever):
"""Retriever that wraps a base retriever and compresses the results."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ def __getattr__(name: str) -> Any:
__all__ = [
"DocumentCompressorPipeline",
"EmbeddingsFilter",
"FlashrankRerank",
"LLMListwiseRerank",
"LLMChainExtractor",
"LLMChainFilter",
"CohereRerank",
"CrossEncoderReranker",
] + list(_module_lookup.keys())
]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from inspect import signature
from typing import Optional, Union

from langchain_core.callbacks.manager import Callbacks
from langchain_core.callbacks import Callbacks
from langchain_core.documents import (
BaseDocumentCompressor,
BaseDocumentTransformer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
from collections.abc import Sequence
from typing import Any, Callable, Optional, cast

from langchain_core.callbacks.manager import Callbacks
from langchain_core.documents import Document
from langchain_core.callbacks import Callbacks
from langchain_core.documents import BaseDocumentCompressor, Document
from langchain_core.language_models import BaseLanguageModel
from langchain_core.output_parsers import BaseOutputParser, StrOutputParser
from langchain_core.prompts import PromptTemplate
from langchain_core.runnables import Runnable
from pydantic import ConfigDict

from langchain.chains.llm import LLMChain
from langchain.retrievers.document_compressors.base import BaseDocumentCompressor
from langchain.retrievers.document_compressors.chain_extract_prompt import (
prompt_template,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from collections.abc import Sequence
from typing import Any, Callable, Optional

from langchain_core.callbacks.manager import Callbacks
from langchain_core.documents import Document
from langchain_core.callbacks import Callbacks
from langchain_core.documents import BaseDocumentCompressor, Document
from langchain_core.language_models import BaseLanguageModel
from langchain_core.output_parsers import StrOutputParser
from langchain_core.prompts import BasePromptTemplate, PromptTemplate
Expand All @@ -14,7 +14,6 @@

from langchain.chains import LLMChain
from langchain.output_parsers.boolean import BooleanOutputParser
from langchain.retrievers.document_compressors.base import BaseDocumentCompressor
from langchain.retrievers.document_compressors.chain_filter_prompt import (
prompt_template,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
from typing import Any, Optional, Union

from langchain_core._api.deprecation import deprecated
from langchain_core.callbacks.manager import Callbacks
from langchain_core.documents import Document
from langchain_core.callbacks import Callbacks
from langchain_core.documents import BaseDocumentCompressor, Document
from langchain_core.utils import get_from_dict_or_env
from pydantic import ConfigDict, model_validator

from langchain.retrievers.document_compressors.base import BaseDocumentCompressor


@deprecated(
since="0.0.30", removal="1.0", alternative_import="langchain_cohere.CohereRerank"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
from collections.abc import Sequence
from typing import Callable, Optional

from langchain_core.callbacks.manager import Callbacks
from langchain_core.documents import Document
from langchain_core.callbacks import Callbacks
from langchain_core.documents import BaseDocumentCompressor, Document
from langchain_core.embeddings import Embeddings
from langchain_core.utils import pre_init
from pydantic import ConfigDict, Field

from langchain.retrievers.document_compressors.base import (
BaseDocumentCompressor,
)


def _get_similarity_function() -> Callable:
try:
Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain/runnables/hub.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from typing import Any, Optional

from langchain_core.runnables.base import Input, Output, RunnableBindingBase
from langchain_core.runnables.base import RunnableBindingBase
from langchain_core.runnables.utils import Input, Output


class HubRunnable(RunnableBindingBase[Input, Output]):
Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain/schema/callbacks/tracers/base.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from langchain_core.tracers.base import BaseTracer, TracerException
from langchain_core.exceptions import TracerException
from langchain_core.tracers.base import BaseTracer

__all__ = ["TracerException", "BaseTracer"]
4 changes: 2 additions & 2 deletions libs/langchain/langchain/smith/evaluation/runner_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
)

from langchain_core._api import warn_deprecated
from langchain_core.callbacks.manager import Callbacks
from langchain_core.callbacks import Callbacks
from langchain_core.language_models import BaseLanguageModel
from langchain_core.messages import BaseMessage, messages_from_dict
from langchain_core.outputs import ChatResult, LLMResult
Expand Down Expand Up @@ -1226,7 +1226,7 @@ def prepare(

def _is_jupyter_environment() -> bool:
try:
from IPython import get_ipython
from IPython.core.getipython import get_ipython

res = get_ipython()
return get_ipython() is not None and "zmqshell" in str(type(res))
Expand Down
15 changes: 12 additions & 3 deletions libs/langchain/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ lint = [
"cffi; python_version >= \"3.10\"",
]
typing = [
"mypy<2.0,>=1.15",
"mypy<1.16,>=1.15",
"types-pyyaml<7.0.0.0,>=6.0.12.2",
"types-requests<3.0.0.0,>=2.28.11.5",
"types-toml<1.0.0.0,>=0.10.8.1",
Expand Down Expand Up @@ -124,9 +124,18 @@ target-version = "py39"
exclude = ["tests/integration_tests/examples/non-utf8-encoding.py"]

[tool.mypy]
strict = "True"
strict_bytes = "True"
ignore_missing_imports = "True"
disallow_untyped_defs = "True"
warn_unused_ignores = "True"
enable_error_code = "deprecated"
report_deprecated_as_note = "True"

# TODO: activate for 'strict' checking
disallow_untyped_calls = "False"
disallow_any_generics = "False"
disallow_untyped_decorators = "False"
warn_return_any = "False"
strict_equality = "False"

[tool.codespell]
skip = ".git,*.pdf,*.svg,*.pdf,*.yaml,*.ipynb,poetry.lock,*.min.js,*.css,package-lock.json,example_data,_dist,examples,*.trig"
Expand Down
Loading
Loading