BUGFIX: Add import types and typevars from core (#13829)

libs/core/langchain_core/language_models/__init__.py

@@ -1,6 +1,7 @@
 from langchain_core.language_models.base import (
     BaseLanguageModel,
     LanguageModelInput,
+    LanguageModelOutput,
     get_tokenizer,
 )
 from langchain_core.language_models.chat_models import BaseChatModel, SimpleChatModel
@@ -14,4 +15,5 @@
     "LLM",
     "LanguageModelInput",
     "get_tokenizer",
+    "LanguageModelOutput",
 ]

libs/core/tests/unit_tests/language_models/test_imports.py

@@ -7,6 +7,7 @@
     "BaseLLM",
     "LLM",
     "LanguageModelInput",
+    "LanguageModelOutput",
     "get_tokenizer",
 ]
 

libs/langchain/langchain/schema/cache.py

@@ -1,3 +1,3 @@
-from langchain_core.caches import BaseCache
+from langchain_core.caches import RETURN_VAL_TYPE, BaseCache
 
-__all__ = ["BaseCache"]
+__all__ = ["BaseCache", "RETURN_VAL_TYPE"]

libs/langchain/langchain/schema/language_model.py

@@ -1,4 +1,15 @@
-from langchain_core.language_models import BaseLanguageModel, get_tokenizer
+from langchain_core.language_models import (
+    BaseLanguageModel,
+    LanguageModelInput,
+    LanguageModelOutput,
+    get_tokenizer,
+)
 from langchain_core.language_models.base import _get_token_ids_default_method
 
-__all__ = ["get_tokenizer", "BaseLanguageModel", "_get_token_ids_default_method"]
+__all__ = [
+    "get_tokenizer",
+    "BaseLanguageModel",
+    "_get_token_ids_default_method",
+    "LanguageModelInput",
+    "LanguageModelOutput",
+]

libs/langchain/langchain/schema/messages.py

@@ -1,6 +1,7 @@
 from langchain_core.messages import (
     AIMessage,
     AIMessageChunk,
+    AnyMessage,
     BaseMessage,
     BaseMessageChunk,
     ChatMessage,
@@ -46,4 +47,5 @@
     "_message_to_dict",
     "_message_from_dict",
     "message_to_dict",
+    "AnyMessage",
 ]

libs/langchain/langchain/schema/output_parser.py

@@ -7,6 +7,7 @@
     BaseTransformOutputParser,
     StrOutputParser,
 )
+from langchain_core.output_parsers.base import T
 
 # Backwards compatibility.
 NoOpOutputParser = StrOutputParser
@@ -20,4 +21,5 @@
     "NoOpOutputParser",
     "StrOutputParser",
     "OutputParserException",
+    "T",
 ]

libs/langchain/langchain/schema/runnable/base.py

@@ -1,21 +1,28 @@
 from langchain_core.runnables.base import (
+    Other,
     Runnable,
     RunnableBinding,
     RunnableBindingBase,
     RunnableEach,
     RunnableEachBase,
     RunnableGenerator,
     RunnableLambda,
+    RunnableLike,
     RunnableParallel,
     RunnableSequence,
     RunnableSerializable,
     coerce_to_runnable,
 )
