Merge branch 'dev' of github.com:simvue-io/python-api into dev

Author: kzscisoft

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: [--branch, main, --branch, dev]
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.13.1
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix, "--ignore=C901" ]

simvue/models.py

@@ -6,7 +6,7 @@
 
 FOLDER_REGEX: str = r"^/.*"
 NAME_REGEX: str = r"^[a-zA-Z0-9\-\_\s\/\.:]+$"
-METRIC_KEY_REGEX: str = r"^[a-zA-Z0-9\-\_\s\/\.:=><]+$"
+METRIC_KEY_REGEX: str = r"^[a-zA-Z0-9\-\_\s\/\.:=><+\(\)]+$"
 DATETIME_FORMAT: str = "%Y-%m-%dT%H:%M:%S.%f"
 
 MetadataKeyString = typing.Annotated[

tests/functional/test_run_class.py

@@ -167,7 +167,7 @@ def test_log_metrics_online(
     visibility: typing.Literal["public", "tenant"] | list[str] | None,
     metric_type: typing.Literal["regular", "tensor"],
 ) -> None:
-    METRICS = {"a": 10, "b": 1.2}
+    METRICS = {"a": 10, "aB0-_/.:=><+()": 1.2}
 
     # Have to create the run outside of fixtures because the resources dispatch
     # occurs immediately and is not captured by the handler when using the fixture
@@ -313,7 +313,7 @@ def test_log_metrics_offline(
             axes_labels=["x", "y"]
         )
     else:
-        METRICS = {"a": 10, "b": 1.2, "c": 2}
+        METRICS = {"a": 10, "aB0-_/.:=><+()": 1.2, "c": 2}
 
     run.log_metrics(METRICS)
 

tests/unit/test_metrics.py

@@ -19,7 +19,7 @@ def test_metrics_creation_online() -> None:
     _values = {
         "x": 1,
         "y": 2.0,
-        "z": True
+        "aB0-_/.:=><+()": True
     }
     _time: int = 1
     _step: int = 1
@@ -40,7 +40,7 @@ def test_metrics_creation_online() -> None:
     )
     assert _metrics.to_dict()
     _metrics.commit()
-    _data = next(_metrics.get(metrics=["x", "y", "z"], runs=[_run.id], xaxis="step"))
+    _data = next(_metrics.get(metrics=["x", "y", "aB0-_/.:=><+()"], runs=[_run.id], xaxis="step"))
     assert sorted(_metrics.names(run_ids=[_run.id])) == sorted(_values.keys())
     assert _data.get(_run.id).get('y')[0].get('value') == 2.0
     assert _data.get(_run.id).get('y')[0].get('step') == 1
@@ -61,7 +61,7 @@ def test_metrics_creation_offline(offline_cache_setup) -> None:
     _values = {
         "x": 1,
         "y": 2.0,
-        "z": True
+        "aB0-_/.:=><+()": True
     }
     _time: int = 1
     _step: int = 1
@@ -93,7 +93,7 @@ def test_metrics_creation_offline(offline_cache_setup) -> None:
 
     # Get online version of metrics
     _online_metrics = Metrics(_id_mapping.get(_metrics.id))
-    _data = next(_online_metrics.get(metrics=["x", "y", "z"], runs=[_id_mapping.get(_run.id)], xaxis="step"))
+    _data = next(_online_metrics.get(metrics=["x", "y", "aB0-_/.:=><+()"], runs=[_id_mapping.get(_run.id)], xaxis="step"))
     assert sorted(_online_metrics.names(run_ids=[_id_mapping.get(_run.id)])) == sorted(_values.keys())
     assert _data.get(_id_mapping.get(_run.id)).get('y')[0].get('value') == 2.0
     assert _data.get(_id_mapping.get(_run.id)).get('y')[0].get('step') == 1