Switch to UV, fix tests and bugs in version retrieval

Author: kzscisoft

.gitignore

@@ -174,3 +174,9 @@ poetry.toml
 pyrightconfig.json
 
 # End of https://www.toptal.com/developers/gitignore/api/python
+
+# Simvue
+simvue.ini
+simvue.toml
+
+.sourcery.yaml

poetry.lock

@@ -5,21 +5,19 @@ description = "Command Line Interface for interaction with a Simvue v3 server"
 authors = [
     {name = "Kristian Zarębski",email = "[email protected]"}
 ]
-license = {text = "Apache-v2"}
+license-files = ["LICENSE"]
 readme = "README.md"
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "click (>=8.1.8,<9.0.0)",
-    "click-option-group (>=0.5.6,<0.6.0)",
-    "click-log (>=0.4.0,<0.5.0)",
-    "click-params (>=0.5.0,<0.6.0)",
-    "click-man (>=0.5.0,<0.6.0)",
-    "pytermgui (>=7.7.3,<8.0.0)",
-    "tabulate (>=0.9.0,<0.10.0)",
-    "toml (>=0.10.2,<0.11.0)",
-    "regex (>=2024.11.6,<2025.0.0)",
-    "requests (>=2.32.3,<3.0.0)",
-    "simvue @ git+https://github.com/simvue-io/python-api@dev",
+    "click-option-group>=0.5.7",
+    "click>=8.1.8",
+    "simvue>=2.1.0",
+    "click-log>=0.4.0",
+    "click-params>=0.5.0",
+    "toml>=0.10.2",
+    "tabulate>=0.9.0",
+    "regex>=2024.11.6",
+    "requests>=2.32.3",
 ]
 
 [project.scripts]
@@ -28,7 +26,7 @@ simvue = "simvue_cli.cli:simvue"
 [tool.ruff]
 lint.extend-select = ["C901", "T201"]
 lint.mccabe.max-complexity = 11
-extend-exclude = ["tests", "examples", "notebooks"]
+extend-exclude = ["tests"]
 
 [tool.pytest.ini_options]
 addopts = "--no-cov"
@@ -37,16 +35,14 @@ testpaths = [
 ]
 
 [build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.group.testing.dependencies]
-pytest = "^8.3.4"
-pytest-cov = "^6.0.0"
-pytest-sugar = "^1.0.0"
-pytest-xdist = "^3.6.1"
-
-
-[tool.poetry.group.lint.dependencies]
-ruff = "^0.9.3"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
+[dependency-groups]
+dev = [
+    "pytest-cov>=6.0.0",
+    "pytest>=8.3.5",
+]
+lint = [
+    "ruff>=0.11.2",
+]

pyproject.toml

@@ -77,10 +77,14 @@ def _check_run_exists(run_id: str) -> tuple[pathlib.Path, Run]:
     # retrieve last time step, and the start time of the run
     if not run_shelf_file.exists():
         out_data = {"step": 0, "start_time": time.time()}
-        if step := max(metric.get("step", 0) for _, metric in run.metrics or {}):
-            out_data["step"] = step
-        if time_now := min(metric.get("time", 0) for _, metric in run.metrics or {}):
-            out_data["start_time"] = time_now
+        _metric_steps: list[int] = [
+            metric.get("step", 0) for _, metric in run.metrics or []
+        ]
+        _times: list[int] = [metric.get("time", 0) for _, metric in run.metrics or []]
+        if _metric_steps:
+            out_data["step"] = max(_metric_steps)
+        if _times:
+            out_data["start_time"] = min(_times)
         with run_shelf_file.open("w") as out_f:
             json.dump(out_data, out_f)
 
@@ -275,7 +279,7 @@ def get_server_version() -> typing.Union[str, int]:
         failed HTTP request
     """
     _url, _headers = get_url_and_headers()
-    response = sv_api.get(f"{_url}/api/version", headers=_headers)
+    response = sv_api.get(f"{_url}/version", headers=_headers)
     if response.status_code != 200:
         return response.status_code
 

simvue_cli/__init__.py renamed to src/simvue_cli/__init__.py

@@ -749,11 +749,11 @@ def monitor(ctx, tag: tuple[str, ...] | None, delimiter: str, **run_params) -> N
     metric_labels: list[str] = []
     run_params |= {"tags": list(tag) if tag else None}
 
-    run_id: str | None = simvue_cli.actions.create_simvue_run(
+    run: Run | None = simvue_cli.actions.create_simvue_run(
         timeout=None, running=True, **run_params
     )
 
-    if not run_id:
+    if not run:
         raise click.Abort("Failed to create run")
 
     try:
@@ -764,19 +764,19 @@ def monitor(ctx, tag: tuple[str, ...] | None, delimiter: str, **run_params) -> N
                 continue
             try:
                 simvue_cli.actions.log_metrics(
-                    run_id, dict(zip(metric_labels, [float(i) for i in line]))
+                    run.id, dict(zip(metric_labels, [float(i) for i in line]))
                 )
             except (RuntimeError, ValueError) as e:
                 if ctx.obj["plain"]:
                     click.echo(e)
                 else:
                     click.secho(e, fg="red", bold=True)
                 sys.exit(1)
-        click.echo(run_id)
+        click.echo(run.id)
     except KeyboardInterrupt as e:
-        simvue_cli.actions.set_run_status(run_id, "terminated")
+        simvue_cli.actions.set_run_status(run.id, "terminated")
         raise click.Abort from e
-    simvue_cli.actions.set_run_status(run_id, "completed")
+    simvue_cli.actions.set_run_status(run.id, "completed")
 
 
 @simvue.group("folder")

simvue_cli/actions.py renamed to src/simvue_cli/actions.py

@@ -0,0 +1,26 @@
+import json
+import typing
+import pydantic
+import simvue.api.objects as sv_obj
+from simvue.models import FOLDER_REGEX
+
+
+def hierarchy(path: typing.Annotated[str, pydantic.Field(pattern=FOLDER_REGEX)]) -> str:
+    _hierarchical_structure = {}
+    for _, folder in sv_obj.Folder.get(
+        filters=json.dumps([f"path contains {path}"]),
+        sorting=[{"column": "created", "descending": True}],
+    ):
+        _components = folder.path.strip("/").split("/")
+        _node = _hierarchical_structure
+        for i, _component in enumerate(_components):
+            if _component not in _node:
+                _node[_component] = {}
+            _node = _node[_component]
+
+    for entry
+    return _hierarchical_structure
+
+
+if __name__ in "__main__":
+    print(hierarchy("/simvue_unit_tests"))