x

Author: eyurtsev

libs/partners/anthropic/langchain_anthropic/middleware/__init__.py

@@ -7,7 +7,6 @@
     StateClaudeTextEditorMiddleware,
 )
 from langchain_anthropic.middleware.file_search import (
-    FilesystemFileSearchMiddleware,
     StateFileSearchMiddleware,
 )
 from langchain_anthropic.middleware.prompt_caching import (
@@ -18,7 +17,6 @@
     "AnthropicPromptCachingMiddleware",
     "FilesystemClaudeMemoryMiddleware",
     "FilesystemClaudeTextEditorMiddleware",
-    "FilesystemFileSearchMiddleware",
     "StateClaudeMemoryMiddleware",
     "StateClaudeTextEditorMiddleware",
     "StateFileSearchMiddleware",

libs/partners/anthropic/langchain_anthropic/middleware/anthropic_tools.py

@@ -748,7 +748,8 @@ def _handle_view(self, args: dict, tool_call_id: str | None) -> Command:
 
         # Check file size
         if full_path.stat().st_size > self.max_file_size_bytes:
-            msg = f"File too large: {path} exceeds {self.max_file_size_bytes / 1024 / 1024}MB"
+            max_mb = self.max_file_size_bytes / 1024 / 1024
+            msg = f"File too large: {path} exceeds {max_mb}MB"
             raise ValueError(msg)
 
         # Read file
@@ -971,7 +972,8 @@ def __init__(
 
         Args:
             root_path: Root directory for file operations.
-            allowed_prefixes: Optional list of allowed virtual path prefixes (default: ["/"]).
+            allowed_prefixes: Optional list of allowed virtual path prefixes
+                (default: ["/"]).
             max_file_size_mb: Maximum file size in MB (default: 10).
         """
         super().__init__(

libs/partners/anthropic/langchain_anthropic/middleware/file_search.py

@@ -9,7 +9,10 @@
 import fnmatch
 import re
 from pathlib import Path, PurePosixPath
-from typing import Annotated, Literal, cast
+from typing import TYPE_CHECKING, Annotated, Literal, cast
+
+if TYPE_CHECKING:
+    from typing import Any
 
 from langchain.agents.middleware.types import AgentMiddleware
 from langchain_core.tools import InjectedToolArg, tool
@@ -166,7 +169,8 @@ def glob_search(  # noqa: D417
 
                     # Match against pattern
                     # Handle ** pattern which requires special care
-                    # PurePosixPath.match doesn't match single-level paths against **/pattern
+                    # PurePosixPath.match doesn't match single-level paths
+                    # against **/pattern
                     is_match = PurePosixPath(relative).match(pattern)
                     if not is_match and pattern.startswith("**/"):
                         # Also try matching without the **/ prefix for files in base dir

libs/partners/anthropic/tests/unit_tests/middleware/test_anthropic_tools.py

@@ -153,12 +153,8 @@ def test_path_prefix_enforcement(self) -> None:
         # Should fail with /etc/passwd
         args = {"command": "create", "path": "/etc/passwd", "file_text": "test"}
 
-        try:
+        with pytest.raises(ValueError, match="Path must start with"):
             middleware._handle_create(args, state, "test_id")
-            msg = "Should have raised ValueError"
-            raise AssertionError(msg)
-        except ValueError as e:
-            assert "Path must start with" in str(e)
 
     def test_memories_prefix_enforcement(self) -> None:
         """Test that /memories prefix is enforced for memory middleware."""
@@ -169,12 +165,8 @@ def test_memories_prefix_enforcement(self) -> None:
         # Should fail with /other/path
         args = {"command": "create", "path": "/other/path.txt", "file_text": "test"}
 
-        try:
+        with pytest.raises(ValueError, match="/memories"):
             middleware._handle_create(args, state, "test_id")
-            msg = "Should have raised ValueError"
-            raise AssertionError(msg)
-        except ValueError as e:
-            assert "/memories" in str(e)
 
     def test_str_replace_operation(self) -> None:
         """Test str_replace command execution."""
@@ -200,6 +192,7 @@ def test_str_replace_operation(self) -> None:
         result = middleware._handle_str_replace(args, state, "test_id")
 
         assert isinstance(result, Command)
+        assert result.update is not None
         files = result.update.get("text_editor_files", {})
         # Should only replace first occurrence
         assert files["/test.txt"]["content"] == ["Hello universe", "Goodbye world"]
@@ -228,6 +221,7 @@ def test_insert_operation(self) -> None:
         result = middleware._handle_insert(args, state, "test_id")
 
         assert isinstance(result, Command)
+        assert result.update is not None
         files = result.update.get("text_editor_files", {})
         assert files["/test.txt"]["content"] == ["inserted", "line1", "line2"]
 
@@ -250,6 +244,7 @@ def test_delete_operation(self) -> None:
         result = middleware._handle_delete(args, state, "test_id")
 
         assert isinstance(result, Command)
+        assert result.update is not None
         files = result.update.get("memory_files", {})
         # Deleted files are marked as None in state
         assert files.get("/memories/test.txt") is None
@@ -277,6 +272,7 @@ def test_rename_operation(self) -> None:
         result = middleware._handle_rename(args, state, "test_id")
 
         assert isinstance(result, Command)
+        assert result.update is not None
         files = result.update.get("memory_files", {})
         # Old path is marked as None (deleted)
         assert files.get("/memories/old.txt") is None

libs/partners/anthropic/tests/unit_tests/middleware/test_file_search.py

@@ -1,13 +1,7 @@
 """Unit tests for file search middleware."""
 
-from pathlib import Path
-from typing import Any
-
-import pytest
-
 from langchain_anthropic.middleware.anthropic_tools import AnthropicToolsState
 from langchain_anthropic.middleware.file_search import (
-    FilesystemFileSearchMiddleware,
     StateFileSearchMiddleware,
 )
 
@@ -56,7 +50,7 @@ def test_glob_basic_pattern(self) -> None:
         }
 
         # Call tool function directly (state is injected in real usage)
-        result = middleware.glob_search.func(pattern="*.py", state=test_state)
+        result = middleware.glob_search.func(pattern="*.py", state=test_state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "/src/main.py" in result
@@ -88,7 +82,7 @@ def test_glob_recursive_pattern(self) -> None:
             },
         }
 
-        result = middleware.glob_search.func(pattern="**/*.py", state=state)
+        result = middleware.glob_search.func(pattern="**/*.py", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         lines = result.split("\n")
@@ -115,7 +109,7 @@ def test_glob_with_base_path(self) -> None:
             },
         }
 
-        result = middleware.glob_search.func(
+        result = middleware.glob_search.func(  # type: ignore[attr-defined]
             pattern="**/*.py", path="/src", state=state
         )
 
@@ -138,7 +132,7 @@ def test_glob_no_matches(self) -> None:
             },
         }
 
-        result = middleware.glob_search.func(pattern="*.ts", state=state)
+        result = middleware.glob_search.func(pattern="*.ts", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert result == "No files found"
@@ -163,7 +157,7 @@ def test_glob_sorts_by_modified_time(self) -> None:
             },
         }
 
-        result = middleware.glob_search.func(pattern="*.py", state=state)
+        result = middleware.glob_search.func(pattern="*.py", state=state)  # type: ignore[attr-defined]
 
         lines = result.split("\n")
         # Most recent first
@@ -199,7 +193,7 @@ def test_grep_files_with_matches_mode(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(pattern=r"def \w+\(\):", state=state)
+        result = middleware.grep_search.func(pattern=r"def \w+\(\):", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "/src/main.py" in result
@@ -222,7 +216,7 @@ def test_grep_invalid_include_pattern(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(
+        result = middleware.grep_search.func(  # type: ignore[attr-defined]
             pattern=r"def", include="*.{py", state=state
         )
 
@@ -232,53 +226,6 @@ def test_grep_invalid_include_pattern(self) -> None:
 class TestFilesystemGrepSearch:
     """Tests for filesystem-backed grep search."""
 
-    def test_grep_invalid_include_pattern(self, tmp_path: Path) -> None:
-        """Return error when include glob cannot be parsed."""
-
-        (tmp_path / "example.py").write_text("print('hello')\n", encoding="utf-8")
-
-        middleware = FilesystemFileSearchMiddleware(
-            root_path=str(tmp_path), use_ripgrep=False
-        )
-
-        result = middleware.grep_search.func(pattern="print", include="*.{py")
-
-        assert result == "Invalid include pattern"
-
-    def test_ripgrep_command_uses_literal_pattern(
-        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
-        """Ensure ripgrep receives pattern after ``--`` to avoid option parsing."""
-
-        (tmp_path / "example.py").write_text("print('hello')\n", encoding="utf-8")
-
-        middleware = FilesystemFileSearchMiddleware(
-            root_path=str(tmp_path), use_ripgrep=True
-        )
-
-        captured: dict[str, list[str]] = {}
-
-        class DummyResult:
-            stdout = ""
-
-        def fake_run(*args: Any, **kwargs: Any) -> DummyResult:
-            cmd = args[0]
-            captured["cmd"] = cmd
-            return DummyResult()
-
-        monkeypatch.setattr(
-            "langchain_anthropic.middleware.file_search.subprocess.run", fake_run
-        )
-
-        middleware._ripgrep_search("--pattern", "/", None)
-
-        assert "cmd" in captured
-        cmd = captured["cmd"]
-        assert cmd[:2] == ["rg", "--json"]
-        assert "--" in cmd
-        separator_index = cmd.index("--")
-        assert cmd[separator_index + 1] == "--pattern"
-
     def test_grep_content_mode(self) -> None:
         """Test grep with content output mode."""
         middleware = StateFileSearchMiddleware()
@@ -294,7 +241,7 @@ def test_grep_content_mode(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(
+        result = middleware.grep_search.func(  # type: ignore[attr-defined]
             pattern=r"def \w+\(\):", output_mode="content", state=state
         )
 
@@ -324,7 +271,7 @@ def test_grep_count_mode(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(
+        result = middleware.grep_search.func(  # type: ignore[attr-defined]
             pattern=r"TODO", output_mode="count", state=state
         )
 
@@ -353,7 +300,7 @@ def test_grep_with_include_filter(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(
+        result = middleware.grep_search.func(  # type: ignore[attr-defined]
             pattern="import", include="*.py", state=state
         )
 
@@ -386,7 +333,7 @@ def test_grep_with_brace_expansion_filter(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(
+        result = middleware.grep_search.func(  # type: ignore[attr-defined]
             pattern="const", include="*.{ts,tsx}", state=state
         )
 
@@ -415,7 +362,7 @@ def test_grep_with_base_path(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(pattern="import", path="/src", state=state)
+        result = middleware.grep_search.func(pattern="import", path="/src", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "/src/main.py" in result
@@ -436,7 +383,7 @@ def test_grep_no_matches(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(pattern=r"TODO", state=state)
+        result = middleware.grep_search.func(pattern=r"TODO", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert result == "No matches found"
@@ -450,7 +397,7 @@ def test_grep_invalid_regex(self) -> None:
             "text_editor_files": {},
         }
 
-        result = middleware.grep_search.func(pattern=r"[unclosed", state=state)
+        result = middleware.grep_search.func(pattern=r"[unclosed", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "Invalid regex pattern" in result
@@ -481,7 +428,7 @@ def test_glob_default_backend(self) -> None:
             },
         }
 
-        result = middleware.glob_search.func(pattern="**/*", state=state)
+        result = middleware.glob_search.func(pattern="**/*", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "/src/main.py" in result
@@ -510,7 +457,7 @@ def test_grep_default_backend(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(pattern=r"TODO", state=state)
+        result = middleware.grep_search.func(pattern=r"TODO", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "/src/main.py" in result
@@ -539,7 +486,7 @@ def test_search_with_single_store(self) -> None:
             },
         }
 
-        result = middleware.grep_search.func(pattern=r".*", state=state)
+        result = middleware.grep_search.func(pattern=r".*", state=state)  # type: ignore[attr-defined]
 
         assert isinstance(result, str)
         assert "/src/main.py" in result