community[patch]: Skip broken unit test that depends on langchain-aws in env, fix pydantic_settings

.github/scripts/check_diff.py

@@ -16,6 +16,10 @@
     "libs/experimental",
 ]
 
+# for 0.3rc, we are ignoring core dependents
+# in order to be able to get CI to pass for individual PRs.
+IGNORE_CORE_DEPENDENTS = True
+
 # ignored partners are removed from dependents
 # but still run if directly edited
 IGNORED_PARTNERS = [
@@ -104,7 +108,7 @@ def _get_configs_for_single_dir(job: str, dir_: str) -> List[Dict[str, str]]:
             {"working-directory": dir_, "python-version": f"3.{v}"}
             for v in range(8, 13)
         ]
-    min_python = "3.8"
+    min_python = "3.9"
     max_python = "3.12"
 
     # custom logic for specific directories
@@ -184,6 +188,9 @@ def _get_configs_for_multi_dirs(
             # for extended testing
             found = False
             for dir_ in LANGCHAIN_DIRS:
+                if dir_ == "libs/core" and IGNORE_CORE_DEPENDENTS:
+                    dirs_to_run["extended-test"].add(dir_)
+                    continue
                 if file.startswith(dir_):
                     found = True
                 if found:

.github/workflows/check_diffs.yml

@@ -89,19 +89,6 @@ jobs:
       python-version: ${{ matrix.job-configs.python-version }}
     secrets: inherit
 
-  dependencies:
-    name: cd ${{ matrix.job-configs.working-directory }}
-    needs: [ build ]
-    if: ${{ needs.build.outputs.dependencies != '[]' }}
-    strategy:
-      matrix:
-        job-configs: ${{ fromJson(needs.build.outputs.dependencies) }}
-    uses: ./.github/workflows/_dependencies.yml
-    with:
-      working-directory: ${{ matrix.job-configs.working-directory }}
-      python-version: ${{ matrix.job-configs.python-version }}
-    secrets: inherit
-
   extended-tests:
     name: "cd ${{ matrix.job-configs.working-directory }} / make extended_tests #${{ matrix.job-configs.python-version }}"
     needs: [ build ]
@@ -149,7 +136,7 @@ jobs:
           echo "$STATUS" | grep 'nothing to commit, working tree clean'
   ci_success:
     name: "CI Success"
-    needs: [build, lint, test, compile-integration-tests, dependencies, extended-tests, test-doc-imports]
+    needs: [build, lint, test, compile-integration-tests, extended-tests, test-doc-imports]
     if: |
       always()
     runs-on: ubuntu-latest

.github/workflows/scheduled_test.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.8"
+          - "3.9"
           - "3.11"
         working-directory:
           - "libs/partners/openai"

libs/cli/langchain_cli/integration_template/Makefile

@@ -12,6 +12,9 @@ integration_test integration_tests: TEST_FILE = tests/integration_tests/
 test tests:
 	poetry run pytest --disable-socket --allow-unix-socket $(TEST_FILE)
 
+test_watch:
+	poetry run ptw --snapshot-update --now . -- -vv $(TEST_FILE)
+
 # integration tests are run without the --disable-socket flag to allow network calls
 integration_test integration_tests:
 	poetry run pytest $(TEST_FILE)

libs/cli/langchain_cli/integration_template/pyproject.toml

@@ -23,6 +23,7 @@ pytest = "^7.4.3"
 pytest-asyncio = "^0.23.2"
 pytest-socket = "^0.7.0"
 langchain-core = { path = "../../core", develop = true }
+pytest-watcher = "^0.3.4"
 
 [tool.poetry.group.codespell]
 optional = true

libs/community/Makefile

@@ -22,7 +22,7 @@ integration_tests:
 	poetry run pytest $(TEST_FILE)
 
 test_watch:
-	poetry run ptw --disable-socket --allow-unix-socket --snapshot-update --now . -- -vv -x tests/unit_tests
+	poetry run ptw --disable-socket --allow-unix-socket --snapshot-update --now . -- -vv tests/unit_tests
 
 check_imports: $(shell find langchain_community -name '*.py')
 	poetry run python ./scripts/check_imports.py $^
@@ -45,7 +45,6 @@ lint_tests: PYTHON_FILES=tests
 lint_tests: MYPY_CACHE=.mypy_cache_test
 
 lint lint_diff lint_package lint_tests:
-	./scripts/check_pydantic.sh .
 	./scripts/lint_imports.sh .
 	./scripts/check_pickle.sh .
 	[ "$(PYTHON_FILES)" = "" ] || poetry run ruff check $(PYTHON_FILES)

libs/community/langchain_community/adapters/openai.py

@@ -25,7 +25,7 @@
     SystemMessage,
     ToolMessage,
 )
