From ee2126ca56592aaa4b3249c8956abd8a9fd38799 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Apr 2025 12:31:05 -0700
Subject: [PATCH] python3Packages.langchain: 0.3.21 -> 0.3.24

Diff: https://github.com/langchain-ai/langchain/compare/langchain%3D%3D0.3.21...langchain%3D%3D0.3.24
---
 .../python-modules/langchain/default.nix      | 15 ++--
 .../langchain/rm-blockbuster.patch            | 68 -------------------
 2 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/python-modules/langchain/rm-blockbuster.patch

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 92a4c7d67001..cb67f1450edd 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -25,6 +25,7 @@
   tenacity,
 
   # tests
+  blockbuster,
   freezegun,
   httpx,
   lark,
@@ -41,7 +42,7 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.21";
+  version = "0.3.24";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -53,11 +54,6 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/libs/langchain";
 
-  patches = [
-    # blockbuster isn't supported in nixpkgs
-    ./rm-blockbuster.patch
-  ];
-
   build-system = [ pdm-backend ];
 
   buildInputs = [ bash ];
@@ -70,10 +66,6 @@ buildPythonPackage rec {
     "tenacity"
   ];
 
-  pythonRemoveDeps = [
-    "blockbuster"
-  ];
-
   dependencies = [
     aiohttp
     langchain-core
@@ -92,6 +84,7 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    blockbuster
     freezegun
     httpx
     lark
@@ -151,7 +144,7 @@ buildPythonPackage rec {
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      "^langchain==([0-9.]+)$"
+      "langchain==([0-9.]+)"
     ];
   };
 
diff --git a/pkgs/development/python-modules/langchain/rm-blockbuster.patch b/pkgs/development/python-modules/langchain/rm-blockbuster.patch
deleted file mode 100644
index 4022f17a9323..000000000000
--- a/pkgs/development/python-modules/langchain/rm-blockbuster.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
-index fed8dbec5..6144ad7b8 100644
---- a/tests/unit_tests/conftest.py
-+++ b/tests/unit_tests/conftest.py
-@@ -5,36 +5,36 @@ from importlib import util
- from typing import Dict, Sequence
- 
- import pytest
--from blockbuster import blockbuster_ctx
-+# from blockbuster import blockbuster_ctx
- from pytest import Config, Function, Parser
- 
- 
--@pytest.fixture(autouse=True)
--def blockbuster() -> Iterator[None]:
--    with blockbuster_ctx("langchain") as bb:
--        bb.functions["io.TextIOWrapper.read"].can_block_in(
--            "langchain/__init__.py", "<module>"
--        )
--
--        for func in ["os.stat", "os.path.abspath"]:
--            (
--                bb.functions[func]
--                .can_block_in("langchain_core/runnables/base.py", "__repr__")
--                .can_block_in(
--                    "langchain_core/beta/runnables/context.py", "aconfig_with_context"
--                )
--            )
--
--        for func in ["os.stat", "io.TextIOWrapper.read"]:
--            bb.functions[func].can_block_in(
--                "langsmith/client.py", "_default_retry_config"
--            )
--
--        for bb_function in bb.functions.values():
--            bb_function.can_block_in(
--                "freezegun/api.py", "_get_cached_module_attributes"
--            )
--        yield
-+# @pytest.fixture(autouse=True)
-+# def blockbuster() -> Iterator[None]:
-+#     with blockbuster_ctx("langchain") as bb:
-+#         bb.functions["io.TextIOWrapper.read"].can_block_in(
-+#             "langchain/__init__.py", "<module>"
-+#         )
-+
-+#         for func in ["os.stat", "os.path.abspath"]:
-+#             (
-+#                 bb.functions[func]
-+#                 .can_block_in("langchain_core/runnables/base.py", "__repr__")
-+#                 .can_block_in(
-+#                     "langchain_core/beta/runnables/context.py", "aconfig_with_context"
-+#                 )
-+#             )
-+
-+#         for func in ["os.stat", "io.TextIOWrapper.read"]:
-+#             bb.functions[func].can_block_in(
-+#                 "langsmith/client.py", "_default_retry_config"
-+#             )
-+
-+#         for bb_function in bb.functions.values():
-+#             bb_function.can_block_in(
-+#                 "freezegun/api.py", "_get_cached_module_attributes"
-+#             )
-+#         yield
- 
- 
- def pytest_addoption(parser: Parser) -> None: