skypilot-nightly 1.0.0.dev20250729__py3-none-any.whl → 1.0.0.dev20250731__py3-none-any.whl

sky/utils/command_runner.py

@@ -201,6 +201,7 @@ class CommandRunner:
         separate_stderr: bool,
         skip_num_lines: int,
         source_bashrc: bool = False,
+        use_login: bool = True,
     ) -> str:
         """Returns the command to run."""
         if isinstance(cmd, list):
@@ -211,7 +212,7 @@ class CommandRunner:
             '/bin/bash',
             '--login',
             '-c',
-        ]
+        ] if use_login else ['/bin/bash', '-c']
         if source_bashrc:
             command += [
                 # Need this `-i` option to make sure `source ~/.bashrc` work.
@@ -1124,7 +1125,8 @@ class LocalProcessCommandRunner(CommandRunner):
                                                process_stream,
                                                separate_stderr,
                                                skip_num_lines=skip_num_lines,
-                                               source_bashrc=source_bashrc)
+                                               source_bashrc=source_bashrc,
+                                               use_login=False)
 
         log_dir = os.path.expanduser(os.path.dirname(log_path))
         os.makedirs(log_dir, exist_ok=True)

sky/utils/controller_utils.py

@@ -5,7 +5,7 @@ import enum
 import os
 import tempfile
 import typing
-from typing import Any, Dict, Iterable, List, Optional, Set
+from typing import Any, Callable, Dict, Iterable, List, Optional, Set
 import uuid
 
 import colorama
@@ -64,7 +64,7 @@ class _ControllerSpec:
     controller_type: str
     name: str
     cluster_name: str
-    in_progress_hint: str
+    in_progress_hint: Callable[[bool], str]
     decline_cancel_hint: str
     _decline_down_when_failed_to_fetch_status_hint: str
     decline_down_for_dirty_controller_hint: str
@@ -94,9 +94,9 @@ class Controllers(enum.Enum):
         controller_type='jobs',
         name='managed jobs controller',
         cluster_name=common.JOB_CONTROLLER_NAME,
