Restructure code

Author: luca3rd

src/lightning_app/cli/cmd_clusters.py

@@ -25,6 +25,7 @@
 from lightning_app.cli.core import Formatable
 from lightning_app.utilities.network import LightningClient
 from lightning_app.utilities.openapi import create_openapi_object, string2dict
+from lightning_app.utilities.string_formatting import duration_seconds
 
 CLUSTER_STATE_CHECKING_TIMEOUT = 60
 MAX_CLUSTER_WAIT_TIME = 5400
@@ -313,19 +314,7 @@ def echo_cluster_status_long(
         message = f"Cluster {cluster_id} has been deleted."
 
     if seconds_in_current_state:
-        message += f" [{format_seconds(seconds_in_current_state)}]"
+        message += f" [{duration_seconds(seconds_in_current_state)}]"
 
     click.echo(message)
 
-
-def format_seconds(seconds: int) -> str:
-    """Generates a duration string in 00h00m00s format."""
-    mins, seconds = divmod(seconds, 60)
-    hours, mins = divmod(mins, 60)
-
-    duration = f"{seconds:02}s"
-    if mins:
-        duration = f"{mins:02}m" + duration
-    if hours:
-        duration = f"{hours:02}h" + duration
-    return duration

src/lightning_app/utilities/string_formatting.py

@@ -0,0 +1,12 @@
+
+def duration_seconds(seconds: int) -> str:
+    """Generates a duration string in 00h00m00s format."""
+    mins, seconds = divmod(seconds, 60)
+    hours, mins = divmod(mins, 60)
+
+    duration = f"{seconds:02}s"
+    if mins:
+        duration = f"{mins:02}m" + duration
+    if hours:
+        duration = f"{hours:02}h" + duration
+    return duration

tests/tests_app/utilities/test_string_formatting.py

@@ -0,0 +1,17 @@
+import pytest
+
+from lightning_app.utilities.string_formatting import duration_seconds
+
+
+@pytest.mark.parametrize("seconds,want_string", [
+    (0, "00s"),
+    (0.1, "0.1s"),
+    (5, "05s"),
+    (50, "50s"),
+    (60, "01m00s"),
+    (60*60, "01h00s"),
+    (60*60+60, "01h01m00s"),
+    (60*60*25, "25h00s"),
+])
+def test_duration_seconds(seconds, want_string):
+    assert want_string == duration_seconds(seconds)