skypilot-nightly 1.0.0.dev20250202__py3-none-any.whl → 1.0.0.dev20250204__py3-none-any.whl

sky/__init__.py

@@ -5,7 +5,7 @@ from typing import Optional
 import urllib.request
 
 # Replaced with the current commit when building the wheels.
-_SKYPILOT_COMMIT_SHA = '269dfb19286a79f4f3a233aa525c73f6562dae37'
+_SKYPILOT_COMMIT_SHA = 'e4ad98c907a819d9a6b7f6872445ca497401b8c9'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20250202'
+__version__ = '1.0.0.dev20250204'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 

sky/check.py

@@ -245,10 +245,10 @@ def _format_enabled_cloud(cloud_name: str) -> str:
                 # here we are using rich. We should migrate this file to
                 # use colorama as we do in the rest of the codebase.
                 symbol = ('└── ' if i == len(existing_contexts) - 1 else '├── ')
-                contexts_formatted.append(f'\n        {symbol}{context}')
+                contexts_formatted.append(f'\n    {symbol}{context}')
             context_info = f'Allowed contexts:{"".join(contexts_formatted)}'
         else:
             context_info = f'Active context: {existing_contexts[0]}'
 
-        return f'{cloud_name}[/green][dim]\n    └── {context_info}[/dim][green]'
+        return f'{cloud_name}[/green][dim]\n    {context_info}[/dim][green]'
     return cloud_name

sky/jobs/dashboard/dashboard.py

