cli: Add ruff rule UP (pyupgrade) (#31843)

See https://docs.astral.sh/ruff/rules/#pyupgrade-up
All auto-fixed

Co-authored-by: Eugene Yurtsev <[email protected]>

Author: cbornet

libs/cli/langchain_cli/cli.py

@@ -1,7 +1,6 @@
-from typing import Optional
+from typing import Annotated, Optional
 
 import typer
-from typing_extensions import Annotated
 
 from langchain_cli._version import __version__
 from langchain_cli.namespaces import app as app_namespace

libs/cli/langchain_cli/dev_scripts.py

@@ -3,7 +3,7 @@
 Development Scripts for template packages
 """
 
-from typing import Sequence
+from collections.abc import Sequence
 
 from fastapi import FastAPI
 from langserve import add_routes

libs/cli/langchain_cli/namespaces/app.py

@@ -7,10 +7,9 @@
 import sys
 import warnings
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple
+from typing import Annotated, Optional
 
 import typer
-from typing_extensions import Annotated
 
 from langchain_cli.utils.events import create_events
 from langchain_cli.utils.git import (
@@ -44,7 +43,7 @@ def new(
     ] = None,
     *,
     package: Annotated[
-        Optional[List[str]],
+        Optional[list[str]],
         typer.Option(help="Packages to seed the project with"),
     ] = None,
     pip: Annotated[
@@ -132,19 +131,19 @@ def new(
 @app_cli.command()
 def add(
     dependencies: Annotated[
-        Optional[List[str]], typer.Argument(help="The dependency to add")
+        Optional[list[str]], typer.Argument(help="The dependency to add")
     ] = None,
     *,
-    api_path: Annotated[List[str], typer.Option(help="API paths to add")] = [],
+    api_path: Annotated[list[str], typer.Option(help="API paths to add")] = [],
     project_dir: Annotated[
         Optional[Path], typer.Option(help="The project directory")
     ] = None,
     repo: Annotated[
-        List[str],
+        list[str],
         typer.Option(help="Install templates from a specific github repo instead"),
     ] = [],
     branch: Annotated[
-        List[str], typer.Option(help="Install templates from a specific branch")
+        list[str], typer.Option(help="Install templates from a specific branch")
     ] = [],
     pip: Annotated[
         bool,
@@ -181,16 +180,16 @@ def add(
     )
 
     # group by repo/ref
-    grouped: Dict[Tuple[str, Optional[str]], List[DependencySource]] = {}
+    grouped: dict[tuple[str, Optional[str]], list[DependencySource]] = {}
     for dep in parsed_deps:
         key_tup = (dep["git"], dep["ref"])
         lst = grouped.get(key_tup, [])
         lst.append(dep)
         grouped[key_tup] = lst
 
-    installed_destination_paths: List[Path] = []
-    installed_destination_names: List[str] = []
-    installed_exports: List[LangServeExport] = []
+    installed_destination_paths: list[Path] = []
+    installed_destination_names: list[str] = []
+    installed_exports: list[LangServeExport] = []
 
     for (git, ref), group_deps in grouped.items():
         if len(group_deps) == 1:
@@ -295,7 +294,7 @@ def add(
 
 @app_cli.command()
 def remove(
-    api_paths: Annotated[List[str], typer.Argument(help="The API paths to remove")],
+    api_paths: Annotated[list[str], typer.Argument(help="The API paths to remove")],
     *,
     project_dir: Annotated[
         Optional[Path], typer.Option(help="The project directory")
@@ -311,7 +310,7 @@ def remove(
 
     package_root = project_root / "packages"
 
-    remove_deps: List[str] = []
+    remove_deps: list[str] = []
 
     for api_path in api_paths:
         package_dir = package_root / api_path

libs/cli/langchain_cli/namespaces/integration.py

@@ -6,10 +6,10 @@
 import shutil
 import subprocess
 from pathlib import Path
-from typing import Dict, Optional, cast
+from typing import Annotated, Optional, cast
 
 import typer
-from typing_extensions import Annotated, TypedDict
+from typing_extensions import TypedDict
 
 from langchain_cli.utils.find_replace import replace_file, replace_glob
 
@@ -123,7 +123,7 @@ def new(
         shutil.move(destination_dir / "integration_template", package_dir)
 
         # replacements in files
-        replace_glob(destination_dir, "**/*", cast(Dict[str, str], replacements))
+        replace_glob(destination_dir, "**/*", cast(dict[str, str], replacements))
 
         # poetry install
         subprocess.run(
@@ -167,7 +167,7 @@ def new(
 
         for src_path, dst_path in zip(src_paths, dst_paths):
             shutil.copy(src_path, dst_path)
-            replace_file(dst_path, cast(Dict[str, str], replacements))
+            replace_file(dst_path, cast(dict[str, str], replacements))
 
 
 TEMPLATE_MAP: dict[str, str] = {

libs/cli/langchain_cli/namespaces/migrate/generate/generic.py

@@ -3,12 +3,11 @@
 import importlib
 import inspect
 import pkgutil
-from typing import List, Tuple
 
 
 def generate_raw_migrations(
     from_package: str, to_package: str, filter_by_all: bool = False
-) -> List[Tuple[str, str]]:
+) -> list[tuple[str, str]]:
     """Scan the `langchain` package and generate migrations for all modules."""
     package = importlib.import_module(from_package)
 
@@ -56,7 +55,7 @@ def generate_raw_migrations(
     return items
 
 
-def generate_top_level_imports(pkg: str) -> List[Tuple[str, str]]:
+def generate_top_level_imports(pkg: str) -> list[tuple[str, str]]:
     """This code will look at all the top level modules in langchain_community.
 
     It'll attempt to import everything from each __init__ file
@@ -121,7 +120,7 @@ def handle_module(module, module_name):
 
 def generate_simplified_migrations(
     from_package: str, to_package: str, filter_by_all: bool = True
-) -> List[Tuple[str, str]]:
+) -> list[tuple[str, str]]:
     """Get all the raw migrations, then simplify them if possible."""
     raw_migrations = generate_raw_migrations(
         from_package, to_package, filter_by_all=filter_by_all

libs/cli/langchain_cli/namespaces/migrate/generate/grit.py

@@ -1,13 +1,10 @@
-from typing import List, Tuple
-
-
-def split_package(package: str) -> Tuple[str, str]:
+def split_package(package: str) -> tuple[str, str]:
     """Split a package name into the containing package and the final name"""
     parts = package.split(".")
     return ".".join(parts[:-1]), parts[-1]
 
 
-def dump_migrations_as_grit(name: str, migration_pairs: List[Tuple[str, str]]):
+def dump_migrations_as_grit(name: str, migration_pairs: list[tuple[str, str]]):
     """Dump the migration pairs as a Grit file."""
     output = "language python"
     remapped = ",\n".join(

libs/cli/langchain_cli/namespaces/migrate/generate/partner.py

@@ -1,7 +1,6 @@
 """Generate migrations for partner packages."""
 
 import importlib
-from typing import List, Tuple
 
 from langchain_core.documents import BaseDocumentCompressor, BaseDocumentTransformer
 from langchain_core.embeddings import Embeddings
@@ -19,7 +18,7 @@
 # PUBLIC API
 
 
-def get_migrations_for_partner_package(pkg_name: str) -> List[Tuple[str, str]]:
+def get_migrations_for_partner_package(pkg_name: str) -> list[tuple[str, str]]:
     """Generate migrations from community package to partner package.
 
     This code works

libs/cli/langchain_cli/namespaces/migrate/generate/utils.py

@@ -3,7 +3,7 @@
 import os
 import pathlib
 from pathlib import Path
-from typing import Any, List, Optional, Tuple, Type
+from typing import Any, Optional
 
 HERE = Path(__file__).parent
 # Should bring us to [root]/src
@@ -29,7 +29,7 @@ def visit_ImportFrom(self, node):
         self.generic_visit(node)
 
 
-def _get_class_names(code: str) -> List[str]:
+def _get_class_names(code: str) -> list[str]:
     """Extract class names from a code string."""
     # Parse the content of the file into an AST
     tree = ast.parse(code)
@@ -49,7 +49,7 @@ def visit_ClassDef(self, node):
     return class_names
 
 
-def is_subclass(class_obj: Any, classes_: List[Type]) -> bool:
+def is_subclass(class_obj: Any, classes_: list[type]) -> bool:
     """Check if the given class object is a subclass of any class in list classes."""
     return any(
         issubclass(class_obj, kls)
@@ -58,7 +58,7 @@ def is_subclass(class_obj: Any, classes_: List[Type]) -> bool:
     )
 
 
-def find_subclasses_in_module(module, classes_: List[Type]) -> List[str]:
+def find_subclasses_in_module(module, classes_: list[type]) -> list[str]:
     """Find all classes in the module that inherit from one of the classes."""
     subclasses = []
     # Iterate over all attributes of the module that are classes
@@ -68,7 +68,7 @@ def find_subclasses_in_module(module, classes_: List[Type]) -> List[str]:
     return subclasses
 
 
-def _get_all_classnames_from_file(file: Path, pkg: str) -> List[Tuple[str, str]]:
+def _get_all_classnames_from_file(file: Path, pkg: str) -> list[tuple[str, str]]:
     """Extract all class names from a file."""
     with open(file, encoding="utf-8") as f:
         code = f.read()
@@ -80,7 +80,7 @@ def _get_all_classnames_from_file(file: Path, pkg: str) -> List[Tuple[str, str]]
 
 def identify_all_imports_in_file(
     file: str, *, from_package: Optional[str] = None
-) -> List[Tuple[str, str]]:
+) -> list[tuple[str, str]]:
     """Let's also identify all the imports in the given file."""
     with open(file, encoding="utf-8") as f:
         code = f.read()
@@ -103,7 +103,7 @@ def identify_pkg_source(pkg_root: str) -> pathlib.Path:
     return matching_dirs[0]
 
 
-def list_classes_by_package(pkg_root: str) -> List[Tuple[str, str]]:
+def list_classes_by_package(pkg_root: str) -> list[tuple[str, str]]:
     """List all classes in a package."""
     module_classes = []
     pkg_source = identify_pkg_source(pkg_root)
@@ -117,7 +117,7 @@ def list_classes_by_package(pkg_root: str) -> List[Tuple[str, str]]:
     return module_classes
 
 
-def list_init_imports_by_package(pkg_root: str) -> List[Tuple[str, str]]:
+def list_init_imports_by_package(pkg_root: str) -> list[tuple[str, str]]:
     """List all the things that are being imported in a package by module."""
     imports = []
     pkg_source = identify_pkg_source(pkg_root)
@@ -135,7 +135,7 @@ def list_init_imports_by_package(pkg_root: str) -> List[Tuple[str, str]]:
 
 def find_imports_from_package(
     code: str, *, from_package: Optional[str] = None
-) -> List[Tuple[str, str]]:
+) -> list[tuple[str, str]]:
     # Parse the code into an AST
     tree = ast.parse(code)
     # Create an instance of the visitor

libs/cli/langchain_cli/namespaces/template.py

@@ -6,10 +6,9 @@
 import shutil
 import subprocess
 from pathlib import Path
-from typing import Optional
+from typing import Annotated, Optional
 
 import typer
-from typing_extensions import Annotated
 
 from langchain_cli.utils.packages import get_langserve_export, get_package_root
 

libs/cli/langchain_cli/utils/events.py

@@ -1,16 +1,16 @@
 import http.client
 import json
-from typing import Any, Dict, List, Optional, TypedDict
+from typing import Any, Optional, TypedDict
 
 WRITE_KEY = "310apTK0HUFl4AOv"
 
 
 class EventDict(TypedDict):
     event: str
-    properties: Optional[Dict[str, Any]]
+    properties: Optional[dict[str, Any]]
 
 
-def create_events(events: List[EventDict]) -> Optional[Any]:
+def create_events(events: list[EventDict]) -> Optional[Any]:
     try:
         data = {
             "events": [