pluto-ml 0.0.22__tar.gz → 0.0.23__tar.gz

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pluto-ml
-Version: 0.0.22
+Version: 0.0.23
 Summary: Pluto ML - Machine Learning Operations Framework
 License-File: LICENSE
 Author: jqssun

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pluto/__init__.py

@@ -41,11 +41,11 @@ __all__ = (
     'generate_run_id',
 )
 
-__version__ = '0.0.22'
+__version__ = '0.0.23'
 
 
 # Replaced with the current commit when building the wheels.
-_PLUTO_COMMIT_SHA = '4587211b1c6ccebe92f92d1243bf9a213ec1f3dd'
+_PLUTO_COMMIT_SHA = 'b279ceb6e63cc782fe7f3d6a3513cc97924deefe'
 
 
 def _get_git_commit():

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pluto/api.py

@@ -4,7 +4,7 @@ import re
 import signal
 from datetime import datetime
 
-from .util import clean_dict, find_node
+from .util import clean_dict, config_json_default, find_node
 
 logger = logging.getLogger(f'{__name__.split(".")[0]}')
 tag = 'API'
@@ -40,7 +40,9 @@ def make_compat_start_v1(config, settings, info, tags=None):
         'runName': settings._op_name,
         'projectName': settings.project,
         'externalId': settings._external_id,  # User-provided run ID for multi-node
-        'config': json.dumps(config) if config is not None else None,
+        'config': json.dumps(config, default=config_json_default)
+        if config is not None
+        else None,
         'loggerSettings': json.dumps(clean_dict(settings.to_dict())),
         'systemMetadata': json.dumps(info) if info is not None else None,
         'tags': tags if tags else None,
@@ -97,7 +99,9 @@ def make_compat_update_config_v1(settings, config):
     return json.dumps(
         {
             'runId': settings._op_id,
-            'config': json.dumps(config) if config else None,
+            'config': json.dumps(config, default=config_json_default)
+            if config
+            else None,
         }
     ).encode()
 

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pluto/compat/wandb.py

@@ -851,7 +851,9 @@ def _make_patched_init(original_init, wandb_module):
                 f'wandb will continue to work normally, but NO DATA will be '
                 f'sent to Pluto. To fix, resolve the error above and retry.'
             )
-            logger.error(_msg)
+            # exc_info=True attaches the traceback so the log points at the
+            # raise site (e.g. the failing json.dumps), not just this handler.
+            logger.error(_msg, exc_info=True)
             # Also print to stderr so it shows up even if logging is not configured
             import sys
 

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pluto/init.py

@@ -7,7 +7,7 @@ import pluto
 from . import sentry as _sentry
 from .op import Op
 from .sets import Settings, _classify_run_id, _is_display_id, setup
-from .util import deep_merge, gen_id, get_char
+from .util import deep_merge, gen_id, get_char, to_native_config
 
 logger = logging.getLogger(f'{__name__.split(".")[0]}')
 tag = 'Init'
