ntermqt 0.1.8__tar.gz → 0.1.11__tar.gz

{ntermqt-0.1.8/ntermqt.egg-info → ntermqt-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ntermqt
-Version: 0.1.8
+Version: 0.1.11
 Summary: Modern SSH terminal widget for PyQt6 with credential vault and jump host support
 Author: Scott Peterman
 License: GPL-3.0
@@ -112,7 +112,7 @@ nterm includes a built-in development console accessible via **Dev → IPython**
 
 ![IPython Console](https://raw.githubusercontent.com/scottpeterman/nterm/main/screenshots/ipython.png)
 
-![IPython Console](https://raw.githubusercontent.com/scottpeterman/nterm/main/screenshots/repl.png)
+![IPython Console](https://raw.githubusercontent.com/scottpeterman/nterm/main/screenshots/repl_dark3.png)
 
 The IPython console runs in the same Python environment as nterm, with the scripting API pre-loaded. Query your device inventory, inspect credentials, and prototype automation workflows without leaving the app.
 

{ntermqt-0.1.8 → ntermqt-0.1.11}/README.md

@@ -67,7 +67,7 @@ nterm includes a built-in development console accessible via **Dev → IPython**
 
 ![IPython Console](https://raw.githubusercontent.com/scottpeterman/nterm/main/screenshots/ipython.png)
 
-![IPython Console](https://raw.githubusercontent.com/scottpeterman/nterm/main/screenshots/repl.png)
+![IPython Console](https://raw.githubusercontent.com/scottpeterman/nterm/main/screenshots/repl_dark3.png)
 
 The IPython console runs in the same Python environment as nterm, with the scripting API pre-loaded. Query your device inventory, inspect credentials, and prototype automation workflows without leaving the app.
 

{ntermqt-0.1.8 → ntermqt-0.1.11}/nterm/__main__.py

@@ -197,11 +197,28 @@ class TerminalTab(QWidget):
         self.terminal = TerminalWidget()
         layout.addWidget(self.terminal)
 
-        # Pass the vault to SSHSession for credential resolution
-        vault = credential_resolver if credential_resolver else None
-        self.ssh_session = SSHSession(profile, vault=vault)
+        # Create initial session
+        self._create_and_attach_session()
+
+        # Handle reconnect by creating fresh session
+        self.terminal.reconnect_requested.connect(self._on_reconnect)
+
+    def _create_and_attach_session(self):
+        """Create fresh SSHSession and attach to terminal."""
+        vault = self.credential_resolver if self.credential_resolver else None
+        self.ssh_session = SSHSession(self.profile, vault=vault)
         self.terminal.attach_session(self.ssh_session)
 
+    def _on_reconnect(self):
+        """Handle reconnect by building fresh session."""
+        print(f"Reconnecting: {self.session.name}")
+        try:
+            self.ssh_session.disconnect()
+        except Exception:
+            pass  # Old session may already be dead
+        self._create_and_attach_session()
+        self.ssh_session.connect()
+
     def connect(self):
         """Start the SSH connection."""
         self.ssh_session.connect()
@@ -227,7 +244,6 @@ class TerminalTab(QWidget):
         # Default to True if we can't determine - safer to warn
         return True
 
-
 class LocalTerminalTab(QWidget):
     """A terminal tab for local processes (shell, IPython, etc.)."""
 

{ntermqt-0.1.8 → ntermqt-0.1.11}/nterm/manager/io.py

@@ -3,11 +3,14 @@ Session import/export functionality.
 
 Supports JSON format for portability.
 Also supports importing from TerminalTelemetry YAML format.
+Also supports simple CSV import for quick session lists.
 """
 
 from __future__ import annotations
+import csv
 import json
 import yaml
+from io import StringIO
 from pathlib import Path
 from datetime import datetime
 from typing import Optional
@@ -17,9 +20,10 @@ from PyQt6.QtWidgets import (
     QWidget, QFileDialog, QMessageBox, QDialog,
     QVBoxLayout, QHBoxLayout, QLabel, QCheckBox,
     QPushButton, QDialogButtonBox, QTreeWidget,
-    QTreeWidgetItem, QGroupBox
+    QTreeWidgetItem, QGroupBox, QComboBox, QTextEdit
 )
 from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QFont
 
 from .models import SessionStore, SavedSession, SessionFolder
 
@@ -189,6 +193,133 @@ def import_sessions(
     return imported, skipped
 
 
+def import_sessions_csv(
+    store: SessionStore,
+    path: Path,
+    merge: bool = True,
+    folder_name: Optional[str] = None
+) -> tuple[int, int, int]:
+    """
+    Import sessions from CSV file.
+
+    Supports flexible column names:
+    - name/display_name/hostname → session name
+    - hostname/host/ip/address → connection hostname
+    - port → port (default 22)
+    - description/desc → description
+    - folder/folder_name/group → folder assignment
+
+    Args:
+        store: Session store instance
+        path: Input CSV file path
+        merge: If True, merge with existing. If False, skip duplicates.
+        folder_name: Override folder for all imported sessions (optional)
+
+    Returns:
+        Tuple of (folders_created, sessions_imported, sessions_skipped)
+    """
+    with open(path, newline='', encoding='utf-8-sig') as f:
+        # Sniff dialect and read
+        sample = f.read(4096)
+        f.seek(0)
+
+        try:
+            dialect = csv.Sniffer().sniff(sample)
+        except csv.Error:
+            dialect = csv.excel  # Default to standard CSV
+
+        reader = csv.DictReader(f, dialect=dialect)
+
+        # Normalize header names (lowercase, strip whitespace)
+        if reader.fieldnames:
+            reader.fieldnames = [h.lower().strip() for h in reader.fieldnames]
+
+        rows = list(reader)
+
+    if not rows:
+        return 0, 0, 0
+
+    # Column name mappings (first match wins)
+    name_cols = ['name', 'display_name', 'session_name', 'device_name', 'device']
+    host_cols = ['hostname', 'host', 'ip', 'ip_address', 'address', 'mgmt_ip']
+    port_cols = ['port', 'ssh_port']
+    desc_cols = ['description', 'desc', 'notes', 'comment']
+    folder_cols = ['folder', 'folder_name', 'group', 'site', 'location']
+
+    def find_col(row: dict, candidates: list[str]) -> Optional[str]:
+        """Find first matching column value."""
+        for col in candidates:
+            if col in row and row[col]:
+                return row[col].strip()
+        return None
+
+    # Track folders and sessions
+    folders_created = 0
+    sessions_imported = 0
+    sessions_skipped = 0
+
+    existing_sessions = {s.hostname: s for s in store.list_all_sessions()}
+    folder_cache: dict[str, int] = {}  # folder_name -> folder_id
+
+    for row in rows:
+        # Extract fields with fallbacks
+        hostname = find_col(row, host_cols)
+        if not hostname:
+            continue  # Skip rows without hostname
+
+        name = find_col(row, name_cols) or hostname
+        port_str = find_col(row, port_cols)
+        port = int(port_str) if port_str and port_str.isdigit() else 22
+        description = find_col(row, desc_cols) or ""
+
+        # Determine folder
+        row_folder = folder_name or find_col(row, folder_cols)
+        folder_id = None
+
+        if row_folder:
+            if row_folder in folder_cache:
+                folder_id = folder_cache[row_folder]
+            else:
+                # Check if folder exists
+                existing_folders = store.list_folders(None)
+                existing = next((f for f in existing_folders if f.name == row_folder), None)
+
+                if existing:
+                    folder_id = existing.id
+                else:
+                    folder_id = store.add_folder(row_folder)
+                    folders_created += 1
+
+                folder_cache[row_folder] = folder_id
+
+        # Check for duplicate
+        if hostname in existing_sessions and not merge:
+            sessions_skipped += 1
+            continue
+
+        session = SavedSession(
+            name=name,
+            description=description,
+            hostname=hostname,
+            port=port,
+            credential_name=None,
+            folder_id=folder_id,
+        )
+
+        # Update or insert
+        if hostname in existing_sessions and merge:
+            existing = existing_sessions[hostname]
+            session.id = existing.id
+            store.update_session(session)
+        else:
+            store.add_session(session)
+            existing_sessions[hostname] = session
+
+        sessions_imported += 1
+
+    return folders_created, sessions_imported, sessions_skipped
+
+
 def import_terminal_telemetry(
     store: SessionStore,
     path: Path,
@@ -359,6 +490,49 @@ class ExportDialog(QDialog):
                 )
 
 
+# =============================================================================
+# Format Help Text
+# =============================================================================
+
+CSV_HELP_TEXT = """\
+<b>CSV Format</b><br><br>
+Simple comma-separated format for quick imports from spreadsheets or other tools.<br><br>
+
+<b>Supported Columns:</b>
+<table cellspacing="4">
+<tr><td><code>name</code></td><td>Session display name (falls back to hostname)</td></tr>
+<tr><td><code>hostname</code></td><td><b>Required.</b> IP address or DNS name</td></tr>
+<tr><td><code>port</code></td><td>SSH port (default: 22)</td></tr>
+<tr><td><code>description</code></td><td>Optional notes</td></tr>
+<tr><td><code>folder</code></td><td>Folder name (created if missing)</td></tr>
+</table>
+<br>
+<b>Example:</b><br>
+<code>name,hostname,port,folder<br>
+core-rtr-01,10.0.0.1,22,Core<br>
+core-rtr-02,10.0.0.2,22,Core<br>
+edge-sw-01,10.1.0.1,22,Edge</code><br><br>
+
+<i>Column names are flexible: "host", "ip", "address" also work for hostname.</i>
+"""
+
+JSON_HELP_TEXT = """\
+<b>JSON Format</b><br><br>
+Native nterm export format. Preserves folders, hierarchy, and all session metadata.<br><br>
+
+<b>Structure:</b><br>
+<code>{<br>
+&nbsp;&nbsp;"version": 1,<br>
+&nbsp;&nbsp;"folders": [{"id": 1, "name": "Site A", ...}],<br>
+&nbsp;&nbsp;"sessions": [<br>
+&nbsp;&nbsp;&nbsp;&nbsp;{"name": "router-01", "hostname": "10.0.0.1", "port": 22, "folder_id": 1}<br>
+&nbsp;&nbsp;]<br>
+}</code><br><br>
+
+<b>Tip:</b> Use <i>Export Sessions</i> to create a template, then edit and re-import.
+"""
+
+
 class ImportDialog(QDialog):
     """Dialog for import options and preview."""
 
@@ -366,14 +540,45 @@ class ImportDialog(QDialog):
         super().__init__(parent)
         self.store = store
         self._import_path: Optional[Path] = None
-        self._import_data: Optional[dict] = None
+        self._import_data = None  # Can be dict (JSON) or list of rows (CSV)
+        self._import_format: str = "json"
 
         self.setWindowTitle("Import Sessions")
-        self.setMinimumWidth(500)
-        self.setMinimumHeight(400)
+        self.setMinimumWidth(600)
+        self.setMinimumHeight(500)
 
         layout = QVBoxLayout(self)
 
+        # Format selection row
+        format_row = QHBoxLayout()
+        format_row.addWidget(QLabel("Format:"))
+
+        self._format_combo = QComboBox()
+        self._format_combo.addItem("JSON (nterm native)", "json")
+        self._format_combo.addItem("CSV (spreadsheet)", "csv")
+        self._format_combo.currentIndexChanged.connect(self._on_format_changed)
+        self._format_combo.setMinimumWidth(180)
+        format_row.addWidget(self._format_combo)
+
+        format_row.addStretch()
+
+        # Help toggle
+        self._help_btn = QPushButton("? Help")
+        self._help_btn.setCheckable(True)
+        self._help_btn.setMaximumWidth(80)
+        self._help_btn.toggled.connect(self._toggle_help)
+        format_row.addWidget(self._help_btn)
+
+        layout.addLayout(format_row)
+
+        # Help panel (hidden by default)
+        self._help_panel = QTextEdit()
+        self._help_panel.setReadOnly(True)
+        self._help_panel.setMaximumHeight(180)
+        self._help_panel.setHtml(JSON_HELP_TEXT)
+        self._help_panel.hide()
+        layout.addWidget(self._help_panel)
+
         # File selection
         file_row = QHBoxLayout()
         self._file_label = QLabel("No file selected")
@@ -392,6 +597,7 @@ class ImportDialog(QDialog):
         self._preview_tree = QTreeWidget()
         self._preview_tree.setHeaderLabels(["Name", "Host", "Port"])
         self._preview_tree.setRootIsDecorated(True)
+        self._preview_tree.setAlternatingRowColors(True)
         preview_layout.addWidget(self._preview_tree)
 
         layout.addWidget(preview_group)
@@ -421,13 +627,41 @@ class ImportDialog(QDialog):
         self._button_box.button(QDialogButtonBox.StandardButton.Ok).setText("Import")
         layout.addWidget(self._button_box)
 
+    def _on_format_changed(self, index: int) -> None:
+        """Handle format selection change."""
+        self._import_format = self._format_combo.currentData()
+
+        # Update help text
+        if self._import_format == "csv":
+            self._help_panel.setHtml(CSV_HELP_TEXT)
+        else:
+            self._help_panel.setHtml(JSON_HELP_TEXT)
+
+        # Clear preview if format changed after file loaded
+        if self._import_path:
+            self._preview_tree.clear()
+            self._import_path = None
+            self._import_data = None
+            self._file_label.setText("No file selected")
+            self._button_box.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False)
+
+    def _toggle_help(self, show: bool) -> None:
+        """Show/hide help panel."""
+        self._help_panel.setVisible(show)
+        self._help_btn.setText("▼ Help" if show else "? Help")
+
     def _browse_file(self) -> None:
         """Browse for import file."""
+        if self._import_format == "csv":
+            filter_str = "CSV Files (*.csv);;All Files (*)"
+        else:
+            filter_str = "JSON Files (*.json);;All Files (*)"
+
         path, _ = QFileDialog.getOpenFileName(
             self,
             "Import Sessions",
             "",
-            "JSON Files (*.json);;All Files (*)"
+            filter_str
         )
 
         if path:
@@ -436,47 +670,19 @@ class ImportDialog(QDialog):
     def _load_preview(self, path: Path) -> None:
         """Load and preview import file."""
         try:
-            with open(path) as f:
-                data = json.load(f)
+            self._preview_tree.clear()
+
+            if self._import_format == "csv":
+                self._load_csv_preview(path)
+            else:
+                self._load_json_preview(path)
 
             self._import_path = path
-            self._import_data = data
             self._file_label.setText(path.name)
 
-            # Build preview tree
-            self._preview_tree.clear()
-
-            # Create folder items
-            folder_items: dict[int, QTreeWidgetItem] = {}
-            for folder_data in data.get("folders", []):
-                item = QTreeWidgetItem()
-                item.setText(0, f"📁 {folder_data['name']}")
-                folder_items[folder_data["id"]] = item
-
-            # Parent folders
-            for folder_data in data.get("folders", []):
-                item = folder_items[folder_data["id"]]
-                parent_id = folder_data.get("parent_id")
-                if parent_id and parent_id in folder_items:
-                    folder_items[parent_id].addChild(item)
-                else:
-                    self._preview_tree.addTopLevelItem(item)
-
-            # Add sessions
-            for session_data in data.get("sessions", []):
-                item = QTreeWidgetItem()
-                item.setText(0, session_data.get("name", ""))
-                item.setText(1, session_data.get("hostname", ""))
-                item.setText(2, str(session_data.get("port", 22)))
-
-                folder_id = session_data.get("folder_id")
-                if folder_id and folder_id in folder_items:
-                    folder_items[folder_id].addChild(item)
-                else:
-                    self._preview_tree.addTopLevelItem(item)
-
             self._preview_tree.expandAll()
-            self._preview_tree.resizeColumnToContents(0)
+            for i in range(3):
+                self._preview_tree.resizeColumnToContents(i)
 
             # Enable import button
             self._button_box.button(QDialogButtonBox.StandardButton.Ok).setEnabled(True)
@@ -488,19 +694,126 @@ class ImportDialog(QDialog):
                 f"Failed to load file:\n{e}"
             )
 
+    def _load_csv_preview(self, path: Path) -> None:
+        """Load CSV file and populate preview."""
+        with open(path, newline='', encoding='utf-8-sig') as f:
+            sample = f.read(4096)
+            f.seek(0)
+
+            try:
+                dialect = csv.Sniffer().sniff(sample)
+            except csv.Error:
+                dialect = csv.excel
+
+            reader = csv.DictReader(f, dialect=dialect)
+            if reader.fieldnames:
+                reader.fieldnames = [h.lower().strip() for h in reader.fieldnames]
+
+            rows = list(reader)
+
+        self._import_data = rows
+
+        # Column mappings
+        name_cols = ['name', 'display_name', 'session_name', 'device_name', 'device']
+        host_cols = ['hostname', 'host', 'ip', 'ip_address', 'address', 'mgmt_ip']
+        port_cols = ['port', 'ssh_port']
+        folder_cols = ['folder', 'folder_name', 'group', 'site', 'location']
+
+        def find_col(row: dict, candidates: list[str]) -> Optional[str]:
+            for col in candidates:
+                if col in row and row[col]:
+                    return row[col].strip()
+            return None
+
+        # Group by folder for preview
+        folder_items: dict[str, QTreeWidgetItem] = {}
+        root_sessions: list[QTreeWidgetItem] = []
+
+        for row in rows:
+            hostname = find_col(row, host_cols)
+            if not hostname:
+                continue
+
+            name = find_col(row, name_cols) or hostname
+            port = find_col(row, port_cols) or "22"
+            folder = find_col(row, folder_cols)
+
+            item = QTreeWidgetItem()
+            item.setText(0, name)
+            item.setText(1, hostname)
+            item.setText(2, port)
+
+            if folder:
+                if folder not in folder_items:
+                    folder_item = QTreeWidgetItem()
+                    folder_item.setText(0, f"📁 {folder}")
+                    self._preview_tree.addTopLevelItem(folder_item)
+                    folder_items[folder] = folder_item
+                folder_items[folder].addChild(item)
+            else:
+                root_sessions.append(item)
+
+        # Add ungrouped sessions at root
+        for item in root_sessions:
+            self._preview_tree.addTopLevelItem(item)
+
+    def _load_json_preview(self, path: Path) -> None:
+        """Load JSON file and populate preview."""
+        with open(path) as f:
+            data = json.load(f)
+
+        self._import_data = data
+
+        # Create folder items
+        folder_items: dict[int, QTreeWidgetItem] = {}
+        for folder_data in data.get("folders", []):
+            item = QTreeWidgetItem()
+            item.setText(0, f"📁 {folder_data['name']}")
+            folder_items[folder_data["id"]] = item
+
+        # Parent folders
+        for folder_data in data.get("folders", []):
+            item = folder_items[folder_data["id"]]
+            parent_id = folder_data.get("parent_id")
+            if parent_id and parent_id in folder_items:
+                folder_items[parent_id].addChild(item)
+            else:
+                self._preview_tree.addTopLevelItem(item)
+
+        # Add sessions
+        for session_data in data.get("sessions", []):
+            item = QTreeWidgetItem()
+            item.setText(0, session_data.get("name", ""))
+            item.setText(1, session_data.get("hostname", ""))
+            item.setText(2, str(session_data.get("port", 22)))
+
+            folder_id = session_data.get("folder_id")
+            if folder_id and folder_id in folder_items:
+                folder_items[folder_id].addChild(item)
+            else:
+                self._preview_tree.addTopLevelItem(item)
+
     def _on_import(self) -> None:
         """Perform import."""
         if not self._import_path:
             return
 
         try:
-            imported, skipped = import_sessions(
-                self.store,
-                self._import_path,
-                merge=self._merge_check.isChecked()
-            )
+            if self._import_format == "csv":
+                folders, imported, skipped = import_sessions_csv(
+                    self.store,
+                    self._import_path,
+                    merge=self._merge_check.isChecked()
+                )
+                msg = f"Created {folders} folders.\nImported {imported} sessions."
+            else:
+                imported, skipped = import_sessions(
+                    self.store,
+                    self._import_path,
+                    merge=self._merge_check.isChecked()
+                )
+                msg = f"Imported {imported} sessions."
 
-            msg = f"Imported {imported} sessions."
             if skipped:
                 msg += f"\nSkipped {skipped} duplicates."