ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-06-26 23:15:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix last metrics for task are updated for events reported without variants

Browse Source
This commit is contained in:
allegroai 2024-03-18 15:44:28 +02:00
parent 6112910768
commit 85f5b8b6f6
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apiserver/bll/event/event_bll.py
View File

@ -438,10 +438,8 @@ class EventBLL(object):
last_events contains [hashed_metric_name -> hashed_variant_name -> event]. Keys are hashed to avoid mongodb last_events contains [hashed_metric_name -> hashed_variant_name -> event]. Keys are hashed to avoid mongodb
key conflicts due to invalid characters and/or long field names. key conflicts due to invalid characters and/or long field names.
""" """
metric = event.get("metric") metric = event.get("metric") or ""
variant = event.get("variant") variant = event.get("variant") or ""
if not (metric and variant):
return
metric_hash = dbutils.hash_field_name(metric) metric_hash = dbutils.hash_field_name(metric)
variant_hash = dbutils.hash_field_name(variant) variant_hash = dbutils.hash_field_name(variant)
@ -486,9 +484,9 @@ class EventBLL(object):
recent than the currently stored event for its metric/event_type combination. recent than the currently stored event for its metric/event_type combination.
last_events contains [metric_name -> event_type -> event] last_events contains [metric_name -> event_type -> event]
""" """
metric = event.get("metric") metric = event.get("metric") or ""
event_type = event.get("type") event_type = event.get("type")
if not (metric and event_type): if not event_type:
return return
timestamp = last_events[metric][event_type].get("timestamp", None) timestamp = last_events[metric][event_type].get("timestamp", None)

50
apiserver/tests/automated/test_task_events.py
View File

@ -193,33 +193,33 @@ class TestTaskEvents(TestService):
def test_last_scalar_metrics(self): def test_last_scalar_metrics(self):
metric = "Metric1" metric = "Metric1"
variant = "Variant1" for variant in ("Variant1", None):
iter_count = 100 iter_count = 100
task = self._temp_task() task = self._temp_task()
events = [ events = [
{ {
**self._create_task_event("training_stats_scalar", task, iteration), **self._create_task_event("training_stats_scalar", task, iteration),
"metric": metric, "metric": metric,
"variant": variant, "variant": variant,
"value": iteration, "value": iteration,
} }
for iteration in range(iter_count) for iteration in range(iter_count)
] ]
# send 2 batches to check the interaction with already stored db value # send 2 batches to check the interaction with already stored db value
# each batch contains multiple iterations # each batch contains multiple iterations
self.send_batch(events[:50]) self.send_batch(events[:50])
self.send_batch(events[50:]) self.send_batch(events[50:])
task_data = self.api.tasks.get_by_id(task=task).task task_data = self.api.tasks.get_by_id(task=task).task
metric_data = first(first(task_data.last_metrics.values()).values()) metric_data = first(first(task_data.last_metrics.values()).values())
self.assertEqual(iter_count - 1, metric_data.value) self.assertEqual(iter_count - 1, metric_data.value)
self.assertEqual(iter_count - 1, metric_data.max_value) self.assertEqual(iter_count - 1, metric_data.max_value)
self.assertEqual(iter_count - 1, metric_data.max_value_iteration) self.assertEqual(iter_count - 1, metric_data.max_value_iteration)
self.assertEqual(0, metric_data.min_value) self.assertEqual(0, metric_data.min_value)
self.assertEqual(0, metric_data.min_value_iteration) self.assertEqual(0, metric_data.min_value_iteration)
res = self.api.events.get_task_latest_scalar_values(task=task) res = self.api.events.get_task_latest_scalar_values(task=task)
self.assertEqual(iter_count - 1, res.last_iter) self.assertEqual(iter_count - 1, res.last_iter)
def test_model_events(self): def test_model_events(self):
model = self._temp_model(ready=False) model = self._temp_model(ready=False)