@@ -194,6 +194,12 @@ def init(
     if inherit_tags is not None:
         settings._inherit_tags = inherit_tags
 
+    # Normalize the config to JSON-native types up front (e.g. OmegaConf
+    # DictConfig -> dict, resolving interpolations). Done before the fork
+    # deep-merge below so its `isinstance(config, dict)` check works, and so
+    # everything downstream (storage, serialization) sees clean native data.
+    config = to_native_config(config)
+
     # Deep-merge inherited parent config with user config (client-side).
     # The server only does a shallow merge, so we fetch the parent config,
     # deep-merge locally, and disable server-side inheritance.
@@ -240,7 +246,7 @@ def init(
         return op
     except Exception as e:
         _sentry.capture_exception(e)
-        logger.critical('%s: failed, %s', tag, e)  # add early logger
+        logger.critical('%s: failed, %s', tag, e, exc_info=True)  # add early logger
         raise e
 
 

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pluto/op.py

@@ -32,7 +32,14 @@ from .store import DataStore
 from .sync import SyncProcessManager
 from .sync.store import HEALTH_METRIC_KEYS
 from .sys import System
-from .util import deep_merge, get_char, get_val, print_url, to_json
+from .util import (
+    deep_merge,
+    get_char,
+    get_val,
+    print_url,
+    to_json,
+    to_native_config,
+)
 
 logger = logging.getLogger(f'{__name__.split(".")[0]}')
 tag = 'Operation'
@@ -888,6 +895,7 @@ class Op:
             run.update_config({'epochs': 100})
             run.update_config({'lr': 0.01, 'model': 'resnet50'})
         """
+        config = to_native_config(config)
         if self.config is None:
             self.config = {}
         self.config = deep_merge(self.config, config)

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pluto/util.py

@@ -17,6 +17,11 @@ import numpy as np
 
 from .sets import get_console
 
+try:
+    from omegaconf import OmegaConf
+except ImportError:  # optional dependency; degrade gracefully when absent
+    OmegaConf = None  # type: ignore[misc, assignment]
+
 logger = logging.getLogger(f'{__name__.split(".")[0]}')
 tag = 'Util'
 
@@ -419,6 +424,79 @@ def clean_dict(d):
     return c
 
 
+def _is_omegaconf(obj: Any) -> bool:
+    """True if ``obj`` is an OmegaConf node (DictConfig/ListConfig).
+
+    Returns False when omegaconf isn't installed. Any failure (broken install)
+    is also treated as "not omegaconf" so a degraded dependency can never crash
+    a caller that doesn't even use OmegaConf.
+    """
+    if OmegaConf is None:
+        return False
+    try:
+        return OmegaConf.is_config(obj)
+    except Exception:
+        return False
+
+
+def _omegaconf_to_container(obj: Any) -> Any:
+    """Convert an OmegaConf node to a native container, degrading on failure.
+
+    Prefer fully-resolved values, but ``resolve=True`` raises on unresolvable
+    or cyclic interpolations (e.g. an unset ``${oc.env:VAR}``). Rather than let
+    that crash init or disable logging, fall back to the unresolved structure
+    (interpolations kept as literal ``${...}`` strings), and finally to a plain
+    string if even that fails. Callers must already have checked
+    :func:`_is_omegaconf`.
+    """
+    if OmegaConf is None:  # pragma: no cover - guarded by _is_omegaconf
+        return str(obj)
+    try:
+        return OmegaConf.to_container(obj, resolve=True)
+    except Exception:
+        try:
+            return OmegaConf.to_container(obj, resolve=False)
+        except Exception:
+            return str(obj)
+
+
+def to_native_config(obj: Any) -> Any:
+    """Recursively convert a run config into JSON-native Python types.
+
+    Handles OmegaConf ``DictConfig`` / ``ListConfig`` at any nesting depth,
+    including the common ``dict(cfg)`` shape where the top-level is a plain
+    ``dict`` but nested values are still OmegaConf nodes. OmegaConf nodes are
+    deep-converted, resolving interpolations (``${...}``) where possible and
+    degrading gracefully when they can't be resolved (see
+    :func:`_omegaconf_to_container`). Plain data (dicts, lists, scalars,
+    ``None``) passes through unchanged. Non-string dict keys are coerced to
+    ``str`` (note: distinct keys with the same string form collapse, matching
+    JSON's own key semantics).
+    """
+    if _is_omegaconf(obj):
+        # _omegaconf_to_container already does a deep conversion to native
+        # types, so return its result rather than re-walking the whole tree.
+        return _omegaconf_to_container(obj)
+    if isinstance(obj, dict):
+        return {str(k): to_native_config(v) for k, v in obj.items()}
+    if isinstance(obj, (list, tuple)):
+        return [to_native_config(v) for v in obj]
+    return obj
+
+
+def config_json_default(o: Any) -> Any:
+    """``json.dumps(default=...)`` hook for config payloads.
+
+    Last line of defense so a single non-serializable config value can never
+    raise and silently disable logging. OmegaConf nodes are deep-converted
+    (resolving interpolations where possible, see
+    :func:`_omegaconf_to_container`); anything else degrades to its string form.
+    """
+    if _is_omegaconf(o):
+        return _omegaconf_to_container(o)
+    return str(o)
+
+
 def dict_to_json(data: Dict[str, Any]) -> Dict[str, Any]:
     for key in list(data):  # avoid RuntimeError if dict size changes
         val = data[key]

{pluto_ml-0.0.22 → pluto_ml-0.0.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pluto-ml"
-version = "0.0.22"
+version = "0.0.23"
 description = "Pluto ML - Machine Learning Operations Framework"
 packages = [
     {include = "pluto"},
@@ -48,6 +48,7 @@ matplotlib = "^3.10"
 torchvision = "*"
 imageio = "^2.37.0"
 moviepy = "^1.0.3"
+omegaconf = "^2.3"
 
 
 [tool.poetry.extras]