@@ -6,13 +6,17 @@ https://github.com/ray-project/ray/tree/master/dashboard/client/src) and/or get
 rid of the SSH port-forwarding business (see cli.py's job_dashboard()
 comment).
 """
+import collections
 import datetime
+import enum
+import os
 import pathlib
 
 import flask
 import yaml
 
 from sky import jobs as managed_jobs
+from sky.jobs import constants as managed_job_constants
 from sky.utils import common_utils
 from sky.utils import controller_utils
 
@@ -41,6 +45,92 @@ def _is_running_on_jobs_controller() -> bool:
     return False
 
 
+# Column indices for job table
+class JobTableColumns(enum.IntEnum):
+    """Column indices for the jobs table in the dashboard.
+
+    - DROPDOWN (0): Column for expandable dropdown arrow
+    - ID (1): Job ID column
+    - TASK (2): Task name/number column
+    - NAME (3): Job name column
+    - RESOURCES (4): Resources used by job
+    - SUBMITTED (5): Job submission timestamp
+    - TOTAL_DURATION (6): Total time since job submission
+    - JOB_DURATION (7): Actual job runtime
+    - RECOVERIES (8): Number of job recoveries
+    - STATUS (9): Current job status
+    - STARTED (10): Job start timestamp
+    - CLUSTER (11): Cluster name
+    - REGION (12): Cloud region
+    - FAILOVER (13): Job failover history
+    - DETAILS (14): Job details
+    - ACTIONS (15): Available actions column
+    """
+    DROPDOWN = 0
+    ID = 1
+    TASK = 2
+    NAME = 3
+    RESOURCES = 4
+    SUBMITTED = 5
+    TOTAL_DURATION = 6
+    JOB_DURATION = 7
+    RECOVERIES = 8
+    STATUS = 9
+    STARTED = 10
+    CLUSTER = 11
+    REGION = 12
+    DETAILS = 13
+    FAILOVER = 14
+    ACTIONS = 15
+
+
+# Column headers matching the indices above
+JOB_TABLE_COLUMNS = [
+    '', 'ID', 'Task', 'Name', 'Resources', 'Submitted', 'Total Duration',
+    'Job Duration', 'Status', 'Started', 'Cluster', 'Region', 'Failover',
+    'Recoveries', 'Details', 'Actions'
+]
+
+
+def _extract_launch_history(log_content: str) -> str:
+    """Extract launch history from log content.
+    
+    Args:
+        log_content: Content of the log file.
+    Returns:
+        A formatted string containing the launch history.
+    """
+    launches = []
+    current_launch = None
+
+    for line in log_content.splitlines():
+        if 'Launching on' in line:
+            try:
+                parts = line.split(']')
+                if len(parts) >= 2:
+                    timestamp = parts[0].split()[1:3]
+                    message = parts[1].replace('[0m⚙︎', '').strip()
+                    formatted_line = f'{" ".join(timestamp)} {message}'
+                    if current_launch:
+                        prev_time, prev_target = current_launch.rsplit(
+                            ' Launching on ', 1)
+                        launches.append(
+                            f'{prev_time} Tried to launch on {prev_target}')
+
+                    # Store the current launch
+                    current_launch = formatted_line
+            except IndexError:
+                launches.append(line.strip())
+
+    # Add the final (successful) launch at the beginning
+    if current_launch:
+        result = [current_launch]
+        result.extend(launches)
+        return '\n'.join(result)
+
+    return 'No launch history found'
+
+
 @app.route('/')
 def home():
     if not _is_running_on_jobs_controller():
@@ -54,38 +144,84 @@ def home():
     rows = managed_jobs.format_job_table(all_managed_jobs,
                                          show_all=True,
                                          return_rows=True)
-    # Add an empty column for the dropdown button. This will be added in the
-    # jobs/templates/index.html file.
-    rows = [[''] + row for row in rows]
-
-    # FIXME(zongheng): make the job table/queue funcs return structured info so
-    # that we don't have to do things like row[-5] below.
-    columns = [
-        '', 'ID', 'Task', 'Name', 'Resources', 'Submitted', 'Total Duration',
-        'Job Duration', 'Recoveries', 'Status', 'Started', 'Cluster', 'Region',
-        'Failure'
-    ]
-    if rows and len(rows[0]) != len(columns):
+
+    status_counts = collections.defaultdict(int)
+    for task in all_managed_jobs:
+        if not task['status'].is_terminal():
+            status_counts[task['status'].value] += 1
+
+    # Add an empty column for the dropdown button and actions column
+    rows = [[''] + row + [''] + [''] for row in rows
+           ]  # Add empty cell for failover and actions column
+
+    # Add log content as failover history for each job
+    for row in rows:
+        job_id = str(row[JobTableColumns.ID]).strip().replace(' ⤳', '')
+        if job_id and job_id != '-':
+            try:
+                log_path = os.path.join(
+                    os.path.expanduser(
+                        managed_job_constants.JOBS_CONTROLLER_LOGS_DIR),
+                    f'{job_id}.log')
+                if os.path.exists(log_path):
+                    with open(log_path, 'r', encoding='utf-8') as f:
+                        log_content = f.read()
+                        row[JobTableColumns.FAILOVER] = _extract_launch_history(
+                            log_content)
+                else:
+                    row[JobTableColumns.FAILOVER] = 'Log file not found'
+            except (IOError, OSError) as e:
+                row[JobTableColumns.FAILOVER] = f'Error reading log: {str(e)}'
+    app.logger.error('All managed jobs:')
+
+    # Validate column count
+    if rows and len(rows[0]) != len(JOB_TABLE_COLUMNS):
         raise RuntimeError(
-            'Dashboard code and managed job queue code are out of sync.')
+            f'Dashboard code and managed job queue code are out of sync. '
+            f'Expected {(JOB_TABLE_COLUMNS)} columns, got {(rows[0])}')
 
-    # Fix STATUS color codes: '\x1b[33mCANCELLED\x1b[0m' -> 'CANCELLED'.
+    # Fix STATUS color codes: '\x1b[33mCANCELLED\x1b[0m' -> 'CANCELLED'
     for row in rows:
-        row[-5] = common_utils.remove_color(row[-5])
-    # Remove filler rows ([''], ..., ['-']).
-    rows = [row for row in rows if ''.join(map(str, row)) != '']
+        row[JobTableColumns.STATUS] = common_utils.remove_color(
+            row[JobTableColumns.STATUS])
+
+    # Remove filler rows ([''], ..., ['-'])
+    rows = [
+        row for row in rows
+        if ''.join(map(str, row[:JobTableColumns.ACTIONS])) != ''
+    ]
+
+    # Get all unique status values
+    status_values = sorted(
+        list(set(row[JobTableColumns.STATUS] for row in rows)))
 
-    # Get all unique status values.
-    status_values = sorted(list(set(row[-5] for row in rows)))
     rendered_html = flask.render_template(
         'index.html',
-        columns=columns,
+        columns=JOB_TABLE_COLUMNS,
         rows=rows,
         last_updated_timestamp=timestamp,
         status_values=status_values,
+        status_counts=status_counts,
     )
     return rendered_html
 
 
+@app.route('/download_log/<job_id>')
+def download_log(job_id):
+    try:
+        log_path = os.path.join(
+            os.path.expanduser(managed_job_constants.JOBS_CONTROLLER_LOGS_DIR),
+            f'{job_id}.log')
+        if not os.path.exists(log_path):
+            flask.abort(404)
+        return flask.send_file(log_path,
+                               mimetype='text/plain',
+                               as_attachment=True,
+                               download_name=f'job_{job_id}.log')
+    except (IOError, OSError) as e:
+        app.logger.error(f'Error downloading log for job {job_id}: {str(e)}')
+        flask.abort(500)
+
+
 if __name__ == '__main__':
     app.run()

sky/jobs/dashboard/templates/index.html

@@ -5,61 +5,314 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}" type="image/x-icon">
-    <title>SkyPilot Dashboard</title>
+    <title>SkyPilot Managed Jobs</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
         integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
     <style>
-        .table-no-stripes tbody tr:nth-of-type(even) {
-            background-color: transparent;
+        :root {
+            --primary-color: #0d6efd;
+            --secondary-color: #6c757d;
+            --success-color: #198754;
+            --warning-color: #ffc107;
+            --info-color: #0dcaf0;
+            --light-color: #f8f9fa;
         }
 
-        .table-hover-selected tbody tr:hover {
-            background-color: #f5f5f5;
+        body {
+            margin-top: 0;
+            font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
+            background-color: white;
         }
 
-        .footer {
-            font-size: 14px;
-            color: #777;
-            margin-top: 20px;
+        .container {
+            max-width: 100%;
+            width: 100%;
+            background-color: white;
+            border-radius: 0;
+            box-shadow: none;
+            padding: 2rem;
+            margin-bottom: 0;
         }
 
-        body {
-            margin-top: 20px;
+        header {
+            position: sticky;
+            top: 0;
+            background: white;
+            z-index: 1000;
+            padding: 1.5rem 2rem;
+            margin: -2rem -2rem 1.5rem -2rem;  /* Negative margins to match container padding */
+            border-bottom: 1px solid #dee2e6;
         }
 
-        .bg-light {
-            color: #212529;
-            /* for some reason not in bootstrap? */
+        /* Add shadow when header is sticky */
+        header.sticky {
+            box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
         }
 
-        .fixed-header-table thead {
-            position: sticky;
-            top: 0;
-            background-color: #f8f9fa;
-            /* Replace with your desired background color */
-            color: #000000;
-            /* Replace with your desired text color */
-            z-index: 1;
+        h1 {
+            color: var(--primary-color);
+            font-weight: 600;
+            font-size: 2rem;
         }
-        .clickable {
-           cursor: pointer; /* This makes the cursor a pointer when hovering over the element */
+
+        .table {
+            width: 100%;       /* Ensure table takes full container width */
+            border-radius: 8px;
+            overflow: hidden;
+            box-shadow: 0 0 8px rgba(0, 0, 0, 0.05);
+            table-layout: auto;  /* Allow table to adjust column widths automatically */
+        }
+
+        .fixed-header-table thead th,
+        .fixed-header-table thead td {  /* Added td selector */
+            background-color: var(--light-color);
+            padding: 1rem;
+            font-weight: 600;
+            border-bottom: 2px solid #dee2e6;
+        }
+
+        .table th:nth-child(2),  /* ID column */
+        .table td:nth-child(2) {
+            min-width: 30px;     /* Reduced from 100px */
+            max-width: 60px;     /* Added max-width */
+            overflow: hidden;     /* Handle overflow */
+            text-overflow: ellipsis;  /* Show ellipsis for overflow */
+            white-space: nowrap;  /* Keep text on one line */
+        }
+
+        .table th:nth-child(4),  /* Name column */
+        .table td:nth-child(4) {
+            min-width: 150px;
+        }
+
+        .table th:nth-child(10),  /* Status column */
+        .table td:nth-child(10) {
+            min-width: 120px;
+        }
+
+        .table th,
+        .table td {
+            padding: 0.8rem 1rem;
+            white-space: nowrap;  /* Prevent text wrapping in cells */
+        }
+
+        /* Allow Details column to wrap */
+        .table th:nth-child(12),  /* Details column */
+        .table td:nth-child(12) {
+            white-space: normal;  /* Allow text wrapping */
+            max-width: 250px;     /* Limit width to prevent excessive stretching */
+            word-wrap: break-word; /* Break long words if needed */
+        }
+
+        .badge {
+            padding: 0.5em 0.8em;
+            font-weight: 500;
+            border-radius: 6px;
+        }
+
+        .btn-outline-secondary {
+            transition: all 0.2s;
+        }
+
+        .btn-outline-secondary:hover {
+            background-color: var(--secondary-color);
+            color: white;
+            transform: translateY(-1px);
         }
 
         .filter-controls {
-            display: flex;
-            gap: 10px;
-            align-items: center;  /* This ensures vertical alignment */
-            margin-top: 1rem;
+            background-color: var(--light-color);
+            padding: 1rem;
+            border-radius: 8px;
+            margin: 1rem 0;
+        }
+
+        .form-select {
+            border-radius: 6px;
+            border: 1px solid #dee2e6;
+            padding: 0.5rem 2rem 0.5rem 1rem;
+            transition: all 0.2s;
+        }
+
+        .form-select:hover {
+            border-color: var(--primary-color);
+        }
+
+        .form-check-input {
+            cursor: pointer;
+        }
+
+        .clickable {
+            transition: color 0.2s;
+        }
+
+        .clickable:hover {
+            color: var(--primary-color);
+        }
+
+        /* Status badge animations */
+        .badge {
+            animation: fadeIn 0.3s ease-in;
+        }
+
+        @keyframes fadeIn {
+            from { opacity: 0; transform: translateY(-2px); }
+            to { opacity: 1; transform: translateY(0); }
+        }
+
+        /* Loading indicator for auto-refresh */
+        .refresh-indicator {
+            display: inline-block;
+            margin-left: 8px;
+            font-size: 12px;
+            color: var(--secondary-color);
+        }
+
+        .refresh-spinner {
+            display: none;
+            width: 12px;
+            height: 12px;
+            border: 2px solid #f3f3f3;
+            border-top: 2px solid var(--primary-color);
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+        }
+
+        @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+        }
+
+        .status-container {
+            cursor: help;
             position: relative;
-            z-index: 2;
+            display: inline-block;
+        }
+
+        .status-container:hover::after {
+            content: attr(title);
+            position: absolute;
+            left: 0;          /* Changed from 50% */
+            bottom: 100%;
+            transform: translateY(-8px);  /* Removed translateX */
+            z-index: 1001;
+            background-color: rgba(33, 37, 41, 0.9);
+            color: white;
+            padding: 0.75rem 1rem;
+            border-radius: 6px;
+            font-size: 0.875rem;
+            white-space: pre;
+            min-width: 500px;
+            max-width: 800px;
+            box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
+            pointer-events: none;
+            opacity: 0;
+            animation: tooltipFadeIn 0.2s ease-in-out forwards;
+        }
+
+        /* Update the arrow position */
+        .status-container:hover::before {
+            content: '';
+            position: absolute;
+            left: 20px;       /* Changed from 50% */
+            bottom: 100%;
+            transform: none;   /* Removed transform */
+            border: 8px solid transparent;
+            border-top-color: rgba(33, 37, 41, 0.9);
+            z-index: 1001;
+            pointer-events: none;
+            opacity: 0;
+            animation: tooltipFadeIn 0.2s ease-in-out forwards;
         }
 
-        /* Customize the select focus/hover states */
-        .form-select:focus {
-            border-color: #dee2e6;
-            box-shadow: 0 0 0 0.1rem rgba(0,0,0,0.1);
+        @keyframes tooltipFadeIn {
+            to {
+                opacity: 1;
+                transform: translateY(0);  /* Simplified animation */
+            }
+        }
+
+        /* Ensure the table doesn't cut off tooltips */
+        .table {
+            overflow: visible !important;
+        }
+        
+        .fixed-header-table {
+            overflow: visible !important;
         }
 
+        /* Add horizontal scroll for very small screens */
+        @media (max-width: 1200px) {
+            .table-responsive {
+                overflow-x: auto;
+            }
+        }
+
+        /* Update the timestamp hover styles */
+        #last-updated {
+            position: relative;
+            text-decoration: none;
+            border-bottom: 1px solid transparent;
+            transition: border-bottom-color 0.2s;
+            cursor: help;
+        }
+
+        #last-updated:hover {
+            border-bottom-color: var(--secondary-color);
+        }
+
+        #last-updated:hover::after {
+            content: attr(title);
+            position: absolute;
+            bottom: 100%;
+            left: 50%;
+            transform: translateX(-50%);
+            padding: 0.5rem 1rem;
+            background-color: rgba(33, 37, 41, 0.9);
+            color: white;
+            border-radius: 6px;
+            font-size: 0.875rem;
+            white-space: nowrap;
+            z-index: 1000;
+            margin-bottom: 8px;
+        }
+
+        #last-updated:hover::before {
+            content: '';
+            position: absolute;
+            bottom: 100%;
+            left: 50%;
+            transform: translateX(-50%);
+            border: 8px solid transparent;
+            border-top-color: rgba(33, 37, 41, 0.9);
+            margin-bottom: -8px;
+            z-index: 1000;
+        }
+
+        .clickable-badge {
+            cursor: pointer;
+            transition: transform 0.2s, opacity 0.2s;
+            opacity: 0.4; 
+        }
+
+        .clickable-badge:hover {
+            transform: scale(1.1);
+            opacity: 1;
+        }
+
+        .clickable-badge.selected-filter {
+            transform: scale(1.1);
+            opacity: 1;
+            box-shadow: 0 0 0 2px #fff, 0 0 0 4px currentColor;
+        }
+
+        /* Ensure tooltips appear above the sticky header */
+        .status-container:hover::after,
+        .status-container:hover::before,
+        #last-updated:hover::after,
+        #last-updated:hover::before {
+            z-index: 1001;
+        }
     </style>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
     <script
@@ -70,29 +323,84 @@
 <body>
     <div class="container">
         <header>
-            <h1>SkyPilot managed jobs</h1>
-            <p class="text-muted mt-4" id="last-updated"></p>
-            <div class="form-check form-switch">
-                <input class="form-check-input" type="checkbox" id="refresh-toggle" checked>
-                <label class="form-check-label" for="refresh-toggle">Auto-refresh (every 30s)</label>
-            </div>
-            <div class="filter-controls">
-                <span class="fw-medium fs-6">Filter by status:</span>
-                <select class="form-select" id="status-filter" style="width: auto;">
-                    <option value="">All statuses</option>
-                    {% for status in status_values %}
-                    <option value="{{ status }}">{{ status }}</option>
-                    {% endfor %}
-                </select>
+            <div class="d-flex justify-content-between align-items-center">
+                <h1>SkyPilot Managed Jobs</h1>
+                <div class="d-flex align-items-center">
+                    <div class="form-check form-switch me-3">
+                        <input class="form-check-input" type="checkbox" id="refresh-toggle" checked>
+                        <label class="form-check-label" for="refresh-toggle">
+                            Auto-refresh
+                            <span class="refresh-indicator">
+                                <span class="refresh-spinner" id="refresh-spinner"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <p class="text-muted mb-0" id="last-updated"></p>
+                </div>
             </div>
         </header>
 
+        <!-- Hidden status filter -->
+        <select id="status-filter" style="display: none;">
+            <option value="">All</option>
+            {% for status in status_values %}
+            <option value="{{ status }}">{{ status }}</option>
+            {% endfor %}
+        </select>
+
+        {% if rows %}
+        <p>Filter By : 
+            <span class="badge bg-secondary clickable-badge selected-filter me-2" data-status="ALL">All</span>
+            {% set status_dict = {} %}
+            {% for row in rows %}
+                {% set status = row[9].split()[0] %}
+                {% if status not in status_dict %}
+                    {% set _ = status_dict.update({status: 1}) %}
+                {% else %}
+                    {% set _ = status_dict.update({status: status_dict[status] + 1}) %}
+                {% endif %}
+            {% endfor %}
+            {% for status, count in status_dict|dictsort %}
+                <span class="me-2">
+                    <span class="me-1">; {{ count }}</span>
+                    {% if status.startswith('RUNNING') %}
+                    <span class="badge bg-primary clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% elif status.startswith('PENDING') or status.startswith('SUBMITTED') %}
+                    <span class="badge bg-light clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% elif status.startswith('RECOVERING') or status.startswith('CANCELLING') or status.startswith('STARTING') %}
+                    <span class="badge bg-info clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% elif status.startswith('SUCCEEDED') %}
+                    <span class="badge bg-success clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% elif status.startswith('CANCELLED') %}
+                    <span class="badge bg-secondary clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% elif status.startswith('FAILED') %}
+                    <span class="badge bg-danger clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% else %}
+                    <span class="clickable-badge" data-status="{{ status }}">{{ status }}</span>
+                    {% endif %}
+                </span>
+            {% endfor %}
+        </p>
+        {% else %}
+        <p>No jobs found.</p>
+        {% endif %}
+
         <table class="table table-hover table-hover-selected fixed-header-table" id="jobs-table">
             <thead>
                 <tr>
-                    {% for column in columns %}
-                    <th>{{ column }}</th>
-                    {% endfor %}
+                    <td></td>
+                    <th>ID</th>
+                    <th>Task</th>
+                    <th>Name</th>
+                    <th>Total Duration</th>
+                    <th>Job Duration</th>
+                    <th>Status</th>
+                    <th>Resources</th>
+                    <th>Cluster</th>
+                    <th>Region</th>
+                    <th>Recoveries</th>
+                    <th>Details</th>
+                    <th>Actions</th>
                 </tr>
             </thead>
             <tbody>
@@ -102,33 +410,41 @@
                     <td>{{ row[1]|string|replace(' \u21B3', '') }}</td>
                     <td>{{ row[2] }}</td>
                     <td>{{ row[3] }}</td>
-                    <td>{{ row[4] }}</td>
-                    <td>{{ row[5] }}</td>
                     <td>{{ row[6] }}</td>
                     <td>{{ row[7] }}</td>
-                    <td>{{ row[8] }}</td>
                     <td>
-                        <!-- https://getbootstrap.com/docs/4.0/components/badge/ -->
-                        {% if row[9].startswith('RUNNING') %}
-                        <span class="badge bg-primary">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
-                        {% elif row[9].startswith('PENDING') or row[9].startswith('SUBMITTED') %}
-                        <span class="badge bg-light">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
-                        {% elif row[9].startswith('RECOVERING') or row[9].startswith('CANCELLING') or row[9].startswith('STARTING') %}
-                        <span class="badge bg-info">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
-                        {% elif row[9].startswith('SUCCEEDED') %}
-                        <span class="badge bg-success">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
-                        {% elif row[9].startswith('CANCELLED') %}
-                        <span class="badge bg-secondary">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
-                        {% elif row[9].startswith('FAILED') %}
-                        <span class="badge bg-warning">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
-                        {% else %}
-                        {{ row[9] }}
+                        <!-- Status column with tooltip -->
+                        <div class="status-container" style="position: relative;" title="{{ row[14] }}">
+                            {% if row[9].startswith('RUNNING') %}
+                            <span class="badge bg-primary">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
+                            {% elif row[9].startswith('PENDING') or row[9].startswith('SUBMITTED') %}
+                            <span class="badge bg-warning">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
+                            {% elif row[9].startswith('RECOVERING') or row[9].startswith('CANCELLING') or row[9].startswith('STARTING') %}
+                            <span class="badge bg-info">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
+                            {% elif row[9].startswith('SUCCEEDED') %}
+                            <span class="badge bg-success">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
+                            {% elif row[9].startswith('CANCELLED') %}
+                            <span class="badge bg-secondary">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
+                            {% elif row[9].startswith('FAILED') %}
+                            <span class="badge bg-danger">{{ row[9].split()[0] }}</span>{{ row[9][row[9].split()[0]|length:] }}
+                            {% else %}
+                            {{ row[9] }}
+                            {% endif %}
+                        </div>
+                    </td>
+                    <td>{{ row[4] }}</td>  {# Resources #}
+                    <td>{{ row[11] }}</td>  {# Cluster #}
+                    <td>{{ row[12] }}</td>  {# Region #}
+                    <td>{{ row[8] }}</td>   {# Recoveries #}
+                    <td>{{ row[13] }}</td>  {# Details #}
+                    <td>
+                        {% if row[1]|string|replace(' \u21B3', '') and row[1]|string|replace(' \u21B3', '') != '-' %}
+                        <a href="{{ url_for('download_log', job_id=row[1]|string|replace(' \u21B3', '')) }}" 
+                           class="btn btn-sm btn-outline-secondary">
+                            Controller Log
+                        </a>
                         {% endif %}
                     </td>
-                    <td>{{ row[10] }}</td>
-                    <td>{{ row[11] }}</td>
-                    <td>{{ row[12] }}</td>
-                    <td>{{ row[13] }}</td>
                 </tr>
                 {% endfor %}
             </tbody>
@@ -197,7 +513,9 @@
         document.addEventListener("DOMContentLoaded", function () {
             var timestamp = "{{ last_updated_timestamp }}";  // Get the UTC timestamp from the template
             var localTimestamp = moment.utc(timestamp).tz(moment.tz.guess()).format('YYYY-MM-DD HH:mm:ss z');
+            var utcTimestamp = moment.utc(timestamp).format('YYYY-MM-DD HH:mm:ss UTC');
             document.getElementById("last-updated").textContent = "Last updated: " + localTimestamp;
+            document.getElementById("last-updated").title = utcTimestamp;
         });
     </script>
     <script>
@@ -210,6 +528,7 @@
         } else {
             refreshToggle.checked = false;
         }
+
         // Add event listener to the toggle switch
         function handleAutoRefresh() {
             localStorage.setItem("refreshState", refreshToggle.checked);
@@ -217,6 +536,9 @@
             if (refreshToggle.checked) {
                 // Auto-refresh is enabled
                 refreshInterval = setInterval(function () {
+                    // Store current filter before reload
+                    var currentFilter = document.getElementById("status-filter").value;
+                    localStorage.setItem("statusFilter", currentFilter);
                     location.reload();
                 }, 30000); // 30 seconds in milliseconds
             } else {
@@ -224,6 +546,17 @@
                 clearInterval(refreshInterval);
             }
         }
+
+        // Restore filter state after page load
+        document.addEventListener("DOMContentLoaded", function() {
+            var savedFilter = localStorage.getItem("statusFilter");
+            if (savedFilter) {
+                var statusFilter = document.getElementById("status-filter");
+                statusFilter.value = savedFilter;
+                filterStatus(savedFilter);
+            }
+        });
+
         refreshToggle.addEventListener("change", handleAutoRefresh);
         handleAutoRefresh();
     </script>
@@ -231,13 +564,15 @@
         function filterStatus(status) {
             var rows = document.querySelectorAll("#jobs-table tbody tr");
             rows.forEach(function(row) {
-                var statusCell = row.querySelector("td:nth-child(10)"); // Status is in the 10th column
-                var statusText = statusCell.textContent.trim().split(' ')[0]; // Get first word of status
-
-                if (status === '' || statusText === status) {
-                    row.style.display = "";
-                } else {
-                    row.style.display = "none";
+                var statusCell = row.querySelector("td:nth-child(7)"); // Status is now in the 7th column
+                if (statusCell) {
+                    var statusText = statusCell.textContent.trim().split(' ')[0]; // Get first word of status
+                    
+                    if (status === '' || statusText === status) {
+                        row.style.display = "";
+                    } else {
+                        row.style.display = "none";
+                    }
                 }
             });
         }
@@ -249,6 +584,85 @@
             });
         });
     </script>
+    <script>
+        // Show loading spinner during refresh
+        window.addEventListener('beforeunload', function() {
+            document.getElementById('refresh-spinner').style.display = 'inline-block';
+        });
+
+        // Enhance table row hover effect
+        document.querySelectorAll('tbody tr').forEach(row => {
+            row.addEventListener('mouseenter', function() {
+                this.style.transform = 'scale(1.002)';
+                this.style.transition = 'transform 0.2s';
+            });
+            
+            row.addEventListener('mouseleave', function() {
+                this.style.transform = 'scale(1)';
+            });
+        });
+    </script>
+    <script>
+        // Update column indices for job table
+        const JOB_TABLE_COLUMNS = [
+            '', 'ID', 'Task', 'Name', 'Total Duration',
+            'Job Duration', 'Status', 'Resources', 'Cluster', 'Region', 'Recoveries', 'Details',
+            'Actions'
+        ];
+    </script>
+    <script>
+        // Replace the existing click handler for status badges with this updated version
+        document.addEventListener("DOMContentLoaded", function() {
+            const statusFilter = document.getElementById('status-filter');
+            const badges = document.querySelectorAll('.clickable-badge');
+            
+            // Set initial state
+            const savedFilter = localStorage.getItem("statusFilter") || '';
+            updateSelectedBadge(savedFilter);
+            
+            badges.forEach(function(badge) {
+                badge.addEventListener('click', function() {
+                    const status = this.dataset.status;
+                    const currentFilter = statusFilter.value;
+                    
+                    // If clicking the already selected filter, clear it (show all)
+                    const newStatus = (status === currentFilter || (status === 'ALL' && currentFilter === '')) ? '' : 
+                                    (status === 'ALL' ? '' : status);
+                    
+                    // Update filter and UI
+                    statusFilter.value = newStatus;
+                    filterStatus(newStatus);
+                    localStorage.setItem("statusFilter", newStatus);
+                    updateSelectedBadge(newStatus);
+                });
+            });
+            
+            function updateSelectedBadge(selectedStatus) {
+                badges.forEach(badge => {
+                    badge.classList.remove('selected-filter');
+                    if ((selectedStatus === '' && badge.dataset.status === 'ALL') || 
+                        badge.dataset.status === selectedStatus) {
+                        badge.classList.add('selected-filter');
+                    }
+                });
+            }
+        });
+    </script>
+    <script>
+        // Add scroll event listener to handle sticky header shadow
+        document.addEventListener("DOMContentLoaded", function() {
+            const header = document.querySelector('header');
+            const container = document.querySelector('.container');
+            
+            window.addEventListener('scroll', function() {
+                if (container.getBoundingClientRect().top < 0) {
+                    header.classList.add('sticky');
+                } else {
+                    header.classList.remove('sticky');
+                }
+            });
+        });
+    </script>
 
 </body>
 

sky/provision/lambda_cloud/instance.py

@@ -64,6 +64,21 @@ def _get_ssh_key_name(prefix: str = '') -> str:
     return name
 
 
+def _get_private_ip(instance_info: Dict[str, Any], single_node: bool) -> str:
+    private_ip = instance_info.get('private_ip')
+    if private_ip is None:
+        if single_node:
+            # The Lambda cloud API may return an instance info without
+            # private IP. It does not align with their docs, but we still
+            # allow single-node cluster to proceed with provisioning, by using
+            # 127.0.0.1, as private IP is not critical for single-node case.
+            return '127.0.0.1'
+        msg = f'Failed to retrieve private IP for instance {instance_info}.'
+        logger.error(msg)
+        raise RuntimeError(msg)
+    return private_ip
+
+
 def run_instances(region: str, cluster_name_on_cloud: str,
                   config: common.ProvisionConfig) -> common.ProvisionRecord:
     """Runs instances for the given cluster"""
@@ -197,13 +212,14 @@ def get_cluster_info(
 ) -> common.ClusterInfo:
     del region  # unused
     running_instances = _filter_instances(cluster_name_on_cloud, ['active'])
+    single_node = len(running_instances) == 1
     instances: Dict[str, List[common.InstanceInfo]] = {}
     head_instance_id = None
     for instance_id, instance_info in running_instances.items():
         instances[instance_id] = [
             common.InstanceInfo(
                 instance_id=instance_id,
-                internal_ip=instance_info['private_ip'],
+                internal_ip=_get_private_ip(instance_info, single_node),
                 external_ip=instance_info['ip'],
                 ssh_port=22,
                 tags={},

sky/serve/serve_state.py

@@ -55,33 +55,35 @@ def create_table(cursor: 'sqlite3.Cursor', conn: 'sqlite3.Connection') -> None:
         PRIMARY KEY (service_name, replica_id))""")
     cursor.execute("""\
         CREATE TABLE IF NOT EXISTS version_specs (
-        version INTEGER, 
+        version INTEGER,
         service_name TEXT,
         spec BLOB,
         PRIMARY KEY (service_name, version))""")
     conn.commit()
 
