From c52a84c5a3e23b3bea66d90c2cd08a3ba40898ca Mon Sep 17 00:00:00 2001
From: Eugene Yurtsev <eyurtsev@gmail.com>
Date: Tue, 23 Apr 2024 16:55:05 -0400
Subject: [PATCH] x

---
 libs/core/langchain_core/legacy/chains/base.py     | 4 +++-
 libs/core/langchain_core/legacy/memory/__init__.py | 7 -------
 libs/core/langchain_core/legacy/memory/buffer.py   | 3 ++-
 libs/core/langchain_core/legacy/memory/entity.py   | 4 +---
 libs/core/tests/unit_tests/test_memory.py          | 2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/libs/core/langchain_core/legacy/chains/base.py b/libs/core/langchain_core/legacy/chains/base.py
index db02ce68a81..f33bc77db2c 100644
--- a/libs/core/langchain_core/legacy/chains/base.py
+++ b/libs/core/langchain_core/legacy/chains/base.py
@@ -8,7 +8,6 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Type, Union, cast
 
 import yaml
-from langchain.schema import RUN_KEY
 
 from langchain_core._api import deprecated
 from langchain_core.callbacks import (
@@ -40,6 +39,9 @@ def _get_verbosity() -> bool:
     return get_verbose()
 
 
+RUN_KEY = "__run"
+
+
 class Chain(RunnableSerializable[Dict[str, Any], Dict[str, Any]], ABC):
     """Abstract base class for creating structured sequences of calls to components.
 
diff --git a/libs/core/langchain_core/legacy/memory/__init__.py b/libs/core/langchain_core/legacy/memory/__init__.py
index 0c4aed94b68..bb82eba9e23 100644
--- a/libs/core/langchain_core/legacy/memory/__init__.py
+++ b/libs/core/langchain_core/legacy/memory/__init__.py
@@ -9,11 +9,7 @@ from langchain_core.legacy.memory.combined import CombinedMemory
 from langchain_core.legacy.memory.entity import (
     ConversationEntityMemory,
     InMemoryEntityStore,
-    RedisEntityStore,
-    SQLiteEntityStore,
-    UpstashRedisEntityStore,
 )
-from langchain_core.legacy.memory.kg import ConversationKGMemory
 from langchain_core.legacy.memory.readonly import ReadOnlySharedMemory
 from langchain_core.legacy.memory.simple import SimpleMemory
 from langchain_core.legacy.memory.summary import ConversationSummaryMemory
@@ -28,15 +24,12 @@ __all__ = [
     "ConversationBufferMemory",
     "ConversationBufferWindowMemory",
     "ConversationEntityMemory",
-    "ConversationKGMemory",
     "ConversationStringBufferMemory",
     "ConversationSummaryBufferMemory",
     "ConversationSummaryMemory",
     "ConversationTokenBufferMemory",
     "InMemoryEntityStore",
     "ReadOnlySharedMemory",
-    "RedisEntityStore",
-    "SQLiteEntityStore",
     "SimpleMemory",
     "VectorStoreRetrieverMemory",
 ]
diff --git a/libs/core/langchain_core/legacy/memory/buffer.py b/libs/core/langchain_core/legacy/memory/buffer.py
index b4add34d633..113f7bd1eb7 100644
--- a/libs/core/langchain_core/legacy/memory/buffer.py
+++ b/libs/core/langchain_core/legacy/memory/buffer.py
@@ -1,6 +1,7 @@
 from typing import Any, Dict, List, Optional
 
-from langchain_core.legacy.memory import BaseChatMemory, BaseMemory
+from langchain_core.legacy.memory.base import BaseMemory
+from langchain_core.legacy.memory.chat_memory import BaseChatMemory
 from langchain_core.legacy.memory.utils import get_prompt_input_key
 from langchain_core.messages import BaseMessage, get_buffer_string
 from langchain_core.pydantic_v1 import root_validator
diff --git a/libs/core/langchain_core/legacy/memory/entity.py b/libs/core/langchain_core/legacy/memory/entity.py
index 25ca289b899..7cc0a75032a 100644
--- a/libs/core/langchain_core/legacy/memory/entity.py
+++ b/libs/core/langchain_core/legacy/memory/entity.py
@@ -2,8 +2,6 @@ import logging
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
 
-from pydantic import Field
-
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.legacy.chains import LLMChain
 from langchain_core.legacy.memory import BaseChatMemory
@@ -14,7 +12,7 @@ from langchain_core.legacy.memory.prompt import (
 from langchain_core.legacy.memory.utils import get_prompt_input_key
 from langchain_core.messages import BaseMessage, get_buffer_string
 from langchain_core.prompts import BasePromptTemplate
-from langchain_core.pydantic_v1 import BaseModel
+from langchain_core.pydantic_v1 import BaseModel, Field
 
 logger = logging.getLogger(__name__)
 
diff --git a/libs/core/tests/unit_tests/test_memory.py b/libs/core/tests/unit_tests/test_memory.py
index b532bf67198..f4fd705ddcd 100644
--- a/libs/core/tests/unit_tests/test_memory.py
+++ b/libs/core/tests/unit_tests/test_memory.py
@@ -2,7 +2,7 @@ from typing import List
 
 import pytest
 
-from langchain_core.memory import CombinedMemory, ConversationBufferMemory
+from langchain_core.legacy.memory import CombinedMemory, ConversationBufferMemory
 
 
 @pytest.fixture()