Skip to content

armgit / dspy

Public Imported from GitHub
0

DSPy: The framework for programming—not prompting—language models

Python

format adapters/base.py and adapters/utils.py (#7982)

Chen Qian5d9e448fda2d
diff --git a/dspy/adapters/base.py b/dspy/adapters/base.py
index f5d948ee5..8fa57da42 100644
--- a/dspy/adapters/base.py
+++ b/dspy/adapters/base.py
@@ -8,6 +8,7 @@ from dspy.utils.callback import BaseCallback, with_callbacks
if TYPE_CHECKING:
from dspy.clients.lm import LM
+
class Adapter(ABC):
def __init__(self, callbacks: Optional[list[BaseCallback]] = None):
self.callbacks = callbacks or []
@@ -19,7 +20,14 @@ class Adapter(ABC):
cls.format = with_callbacks(cls.format)
cls.parse = with_callbacks(cls.parse)
- def __call__(self, lm: "LM", lm_kwargs: dict[str, Any], signature: Type[Signature], demos: list[dict[str, Any]], inputs: dict[str, Any]) -> list[dict[str, Any]]:
+ def __call__(
+ self,
+ lm: "LM",
+ lm_kwargs: dict[str, Any],
+ signature: Type[Signature],
+ demos: list[dict[str, Any]],
+ inputs: dict[str, Any],
+ ) -> list[dict[str, Any]]:
inputs_ = self.format(signature, demos, inputs)
inputs_ = dict(prompt=inputs_) if isinstance(inputs_, str) else dict(messages=inputs_)
@@ -47,22 +55,39 @@ class Adapter(ABC):
return values
-
@abstractmethod
- def format(self, signature: Type[Signature], demos: list[dict[str, Any]], inputs: dict[str, Any]) -> list[dict[str, Any]]:
+ def format(
+ self,
+ signature: Type[Signature],
+ demos: list[dict[str, Any]],
+ inputs: dict[str, Any],
+ ) -> list[dict[str, Any]]:
raise NotImplementedError
@abstractmethod
def parse(self, signature: Type[Signature], completion: str) -> dict[str, Any]:
raise NotImplementedError
-
+
def format_fields(self, signature: Type[Signature], values: dict[str, Any], role: str) -> str:
raise NotImplementedError
-
- def format_finetune_data(self, signature: Type[Signature], demos: list[dict[str, Any]], inputs: dict[str, Any], outputs: dict[str, Any]) -> dict[str, list[Any]]:
+
+ def format_finetune_data(
+ self,
+ signature: Type[Signature],
+ demos: list[dict[str, Any]],
+ inputs: dict[str, Any],
+ outputs: dict[str, Any],
+ ) -> dict[str, list[Any]]:
raise NotImplementedError
- def format_turn(self, signature: Type[Signature], values, role: str, incomplete: bool = False, is_conversation_history: bool = False) -> dict[str, Any]:
+ def format_turn(
+ self,
+ signature: Type[Signature],
+ values,
+ role: str,
+ incomplete: bool = False,
+ is_conversation_history: bool = False,
+ ) -> dict[str, Any]:
raise NotImplementedError
def format_conversation_history(self, signature: Type[Signature], inputs: dict[str, Any]) -> list[dict[str, Any]]:
diff --git a/dspy/adapters/utils.py b/dspy/adapters/utils.py
index 199fc1056..ad07a5e63 100644
--- a/dspy/adapters/utils.py
+++ b/dspy/adapters/utils.py
@@ -1,11 +1,11 @@
import ast
import enum
import json
-import json_repair
+from typing import Any, List, Literal, Union, get_args, get_origin
+import json_repair
from pydantic import TypeAdapter
from pydantic.fields import FieldInfo
-from typing import Any, List, Literal, Union, get_args, get_origin
def serialize_for_json(value: Any) -> Any:
@@ -86,7 +86,6 @@ def find_enum_member(enum, identifier):
raise ValueError(f"{identifier} is not a valid name or value for the enum {enum.__name__}")
-
def parse_value(value, annotation):
if annotation is str:
return str(value)
@@ -97,7 +96,7 @@ def parse_value(value, annotation):
if not isinstance(value, str):
return TypeAdapter(annotation).validate_python(value)
- candidate = json_repair.loads(value) # json_repair.loads returns "" on failure.
+ candidate = json_repair.loads(value) # json_repair.loads returns "" on failure.
if candidate == "" and value != "":
try:
candidate = ast.literal_eval(value)