skypilot-nightly 1.0.0.dev20250826__py3-none-any.whl → 1.0.0.dev20250828__py3-none-any.whl

sky/utils/controller_utils.py

@@ -38,6 +38,7 @@ from sky.utils import env_options
 from sky.utils import registry
 from sky.utils import rich_utils
 from sky.utils import ux_utils
+from sky.utils import yaml_utils
 
 if typing.TYPE_CHECKING:
     import psutil
@@ -497,7 +498,7 @@ def shared_controller_vars_to_fill(
         with tempfile.NamedTemporaryFile(
                 delete=False,
                 suffix=_LOCAL_SKYPILOT_CONFIG_PATH_SUFFIX) as temp_file:
-            common_utils.dump_yaml(temp_file.name, dict(**local_user_config))
+            yaml_utils.dump_yaml(temp_file.name, dict(**local_user_config))
         local_user_config_path = temp_file.name
 
     vars_to_fill: Dict[str, Any] = {
@@ -786,9 +787,9 @@ def replace_skypilot_config_path_in_file_mounts(
             continue
         if local_path.endswith(_LOCAL_SKYPILOT_CONFIG_PATH_SUFFIX):
             with tempfile.NamedTemporaryFile('w', delete=False) as f:
-                user_config = common_utils.read_yaml(local_path)
+                user_config = yaml_utils.read_yaml(local_path)
                 config = _setup_proxy_command_on_controller(cloud, user_config)
-                common_utils.dump_yaml(f.name, dict(**config))
+                yaml_utils.dump_yaml(f.name, dict(**config))
                 file_mounts[remote_path] = f.name
                 replaced = True
     if replaced:

sky/utils/dag_utils.py

@@ -6,9 +6,9 @@ from sky import dag as dag_lib
 from sky import sky_logging
 from sky import task as task_lib
 from sky.utils import cluster_utils
-from sky.utils import common_utils
 from sky.utils import registry
 from sky.utils import ux_utils
+from sky.utils import yaml_utils
 
 logger = sky_logging.init_logger(__name__)
 
@@ -117,7 +117,7 @@ def load_chain_dag_from_yaml(
       A chain Dag with 1 or more tasks (an empty entrypoint would create a
       trivial task).
     """
-    configs = common_utils.read_yaml_all(path)
+    configs = yaml_utils.read_yaml_all(path)
     return _load_chain_dag(configs, env_overrides, secret_overrides)
 
 
@@ -143,7 +143,7 @@ def load_chain_dag_from_yaml_str(
       A chain Dag with 1 or more tasks (an empty entrypoint would create a
       trivial task).
     """
-    configs = common_utils.read_yaml_all_str(yaml_str)
+    configs = yaml_utils.read_yaml_all_str(yaml_str)
     return _load_chain_dag(configs, env_overrides, secrets_overrides)
 
 
@@ -164,7 +164,7 @@ def dump_chain_dag_to_yaml_str(dag: dag_lib.Dag,
         configs.append(
             task.to_yaml_config(
                 use_user_specified_yaml=use_user_specified_yaml))
-    return common_utils.dump_yaml_str(configs)
+    return yaml_utils.dump_yaml_str(configs)
 
 
 def dump_chain_dag_to_yaml(dag: dag_lib.Dag, path: str) -> None:

sky/utils/kubernetes/config_map_utils.py

@@ -4,7 +4,7 @@ import os
 from sky import sky_logging
 from sky import skypilot_config
 from sky.adaptors import kubernetes
-from sky.utils import common_utils
+from sky.utils import yaml_utils
 
 logger = sky_logging.init_logger(__name__)
 
@@ -69,7 +69,7 @@ def initialize_configmap_sync_on_startup(config_file_path: str) -> None:
 
         current_config = skypilot_config.parse_and_validate_config_file(
             config_file_path)
-        config_yaml = common_utils.dump_yaml_str(dict(current_config))
+        config_yaml = yaml_utils.dump_yaml_str(dict(current_config))
 
         configmap_body = {
             'apiVersion': 'v1',
@@ -111,7 +111,7 @@ def patch_configmap_with_config(config, config_file_path: str) -> None:
     try:
         namespace = _get_kubernetes_namespace()
         configmap_name = _get_configmap_name()
-        config_yaml = common_utils.dump_yaml_str(dict(config))
+        config_yaml = yaml_utils.dump_yaml_str(dict(config))
         patch_body = {'data': {'config.yaml': config_yaml}}
 
         try:

sky/utils/schemas.py

@@ -1555,6 +1555,9 @@ def get_config_schema():
             'cluster_event_retention_hours': {
                 'type': 'number',
             },
+            'cluster_debug_event_retention_hours': {
+                'type': 'number',
+            },
         }
     }
 

sky/utils/yaml_utils.py

@@ -0,0 +1,102 @@
+"""YAML utilities."""
+import io
+from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union
+
+from sky.adaptors import common
+
+if TYPE_CHECKING:
+    import yaml
+else:
+    yaml = common.LazyImport('yaml')
+
+_c_extension_unavailable = False
+
+
+def safe_load(stream) -> Any:
+    global _c_extension_unavailable
+    if _c_extension_unavailable:
+        return yaml.load(stream, Loader=yaml.SafeLoader)
+
+    try:
+        return yaml.load(stream, Loader=yaml.CSafeLoader)
+    except AttributeError:
+        _c_extension_unavailable = True
+        return yaml.load(stream, Loader=yaml.SafeLoader)
+
+
+def safe_load_all(stream) -> Any:
+    global _c_extension_unavailable
+    if _c_extension_unavailable:
+        return yaml.load_all(stream, Loader=yaml.SafeLoader)
+
+    try:
+        return yaml.load_all(stream, Loader=yaml.CSafeLoader)
+    except AttributeError:
+        _c_extension_unavailable = True
+        return yaml.load_all(stream, Loader=yaml.SafeLoader)
+
+
+def read_yaml(path: Optional[str]) -> Dict[str, Any]:
+    if path is None:
+        raise ValueError('Attempted to read a None YAML.')
+    with open(path, 'r', encoding='utf-8') as f:
+        config = safe_load(f)
+    return config
+
+
+def read_yaml_all_str(yaml_str: str) -> List[Dict[str, Any]]:
+    stream = io.StringIO(yaml_str)
+    config = safe_load_all(stream)
+    configs = list(config)
+    if not configs:
+        # Empty YAML file.
+        return [{}]
+    return configs
+
+
+def read_yaml_all(path: str) -> List[Dict[str, Any]]:
+    with open(path, 'r', encoding='utf-8') as f:
+        return read_yaml_all_str(f.read())
+
+
+def dump_yaml(path: str,
+              config: Union[List[Dict[str, Any]], Dict[str, Any]],
+              blank: bool = False) -> None:
+    """Dumps a YAML file.
+
+    Args:
+        path: the path to the YAML file.
+        config: the configuration to dump.
+    """
+    with open(path, 'w', encoding='utf-8') as f:
+        contents = dump_yaml_str(config)
+        if blank and isinstance(config, dict) and len(config) == 0:
+            # when dumping to yaml, an empty dict will go in as {}.
+            contents = ''
+        f.write(contents)
+
+
+def dump_yaml_str(config: Union[List[Dict[str, Any]], Dict[str, Any]]) -> str:
+    """Dumps a YAML string.
+    Args:
+        config: the configuration to dump.
+    Returns:
+        The YAML string.
+    """
+
+    # https://github.com/yaml/pyyaml/issues/127
+    class LineBreakDumper(yaml.SafeDumper):
+
+        def write_line_break(self, data=None):
+            super().write_line_break(data)
+            if len(self.indents) == 1:
+                super().write_line_break()
+
+    if isinstance(config, list):
+        dump_func = yaml.dump_all  # type: ignore
+    else:
+        dump_func = yaml.dump  # type: ignore
+    return dump_func(config,
+                     Dumper=LineBreakDumper,
+                     sort_keys=False,
+                     default_flow_style=False)

sky/volumes/volume.py

@@ -125,14 +125,19 @@ class Volume:
 
     def _validate_config(self) -> None:
         """Validate the volume config."""
+        assert self.cloud is not None, 'Cloud must be specified'
+        cloud_obj = registry.CLOUD_REGISTRY.from_str(self.cloud)
+        assert cloud_obj is not None
+
+        valid, err_msg = cloud_obj.is_volume_name_valid(self.name)
+        if not valid:
+            raise ValueError(f'Invalid volume name: {err_msg}')
+
         if not self.resource_name and not self.size:
             raise ValueError('Size is required for new volumes. '
                              'Please specify the size in the YAML file or '
                              'use the --size flag.')
         if self.labels:
-            assert self.cloud is not None, 'Cloud must be specified'
-            cloud_obj = registry.CLOUD_REGISTRY.from_str(self.cloud)
-            assert cloud_obj is not None
             for key, value in self.labels.items():
                 valid, err_msg = cloud_obj.is_label_valid(key, value)
                 if not valid:

{skypilot_nightly-1.0.0.dev20250826.dist-info → skypilot_nightly-1.0.0.dev20250828.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skypilot-nightly
-Version: 1.0.0.dev20250826
+Version: 1.0.0.dev20250828
 Summary: SkyPilot: Run AI on Any Infra — Unified, Faster, Cheaper.
 Author: SkyPilot Team
 License: Apache 2.0
@@ -53,6 +53,7 @@ Requires-Dist: casbin
 Requires-Dist: sqlalchemy_adapter
 Requires-Dist: prometheus_client>=0.8.0
 Requires-Dist: passlib
+Requires-Dist: bcrypt
 Requires-Dist: pyjwt
 Requires-Dist: gitpython
 Requires-Dist: types-paramiko