Merge branch 'main' into exp-save-warning

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/isort
@@ -34,7 +34,7 @@ repos:
         additional_dependencies: ["tomli"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.0.277'
+    rev: 'v0.0.278'
     hooks:
       - id: ruff
   - repo: https://github.com/executablebooks/mdformat

src/dvclive/lightning.py

@@ -2,13 +2,23 @@
 import inspect
 from typing import Any, Dict, Optional
 
-from lightning.fabric.utilities.logger import (
-    _convert_params,
-    _sanitize_callable_params,
-    _sanitize_params,
-)
-from lightning.pytorch.loggers.logger import Logger, rank_zero_experiment
-from lightning.pytorch.utilities import rank_zero_only
+try:
+    from lightning.fabric.utilities.logger import (
+        _convert_params,
+        _sanitize_callable_params,
+        _sanitize_params,
+    )
+    from lightning.pytorch.loggers.logger import Logger, rank_zero_experiment
+    from lightning.pytorch.utilities import rank_zero_only
+except ImportError:
+    from lightning_fabric.utilities.logger import (
+        _convert_params,
+        _sanitize_callable_params,
+        _sanitize_params,
+    )
+    from pytorch_lightning.loggers.logger import Logger, rank_zero_experiment
+    from pytorch_lightning.utilities import rank_zero_only
+
 from torch import is_tensor
 
 from dvclive import Live