+from langchain_core.runnables.utils import Input, Output
 
 # Backwards compatibility.
 RunnableMap = RunnableParallel
 
 __all__ = [
+    "Input",
+    "Output",
+    "RunnableLike",
+    "Other",
     "Runnable",
     "RunnableSerializable",
     "RunnableSequence",

libs/langchain/langchain/schema/runnable/history.py

@@ -1,3 +1,11 @@
-from langchain_core.runnables.history import RunnableWithMessageHistory
+from langchain_core.runnables.history import (
+    GetSessionHistoryCallable,
+    MessagesOrDictWithMessages,
+    RunnableWithMessageHistory,
+)
 
-__all__ = ["RunnableWithMessageHistory"]
+__all__ = [
+    "RunnableWithMessageHistory",
+    "GetSessionHistoryCallable",
+    "MessagesOrDictWithMessages",
+]

libs/langchain/langchain/schema/runnable/retry.py

@@ -1,3 +1,3 @@
-from langchain_core.runnables.retry import RunnableRetry
+from langchain_core.runnables.retry import RunnableRetry, U
 
-__all__ = ["RunnableRetry"]
+__all__ = ["RunnableRetry", "U"]

libs/langchain/langchain/schema/runnable/utils.py

@@ -1,5 +1,7 @@
 from langchain_core.runnables.utils import (
+    Addable,
     AddableDict,
+    AnyConfigurableField,
     ConfigurableField,
     ConfigurableFieldMultiOption,
     ConfigurableFieldSingleOption,
@@ -44,4 +46,6 @@
     "gather_with_concurrency",
     "Input",
     "Output",
+    "Addable",
+    "AnyConfigurableField",
 ]

libs/langchain/langchain/schema/storage.py

@@ -1,3 +1,3 @@
-from langchain_core.stores import BaseStore
+from langchain_core.stores import BaseStore, K, V
 
-__all__ = ["BaseStore"]
+__all__ = ["BaseStore", "K", "V"]

libs/langchain/langchain/schema/vectorstore.py

@@ -1,3 +1,3 @@
-from langchain_core.vectorstores import VectorStore, VectorStoreRetriever
+from langchain_core.vectorstores import VST, VectorStore, VectorStoreRetriever
 
-__all__ = ["VectorStore", "VectorStoreRetriever"]
+__all__ = ["VectorStore", "VectorStoreRetriever", "VST"]

libs/langchain/tests/unit_tests/schema/runnable/test_base.py

@@ -13,6 +13,10 @@
     "RunnableSequence",
     "RunnableSerializable",
     "coerce_to_runnable",
+    "Input",
+    "Output",
+    "Other",
+    "RunnableLike",
 ]
 
 

libs/langchain/tests/unit_tests/schema/runnable/test_history.py

@@ -1,6 +1,10 @@
 from langchain.schema.runnable.history import __all__
 
-EXPECTED_ALL = ["RunnableWithMessageHistory"]
+EXPECTED_ALL = [
+    "RunnableWithMessageHistory",
+    "GetSessionHistoryCallable",
+    "MessagesOrDictWithMessages",
+]
 
 
 def test_all_imports() -> None:

libs/langchain/tests/unit_tests/schema/runnable/test_retry.py

@@ -1,6 +1,6 @@
 from langchain.schema.runnable.retry import __all__
 
-EXPECTED_ALL = ["RunnableRetry"]
+EXPECTED_ALL = ["RunnableRetry", "U"]
 
 
 def test_all_imports() -> None:

libs/langchain/tests/unit_tests/schema/runnable/test_utils.py

@@ -22,6 +22,8 @@
     "indent_lines_after_first",
     "Input",
     "Output",
+    "Addable",
+    "AnyConfigurableField",
 ]
 
 

libs/langchain/tests/unit_tests/schema/test_cache.py

@@ -1,6 +1,6 @@
 from langchain.schema.cache import __all__
 
-EXPECTED_ALL = ["BaseCache"]
+EXPECTED_ALL = ["BaseCache", "RETURN_VAL_TYPE"]
 
 
 def test_all_imports() -> None:

libs/langchain/tests/unit_tests/schema/test_language_model.py

@@ -1,6 +1,12 @@
 from langchain.schema.language_model import __all__
 
-EXPECTED_ALL = ["BaseLanguageModel", "_get_token_ids_default_method", "get_tokenizer"]
+EXPECTED_ALL = [
+    "BaseLanguageModel",
+    "_get_token_ids_default_method",
+    "get_tokenizer",
+    "LanguageModelOutput",
+    "LanguageModelInput",
+]
 
 
 def test_all_imports() -> None:

libs/langchain/tests/unit_tests/schema/test_messages.py

@@ -22,6 +22,7 @@
     "merge_content",
     "messages_from_dict",
     "messages_to_dict",
+    "AnyMessage",
 ]
 
 

libs/langchain/tests/unit_tests/schema/test_output_parser.py

@@ -9,6 +9,7 @@
     "NoOpOutputParser",
     "OutputParserException",
     "StrOutputParser",
+    "T",
 ]
 
 

libs/langchain/tests/unit_tests/schema/test_storage.py

@@ -1,6 +1,6 @@
 from langchain.schema.storage import __all__
 
-EXPECTED_ALL = ["BaseStore"]
+EXPECTED_ALL = ["BaseStore", "K", "V"]
 
 
 def test_all_imports() -> None:

libs/langchain/tests/unit_tests/schema/test_vectorstore.py

@@ -1,6 +1,6 @@
 from langchain.schema.vectorstore import __all__
 
-EXPECTED_ALL = ["VectorStore", "VectorStoreRetriever"]
+EXPECTED_ALL = ["VectorStore", "VectorStoreRetriever", "VST"]
 
 
 def test_all_imports() -> None: