🐛 Address MR issues

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.12.12
+    rev: v0.13.0
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix, "--ignore=C901" ]

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Improves handling of Conda based environments in metadata collection.
 - Adds additional options to `Client.get_runs`.
 - Added ability to include environment variables within metadata for runs.
+- Added new feature allowing users to log tensors as multidimensional metrics after defining a grid.
 - Improves checks on `offline.cache` directory specification in config file.
 - Added ability to upload multiple runs as a batch via the low level API.
 

poetry.lock

@@ -8,28 +8,54 @@
 
 """
 
-from .administrator import Tenant as Tenant, User as User
+from .administrator import Tenant, User
 from .alert import (
-    Alert as Alert,
-    EventsAlert as EventsAlert,
-    MetricsThresholdAlert as MetricsThresholdAlert,
-    MetricsRangeAlert as MetricsRangeAlert,
-    UserAlert as UserAlert,
+    Alert,
+    EventsAlert,
+    MetricsThresholdAlert,
+    MetricsRangeAlert,
+    UserAlert,
 )
 from .storage import (
-    S3Storage as S3Storage,
-    FileStorage as FileStorage,
-    Storage as Storage,
+    S3Storage,
+    FileStorage,
+    Storage,
 )
 from .artifact import (
-    FileArtifact as FileArtifact,
-    ObjectArtifact as ObjectArtifact,
-    Artifact as Artifact,
+    FileArtifact,
+    ObjectArtifact,
+    Artifact,
 )
 
-from .stats import Stats as Stats
-from .run import Run as Run
-from .tag import Tag as Tag
-from .folder import Folder as Folder, get_folder_from_path as get_folder_from_path
+from .stats import Stats
+from .run import Run
+from .tag import Tag
+from .folder import Folder, get_folder_from_path
 from .events import Events as Events
 from .metrics import Metrics as Metrics
+from .grids import Grid, GridMetrics
+
+__all__ = [
+    "Grid",
+    "GridMetrics",
+    "Metrics",
+    "Events",
+    "get_folder_from_path",
+    "Folder",
+    "Stats",
+    "Run",
+    "Tag",
+    "Artifact",
+    "FileArtifact",
+    "ObjectArtifact",
+    "S3Storage",
+    "FileStorage",
+    "Storage",
+    "MetricsRangeAlert",
+    "MetricsThresholdAlert",
+    "UserAlert",
+    "EventsAlert",
+    "Alert",
+    "Tenant",
+    "User",
+]

simvue/api/objects/__init__.py

@@ -480,10 +480,22 @@ def count(cls, **kwargs) -> int:
 
     @classmethod
     def _get_all_objects(
-        cls, offset: int | None, count: int | None, **kwargs
+        cls,
+        offset: int | None,
+        count: int | None,
+        endpoint: str | None = None,
+        expected_type: type = dict,
+        **kwargs,
     ) -> Generator[dict, None, None]:
         _class_instance = cls(_read_only=True)
-        _url = f"{_class_instance._base_url}"
+
+        # Allow the possibility of paginating a URL that is not the
+        # main class endpoint
+        _url = (
+            f"{_class_instance._user_config.server.url}/{endpoint}"
+            if endpoint
+            else f"{_class_instance._base_url}"
+        )
 
         _label = _class_instance.__class__.__name__.lower()
         if _label.endswith("s"):
@@ -492,12 +504,18 @@ def _get_all_objects(
         for response in get_paginated(
             _url, headers=_class_instance._headers, offset=offset, count=count, **kwargs
         ):
-            yield get_json_from_response(
+            _generator = get_json_from_response(
                 response=response,
                 expected_status=[http.HTTPStatus.OK],
                 scenario=f"Retrieval of {_label}s",
+                expected_type=expected_type,
             )  # type: ignore
 
+            if expected_type is dict:
+                yield _generator
+            else:
+                yield from _generator
+
     def read_only(self, is_read_only: bool) -> None:
         """Set whether this object is in read only state.
 
@@ -535,7 +553,7 @@ def commit(self) -> dict | list[dict] | None:
             # If batch upload send as list, else send as dictionary of params
             if _batch_commit := self._staging.get("batch"):
                 self._logger.debug(
-                    f"Posting batched data to server: \n{json.dumps(_batch_commit, indent=2)}"
+                    f"Posting batched data to server: {len(_batch_commit)} {self._label}s"
                 )
                 _response = self._post_batch(batch_data=_batch_commit)
             else:
@@ -612,19 +630,16 @@ def _post_batch(
         return _json_response
 
     def _post_single(
-        self,
-        *,
-        is_json: bool = True,
-        **kwargs,
+        self, *, is_json: bool = True, data: list | dict | None = None, **kwargs
     ) -> dict[str, typing.Any] | list[dict[str, typing.Any]]:
         if not is_json:
-            kwargs = msgpack.packb(kwargs, use_bin_type=True)
+            kwargs = msgpack.packb(data or kwargs, use_bin_type=True)
 
         _response = sv_post(
             url=f"{self._base_url}",
             headers=self._headers | {"Content-Type": "application/msgpack"},
             params=self._params,
-            data=kwargs,
+            data=data or kwargs,
             is_json=is_json,
         )
 

simvue/api/objects/base.py

@@ -78,8 +78,8 @@ def new(
             **kwargs,
         )
 
-    def _post(self, **kwargs) -> dict[str, typing.Any]:
-        return super()._post(is_json=False, **kwargs)
+    def _post_single(self, **kwargs) -> dict[str, typing.Any]:
+        return super()._post_single(is_json=False, **kwargs)
 
     def _put(self, **kwargs) -> dict[str, typing.Any]:
         raise NotImplementedError("Method 'put' is not available for type Events")