Drop Python 3.9 support (#8456)

* drop 3.9 support

* lint

* fix type for ChainOfThought

Author: TomeHirata

.github/workflows/precommits_check.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: "pip"
       - name: Check Pull Request Title
         uses: Slashgear/action-check-pr-title@main

dspy/adapters/base.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TYPE_CHECKING, Any, Optional, Type, get_origin
+from typing import TYPE_CHECKING, Any, Type, get_origin
 
 import json_repair
 import litellm
@@ -17,7 +17,7 @@
 
 
 class Adapter:
-    def __init__(self, callbacks: Optional[list[BaseCallback]] = None):
+    def __init__(self, callbacks: list[BaseCallback] | None = None):
         self.callbacks = callbacks or []
 
     def __init_subclass__(cls, **kwargs) -> None:
@@ -281,7 +281,7 @@ def format_assistant_message_content(
         self,
         signature: Type[Signature],
         outputs: dict[str, Any],
-        missing_field_message: Optional[str] = None,
+        missing_field_message: str | None = None,
     ) -> str:
         """Format the assistant message content.
 

dspy/adapters/chat_adapter.py

@@ -1,6 +1,6 @@
 import re
 import textwrap
-from typing import Any, Dict, NamedTuple, Optional, Type
+from typing import Any, Dict, NamedTuple, Type
 
 from litellm import ContextWindowExceededError
 from pydantic.fields import FieldInfo
@@ -27,7 +27,7 @@ class FieldInfoWithName(NamedTuple):
 
 
 class ChatAdapter(Adapter):
-    def __init__(self, callbacks: Optional[list[BaseCallback]] = None):
+    def __init__(self, callbacks: list[BaseCallback] | None = None):
         super().__init__(callbacks)
 
     def __call__(

dspy/adapters/two_step_adapter.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Type
+from typing import Any, Type
 
 import json_repair
 
@@ -193,7 +193,7 @@ def format_assistant_message_content(
         self,
         signature: Type[Signature],
         outputs: dict[str, Any],
-        missing_field_message: Optional[str] = None,
+        missing_field_message: str | None = None,
     ) -> str:
         parts = []
 

dspy/adapters/types/base_type.py

@@ -1,6 +1,6 @@
 import json
 import re
-from typing import Any, Union, get_args, get_origin
+from typing import Any, get_args, get_origin
 
 import json_repair
 import pydantic
@@ -26,7 +26,7 @@ def format(self) -> list[dict[str, Any]]:
         ```
     """
 
-    def format(self) -> Union[list[dict[str, Any]], str]:
+    def format(self) -> list[dict[str, Any]] | str:
         raise NotImplementedError
 
     @classmethod

dspy/adapters/types/image.py

@@ -28,7 +28,7 @@ class Image(BaseType):
         "extra": "forbid",
     }
 
-    def format(self) -> Union[list[dict[str, Any]], str]:
+    def format(self) -> list[dict[str, Any]] | str:
         try:
             image_url = encode_image(self.url)
         except Exception as e:

dspy/adapters/types/tool.py

@@ -1,6 +1,6 @@
 import asyncio
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Optional, Tuple, Type, get_origin, get_type_hints
+from typing import TYPE_CHECKING, Any, Callable, Tuple, Type, get_origin, get_type_hints
 
 from jsonschema import ValidationError, validate
 from pydantic import BaseModel, TypeAdapter, create_model
@@ -24,21 +24,21 @@ class Tool(BaseType):
     """
 
     func: Callable
-    name: Optional[str] = None
-    desc: Optional[str] = None
-    args: Optional[dict[str, Any]] = None
-    arg_types: Optional[dict[str, Any]] = None
-    arg_desc: Optional[dict[str, str]] = None
+    name: str | None = None
+    desc: str | None = None
+    args: dict[str, Any] | None = None
+    arg_types: dict[str, Any] | None = None
+    arg_desc: dict[str, str] | None = None
     has_kwargs: bool = False
 
     def __init__(
         self,
         func: Callable,
-        name: Optional[str] = None,
-        desc: Optional[str] = None,
-        args: Optional[dict[str, Any]] = None,
-        arg_types: Optional[dict[str, Any]] = None,
-        arg_desc: Optional[dict[str, str]] = None,
+        name: str | None = None,
+        desc: str | None = None,
+        args: dict[str, Any] | None = None,
+        arg_types: dict[str, Any] | None = None,
+        arg_desc: dict[str, str] | None = None,
     ):
         """Initialize the Tool class.
 
@@ -71,7 +71,7 @@ def foo(x: int, y: str = "hello"):
         super().__init__(func=func, name=name, desc=desc, args=args, arg_types=arg_types, arg_desc=arg_desc)
         self._parse_function(func, arg_desc)
 
-    def _parse_function(self, func: Callable, arg_desc: Optional[dict[str, str]] = None):
+    def _parse_function(self, func: Callable, arg_desc: dict[str, str] | None = None):
         """Helper method that parses a function to extract the name, description, and args.
 
         This is a helper function that automatically infers the name, description, and args of the tool from the

dspy/adapters/utils.py

@@ -32,7 +32,7 @@ def serialize_for_json(value: Any) -> Any:
         return str(value)
 
 
-def format_field_value(field_info: FieldInfo, value: Any, assume_text=True) -> Union[str, dict]:
+def format_field_value(field_info: FieldInfo, value: Any, assume_text=True) -> str | dict:
     """
     Formats the value of the specified field according to the field's DSPy type (input or output),
     annotation (e.g. str, int, etc.), and the type of the value itself.

dspy/adapters/xml_adapter.py

@@ -1,5 +1,5 @@
 import re
-from typing import Any, Dict, Optional, Type
+from typing import Any, Dict, Type
 
 from dspy.adapters.chat_adapter import ChatAdapter, FieldInfoWithName
 from dspy.adapters.utils import format_field_value
@@ -8,7 +8,7 @@
 
 
 class XMLAdapter(ChatAdapter):
-    def __init__(self, callbacks: Optional[list[BaseCallback]] = None):
+    def __init__(self, callbacks: list[BaseCallback] | None = None):
         super().__init__(callbacks)
         self.field_pattern = re.compile(r"<(?P<name>\w+)>((?P<content>.*?))</\1>", re.DOTALL)
 

dspy/clients/__init__.py

@@ -27,11 +27,11 @@ def _litellm_track_cache_hit_callback(kwargs, completion_response, start_time, e
 
 
 def configure_cache(
-    enable_disk_cache: Optional[bool] = True,
-    enable_memory_cache: Optional[bool] = True,
-    disk_cache_dir: Optional[str] = DISK_CACHE_DIR,
-    disk_size_limit_bytes: Optional[int] = DISK_CACHE_LIMIT,
-    memory_max_entries: Optional[int] = 1000000,
+    enable_disk_cache: bool | None = True,
+    enable_memory_cache: bool | None = True,
+    disk_cache_dir: str | None = DISK_CACHE_DIR,
+    disk_size_limit_bytes: int | None = DISK_CACHE_LIMIT,
+    memory_max_entries: int | None = 1000000,
     enable_litellm_cache: bool = False,
 ):
     """Configure the cache for DSPy.