skypilot-nightly 1.0.0.dev20250304__tar.gz → 1.0.0.dev20250305__tar.gz

{skypilot_nightly-1.0.0.dev20250304/skypilot_nightly.egg-info → skypilot_nightly-1.0.0.dev20250305}/PKG-INFO

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

{skypilot_nightly-1.0.0.dev20250304 → skypilot_nightly-1.0.0.dev20250305}/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 = '5c126400a3a3791b34beebd5e7b5a3717efd9505'
+_SKYPILOT_COMMIT_SHA = '296a22e868b9bdf1faccbe3effbfb858a5a05905'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20250304'
+__version__ = '1.0.0.dev20250305'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 

{skypilot_nightly-1.0.0.dev20250304 → skypilot_nightly-1.0.0.dev20250305}/sky/cli.py

@@ -3034,7 +3034,7 @@ def _down_or_stop_clusters(
                     # with the termination.
                     hint_or_raise(controller_name, purge)
                 except (exceptions.ClusterOwnerIdentityMismatchError,
-                        RuntimeError) as e:
+                        exceptions.NotSupportedError, RuntimeError) as e:
                     if purge:
                         click.echo(common_utils.format_exception(e))
                     else:

{skypilot_nightly-1.0.0.dev20250304 → skypilot_nightly-1.0.0.dev20250305}/sky/client/cli.py

@@ -3034,7 +3034,7 @@ def _down_or_stop_clusters(
                     # with the termination.
                     hint_or_raise(controller_name, purge)
                 except (exceptions.ClusterOwnerIdentityMismatchError,
-                        RuntimeError) as e:
+                        exceptions.NotSupportedError, RuntimeError) as e:
                     if purge:
                         click.echo(common_utils.format_exception(e))
                     else:

{skypilot_nightly-1.0.0.dev20250304 → skypilot_nightly-1.0.0.dev20250305}/sky/jobs/dashboard/dashboard.py

@@ -62,6 +62,7 @@ class JobTableColumns(enum.IntEnum):
     - FAILOVER (13): Job failover history
     - DETAILS (14): Job details
     - ACTIONS (15): Available actions column
