tidy

weave/flow/eval.py

@@ -141,12 +141,6 @@ def model_post_init(self, __context: Any) -> None:
                 logger,
                 "Using 'model_output' key for compatibility with older scorers. Please update scorers to use 'output' parameter.",
             )
-        else:
-            self._output_key = "output"
-            util.warn_once(
-                logger,
-                "Using 'output' key for model results. Make sure your scorers expect an 'output' parameter.",
-            )
         self.scorers = scorers
 
         if isinstance(self.dataset, list):

weave/scorers/base_scorer.py

@@ -112,14 +112,13 @@ def get_scorer_attributes(
 
 def _has_oldstyle_scorers(scorers: list[Union[Callable, Op, Scorer]]) -> bool:
     """Check if any scorers use the deprecated 'model_output' parameter."""
-    for scorer in scorers or []:
+    for scorer in scorers:
         _, score_fn, _ = get_scorer_attributes(scorer)
         if is_op(score_fn):
             score_fn = as_op(score_fn)
             score_signature = score_fn.signature
         else:
             score_signature = inspect.signature(score_fn)
-        score_arg_names = list(score_signature.parameters.keys())
-        if "model_output" in score_arg_names:
+        if "model_output" in score_signature.parameters:
             return True
     return False