limit windows path handling to studio

Author: dberenbaum

dvc.yaml

@@ -1,8 +1,14 @@
 metrics:
 - ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-255/test_dvclive_log_metrics_10_0/metrics.json
 - ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-255/test_dvclive_log_metrics_None_0/metrics.json
+- ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-256/test_dvclive_log_metrics_10_0/metrics.json
+- ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-256/test_dvclive_log_metrics_None_0/metrics.json
 plots:
 - ? ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-255/test_dvclive_log_metrics_10_0/plots/metrics
   : x: step
 - ? ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-255/test_dvclive_log_metrics_None_0/plots/metrics
   : x: step
+- ? ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-256/test_dvclive_log_metrics_10_0/plots/metrics
+  : x: step
+- ? ../../../../private/var/folders/24/99_tf1xj3vx8k1k_jkdmnhq00000gn/T/pytest-of-dave/pytest-256/test_dvclive_log_metrics_None_0/plots/metrics
+  : x: step

src/dvclive/studio.py

@@ -4,6 +4,7 @@
 import logging
 import math
 import os
+from pathlib import PureWindowsPath
 from typing import TYPE_CHECKING
 
 from dvc_studio_client.config import get_studio_config
@@ -38,8 +39,11 @@ def _cast_to_numbers(datapoints: dict):
 
 
 def _adapt_path(live: Live, name: StrPath):
-    dvc_root_path = live._dvc_repo.root_dir if live._dvc_repo else None
-    return rel_path(name, dvc_root_path)
+    if live._dvc_repo is not None:
+        name = rel_path(name, live._dvc_repo.root_dir)
+    if os.name == "nt":
+        name = str(PureWindowsPath(name).as_posix())
+    return name
 
 
 def _adapt_plot_datapoints(live: Live, plot: dict):

src/dvclive/utils.py

@@ -4,7 +4,7 @@
 import os
 import re
 import shutil
-from pathlib import Path, PureWindowsPath
+from pathlib import Path
 from platform import uname
 from typing import Union, List, Dict, TYPE_CHECKING
 import webbrowser
@@ -192,12 +192,8 @@ def wrapper(*args, **kwargs):
 
 
 def rel_path(path, dvc_root_path):
-    if dvc_root_path:
-        absolute_path = Path(path).absolute()
-        path = os.path.relpath(absolute_path, dvc_root_path)
-    if os.name == "nt":
-        return str(PureWindowsPath(path).as_posix())
-    return str(Path(path).as_posix())
+    absolute_path = Path(path).absolute()
+    return str(Path(os.path.relpath(absolute_path, dvc_root_path)).as_posix())
 
 
 def read_history(live, metric):