Add pyupgrade as a pre-commit hook; commit the changes

Author: kurtmckee

.pre-commit-config.yaml

@@ -26,3 +26,10 @@ repos:
         args: ["--maxkb=1024"]
       - id: check-merge-conflict
       - id: debug-statements
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.20.0
+    hooks:
+      - id: pyupgrade
+        name: Enforce Python 3.10+ idioms
+        args: ["--py310-plus"]

docs/scripts/generate_api_summary.py

@@ -60,7 +60,7 @@ def format_nav_section(nav_dict, indent_level=2):
 
 def read_mkdocs_sections(filename: str = "mkdocs.yml"):
     """Read and parse the mkdocs.yml file into sections."""
-    with open(filename, "r") as f:
+    with open(filename) as f:
         lines = f.readlines()
 
     nav_start = -1

dspy/adapters/types/tool.py

@@ -1,6 +1,7 @@
 import asyncio
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, get_origin, get_type_hints
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, get_origin, get_type_hints
 
 import pydantic
 from jsonschema import ValidationError, validate

dspy/clients/embedding.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import litellm
 import numpy as np

dspy/dsp/utils/dpr.py

@@ -158,7 +158,7 @@ def __init__(self, **kwargs):
             annotators: None or empty set (only tokenizes).
         """
         self._regexp = regex.compile(
-            "(%s)|(%s)" % (self.ALPHA_NUM, self.NON_WS),
+            f"({self.ALPHA_NUM})|({self.NON_WS})",
             flags=regex.IGNORECASE + regex.UNICODE + regex.MULTILINE,
         )
         if len(kwargs.get("annotators", {})) > 0:

dspy/evaluate/evaluate.py

@@ -3,7 +3,8 @@
 import json
 import logging
 import types
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     import pandas as pd

dspy/predict/best_of_n.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 import dspy
 from dspy.predict.predict import Module, Prediction

dspy/predict/code_act.py

@@ -1,6 +1,6 @@
 import inspect
 import logging
-from typing import Callable
+from collections.abc import Callable
 
 import dspy
 from dspy.adapters.types.tool import Tool

dspy/predict/react.py

@@ -1,5 +1,6 @@
 import logging
-from typing import TYPE_CHECKING, Any, Callable, Literal
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Literal
 
 from litellm import ContextWindowExceededError
 

dspy/predict/refine.py

@@ -1,6 +1,6 @@
 import inspect
 import textwrap
-from typing import Callable
+from collections.abc import Callable
 
 import orjson