+    # Backward compatibility.
+    db_utils.add_column_to_table(cursor, conn, 'services',
+                                 'requested_resources_str', 'TEXT')
+    # Deprecated: switched to `active_versions` below for the version
+    # considered active by the load balancer. The
+    # authscaler/replica_manager version can be found in the
+    # version_specs table.
+    db_utils.add_column_to_table(
+        cursor, conn, 'services', 'current_version',
+        f'INTEGER DEFAULT {constants.INITIAL_VERSION}')
+    # The versions that is activated for the service. This is a list
+    # of integers in json format.
+    db_utils.add_column_to_table(cursor, conn, 'services', 'active_versions',
+                                 f'TEXT DEFAULT {json.dumps([])!r}')
+    db_utils.add_column_to_table(cursor, conn, 'services',
+                                 'load_balancing_policy', 'TEXT DEFAULT NULL')
+    # Whether the service's load balancer is encrypted with TLS.
+    db_utils.add_column_to_table(cursor, conn, 'services', 'tls_encrypted',
+                                 'INTEGER DEFAULT 0')
+    conn.commit()
+
 
-_DB = db_utils.SQLiteConn(_DB_PATH, create_table)
-# Backward compatibility.
-db_utils.add_column_to_table(_DB.cursor, _DB.conn, 'services',
-                             'requested_resources_str', 'TEXT')
-# Deprecated: switched to `active_versions` below for the version considered
-# active by the load balancer. The authscaler/replica_manager version can be
-# found in the version_specs table.
-db_utils.add_column_to_table(_DB.cursor, _DB.conn, 'services',
-                             'current_version',
-                             f'INTEGER DEFAULT {constants.INITIAL_VERSION}')
-# The versions that is activated for the service. This is a list of integers in
-# json format.
-db_utils.add_column_to_table(_DB.cursor, _DB.conn, 'services',
-                             'active_versions',
-                             f'TEXT DEFAULT {json.dumps([])!r}')
-db_utils.add_column_to_table(_DB.cursor, _DB.conn, 'services',
-                             'load_balancing_policy', 'TEXT DEFAULT NULL')
-# Whether the service's load balancer is encrypted with TLS.
-db_utils.add_column_to_table(_DB.cursor, _DB.conn, 'services', 'tls_encrypted',
-                             'INTEGER DEFAULT 0')
+db_utils.SQLiteConn(_DB_PATH, create_table)
 _UNIQUE_CONSTRAINT_FAILED_ERROR_MSG = 'UNIQUE constraint failed: services.name'
 
 

