scorebook 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

scorebook/score/score_helpers.py

@@ -4,8 +4,8 @@ import logging
 from typing import Any, Dict, List, Mapping, Optional, Type, Union
 
 from scorebook.exceptions import DataMismatchError, ParameterValidationError
-from scorebook.metrics.metric_base import MetricBase
-from scorebook.metrics.metric_registry import MetricRegistry
+from scorebook.metrics.core.metric_base import MetricBase
+from scorebook.metrics.core.metric_registry import MetricRegistry
 from scorebook.types import MetricScore
 from scorebook.utils.async_utils import is_awaitable
 
@@ -89,7 +89,7 @@ async def calculate_metric_scores_async(
     for metric in metrics:
 
         if progress_bar is not None:
-            progress_bar.set_current_metric(metric.name)
+            progress_bar.set_postfix(metric=metric.name)
 
         if is_awaitable(metric.score):
             aggregate_scores, item_scores = await metric.score(outputs, labels)
@@ -134,7 +134,7 @@ def calculate_metric_scores(
     for metric in metrics:
 
         if progress_bar is not None:
-            progress_bar.set_current_metric(metric.name)
+            progress_bar.set_postfix(metric=metric.name)
 
         if is_awaitable(metric.score):
             raise ParameterValidationError(
@@ -164,18 +164,27 @@ def format_results(
     hyperparameters = hyperparameters or {}
     dataset_name = dataset_name or "scored_items"
 
+    # Detect key collisions across all metrics (for both aggregate and item scores)
+    all_keys: Dict[str, set] = {}
+    for metric_score in metric_scores:
+        for key in metric_score.aggregate_scores.keys():
+            all_keys.setdefault(key, set()).add(metric_score.metric_name)
+        # Also check item_scores keys if they are dicts
+        if metric_score.item_scores and isinstance(metric_score.item_scores[0], dict):
+            for key in metric_score.item_scores[0].keys():
+                all_keys.setdefault(key, set()).add(metric_score.metric_name)
+    colliding_keys = {k for k, metrics in all_keys.items() if len(metrics) > 1}
+
     # Build aggregate results
-    aggregate_result = {
+    aggregate_result: Dict[str, Any] = {
         "dataset": dataset_name,
         **hyperparameters,
     }
 
-    # Add aggregate scores from metrics
+    # Add aggregate scores from metrics (flat, with suffix on collision)
     for metric_score in metric_scores:
         for key, value in metric_score.aggregate_scores.items():
-            score_key = (
-                key if key == metric_score.metric_name else f"{metric_score.metric_name}_{key}"
-            )
+            score_key = f"{key}_{metric_score.metric_name}" if key in colliding_keys else key
             aggregate_result[score_key] = value
 
     # Build item results
@@ -193,10 +202,18 @@ def format_results(
         if inputs is not None and inputs[idx] is not None:
             item_result["input"] = inputs[idx]
 
-        # Add item-level metric scores
+        # Add item-level metric scores (flat, with suffix on collision)
         for metric_score in metric_scores:
             if idx < len(metric_score.item_scores):
-                item_result[metric_score.metric_name] = metric_score.item_scores[idx]
+                item_scores = metric_score.item_scores[idx]
+                if isinstance(item_scores, dict):
+                    for key, value in item_scores.items():
+                        score_key = (
+                            f"{key}_{metric_score.metric_name}" if key in colliding_keys else key
+                        )
+                        item_result[score_key] = value
+                else:
+                    item_result[metric_score.metric_name] = item_scores
 
         item_results.append(item_result)
 

scorebook/types.py

@@ -4,11 +4,11 @@ from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Sequence, Type, Union
 
 from scorebook.eval_datasets.eval_dataset import EvalDataset
-from scorebook.metrics.metric_base import MetricBase
+from scorebook.metrics.core.metric_base import MetricBase
 
 # Type alias for metrics parameter
 Metrics = Union[
-    str, "MetricBase", Type["MetricBase"], Sequence[Union[str, "MetricBase", Type["MetricBase"]]]
+    str, MetricBase, Type[MetricBase], Sequence[Union[str, MetricBase, Type[MetricBase]]]
 ]