From b4587c5d086f729a4810df5e6a98eeab2da0378d Mon Sep 17 00:00:00 2001
From: ViperEkura <3081035982@qq.com>
Date: Thu, 25 Jun 2026 17:18:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor=20:=20metric=5Flogger=20=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B=20(type=3Dstep/va?=
 =?UTF-8?q?lidation/epoch)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 每种事件独立 schema，不再混入 null 字段
- 回调顺序 validation 移到 metric_logger 之前，确保 on_optimizer_step 先跑
- 用内部 _last_val_loss 代替 TrainContext.last_val_iter 判断新验证
- 修复 factory.py 未使用导入、evaluate_ifeval.py 多余 f 前缀
---
 astrai/factory.py                |  1 -
 astrai/trainer/train_callback.py | 47 +++++++++++++++++++-------------
 astrai/trainer/trainer.py        |  2 +-
 scripts/eval/evaluate_ifeval.py  |  2 +-
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/astrai/factory.py b/astrai/factory.py
index f411010..81be8d9 100644
--- a/astrai/factory.py
+++ b/astrai/factory.py
@@ -4,7 +4,6 @@ import inspect
 import sys
 from abc import ABC
 from typing import (
-    Any,
     Callable,
     Dict,
     ForwardRef,
diff --git a/astrai/trainer/train_callback.py b/astrai/trainer/train_callback.py
index 53895ca..eeb2b21 100644
--- a/astrai/trainer/train_callback.py
+++ b/astrai/trainer/train_callback.py
@@ -237,6 +237,7 @@ class MetricLoggerCallback(TrainCallback):
         metrics: List[str] = None,
     ):
         self.last_log_iter = 0
+        self._last_val_loss = None
         self.save_interval = save_interval
         self.log_interval = log_interval
         self.metrics = metrics or ["loss", "lr"]
@@ -258,46 +259,54 @@ class MetricLoggerCallback(TrainCallback):
             "grad_nan_num": ctx_get_grad_nan_num,
         }
 
-    def _get_log_data(self, context: TrainContext):
-        data = {
+    def _metrics(self, context: TrainContext, names):
+        return {
+            m: self._metric_funcs[m](context)
+            for m in names
+            if self._metric_funcs[m](context) is not None
+        }
+
+    @only_on_rank(0)
+    def _append(self, event_type: str, context: TrainContext, **extra):
+        entry = {
+            "type": event_type,
             "timestamp": time.strftime("%Y-%m-%dT%H:%M:%S"),
             "epoch": context.epoch,
             "iter": context.iteration,
+            **extra,
         }
-        for m in self.metrics:
-            val = self._metric_funcs[m](context)
-            if val is not None:
-                data[m] = val
-        return data
+        self.log_cache.append(entry)
 
     @only_on_rank(0)
-    def _add_log(self, log_data):
-        self.log_cache.append(log_data)
-
-    @only_on_rank(0)
-    def _save_log(self, epoch, iter):
+    def _flush(self, epoch, iter):
         log_file = self.log_dir / f"epoch_{epoch}_iter_{iter}_metric.jsonl"
         log_file.parent.mkdir(parents=True, exist_ok=True)
-
         with open(log_file, "w") as f:
             for log in self.log_cache:
                 f.write(json.dumps(log) + "\n")
 
     def on_batch_end(self, context):
         if context.iteration % self.log_interval == 0:
-            log_data = self._get_log_data(context)
-            self._add_log(log_data)
-
+            step_metrics = [m for m in self.metrics if m != "val_loss"]
+            self._append("step", context, **self._metrics(context, step_metrics))
         if context.iteration - self.last_log_iter >= self.save_interval:
-            self._save_log(context.epoch, context.iteration)
+            self._flush(context.epoch, context.iteration)
             self.last_log_iter = context.iteration
 
+    def on_optimizer_step(self, context):
+        if context.val_loss is not None and context.val_loss != self._last_val_loss:
+            self._append("validation", context, val_loss=context.val_loss)
+            self._last_val_loss = context.val_loss
+
+    def on_epoch_end(self, context):
+        self._append("epoch", context)
+
     def on_train_end(self, context):
         if context.iteration != self.last_log_iter:
-            self._save_log(context.epoch, context.iteration)
+            self._flush(context.epoch, context.iteration)
 
     def on_error(self, context):
-        self._save_log(context.epoch, context.iteration)
+        self._flush(context.epoch, context.iteration)
 
 
 @CallbackFactory.register("validation")
diff --git a/astrai/trainer/trainer.py b/astrai/trainer/trainer.py
index dd457c8..c8c73a1 100644
--- a/astrai/trainer/trainer.py
+++ b/astrai/trainer/trainer.py
@@ -34,6 +34,7 @@ class Trainer:
                 cfg.ckpt_dir,
                 cfg.ckpt_interval,
             ),
+            CallbackFactory.create("validation"),
             CallbackFactory.create(
                 "metric_logger",
                 log_dir=cfg.log_dir,
@@ -43,7 +44,6 @@ class Trainer:
             ),
             CallbackFactory.create("progress_bar", cfg.n_epoch),
             CallbackFactory.create("gradient_clipping", cfg.max_grad_norm),
-            CallbackFactory.create("validation"),
         ]
         return callbacks
 
diff --git a/scripts/eval/evaluate_ifeval.py b/scripts/eval/evaluate_ifeval.py
index 70f1320..c239dbd 100644
--- a/scripts/eval/evaluate_ifeval.py
+++ b/scripts/eval/evaluate_ifeval.py
@@ -571,7 +571,7 @@ def main():
     print(f"  Unsupported:    {summary['unsupported_constraints']}")
     print(f"{'=' * 60}")
 
-    print(f"\nPer-type accuracy:")
+    print("\nPer-type accuracy:")
     for inst_id, stats in sorted(summary["per_type_accuracy"].items()):
         print(
             f"  {inst_id:50s}  {stats['accuracy']:.2%}  "