-from langchain_core.pydantic_v1 import BaseModel
+from pydantic import BaseModel
 from typing_extensions import Literal
 
 

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

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, Any, List, Literal, Optional
 
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import BaseToolkit
+from pydantic import ConfigDict, model_validator
 
 from langchain_community.tools.ainetwork.app import AINAppOps
 from langchain_community.tools.ainetwork.owner import AINOwnerOps
@@ -36,8 +36,9 @@ class AINetworkToolkit(BaseToolkit):
     network: Optional[Literal["mainnet", "testnet"]] = "testnet"
     interface: Optional[Ain] = None
 
-    @root_validator(pre=True)
-    def set_interface(cls, values: dict) -> dict:
+    @model_validator(mode="before")
+    @classmethod
+    def set_interface(cls, values: dict) -> Any:
         """Set the interface if not provided.
 
         If the interface is not provided, attempt to authenticate with the
@@ -53,9 +54,10 @@ def set_interface(cls, values: dict) -> dict:
             values["interface"] = authenticate(network=values.get("network", "testnet"))
         return values
 
-    class Config:
-        arbitrary_types_allowed = True
-        validate_all = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        validate_all=True,
+    )
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

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

@@ -3,9 +3,9 @@
 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 BaseTool
 from langchain_core.tools.base import BaseToolkit
+from pydantic import ConfigDict, Field
 
 from langchain_community.tools.amadeus.closest_airport import AmadeusClosestAirport
 from langchain_community.tools.amadeus.flight_search import AmadeusFlightSearch
@@ -26,8 +26,9 @@ class AmadeusToolkit(BaseToolkit):
     client: Client = Field(default_factory=authenticate)
     llm: Optional[BaseLanguageModel] = Field(default=None)
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

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

@@ -2,9 +2,9 @@
 
 from typing import List
 
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import BaseToolkit
+from pydantic import ConfigDict, Field
 
 from langchain_community.tools.cassandra_database.tool import (
     GetSchemaCassandraDatabaseTool,
@@ -24,8 +24,9 @@ class CassandraDatabaseToolkit(BaseToolkit):
 
     db: CassandraDatabase = Field(exclude=True)
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

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

@@ -1,8 +1,8 @@
-from typing import List
+from typing import Any, List
 
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import BaseToolkit
+from pydantic import model_validator
 
 from langchain_community.tools.connery import ConneryService
 
@@ -23,8 +23,9 @@ def get_tools(self) -> List[BaseTool]:
         """
         return self.tools
 
-    @root_validator(pre=True)
-    def validate_attributes(cls, values: dict) -> dict:
+    @model_validator(mode="before")
+    @classmethod
+    def validate_attributes(cls, values: dict) -> Any:
         """
         Validate the attributes of the ConneryToolkit class.
 

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

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Type
+from typing import Any, Dict, List, Optional, Type
 
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.tools import BaseTool, BaseToolkit
 from langchain_core.utils.pydantic import get_fields
+from pydantic import model_validator
 
 from langchain_community.tools.file_management.copy import CopyFileTool
 from langchain_community.tools.file_management.delete import DeleteFileTool
@@ -63,8 +63,9 @@ class FileManagementToolkit(BaseToolkit):
     selected_tools: Optional[List[str]] = None
     """If provided, only provide the selected tools. Defaults to all."""
 
-    @root_validator(pre=True)
-    def validate_tools(cls, values: dict) -> dict:
+    @model_validator(mode="before")
+    @classmethod
+    def validate_tools(cls, values: dict) -> Any:
         selected_tools = values.get("selected_tools") or []
         for tool_name in selected_tools:
             if tool_name not in _FILE_TOOLS_MAP:

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

@@ -2,9 +2,9 @@
 
 from typing import List
 
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import BaseToolkit
+from pydantic import ConfigDict, Field
 
 from langchain_community.tools.financial_datasets.balance_sheets import BalanceSheets
 from langchain_community.tools.financial_datasets.cash_flow_statements import (
@@ -31,8 +31,9 @@ def __init__(self, api_wrapper: FinancialDatasetsAPIWrapper):
         super().__init__()
         self.api_wrapper = api_wrapper
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

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

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