Core refac

libs/core/langchain_core/_api/__init__.py

@@ -16,9 +16,12 @@
     surface_langchain_deprecation_warnings,
     warn_deprecated,
 )
+from .path import as_import_path, get_relative_path
 
 __all__ = [
+    "as_import_path",
     "deprecated",
+    "get_relative_path",
     "LangChainDeprecationWarning",
     "suppress_langchain_deprecation_warning",
     "surface_langchain_deprecation_warnings",

libs/core/langchain_core/schema/agent.py → libs/core/langchain_core/agents.py

@@ -3,7 +3,7 @@
 from typing import Any, Literal, Sequence, Union
 
 from langchain_core.load.serializable import Serializable
-from langchain_core.schema.messages import BaseMessage
+from langchain_core.messages import BaseMessage
 
 
 class AgentAction(Serializable):

libs/core/langchain_core/schema/cache.py → libs/core/langchain_core/caches.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Optional, Sequence
 
-from langchain_core.schema.output import Generation
+from langchain_core.outputs import Generation
 
 RETURN_VAL_TYPE = Sequence[Generation]
 

libs/core/langchain_core/callbacks/__init__.py

@@ -0,0 +1,69 @@
+from langchain_core.callbacks.base import (
+    AsyncCallbackHandler,
+    BaseCallbackHandler,
+    BaseCallbackManager,
+    CallbackManagerMixin,
+    Callbacks,
+    ChainManagerMixin,
+    LLMManagerMixin,
+    RetrieverManagerMixin,
+    RunManagerMixin,
+    ToolManagerMixin,
+)
+from langchain_core.callbacks.manager import (
+    AsyncCallbackManager,
+    AsyncCallbackManagerForChainGroup,
+    AsyncCallbackManagerForChainRun,
+    AsyncCallbackManagerForLLMRun,
+    AsyncCallbackManagerForRetrieverRun,
+    AsyncCallbackManagerForToolRun,
+    AsyncParentRunManager,
+    AsyncRunManager,
+    BaseRunManager,
+    CallbackManager,
+    CallbackManagerForChainGroup,
+    CallbackManagerForChainRun,
+    CallbackManagerForLLMRun,
+    CallbackManagerForRetrieverRun,
+    CallbackManagerForToolRun,
+    ParentRunManager,
+    RunManager,
+    env_var_is_set,
+    register_configure_hook,
+)
+from langchain_core.callbacks.stdout import StdOutCallbackHandler
+from langchain_core.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
+
+__all__ = [
+    "RetrieverManagerMixin",
+    "LLMManagerMixin",
+    "ChainManagerMixin",
+    "ToolManagerMixin",
+    "Callbacks",
+    "CallbackManagerMixin",
+    "RunManagerMixin",
+    "BaseCallbackHandler",
+    "AsyncCallbackHandler",
+    "BaseCallbackManager",
+    "BaseRunManager",
+    "RunManager",
+    "ParentRunManager",
+    "AsyncRunManager",
+    "AsyncParentRunManager",
+    "CallbackManagerForLLMRun",
+    "AsyncCallbackManagerForLLMRun",
+    "CallbackManagerForChainRun",
+    "AsyncCallbackManagerForChainRun",
+    "CallbackManagerForToolRun",
+    "AsyncCallbackManagerForToolRun",
+    "CallbackManagerForRetrieverRun",
+    "AsyncCallbackManagerForRetrieverRun",
+    "CallbackManager",
+    "CallbackManagerForChainGroup",
+    "AsyncCallbackManager",
+    "AsyncCallbackManagerForChainGroup",
+    "StdOutCallbackHandler",
+    "StreamingStdOutCallbackHandler",
+    "env_var_is_set",
+    "register_configure_hook",
+]

libs/core/langchain_core/callbacks/base.py

@@ -6,10 +6,10 @@
 
 from tenacity import RetryCallState
 
-from langchain_core.schema.agent import AgentAction, AgentFinish
-from langchain_core.schema.document import Document
-from langchain_core.schema.messages import BaseMessage
-from langchain_core.schema.output import ChatGenerationChunk, GenerationChunk, LLMResult
+from langchain_core.agents import AgentAction, AgentFinish
+from langchain_core.documents import Document
+from langchain_core.messages import BaseMessage
+from langchain_core.outputs import ChatGenerationChunk, GenerationChunk, LLMResult
 
 
 class RetrieverManagerMixin:

libs/core/langchain_core/callbacks/manager.py

@@ -30,6 +30,10 @@
 from langsmith.run_helpers import get_run_tree_context
 from tenacity import RetryCallState
 
+from langchain_core.agents import (
+    AgentAction,
+    AgentFinish,
+)
 from langchain_core.callbacks.base import (
     BaseCallbackHandler,
     BaseCallbackManager,
@@ -41,23 +45,16 @@
     ToolManagerMixin,
 )
 from langchain_core.callbacks.stdout import StdOutCallbackHandler
-from langchain_core.callbacks.tracers import run_collector
-from langchain_core.callbacks.tracers.langchain import (
+from langchain_core.documents import Document
+from langchain_core.messages import BaseMessage, get_buffer_string
+from langchain_core.outputs import ChatGenerationChunk, GenerationChunk, LLMResult
+from langchain_core.tracers import run_collector
+from langchain_core.tracers.langchain import (
     LangChainTracer,
 )
-from langchain_core.callbacks.tracers.langchain_v1 import (
-    LangChainTracerV1,
-    TracerSessionV1,
-)
-from langchain_core.callbacks.tracers.stdout import ConsoleCallbackHandler
-from langchain_core.schema import (
-    AgentAction,
-    AgentFinish,
-    Document,
-    LLMResult,
-)
-from langchain_core.schema.messages import BaseMessage, get_buffer_string
-from langchain_core.schema.output import ChatGenerationChunk, GenerationChunk
+from langchain_core.tracers.langchain_v1 import LangChainTracerV1
+from langchain_core.tracers.schemas import TracerSessionV1
+from langchain_core.tracers.stdout import ConsoleCallbackHandler
 
 if TYPE_CHECKING:
     from langsmith import Client as LangSmithClient

libs/core/langchain_core/callbacks/stdout.py

@@ -1,9 +1,10 @@
 """Callback Handler that prints to std out."""
 from typing import Any, Dict, List, Optional
 
+from langchain_core.agents import AgentAction, AgentFinish
 from langchain_core.callbacks.base import BaseCallbackHandler
-from langchain_core.schema import AgentAction, AgentFinish, LLMResult
-from langchain_core.utils.input import print_text
+from langchain_core.outputs import LLMResult
+from langchain_core.utils import print_text
 
 
 class StdOutCallbackHandler(BaseCallbackHandler):

libs/core/langchain_core/callbacks/streaming_stdout.py

@@ -2,9 +2,10 @@
 import sys
 from typing import Any, Dict, List
 
+from langchain_core.agents import AgentAction, AgentFinish
 from langchain_core.callbacks.base import BaseCallbackHandler
-from langchain_core.schema import AgentAction, AgentFinish, LLMResult
-from langchain_core.schema.messages import BaseMessage
+from langchain_core.messages import BaseMessage
+from langchain_core.outputs import LLMResult
 
 
 class StreamingStdOutCallbackHandler(BaseCallbackHandler):

libs/core/langchain_core/schema/chat_history.py → libs/core/langchain_core/chat_history.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import List
 
-from langchain_core.schema.messages import AIMessage, BaseMessage, HumanMessage
+from langchain_core.messages import AIMessage, BaseMessage, HumanMessage
 
 
 class BaseChatMessageHistory(ABC):

libs/core/langchain_core/schema/chat.py → libs/core/langchain_core/chat_sessions.py

@@ -1,6 +1,6 @@
 from typing import Sequence, TypedDict
 
-from langchain_core.schema import BaseMessage
+from langchain_core.messages import BaseMessage
 
 
 class ChatSession(TypedDict, total=False):

libs/core/langchain_core/schema/document.py → libs/core/langchain_core/document_transformers.py

@@ -3,27 +3,9 @@
 import asyncio
 from abc import ABC, abstractmethod
 from functools import partial
-from typing import Any, Literal, Sequence
+from typing import Any, Sequence
 
-from langchain_core.load.serializable import Serializable
-from langchain_core.pydantic_v1 import Field
-
-
-class Document(Serializable):
-    """Class for storing a piece of text and associated metadata."""
-
-    page_content: str
-    """String text."""
-    metadata: dict = Field(default_factory=dict)
-    """Arbitrary metadata about the page content (e.g., source, relationships to other
-        documents, etc.).
-    """
-    type: Literal["Document"] = "Document"
-
-    @classmethod
-    def is_lc_serializable(cls) -> bool:
-        """Return whether this class is serializable."""
-        return True
+from langchain_core.documents import Document
 
 
 class BaseDocumentTransformer(ABC):

libs/core/langchain_core/documents.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+from typing import Literal
+
+from langchain_core.load.serializable import Serializable
+from langchain_core.pydantic_v1 import Field
+
+
+class Document(Serializable):
+    """Class for storing a piece of text and associated metadata."""
+
+    page_content: str
+    """String text."""
+    metadata: dict = Field(default_factory=dict)
+    """Arbitrary metadata about the page content (e.g., source, relationships to other
+        documents, etc.).
+    """
+    type: Literal["Document"] = "Document"
+
+    @classmethod
+    def is_lc_serializable(cls) -> bool:
+        """Return whether this class is serializable."""
+        return True

libs/core/langchain_core/prompts/example_selector/__init__.py → libs/core/langchain_core/example_selectors/__init__.py

@@ -1,14 +1,18 @@
 """Logic for selecting examples to include in prompts."""
-from langchain_core.prompts.example_selector.length_based import (
+from langchain_core.example_selectors.base import BaseExampleSelector
+from langchain_core.example_selectors.length_based import (
     LengthBasedExampleSelector,
 )
-from langchain_core.prompts.example_selector.semantic_similarity import (
+from langchain_core.example_selectors.semantic_similarity import (
     MaxMarginalRelevanceExampleSelector,
     SemanticSimilarityExampleSelector,
+    sorted_values,
 )
 
 __all__ = [
+    "BaseExampleSelector",
     "LengthBasedExampleSelector",
     "MaxMarginalRelevanceExampleSelector",
     "SemanticSimilarityExampleSelector",
+    "sorted_values",
 ]

libs/core/langchain_core/prompts/example_selector/length_based.py → libs/core/langchain_core/example_selectors/length_based.py

@@ -2,7 +2,7 @@
 import re
 from typing import Callable, Dict, List
 
-from langchain_core.prompts.example_selector.base import BaseExampleSelector
+from langchain_core.example_selectors.base import BaseExampleSelector
 from langchain_core.prompts.prompt import PromptTemplate
 from langchain_core.pydantic_v1 import BaseModel, validator
 

libs/core/langchain_core/prompts/example_selector/semantic_similarity.py → libs/core/langchain_core/example_selectors/semantic_similarity.py

@@ -3,10 +3,10 @@
 
 from typing import Any, Dict, List, Optional, Type
 
-from langchain_core.prompts.example_selector.base import BaseExampleSelector
+from langchain_core.embeddings import Embeddings
+from langchain_core.example_selectors.base import BaseExampleSelector
 from langchain_core.pydantic_v1 import BaseModel, Extra
-from langchain_core.schema.embeddings import Embeddings
-from langchain_core.schema.vectorstore import VectorStore
+from langchain_core.vectorstores import VectorStore
 
 
 def sorted_values(values: Dict[str, str]) -> List[Any]:

libs/core/langchain_core/exceptions.py

@@ -0,0 +1,48 @@
+from typing import Any, Optional
+
+
+class LangChainException(Exception):
+    """General LangChain exception."""
+
+
+class TracerException(LangChainException):
+    """Base class for exceptions in tracers module."""
+
+
+class OutputParserException(ValueError, LangChainException):
+    """Exception that output parsers should raise to signify a parsing error.
+
+    This exists to differentiate parsing errors from other code or execution errors
+    that also may arise inside the output parser. OutputParserExceptions will be
+    available to catch and handle in ways to fix the parsing error, while other
+    errors will be raised.
+
+    Args:
+        error: The error that's being re-raised or an error message.
+        observation: String explanation of error which can be passed to a
+            model to try and remediate the issue.
+        llm_output: String model output which is error-ing.
+        send_to_llm: Whether to send the observation and llm_output back to an Agent
+            after an OutputParserException has been raised. This gives the underlying
+            model driving the agent the context that the previous output was improperly
+            structured, in the hopes that it will update the output to the correct
+            format.
+    """
+
+    def __init__(
+        self,
+        error: Any,
+        observation: Optional[str] = None,
+        llm_output: Optional[str] = None,
+        send_to_llm: bool = False,
+    ):
+        super(OutputParserException, self).__init__(error)
+        if send_to_llm:
+            if observation is None or llm_output is None:
+                raise ValueError(
+                    "Arguments 'observation' & 'llm_output'"
+                    " are required if 'send_to_llm' is True"
+                )
+        self.observation = observation
+        self.llm_output = llm_output
+        self.send_to_llm = send_to_llm

libs/core/langchain_core/globals/__init__.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
-    from langchain_core.schema import BaseCache
+    from langchain_core.caches import BaseCache
 
 
 # DO NOT USE THESE VALUES DIRECTLY!

libs/core/langchain_core/language_models/__init__.py

@@ -0,0 +1,12 @@
+from langchain_core.language_models.base import BaseLanguageModel, LanguageModelInput
+from langchain_core.language_models.chat_models import BaseChatModel, SimpleChatModel
+from langchain_core.language_models.llms import LLM, BaseLLM
+
+__all__ = [
+    "BaseLanguageModel",
+    "BaseChatModel",
+    "SimpleChatModel",
+    "BaseLLM",
+    "LLM",
+    "LanguageModelInput",
+]

libs/core/langchain_core/schema/language_model.py → libs/core/langchain_core/language_models/base.py

@@ -15,14 +15,14 @@
 
 from typing_extensions import TypeAlias
 
+from langchain_core.messages import AnyMessage, BaseMessage, get_buffer_string
+from langchain_core.outputs import LLMResult
+from langchain_core.prompts import PromptValue
 from langchain_core.runnables import RunnableSerializable
-from langchain_core.schema.messages import AnyMessage, BaseMessage, get_buffer_string
-from langchain_core.schema.output import LLMResult
-from langchain_core.schema.prompt import PromptValue
 from langchain_core.utils import get_pydantic_field_names
 
 if TYPE_CHECKING:
-    from langchain_core.callbacks.manager import Callbacks
+    from langchain_core.callbacks import Callbacks
 
 
 @lru_cache(maxsize=None)  # Cache the tokenizer
@@ -74,8 +74,8 @@ class BaseLanguageModel(
     @property
     def InputType(self) -> TypeAlias:
         """Get the input type for this runnable."""
-        from langchain_core.prompts.base import StringPromptValue
         from langchain_core.prompts.chat import ChatPromptValueConcrete
+        from langchain_core.prompts.str import StringPromptValue
 
         # This is a version of LanguageModelInput which replaces the abstract
         # base class BaseMessage with a union of its subclasses, which makes