Skip to content

Commit 4da0d3d

Browse files
authored
[misc] fix: Sanitize MLFlow metric names (#3736)
### What does this PR do? > Add **concise** overview of what this PR aims to achieve or accomplish. Reference related GitHub issues and PRs that help with the review. Fixes Issue with metric name validation when using MLFlow. Keeps replacement of `@` with `_at_` for backward compatibility. Resolves #1242 ### Checklist Before Starting - [x] Search for similar PRs. Paste at least one query link here: N/A - [x] Format the PR title as `[{modules}] {type}: {description}` (This will be checked by the CI) - `{modules}` include `fsdp`, `megatron`, `sglang`, `vllm`, `rollout`, `trainer`, `ci`, `training_utils`, `recipe`, `hardware`, `deployment`, `ray`, `worker`, `single_controller`, `misc`, `perf`, `model`, `algo`, `env`, `tool`, `ckpt`, `doc`, `data` - If this PR involves multiple modules, separate them with `,` like `[megatron, fsdp, doc]` - `{type}` is in `feat`, `fix`, `refactor`, `chore`, `test` - If this PR breaks any API (CLI arguments, config, function signature, etc.), add `[BREAKING]` to the beginning of the title. - Example: `[BREAKING][fsdp, megatron] feat: dynamic batching` ### Test > For changes that can not be tested by CI (e.g., algorithm implementation, new model support), validate by experiment(s) and show results like training curve plots, evaluation results, etc. Adds a unit tests to validate metric name cleanup ### API and Usage Example > Demonstrate how the API changes if any, and provide usage example(s) if possible. ```python # Add code snippet or script demonstrating how to use this ``` ### Design & Code Changes > Demonstrate the high-level design if this PR is complex, and list the specific changes. ### Checklist Before Submitting > [!IMPORTANT] > Please check all the following items before requesting a review, otherwise the reviewer might deprioritize this PR for review. - [x ] Read the [Contribute Guide](https://github.com/volcengine/verl/blob/main/CONTRIBUTING.md). - [x] Apply [pre-commit checks](https://github.com/volcengine/verl/blob/main/CONTRIBUTING.md#code-linting-and-formatting): `pre-commit install && pre-commit run --all-files --show-diff-on-failure --color=always` - [x] Add / Update [the documentation](https://github.com/volcengine/verl/tree/main/docs). - [x] Add unit or end-to-end test(s) to [the CI workflow](https://github.com/volcengine/verl/tree/main/.github/workflows) to cover all the code. If not feasible, explain why: ... - [x] Once your PR is ready for CI, send a message in [the `ci-request` channel](https://verl-project.slack.com/archives/C091TCESWB1) in [the `verl` Slack workspace](https://join.slack.com/t/verl-project/shared_invite/zt-3855yhg8g-CTkqXu~hKojPCmo7k_yXTQ). (If not accessible, please try [the Feishu group (飞书群)](https://applink.larkoffice.com/client/chat/chatter/add_by_link?link_token=772jd4f1-cd91-441e-a820-498c6614126a).)
1 parent 5b417da commit 4da0d3d

File tree

2 files changed

+69
-1
lines changed

2 files changed

+69
-1
lines changed
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright 2024 Bytedance Ltd. and/or its affiliates
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import unittest
16+
from unittest.mock import patch
17+
18+
from verl.utils.tracking import _MlflowLoggingAdapter
19+
20+
21+
class TestMlflowLoggingAdapter(unittest.TestCase):
22+
def test_sanitize_key_and_warning(self):
23+
adapter = _MlflowLoggingAdapter()
24+
data = {"valid_key": 1.0, "invalid@key!": 2.0, "another/valid-key": 3.0, "bad key#": 4.0}
25+
# Patch mlflow.log_metrics to capture the metrics actually sent
26+
with (
27+
patch("mlflow.log_metrics") as mock_log_metrics,
28+
patch.object(adapter, "logger") as mock_logger,
29+
):
30+
adapter.log(data, step=5)
31+
# Check that keys are sanitized
32+
sent_metrics = mock_log_metrics.call_args[1]["metrics"]
33+
self.assertIn("invalid_at_key_", sent_metrics) # @ becomes _at_, ! becomes _
34+
self.assertIn("bad key_", sent_metrics) # # becomes _, space remains
35+
self.assertNotIn("invalid@key!", sent_metrics)
36+
self.assertNotIn("bad key#", sent_metrics)
37+
# Check that a warning was logged for each sanitized key
38+
warning_msgs = [str(call) for call in mock_logger.warning.call_args_list]
39+
self.assertTrue(any("invalid@key!" in msg and "invalid_at_key_" in msg for msg in warning_msgs))
40+
self.assertTrue(any("bad key#" in msg and "bad key_" in msg for msg in warning_msgs))
41+
42+
43+
if __name__ == "__main__":
44+
unittest.main()

verl/utils/tracking.py

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,34 @@ def finish(self):
263263

264264

265265
class _MlflowLoggingAdapter:
266+
def __init__(self):
267+
import logging
268+
import re
269+
270+
self.logger = logging.getLogger(__name__)
271+
# MLflow metric key validation logic:
272+
# https://github.com/mlflow/mlflow/blob/master/mlflow/utils/validation.py#L157C12-L157C44
273+
# Only characters allowed: slashes, alphanumerics, underscores, periods, dashes, colons,
274+
# and spaces.
275+
self._invalid_chars_pattern = re.compile(
276+
r"[^/\w.\- :]"
277+
) # Allowed: slashes, alphanumerics, underscores, periods, dashes, colons, and spaces.
278+
266279
def log(self, data, step):
267280
import mlflow
268281

269-
results = {k.replace("@", "_at_"): v for k, v in data.items()}
282+
def sanitize_key(key):
283+
# First replace @ with _at_ for backward compatibility
284+
sanitized = key.replace("@", "_at_")
285+
# Then replace any other invalid characters with _
286+
sanitized = self._invalid_chars_pattern.sub("_", sanitized)
287+
if sanitized != key:
288+
self.logger.warning(
289+
"[MLflow] Metric key '%s' sanitized to '%s' due to invalid characters.", key, sanitized
290+
)
291+
return sanitized
292+
293+
results = {sanitize_key(k): v for k, v in data.items()}
270294
mlflow.log_metrics(metrics=results, step=step)
271295

272296

0 commit comments

Comments
 (0)