+    - LOG_CONTENT (16): Log content column
     """
     DROPDOWN = 0
     ID = 1
@@ -79,13 +80,14 @@ class JobTableColumns(enum.IntEnum):
     DETAILS = 13
     FAILOVER = 14
     ACTIONS = 15
+    LOG_CONTENT = 16
 
 
 # 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'
+    'Recoveries', 'Details', 'Actions', 'Log Content'
 ]
 
 # This column is given by format_job_table but should be ignored.
@@ -153,14 +155,14 @@ def home():
             status_counts[task['status'].value] += 1
 
     # Add an empty column for the dropdown button and actions column
-    # Exclude SCHED. STATE column
+    # Exclude SCHED. STATE and LOG_CONTENT columns
     rows = [
         [''] + row[:SCHED_STATE_COLUMN] + row[SCHED_STATE_COLUMN + 1:] +
         # Add empty cell for failover and actions column
-        [''] + [''] for row in rows
+        [''] + [''] + [''] for row in rows
     ]
 
-    # Add log content as failover history for each job
+    # Add log content as a regular column for each job
     for row in rows:
         job_id = str(row[JobTableColumns.ID]).strip().replace(' ⤳', '')
         if job_id and job_id != '-':
@@ -174,17 +176,21 @@ def home():
                         log_content = f.read()
                         row[JobTableColumns.FAILOVER] = _extract_launch_history(
                             log_content)
+                        row[JobTableColumns.LOG_CONTENT] = log_content
                 else:
                     row[JobTableColumns.FAILOVER] = 'Log file not found'
+                    row[JobTableColumns.LOG_CONTENT] = 'Log file not found'
             except (IOError, OSError) as e:
-                row[JobTableColumns.FAILOVER] = f'Error reading log: {str(e)}'
-    app.logger.error('All managed jobs:')
+                error_msg = f'Error reading log: {str(e)}'
+                row[JobTableColumns.FAILOVER] = error_msg
+                row[JobTableColumns.LOG_CONTENT] = error_msg
+        else:
+            row[JobTableColumns.LOG_CONTENT] = ''
 
-    # Validate column count
     if rows and len(rows[0]) != len(JOB_TABLE_COLUMNS):
         raise RuntimeError(
             f'Dashboard code and managed job queue code are out of sync. '
-            f'Expected {(JOB_TABLE_COLUMNS)} columns, got {(rows[0])}')
+            f'Expected {JOB_TABLE_COLUMNS} columns, got {rows[0]}')
 
     # Fix STATUS color codes: '\x1b[33mCANCELLED\x1b[0m' -> 'CANCELLED'
     for row in rows:
@@ -208,26 +214,10 @@ def home():
         last_updated_timestamp=timestamp,
         status_values=status_values,
         status_counts=status_counts,
+        request=flask.request,
     )
     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()

{skypilot_nightly-1.0.0.dev20250304 → skypilot_nightly-1.0.0.dev20250305}/sky/jobs/dashboard/templates/index.html

@@ -498,10 +498,10 @@
                     <td data-full-text="{{ row[13] }}">{{ 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">
+                        <button class="btn btn-sm btn-outline-secondary log-btn" 
+                                data-job-id="{{ row[1]|string|replace(' \u21B3', '') }}">
                             controller log
-                        </a>
+                        </button>
                         {% endif %}
                     </td>
                 </tr>
@@ -509,6 +509,41 @@
             </tbody>
         </table>
     </div>
+    
+    <!-- Hidden container for log content -->
+    <div style="display: none;">
+        {% for row in rows %}
+            {% if row[1]|string|replace(' \u21B3', '') and row[1]|string|replace(' \u21B3', '') != '-' %}
+            <pre id="log-content-{{ row[1]|string|replace(' \u21B3', '') }}">{{ row[-1]|e }}</pre>
+            {% endif %}
+        {% endfor %}
+    </div>
+    
+    <!-- Log Modal -->
+    <div class="modal fade" id="logModal" tabindex="-1" aria-labelledby="logModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="logModalLabel">Controller Log</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <div id="logContent" style="white-space: pre-wrap; font-family: monospace; max-height: 70vh; overflow-y: auto; font-size: 0.85rem;"></div>
+                    <div id="logError" class="alert alert-danger d-none">
+                        Error loading log content. Please try again.
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                    <a id="downloadLogBtn" href="#" class="btn btn-primary" download>Download</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" 
+        integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" 
+        crossorigin="anonymous"></script>
     <script>
         // Folder toggle for pipelines, this will fold/unfold the rows for
         // a pipeline and its tasks.
@@ -729,6 +764,68 @@
         });
     });
 </script>
+<script>
+    // Function to show log modal and display pre-loaded log content
+    function showLogModal(jobId, logContent) {
+        try {
+            // Initialize modal
+            const logModal = new bootstrap.Modal(document.getElementById('logModal'));
+            const logContentEl = document.getElementById('logContent');
+            const logError = document.getElementById('logError');
+            const downloadBtn = document.getElementById('downloadLogBtn');
+            
+            // Create a Blob for download functionality
+            const blob = new Blob([logContent], { type: 'text/plain' });
+            const url = URL.createObjectURL(blob);
+            
+            // Set download button href
+            downloadBtn.href = url;
+            downloadBtn.setAttribute('download', `job_${jobId}.log`);
+            
+            // Clear previous content and show new content directly
+            logContentEl.textContent = logContent || 'No log content available';
+            logError.classList.add('d-none');
+            
+            // Set modal title
+            document.getElementById('logModalLabel').textContent = `Controller Log - Job ${jobId}`;
+            
+            // Show modal
+            logModal.show();
+            
+            // Cleanup the URL object when the modal is hidden
+            document.getElementById('logModal').addEventListener('hidden.bs.modal', function() {
+                URL.revokeObjectURL(url);
+            }, { once: true });
+        } catch (error) {
+            console.error('Error showing log modal:', error);
+            document.getElementById('logError').classList.remove('d-none');
+            document.getElementById('logError').textContent = `Error showing log: ${error.message}`;
+        }
+    }
+
+    // Add event listeners for log buttons
+    document.addEventListener('DOMContentLoaded', function() {
+        document.addEventListener('click', function(event) {
+            if (event.target.closest('.log-btn')) {
+                try {
+                    const button = event.target.closest('.log-btn');
+                    const jobId = button.dataset.jobId;
+                    const logContentEl = document.getElementById(`log-content-${jobId}`);
+                    
+                    if (!logContentEl) {
+                        throw new Error(`Log content element not found for job ${jobId}`);
+                    }
+                    
+                    const logContent = logContentEl.textContent;
+                    showLogModal(jobId, logContent);
+                } catch (error) {
+                    console.error('Error getting log content:', error);
+                    showLogModal(jobId, `Error loading log: ${error.message}`);
+                }
+            }
+        });
+    });
+</script>
 </body>
 
 </html>

{skypilot_nightly-1.0.0.dev20250304 → skypilot_nightly-1.0.0.dev20250305/skypilot_nightly.egg-info}/PKG-INFO

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