-        in_progress_hint=(
-            '* {job_info}To see all managed jobs: '
-            f'{colorama.Style.BRIGHT}sky jobs queue{colorama.Style.RESET_ALL}'),
+        in_progress_hint=lambda _:
+        ('* {job_info}To see all managed jobs: '
+         f'{colorama.Style.BRIGHT}sky jobs queue{colorama.Style.RESET_ALL}'),
         decline_cancel_hint=(
             'Cancelling the jobs controller\'s jobs is not allowed.\nTo cancel '
             f'managed jobs, use: {colorama.Style.BRIGHT}sky jobs cancel '
@@ -126,8 +126,11 @@ class Controllers(enum.Enum):
         name='serve controller',
         cluster_name=common.SKY_SERVE_CONTROLLER_NAME,
         in_progress_hint=(
-            f'* To see detailed service status: {colorama.Style.BRIGHT}'
-            f'sky serve status -v{colorama.Style.RESET_ALL}'),
+            lambda pool:
+            (f'* To see detailed pool status: {colorama.Style.BRIGHT}'
+             f'sky jobs pool status -v{colorama.Style.RESET_ALL}') if pool else
+            (f'* To see detailed service status: {colorama.Style.BRIGHT}'
+             f'sky serve status -v{colorama.Style.RESET_ALL}')),
         decline_cancel_hint=(
             'Cancelling the sky serve controller\'s jobs is not allowed.'),
         _decline_down_when_failed_to_fetch_status_hint=(
@@ -391,10 +394,11 @@ def check_cluster_name_not_controller(
 
 
 # Internal only:
-def download_and_stream_latest_job_log(
+def download_and_stream_job_log(
         backend: 'cloud_vm_ray_backend.CloudVmRayBackend',
         handle: 'cloud_vm_ray_backend.CloudVmRayResourceHandle',
-        local_dir: str) -> Optional[str]:
+        local_dir: str,
+        job_ids: Optional[List[str]] = None) -> Optional[str]:
     """Downloads and streams the latest job log.
 
     This function is only used by jobs controller and sky serve controller.
@@ -412,7 +416,7 @@ def download_and_stream_latest_job_log(
             # multi-node cluster is preempted, and we recover the managed job
             # on the existing cluster, which leads to a larger job_id. Those
             # job_ids all represent the same logical managed job.
-            job_ids=None,
+            job_ids=job_ids,
             local_dir=local_dir)
     except Exception as e:  # pylint: disable=broad-except
         # We want to avoid crashing the controller. sync_down_logs() is pretty

sky/utils/dag_utils.py

@@ -148,7 +148,7 @@ def load_chain_dag_from_yaml_str(
 
 
 def dump_chain_dag_to_yaml_str(dag: dag_lib.Dag,
-                               redact_secrets: bool = False) -> str:
+                               use_user_specified_yaml: bool = False) -> str:
     """Dumps a chain DAG to a YAML string.
 
     Args:
@@ -161,7 +161,9 @@ def dump_chain_dag_to_yaml_str(dag: dag_lib.Dag,
     assert dag.is_chain(), dag
     configs = [{'name': dag.name}]
     for task in dag.tasks:
-        configs.append(task.to_yaml_config(redact_secrets=redact_secrets))
+        configs.append(
+            task.to_yaml_config(
+                use_user_specified_yaml=use_user_specified_yaml))
     return common_utils.dump_yaml_str(configs)
 
 

sky/utils/db/migration_utils.py

@@ -12,7 +12,6 @@ import filelock
 import sqlalchemy
 
 from sky import sky_logging
-from sky import skypilot_config
 from sky.skylet import constants
 
 logger = sky_logging.init_logger(__name__)
@@ -24,16 +23,15 @@ GLOBAL_USER_STATE_VERSION = '001'
 GLOBAL_USER_STATE_LOCK_PATH = '~/.sky/locks/.state_db.lock'
 
 SPOT_JOBS_DB_NAME = 'spot_jobs_db'
-SPOT_JOBS_VERSION = '001'
+SPOT_JOBS_VERSION = '002'
 SPOT_JOBS_LOCK_PATH = '~/.sky/locks/.spot_jobs_db.lock'
 
 
 def get_engine(db_name: str):
     conn_string = None
     if os.environ.get(constants.ENV_VAR_IS_SKYPILOT_SERVER) is not None:
-        conn_string = skypilot_config.get_nested(('db',), None)
+        conn_string = os.environ.get(constants.ENV_VAR_DB_CONNECTION_URI)
     if conn_string:
-        logger.debug(f'using db URI from {conn_string}')
         engine = sqlalchemy.create_engine(conn_string,
                                           poolclass=sqlalchemy.NullPool)
     else:

sky/utils/schemas.py

@@ -605,7 +605,6 @@ def get_service_schema():
     return {
         '$schema': 'https://json-schema.org/draft/2020-12/schema',
         'type': 'object',
-        'required': ['readiness_probe'],
         'additionalProperties': False,
         'properties': {
             'readiness_probe': {
@@ -641,6 +640,9 @@ def get_service_schema():
                     }
                 }]
             },
+            'pool': {
+                'type': 'boolean',
+            },
             'replica_policy': {
                 'type': 'object',
                 'required': ['min_replicas'],
@@ -688,6 +690,9 @@ def get_service_schema():
             'replicas': {
                 'type': 'integer',
             },
+            'workers': {
+                'type': 'integer',
+            },
             'load_balancing_policy': {
                 'type': 'string',
                 'case_insensitive_enum': list(
@@ -825,6 +830,9 @@ def get_task_schema():
             'service': {
                 'type': 'object',
             },
+            'pool': {
+                'type': 'object',
+            },
             'setup': {
                 'type': 'string',
             },
@@ -1137,21 +1145,7 @@ def get_config_schema():
     }
     resources_schema['properties'].pop('ports')
 
-    def _get_controller_schema(add_consolidation_mode: bool = False):
-        controller_properties = {
-            'resources': resources_schema,
-            'high_availability': {
-                'type': 'boolean',
-                'default': False,
-            },
-            'autostop': _AUTOSTOP_SCHEMA,
-        }
-        if add_consolidation_mode:
-            controller_properties['consolidation_mode'] = {
-                'type': 'boolean',
-                'default': False,
-            }
-
+    def _get_controller_schema():
         return {
             'type': 'object',
             'required': [],
@@ -1161,7 +1155,18 @@ def get_config_schema():
                     'type': 'object',
                     'required': [],
                     'additionalProperties': False,
-                    'properties': controller_properties,
+                    'properties': {
+                        'resources': resources_schema,
+                        'high_availability': {
+                            'type': 'boolean',
+                            'default': False,
+                        },
+                        'autostop': _AUTOSTOP_SCHEMA,
+                        'consolidation_mode': {
+                            'type': 'boolean',
+                            'default': False,
+                        }
+                    },
                 },
                 'bucket': {
                     'type': 'string',
@@ -1707,8 +1712,8 @@ def get_config_schema():
             'db': {
                 'type': 'string',
             },
-            'jobs': _get_controller_schema(add_consolidation_mode=True),
-            'serve': _get_controller_schema(add_consolidation_mode=False),
+            'jobs': _get_controller_schema(),
+            'serve': _get_controller_schema(),
             'allowed_clouds': allowed_clouds,
             'admin_policy': admin_policy_schema,
             'docker': docker_configs,

{skypilot_nightly-1.0.0.dev20250729.dist-info → skypilot_nightly-1.0.0.dev20250731.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skypilot-nightly
-Version: 1.0.0.dev20250729
+Version: 1.0.0.dev20250731
 Summary: SkyPilot: Run AI on Any Infra — Unified, Faster, Cheaper.
 Author: SkyPilot Team
 License: Apache 2.0