skypilot-nightly 1.0.0.dev20250827__py3-none-any.whl → 1.0.0.dev20250829__py3-none-any.whl

sky/utils/timeline.py

@@ -4,7 +4,6 @@ The timeline follows the trace event format defined here:
 https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview
 """  # pylint: disable=line-too-long
 import atexit
-import functools
 import json
 import os
 import threading
@@ -12,14 +11,15 @@ import time
 import traceback
 from typing import Callable, Optional, Union
 
-import filelock
-
 from sky.utils import common_utils
-from sky.utils import locks
 
 _events = []
 
 
+def _get_events_file_path():
+    return os.environ.get('SKYPILOT_TIMELINE_FILE_PATH')
+
+
 class Event:
     """Record an event.
 
@@ -29,6 +29,10 @@ class Event:
     """
 
     def __init__(self, name: str, message: Optional[str] = None):
+        self._skipped = False
+        if not _get_events_file_path():
+            self._skipped = True
+            return
         self._name = name
         self._message = message
         # See the module doc for the event format.
@@ -45,6 +49,8 @@ class Event:
             self._event['args'] = {'message': self._message}
 
     def begin(self):
+        if self._skipped:
+            return
         event_begin = self._event.copy()
         event_begin.update({
             'ph': 'B',
@@ -56,6 +62,8 @@ class Event:
         _events.append(event_begin)
 
     def end(self):
+        if self._skipped:
+            return
         event_end = self._event.copy()
         event_end.update({
             'ph': 'E',
@@ -77,103 +85,26 @@ def event(name_or_fn: Union[str, Callable], message: Optional[str] = None):
     return common_utils.make_decorator(Event, name_or_fn, message=message)
 
 
-class DistributedLockEvent:
-    """Serve both as a distributed lock and event for the lock."""
-
-    def __init__(self, lock_id: str, timeout: Optional[float] = None):
-        self._lock_id = lock_id
-        self._lock = locks.get_lock(lock_id, timeout)
-        self._hold_lock_event = Event(f'[DistributedLock.hold]:{lock_id}')
-
-    def acquire(self):
-        was_locked = self._lock.is_locked
-        with Event(f'[DistributedLock.acquire]:{self._lock_id}'):
-            self._lock.acquire()
-        if not was_locked and self._lock.is_locked:
-            # start holding the lock after initial acquiring
-            self._hold_lock_event.begin()
-
-    def release(self):
-        was_locked = self._lock.is_locked
-        self._lock.release()
-        if was_locked and not self._lock.is_locked:
-            # stop holding the lock after initial releasing
-            self._hold_lock_event.end()
-
-    def __enter__(self):
-        self.acquire()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.release()
-
-    def __call__(self, f):
-
-        @functools.wraps(f)
-        def wrapper(*args, **kwargs):
-            with self:
-                return f(*args, **kwargs)
-
-        return wrapper
-
-
-class FileLockEvent:
-    """Serve both as a file lock and event for the lock."""
-
-    def __init__(self, lockfile: Union[str, os.PathLike], timeout: float = -1):
-        self._lockfile = lockfile
-        os.makedirs(os.path.dirname(os.path.abspath(self._lockfile)),
-                    exist_ok=True)
-        self._lock = filelock.FileLock(self._lockfile, timeout)
-        self._hold_lock_event = Event(f'[FileLock.hold]:{self._lockfile}')
-
-    def acquire(self):
-        was_locked = self._lock.is_locked
-        with Event(f'[FileLock.acquire]:{self._lockfile}'):
-            self._lock.acquire()
-        if not was_locked and self._lock.is_locked:
-            # start holding the lock after initial acquiring
-            self._hold_lock_event.begin()
-
-    def release(self):
-        was_locked = self._lock.is_locked
-        self._lock.release()
-        if was_locked and not self._lock.is_locked:
-            # stop holding the lock after initial releasing
-            self._hold_lock_event.end()
-
-    def __enter__(self):
-        self.acquire()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.release()
-
-    def __call__(self, f):
-        # Make this class callable as a decorator.
-        @functools.wraps(f)
-        def wrapper(*args, **kwargs):
-            with self:
-                return f(*args, **kwargs)
-
-        return wrapper
-
-
 def save_timeline():
-    file_path = os.environ.get('SKYPILOT_TIMELINE_FILE_PATH')
-    if not file_path:
+    events_file_path = _get_events_file_path()
+    if not events_file_path:
         return
+    global _events
+    events_to_write = _events
+    _events = []
     json_output = {
-        'traceEvents': _events,
+        'traceEvents': events_to_write,
         'displayTimeUnit': 'ms',
         'otherData': {
-            'log_dir': os.path.dirname(os.path.abspath(file_path)),
+            'log_dir': os.path.dirname(os.path.abspath(events_file_path)),
         }
     }
-    os.makedirs(os.path.dirname(os.path.abspath(file_path)), exist_ok=True)
-    with open(file_path, 'w', encoding='utf-8') as f:
+    os.makedirs(os.path.dirname(os.path.abspath(events_file_path)),
+                exist_ok=True)
+    with open(events_file_path, 'w', encoding='utf-8') as f:
         json.dump(json_output, f)
+    del events_to_write
 
 
-if os.environ.get('SKYPILOT_TIMELINE_FILE_PATH'):
+if _get_events_file_path():
     atexit.register(save_timeline)

sky/utils/yaml_utils.py

@@ -1,5 +1,6 @@
 """YAML utilities."""
-from typing import Any, TYPE_CHECKING
+import io
+from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union
 
 from sky.adaptors import common
 
@@ -8,28 +9,94 @@ if TYPE_CHECKING:
 else:
     yaml = common.LazyImport('yaml')
 
-_csafe_loader_import_error = False
+_c_extension_unavailable = False
 
 
 def safe_load(stream) -> Any:
-    global _csafe_loader_import_error
-    if _csafe_loader_import_error:
+    global _c_extension_unavailable
+    if _c_extension_unavailable:
         return yaml.load(stream, Loader=yaml.SafeLoader)
 
     try:
         return yaml.load(stream, Loader=yaml.CSafeLoader)
-    except ImportError:
-        _csafe_loader_import_error = True
+    except AttributeError:
+        _c_extension_unavailable = True
         return yaml.load(stream, Loader=yaml.SafeLoader)
 
 
 def safe_load_all(stream) -> Any:
-    global _csafe_loader_import_error
-    if _csafe_loader_import_error:
+    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 ImportError:
-        _csafe_loader_import_error = True
+    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)

{skypilot_nightly-1.0.0.dev20250827.dist-info → skypilot_nightly-1.0.0.dev20250829.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skypilot-nightly
-Version: 1.0.0.dev20250827
+Version: 1.0.0.dev20250829
 Summary: SkyPilot: Run AI on Any Infra — Unified, Faster, Cheaper.
 Author: SkyPilot Team
 License: Apache 2.0
@@ -34,7 +34,7 @@ Requires-Dist: python-dotenv
 Requires-Dist: rich
 Requires-Dist: tabulate
 Requires-Dist: typing_extensions
-Requires-Dist: filelock>=3.6.0
+Requires-Dist: filelock>=3.15.0
 Requires-Dist: packaging
 Requires-Dist: psutil
 Requires-Dist: pulp
@@ -59,6 +59,8 @@ Requires-Dist: gitpython
 Requires-Dist: types-paramiko
 Requires-Dist: alembic
 Requires-Dist: aiohttp
+Requires-Dist: aiosqlite
+Requires-Dist: anyio
 Provides-Extra: aws
 Requires-Dist: awscli>=1.27.10; extra == "aws"
 Requires-Dist: botocore>=1.29.10; extra == "aws"
@@ -136,8 +138,10 @@ Requires-Dist: sqlalchemy_adapter; extra == "server"
 Requires-Dist: passlib; extra == "server"
 Requires-Dist: pyjwt; extra == "server"
 Requires-Dist: aiohttp; extra == "server"
+Requires-Dist: anyio; extra == "server"
 Requires-Dist: grpcio>=1.63.0; extra == "server"
 Requires-Dist: protobuf<7.0.0,>=5.26.1; extra == "server"
+Requires-Dist: aiosqlite; extra == "server"
 Provides-Extra: all
 Requires-Dist: awscli>=1.27.10; extra == "all"
 Requires-Dist: botocore>=1.29.10; extra == "all"
@@ -194,8 +198,10 @@ Requires-Dist: sqlalchemy_adapter; extra == "all"
 Requires-Dist: passlib; extra == "all"
 Requires-Dist: pyjwt; extra == "all"
 Requires-Dist: aiohttp; extra == "all"
+Requires-Dist: anyio; extra == "all"
 Requires-Dist: grpcio>=1.63.0; extra == "all"
 Requires-Dist: protobuf<7.0.0,>=5.26.1; extra == "all"
+Requires-Dist: aiosqlite; extra == "all"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description