{skypilot_nightly-1.0.0.dev20250202.dist-info → skypilot_nightly-1.0.0.dev20250204.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skypilot-nightly
-Version: 1.0.0.dev20250202
+Version: 1.0.0.dev20250204
 Summary: SkyPilot: An intercloud broker for the clouds
 Author: SkyPilot Team
 License: Apache 2.0

{skypilot_nightly-1.0.0.dev20250202.dist-info → skypilot_nightly-1.0.0.dev20250204.dist-info}/RECORD

@@ -1,7 +1,7 @@
-sky/__init__.py,sha256=WL8LMURbd_cRtu0cPtp8XVTr9t2awrOYnS-0LqeuKBI,5529
+sky/__init__.py,sha256=wD_DitkbMqx2kv8G3wQz7yRYrWtCMbhBQoeM6oaT1KQ,5529
 sky/admin_policy.py,sha256=hPo02f_A32gCqhUueF0QYy1fMSSKqRwYEg_9FxScN_s,3248
 sky/authentication.py,sha256=LXUDABKP1FJCS256xTTDJa40WXwHKF5x49S-4hZbD1M,21501
-sky/check.py,sha256=qTpm3N1zUZi2inEZPsrbt278B3h8nsk2gnepzIgLybE,10899
+sky/check.py,sha256=xzLlxUkBCrzpOho8lw65EvKLPl_b9lA2nteF5MSYbDQ,10885
 sky/cli.py,sha256=B-YWYiKnfSGdSOXtAY8SRGOGhneUeNPBjXFZ0FuLZ8w,214131
 sky/cloud_stores.py,sha256=PcLT57_8SZy7o6paAluElfBynaLkbaOq3l-8dNg1AVM,23672
 sky/core.py,sha256=fE1rn4Ku94S0XmWTO5-6t6eT6aaJImNczRqEnTe8v7Q,38742
@@ -104,9 +104,9 @@ sky/jobs/recovery_strategy.py,sha256=m-EA-MWXPFrgx2CYFPr6MmgeUoDTEBmY2xruD2PRSGY
 sky/jobs/scheduler.py,sha256=WAvNb8-vBk8q1zFordFdpH7gxqWDjPHDGZZay6aodOk,12028
 sky/jobs/state.py,sha256=bvBNZMg3DzPfS4eHNzMqYaMui2cqnWoWGDIaiOpaXSk,40770
 sky/jobs/utils.py,sha256=9tCKeY2x1lOgFQdaxqx6tZd2zd2e3pdUOQGvgvbf1Rk,52682
-sky/jobs/dashboard/dashboard.py,sha256=KMSarpVcfnc-ELPFvy1M9_I1k4kSeXubTk3ibQC67Tg,3219
+sky/jobs/dashboard/dashboard.py,sha256=lLXAt755bkOh0XNjl5eQbu5vys7zYpvEoJgM97DkpeM,7706
 sky/jobs/dashboard/static/favicon.ico,sha256=uYlvgxSM7gjBmXpZ8wydvZUPAbJiiix-rc2Xe5mma9s,15086
-sky/jobs/dashboard/templates/index.html,sha256=su1tqgcsXNl1lGl9hfIR6ig1f531OO57x1Tc2mNDK7U,11139
+sky/jobs/dashboard/templates/index.html,sha256=nBiIjYDgZdRyO4pNt_2qEj201QvCiiO2n2kuVuSgKeI,26289
 sky/provision/__init__.py,sha256=rnuwL9x3qQGhX3EYW6KyZWfw_yBqGSiFBDz86T5xus4,6339
 sky/provision/common.py,sha256=E8AlSUFcn0FYQq1erNmoVfMAdsF9tP2yxfyk-9PLvQU,10286
 sky/provision/constants.py,sha256=oc_XDUkcoLQ_lwDy5yMeMSWviKS0j0s1c0pjlvpNeWY,800
@@ -154,7 +154,7 @@ sky/provision/kubernetes/manifests/smarter-device-manager-configmap.yaml,sha256=
 sky/provision/kubernetes/manifests/smarter-device-manager-daemonset.yaml,sha256=RtTq4F1QUmR2Uunb6zuuRaPhV7hpesz4saHjn3Ncsb4,2010
 sky/provision/lambda_cloud/__init__.py,sha256=6EEvSgtUeEiup9ivIFevHmgv0GqleroO2X0K7TRa2nE,612
 sky/provision/lambda_cloud/config.py,sha256=jq1iLzp4Up61r4JGxvtpVbJlgXnea3LHYQhCQyyl7ik,272
-sky/provision/lambda_cloud/instance.py,sha256=PEVwEPYOzZ3T_vcq6MtWbg4Au01FIUTlkpbIHEtySz0,8950
+sky/provision/lambda_cloud/instance.py,sha256=_gVFNfaXdqYEmCtCwgaCkvU8BwxZarpyetSGGA_Dj64,9681
 sky/provision/lambda_cloud/lambda_utils.py,sha256=H2Qx4xdJyyEu2IXaj5AyppuPJW385nF5_KXFOk8j9RI,9858
 sky/provision/oci/__init__.py,sha256=5E6EUtTK3mqGVREw5TuVl5DxteBYTZigIii7c8gHExU,612
 sky/provision/oci/config.py,sha256=diSDTyHLokcuXGB2XgZCHFvsXa8bah1PP2XuMouW_UU,1650
@@ -195,7 +195,7 @@ sky/serve/core.py,sha256=ANjALyYiQUmcpWjQ1YJor2rqHJypQpzuQxuIPnDyEk0,35788
 sky/serve/load_balancer.py,sha256=2nkMPRvy-h7hJL4Qq__tkT8nIAVC_nmjyXf8mMGYEFk,13658
 sky/serve/load_balancing_policies.py,sha256=XVj76qBgqh7h6wfx53RKQFzBefDWTE4TCdCEtFLLtI4,5398
 sky/serve/replica_managers.py,sha256=SW7k2iivUZ6dw_YMgGYOHOGD9_yyV4byfKa8e5t8_HE,57587
-sky/serve/serve_state.py,sha256=2V9WVD9OZ26vgyIJ-kZcrlouazwFTrpjlZAK9DRv3uA,20084
+sky/serve/serve_state.py,sha256=Do-MITtijw1z8dDUyJZMAGnjZCgdUFtJ2nwhhcjpOGI,20056
 sky/serve/serve_utils.py,sha256=m1Zcjslnzcr5AAppzV48WDOwMWjRaXotTUd_iN-dHgc,40654
 sky/serve/service.py,sha256=DPU1PJGuHa1WaNqxYqgpmqd4LA9jBbQM-KlLrA6C1M0,12156
 sky/serve/service_spec.py,sha256=Q0qnFRjNnfGIpksubH5VqPKIlvpWs5had_Ma_PSHyo8,16940
@@ -289,9 +289,9 @@ sky/utils/kubernetes/k8s_gpu_labeler_job.yaml,sha256=k0TBoQ4zgf79-sVkixKSGYFHQ7Z
 sky/utils/kubernetes/k8s_gpu_labeler_setup.yaml,sha256=VLKT2KKimZu1GDg_4AIlIt488oMQvhRZWwsj9vBbPUg,3812
 sky/utils/kubernetes/rsync_helper.sh,sha256=h4YwrPFf9727CACnMJvF3EyK_0OeOYKKt4su_daKekw,1256
 sky/utils/kubernetes/ssh_jump_lifecycle_manager.py,sha256=Kq1MDygF2IxFmu9FXpCxqucXLmeUrvs6OtRij6XTQbo,6554
-skypilot_nightly-1.0.0.dev20250202.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
-skypilot_nightly-1.0.0.dev20250202.dist-info/METADATA,sha256=a3GhFswZbub9mm90ULVc-rXF0engagKI4_gOLGqwVac,21251
-skypilot_nightly-1.0.0.dev20250202.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skypilot_nightly-1.0.0.dev20250202.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
-skypilot_nightly-1.0.0.dev20250202.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
-skypilot_nightly-1.0.0.dev20250202.dist-info/RECORD,,
+skypilot_nightly-1.0.0.dev20250204.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
+skypilot_nightly-1.0.0.dev20250204.dist-info/METADATA,sha256=8lPz1CRU_biL8tZh6AWIZKdor-F20sON44UpXTOyiSw,21251
+skypilot_nightly-1.0.0.dev20250204.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skypilot_nightly-1.0.0.dev20250204.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
+skypilot_nightly-1.0.0.dev20250204.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
+skypilot_nightly-1.0.0.dev20250204.dist-info/RECORD,,