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
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any

from langchain_core.language_models import BaseLanguageModel
from langchain_core.memory import BaseMemory
from langchain_core.messages import SystemMessage
from langchain_core.prompts.chat import MessagesPlaceholder
from langchain_core.tools import BaseTool
Expand All @@ -11,6 +10,7 @@
AgentTokenBufferMemory,
)
from langchain_classic.agents.openai_functions_agent.base import OpenAIFunctionsAgent
from langchain_classic.base_memory import BaseMemory
from langchain_classic.memory.token_buffer import ConversationTokenBufferMemory


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
from abc import ABC, abstractmethod
from typing import Any

from pydantic import ConfigDict

from langchain_core._api import deprecated
from langchain_core.load.serializable import Serializable
from langchain_core.runnables import run_in_executor
from pydantic import ConfigDict


@deprecated(
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/chains/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
CallbackManagerForChainRun,
Callbacks,
)
from langchain_core.memory import BaseMemory
from langchain_core.outputs import RunInfo
from langchain_core.runnables import (
RunnableConfig,
Expand All @@ -38,6 +37,7 @@
)
from typing_extensions import override

from langchain_classic.base_memory import BaseMemory
from langchain_classic.schema import RUN_KEY

logger = logging.getLogger(__name__)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Chain that carries on a conversation and calls an LLM."""

from langchain_core._api import deprecated
from langchain_core.memory import BaseMemory
from langchain_core.prompts import BasePromptTemplate
from pydantic import ConfigDict, Field, model_validator
from typing_extensions import Self, override

from langchain_classic.base_memory import BaseMemory
from langchain_classic.chains.conversation.prompt import PROMPT
from langchain_classic.chains.llm import LLMChain
from langchain_classic.memory.buffer import ConversationBufferMemory
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/memory/buffer.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from typing import Any

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 typing_extensions import override

from langchain_classic.base_memory import BaseMemory
from langchain_classic.memory.chat_memory import BaseChatMemory
from langchain_classic.memory.utils import get_prompt_input_key

Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/memory/chat_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
BaseChatMessageHistory,
InMemoryChatMessageHistory,
)
from langchain_core.memory import BaseMemory
from langchain_core.messages import AIMessage, HumanMessage
from pydantic import Field

from langchain_classic.base_memory import BaseMemory
from langchain_classic.memory.utils import get_prompt_input_key


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/memory/combined.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import warnings
from typing import Any

from langchain_core.memory import BaseMemory
from pydantic import field_validator

from langchain_classic.base_memory import BaseMemory
from langchain_classic.memory.chat_memory import BaseChatMemory


Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/memory/readonly.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

from langchain_core.memory import BaseMemory
from langchain_classic.base_memory import BaseMemory


class ReadOnlySharedMemory(BaseMemory):
Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain_classic/memory/simple.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from typing import Any

from langchain_core.memory import BaseMemory
from typing_extensions import override

from langchain_classic.base_memory import BaseMemory


class SimpleMemory(BaseMemory):
"""Simple Memory.
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/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_classic.base_memory import BaseMemory
from langchain_classic.memory.utils import get_prompt_input_key


Expand Down
3 changes: 2 additions & 1 deletion libs/langchain/langchain_classic/schema/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from langchain_core.chat_history import BaseChatMessageHistory
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 (
AIMessage,
BaseMessage,
Expand Down Expand Up @@ -36,6 +35,8 @@
from langchain_core.retrievers import BaseRetriever
from langchain_core.stores import BaseStore

from langchain_classic.base_memory import BaseMemory

RUN_KEY = "__run"

# Backwards compatibility.
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/langchain_classic/schema/memory.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from langchain_core.memory import BaseMemory
from langchain_classic.base_memory import BaseMemory

__all__ = ["BaseMemory"]
2 changes: 1 addition & 1 deletion libs/langchain/tests/unit_tests/chains/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

import pytest
from langchain_core.callbacks.manager import CallbackManagerForChainRun
from langchain_core.memory import BaseMemory
from langchain_core.tracers.context import collect_runs
from typing_extensions import override

from langchain_classic.base_memory import BaseMemory
from langchain_classic.chains.base import Chain
from langchain_classic.schema import RUN_KEY
from tests.unit_tests.callbacks.fake_callback_handler import FakeCallbackHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import pytest
from langchain_core.callbacks import CallbackManagerForLLMRun
from langchain_core.language_models import LLM
from langchain_core.memory import BaseMemory
from langchain_core.prompts.prompt import PromptTemplate
from typing_extensions import override

from langchain_classic.base_memory import BaseMemory
from langchain_classic.chains.conversation.base import ConversationChain
from langchain_classic.memory.buffer import ConversationBufferMemory
from langchain_classic.memory.buffer_window import ConversationBufferWindowMemory
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain/tests/unit_tests/chains/test_memory.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
from langchain_core.memory import BaseMemory

from langchain_classic.base_memory import BaseMemory
from langchain_classic.chains.conversation.memory import (
ConversationBufferMemory,
ConversationBufferWindowMemory,
Expand Down