Cleanup and fixing some imports (#1949)

dspy/__init__.py

@@ -6,11 +6,9 @@
 
 import dspy.retrievers
 
-# Functional must be imported after primitives, predict and signatures
-from dspy.functional import *  # isort: skip
 from dspy.evaluate import Evaluate  # isort: skip
 from dspy.clients import *  # isort: skip
-from dspy.adapters import *  # isort: skip
+from dspy.adapters import Adapter, ChatAdapter, JSONAdapter, Image  # isort: skip
 from dspy.utils.logging_utils import configure_dspy_loggers, disable_logging, enable_logging
 from dspy.utils.asyncify import asyncify
 from dspy.utils.saving import load

dspy/evaluate/__init__.py

@@ -1,13 +1,5 @@
 from dspy.dsp.utils import EM, normalize_text
 
-from dspy.evaluate import auto_evaluation
+from dspy.evaluate.metrics import answer_exact_match, answer_passage_match
 from dspy.evaluate.evaluate import Evaluate
-from dspy.evaluate import metrics
-
-__all__ = [
-    "auto_evaluation",
-    "Evaluate",
-    "metrics",
-    "EM",
-    "normalize_text",
-]
+from dspy.evaluate.auto_evaluation import SemanticF1, CompleteAndGrounded

dspy/evaluate/auto_evaluation.py

@@ -98,45 +98,3 @@ def forward(self, example, pred, trace=None):
         score = f1_score(groundedness.groundedness, completeness.completeness)
 
         return score if trace is None else score >= self.threshold
-
-
-
-# """
-# Soon-to-be deprecated Signatures & Modules Below.
-# """
-
-
-# class AnswerCorrectnessSignature(dspy.Signature):
-#     """Verify that the predicted answer matches the gold answer."""
-
-#     question = dspy.InputField()
-#     gold_answer = dspy.InputField(desc="correct answer for question")
-#     predicted_answer = dspy.InputField(desc="predicted answer for question")
-#     is_correct = dspy.OutputField(desc="True or False")
-
-
-# class AnswerCorrectness(dspy.Module):
-#     def __init__(self):
-#         super().__init__()
-#         self.evaluate_correctness = dspy.ChainOfThought(AnswerCorrectnessSignature)
-
-#     def forward(self, question, gold_answer, predicted_answer):
-#         return self.evaluate_correctness(question=question, gold_answer=gold_answer, predicted_answer=predicted_answer)
-
-
-# class AnswerFaithfulnessSignature(dspy.Signature):
-#     """Verify that the predicted answer is based on the provided context."""
-
-#     context = dspy.InputField(desc="relevant facts for producing answer")
-#     question = dspy.InputField()
-#     answer = dspy.InputField(desc="often between 1 and 5 words")
-#     is_faithful = dspy.OutputField(desc="True or False")
-
-
-# class AnswerFaithfulness(dspy.Module):
-#     def __init__(self):
-#         super().__init__()
-#         self.evaluate_faithfulness = dspy.ChainOfThought(AnswerFaithfulnessSignature)
-
-#     def forward(self, context, question, answer):
-#         return self.evaluate_faithfulness(context=context, question=question, answer=answer)