core[minor], community[patch], langchain[patch]: move BaseChatLoader to core (#19607)

Thank you for contributing to LangChain!

- [ ] **PR title**: "core: move BaseChatLoader and BaseToolkit from
community"


- [ ] **PR message**: move BaseChatLoader and BaseToolkit

---------

Co-authored-by: Bagatur <baskaryan@gmail.com>

docs/docs/integrations/chat_loaders/discord.ipynb

@@ -216,11 +216,11 @@
    "source": [
     "from typing import List\n",
     "\n",
-    "from langchain_community.chat_loaders.base import ChatSession\n",
     "from langchain_community.chat_loaders.utils import (\n",
     "    map_ai_messages,\n",
     "    merge_chat_runs,\n",
     ")\n",
+    "from langchain_core.chat_sessions import ChatSession\n",
     "\n",
     "raw_messages = loader.lazy_load()\n",
     "# Merge consecutive messages from the same sender into a single message\n",

docs/docs/integrations/chat_loaders/imessage.ipynb

@@ -116,11 +116,11 @@
    "source": [
     "from typing import List\n",
     "\n",
-    "from langchain_community.chat_loaders.base import ChatSession\n",
     "from langchain_community.chat_loaders.utils import (\n",
     "    map_ai_messages,\n",
     "    merge_chat_runs,\n",
     ")\n",
+    "from langchain_core.chat_sessions import ChatSession\n",
     "\n",
     "raw_messages = loader.lazy_load()\n",
     "# Merge consecutive messages from the same sender into a single message\n",

docs/docs/integrations/chat_loaders/slack.ipynb

@@ -87,11 +87,11 @@
    "source": [
     "from typing import List\n",
     "\n",
-    "from langchain_community.chat_loaders.base import ChatSession\n",
     "from langchain_community.chat_loaders.utils import (\n",
     "    map_ai_messages,\n",
     "    merge_chat_runs,\n",
     ")\n",
+    "from langchain_core.chat_sessions import ChatSession\n",
     "\n",
     "raw_messages = loader.lazy_load()\n",
     "# Merge consecutive messages from the same sender into a single message\n",

docs/docs/integrations/chat_loaders/telegram.ipynb

@@ -136,11 +136,11 @@
    "source": [
     "from typing import List\n",
     "\n",
-    "from langchain_community.chat_loaders.base import ChatSession\n",
     "from langchain_community.chat_loaders.utils import (\n",
     "    map_ai_messages,\n",
     "    merge_chat_runs,\n",
     ")\n",
+    "from langchain_core.chat_sessions import ChatSession\n",
     "\n",
     "raw_messages = loader.lazy_load()\n",
     "# Merge consecutive messages from the same sender into a single message\n",

docs/docs/integrations/chat_loaders/wechat.ipynb

@@ -209,11 +209,11 @@
    "source": [
     "from typing import List\n",
     "\n",
-    "from langchain_community.chat_loaders.base import ChatSession\n",
     "from langchain_community.chat_loaders.utils import (\n",
     "    map_ai_messages,\n",
     "    merge_chat_runs,\n",
     ")\n",
+    "from langchain_core.chat_sessions import ChatSession\n",
     "\n",
     "raw_messages = loader.lazy_load()\n",
     "# Merge consecutive messages from the same sender into a single message\n",

docs/docs/integrations/chat_loaders/whatsapp.ipynb

@@ -126,11 +126,11 @@
    "source": [
     "from typing import List\n",
     "\n",
-    "from langchain_community.chat_loaders.base import ChatSession\n",
     "from langchain_community.chat_loaders.utils import (\n",
     "    map_ai_messages,\n",
     "    merge_chat_runs,\n",
     ")\n",
+    "from langchain_core.chat_sessions import ChatSession\n",
     "\n",
     "raw_messages = loader.lazy_load()\n",
     "# Merge consecutive messages from the same sender into a single message\n",

libs/community/langchain_community/agent_toolkits/ainetwork/toolkit.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, List, Literal, Optional
 
 from langchain_core.pydantic_v1 import root_validator
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.ainetwork.app import AINAppOps
 from langchain_community.tools.ainetwork.owner import AINOwnerOps

libs/community/langchain_community/agent_toolkits/amadeus/toolkit.py

@@ -4,8 +4,8 @@ from typing import TYPE_CHECKING, List, Optional
 
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.amadeus.closest_airport import AmadeusClosestAirport
 from langchain_community.tools.amadeus.flight_search import AmadeusFlightSearch

libs/community/langchain_community/agent_toolkits/azure_cognitive_services.py

@@ -3,9 +3,8 @@ from __future__ import annotations
 import sys
 from typing import List
 
-from langchain_core.tools import BaseTool
+from langchain_core.tools import BaseTool, BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools.azure_cognitive_services import (
     AzureCogsFormRecognizerTool,
     AzureCogsImageAnalysisTool,

libs/community/langchain_community/agent_toolkits/clickup/toolkit.py

@@ -1,6 +1,7 @@
 from typing import Dict, List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.clickup.prompt import (
     CLICKUP_FOLDER_CREATE_PROMPT,

libs/community/langchain_community/agent_toolkits/cogniswitch/toolkit.py

@@ -1,6 +1,7 @@
 from typing import List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.cogniswitch.tool import (
     CogniswitchKnowledgeRequest,

libs/community/langchain_community/agent_toolkits/connery/toolkit.py

@@ -1,9 +1,8 @@
 from typing import List
 
 from langchain_core.pydantic_v1 import root_validator
-from langchain_core.tools import BaseTool
+from langchain_core.tools import BaseTool, BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools.connery import ConneryService
 
 

libs/community/langchain_community/agent_toolkits/file_management/toolkit.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import Dict, List, Optional, Type
 
 from langchain_core.pydantic_v1 import root_validator
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.file_management.copy import CopyFileTool
 from langchain_community.tools.file_management.delete import DeleteFileTool

libs/community/langchain_community/agent_toolkits/github/toolkit.py

@@ -2,8 +2,8 @@
 from typing import Dict, List
 
 from langchain_core.pydantic_v1 import BaseModel, Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.github.prompt import (
     COMMENT_ON_ISSUE_PROMPT,

libs/community/langchain_community/agent_toolkits/gitlab/toolkit.py

@@ -1,7 +1,8 @@
 """GitHub Toolkit."""
 from typing import Dict, List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.gitlab.prompt import (
     COMMENT_ON_ISSUE_PROMPT,

libs/community/langchain_community/agent_toolkits/gmail/toolkit.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, List
 
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.gmail.create_draft import GmailCreateDraft
 from langchain_community.tools.gmail.get_message import GmailGetMessage

libs/community/langchain_community/agent_toolkits/jira/toolkit.py

@@ -1,6 +1,7 @@
 from typing import Dict, List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.jira.prompt import (
     JIRA_CATCH_ALL_PROMPT,

libs/community/langchain_community/agent_toolkits/json/toolkit.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 from typing import List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.json.tool import (
     JsonGetValueTool,

libs/community/langchain_community/agent_toolkits/multion/toolkit.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 
 from typing import List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.multion.close_session import MultionCloseSession
 from langchain_community.tools.multion.create_session import MultionCreateSession

libs/community/langchain_community/agent_toolkits/nasa/toolkit.py

@@ -1,6 +1,7 @@
 from typing import Dict, List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.nasa.prompt import (
     NASA_CAPTIONS_PROMPT,

libs/community/langchain_community/agent_toolkits/nla/toolkit.py

@@ -4,9 +4,8 @@ from typing import Any, List, Optional, Sequence
 
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.pydantic_v1 import Field
-from langchain_core.tools import BaseTool
+from langchain_core.tools import BaseTool, BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.agent_toolkits.nla.tool import NLATool
 from langchain_community.tools.openapi.utils.openapi_utils import OpenAPISpec
 from langchain_community.tools.plugin import AIPlugin

libs/community/langchain_community/agent_toolkits/office365/toolkit.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, List
 
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.office365.create_draft_message import (
     O365CreateDraftMessage,

libs/community/langchain_community/agent_toolkits/openapi/toolkit.py

@@ -4,9 +4,8 @@ from __future__ import annotations
 from typing import Any, List
 
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.tools import Tool
+from langchain_core.tools import BaseToolkit, Tool
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.agent_toolkits.json.base import create_json_agent
 from langchain_community.agent_toolkits.json.toolkit import JsonToolkit
 from langchain_community.agent_toolkits.openapi.prompt import DESCRIPTION

libs/community/langchain_community/agent_toolkits/playwright/toolkit.py

@@ -4,9 +4,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, List, Optional, Type, cast
 
 from langchain_core.pydantic_v1 import Extra, root_validator
-from langchain_core.tools import BaseTool
+from langchain_core.tools import BaseTool, BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools.playwright.base import (
     BaseBrowserTool,
     lazy_import_playwright_browsers,

libs/community/langchain_community/agent_toolkits/polygon/toolkit.py

@@ -1,6 +1,7 @@
 from typing import List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.polygon import (
     PolygonAggregates,

libs/community/langchain_community/agent_toolkits/powerbi/toolkit.py

@@ -13,8 +13,8 @@ from langchain_core.prompts.chat import (
     SystemMessagePromptTemplate,
 )
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.powerbi.prompt import (
     QUESTION_TO_QUERY_BASE,

libs/community/langchain_community/agent_toolkits/slack/toolkit.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, List
 
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.slack.get_channel import SlackGetChannel
 from langchain_community.tools.slack.get_message import SlackGetMessage

libs/community/langchain_community/agent_toolkits/spark_sql/toolkit.py

@@ -3,8 +3,8 @@ from typing import List
 
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.spark_sql.tool import (
     InfoSparkSQLTool,

libs/community/langchain_community/agent_toolkits/sql/toolkit.py

@@ -3,8 +3,8 @@ from typing import List
 
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.pydantic_v1 import Field
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.sql_database.tool import (
     InfoSQLDatabaseTool,

libs/community/langchain_community/agent_toolkits/steam/toolkit.py

@@ -1,7 +1,8 @@
 """Steam Toolkit."""
 from typing import List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
+
 from langchain_community.tools import BaseTool
 from langchain_community.tools.steam.prompt import (
     STEAM_GET_GAMES_DETAILS,

libs/community/langchain_community/agent_toolkits/zapier/toolkit.py

@@ -2,8 +2,8 @@
 from typing import List
 
 from langchain_core._api import warn_deprecated
+from langchain_core.tools import BaseToolkit
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools import BaseTool
 from langchain_community.tools.zapier.tool import ZapierNLARunAction
 from langchain_community.utilities.zapier import ZapierNLAWrapper

libs/community/langchain_community/chat_loaders/__init__.py

@@ -63,7 +63,7 @@ __all__ = [
 ]
 
 _module_lookup = {
-    "BaseChatLoader": "langchain_community.chat_loaders.base",
+    "BaseChatLoader": "langchain_core.chat_loaders",
     "FolderFacebookMessengerChatLoader": "langchain_community.chat_loaders.facebook_messenger",  # noqa: E501
     "GMailLoader": "langchain_community.chat_loaders.gmail",
     "IMessageChatLoader": "langchain_community.chat_loaders.imessage",

libs/community/langchain_community/chat_loaders/base.py

@@ -1,16 +1,3 @@
-from abc import ABC, abstractmethod
-from typing import Iterator, List
+from langchain_core.chat_loaders import BaseChatLoader
 
-from langchain_core.chat_sessions import ChatSession
-
-
-class BaseChatLoader(ABC):
-    """Base class for chat loaders."""
-
-    @abstractmethod
-    def lazy_load(self) -> Iterator[ChatSession]:
-        """Lazy load the chat sessions."""
-
-    def load(self) -> List[ChatSession]:
-        """Eagerly load the chat sessions into memory."""
-        return list(self.lazy_load())
+__all__ = ["BaseChatLoader"]

libs/community/langchain_community/chat_loaders/facebook_messenger.py

@@ -3,11 +3,10 @@ import logging
 from pathlib import Path
 from typing import Iterator, Union
 
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.messages import HumanMessage
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 logger = logging.getLogger(__file__)
 
 

libs/community/langchain_community/chat_loaders/gmail.py

@@ -3,11 +3,10 @@ import re
 from typing import Any, Iterator
 
 from langchain_core._api.deprecation import deprecated
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.messages import HumanMessage
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 
 def _extract_email_content(msg: Any) -> HumanMessage:
     from_email = None

libs/community/langchain_community/chat_loaders/imessage.py

@@ -4,11 +4,10 @@ from datetime import datetime
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterator, List, Optional, Union
 
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.messages import HumanMessage
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 if TYPE_CHECKING:
     import sqlite3
 

libs/community/langchain_community/chat_loaders/langsmith.py

@@ -3,11 +3,10 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Dict, Iterable, Iterator, List, Optional, Union, cast
 
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.load.load import load
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 if TYPE_CHECKING:
     from langsmith.client import Client
     from langsmith.schemas import Run

libs/community/langchain_community/chat_loaders/slack.py

@@ -5,11 +5,10 @@ import zipfile
 from pathlib import Path
 from typing import Dict, Iterator, List, Union
 
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.messages import AIMessage, HumanMessage
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 logger = logging.getLogger(__name__)
 
 

libs/community/langchain_community/chat_loaders/telegram.py

@@ -6,11 +6,10 @@ import zipfile
 from pathlib import Path
 from typing import Iterator, List, Union
 
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.messages import AIMessage, BaseMessage, HumanMessage
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 logger = logging.getLogger(__name__)
 
 

libs/community/langchain_community/chat_loaders/whatsapp.py

@@ -4,11 +4,10 @@ import re
 import zipfile
 from typing import Iterator, List, Union
 
+from langchain_core.chat_loaders import BaseChatLoader
 from langchain_core.chat_sessions import ChatSession
 from langchain_core.messages import AIMessage, HumanMessage
 
-from langchain_community.chat_loaders.base import BaseChatLoader
-
 logger = logging.getLogger(__name__)
 
 

libs/core/langchain_core/chat_loaders.py

@@ -0,0 +1,16 @@
+from abc import ABC, abstractmethod
+from typing import Iterator, List
+
+from langchain_core.chat_sessions import ChatSession
+
+
+class BaseChatLoader(ABC):
+    """Base class for chat loaders."""
+
+    @abstractmethod
+    def lazy_load(self) -> Iterator[ChatSession]:
+        """Lazy load the chat sessions."""
+
+    def load(self) -> List[ChatSession]:
+        """Eagerly load the chat sessions into memory."""
+        return list(self.lazy_load())

libs/langchain/langchain/agents/agent_toolkits/base.py

@@ -1,3 +1,3 @@
-from langchain_community.agent_toolkits.base import BaseToolkit
+from langchain_core.tools import BaseToolkit
 
 __all__ = ["BaseToolkit"]

libs/langchain/langchain/agents/agent_toolkits/vectorstore/toolkit.py

@@ -1,14 +1,13 @@
 """Toolkit for interacting with a vector store."""
 from typing import List
 
-from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.tools.vectorstore.tool import (
     VectorStoreQATool,
     VectorStoreQAWithSourcesTool,
 )
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.pydantic_v1 import BaseModel, Field
-from langchain_core.tools import BaseTool
+from langchain_core.tools import BaseTool, BaseToolkit
 from langchain_core.vectorstores import VectorStore
 
 

libs/langchain/langchain/chat_loaders/base.py

@@ -1,3 +1,3 @@
-from langchain_community.chat_loaders.base import BaseChatLoader
+from langchain_core.chat_loaders import BaseChatLoader
 
 __all__ = ["BaseChatLoader"]