ntermqt 0.1.3__tar.gz → 0.1.5__tar.gz

{ntermqt-0.1.3 → ntermqt-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ntermqt
-Version: 0.1.3
+Version: 0.1.5
 Summary: Modern SSH terminal widget for PyQt6 with credential vault and jump host support
 Author: Scott Peterman
 License: GPL-3.0
@@ -26,22 +26,21 @@ Requires-Dist: paramiko>=3.0.0
 Requires-Dist: cryptography>=41.0.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: click>=8.0.0
+Requires-Dist: ipython>=8.0.0
+Requires-Dist: requests>=2.10.0
+Requires-Dist: textfsm>=2.0.0
 Requires-Dist: pexpect>=4.8.0; sys_platform != "win32"
 Requires-Dist: pywinpty>=2.0.0; sys_platform == "win32"
 Provides-Extra: keyring
 Requires-Dist: keyring>=24.0.0; extra == "keyring"
-Provides-Extra: scripting
-Requires-Dist: ipython>=8.0.0; extra == "scripting"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pyinstaller; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
-Requires-Dist: ipython>=8.0.0; extra == "dev"
 Provides-Extra: all
 Requires-Dist: keyring>=24.0.0; extra == "all"
-Requires-Dist: ipython>=8.0.0; extra == "all"
 
 # nterm
 
@@ -59,9 +58,11 @@ Built for managing hundreds of devices through bastion hosts with hardware secur
 
 **Terminal**
 - xterm.js rendering via QWebEngineView — full VT100/ANSI support
-- Built-in themes: Catppuccin, Dracula, Nord, Solarized, Gruvbox (dark/light/hybrid)
+- 12 built-in themes: Catppuccin, Dracula, Nord, Solarized, Gruvbox, Enterprise variants
+- Hybrid themes: dark UI chrome with light terminal for readability
 - Custom YAML themes with independent terminal and UI colors
 - Tab or window per session — pop sessions to separate windows
+- Session capture to file (clean text, ANSI stripped)
 - Unicode, emoji, box-drawing characters
 
 **Authentication**
@@ -306,19 +307,33 @@ session.connect()
 
 ## Themes
 
-### Built-in
+nterm includes 12 built-in themes covering dark, light, and hybrid styles.
+
+### Built-in Themes
 
 ```python
-Theme.default()         # Catppuccin Mocha
-Theme.dracula()         # Dracula
-Theme.nord()            # Nord
-Theme.solarized_dark()  # Solarized Dark
-Theme.gruvbox_dark()    # Gruvbox Dark
-Theme.gruvbox_light()   # Gruvbox Light
-Theme.gruvbox_hybrid()  # Dark UI + Light terminal
+# Dark themes
+Theme.default()           # Catppuccin Mocha
+Theme.dracula()           # Dracula
+Theme.nord()              # Nord
+Theme.solarized_dark()    # Solarized Dark
+Theme.gruvbox_dark()      # Gruvbox Dark
+Theme.enterprise_dark()   # Microsoft-inspired dark
+
+# Light themes
+Theme.gruvbox_light()     # Gruvbox Light
+Theme.enterprise_light()  # Microsoft-inspired light
+Theme.clean()             # Warm paper tones
+
+# Hybrid themes (dark UI + light terminal)
+Theme.gruvbox_hybrid()    # Gruvbox dark chrome, light terminal
+Theme.nord_hybrid()       # Nord polar night chrome, snow storm terminal
+Theme.enterprise_hybrid() # VS Code-style dark/light split
 ```
 
-### Custom YAML
+**Hybrid themes** combine a dark application chrome (menus, tabs, sidebars) with a light terminal for maximum readability — ideal for long sessions reviewing configs or logs.
+
+### Custom YAML Themes
 
 ```yaml
 # ~/.nterm/themes/my-theme.yaml
@@ -347,6 +362,19 @@ accent_color: "#7aa2f7"
 
 ---
 
+## Session Capture
+
+Capture session output to a file for documentation, auditing, or extracting config snippets.
+
+**Right-click in terminal → Start Capture...** to begin recording. Output is saved as clean text with ANSI escape sequences stripped — ready for grep, diff, or pasting into tickets.
+
+- Per-session capture (each tab independent)
+- File dialog for save location
+- Menu shows active capture filename
+- Auto-stops when session closes
+
+---
+
 ## Jump Hosts
 
 ```python

{ntermqt-0.1.3 → ntermqt-0.1.5}/README.md

@@ -14,9 +14,11 @@ Built for managing hundreds of devices through bastion hosts with hardware secur
 
 **Terminal**
 - xterm.js rendering via QWebEngineView — full VT100/ANSI support
-- Built-in themes: Catppuccin, Dracula, Nord, Solarized, Gruvbox (dark/light/hybrid)
+- 12 built-in themes: Catppuccin, Dracula, Nord, Solarized, Gruvbox, Enterprise variants
+- Hybrid themes: dark UI chrome with light terminal for readability
 - Custom YAML themes with independent terminal and UI colors
 - Tab or window per session — pop sessions to separate windows
+- Session capture to file (clean text, ANSI stripped)
 - Unicode, emoji, box-drawing characters
 
 **Authentication**
@@ -261,19 +263,33 @@ session.connect()
 
 ## Themes
 
-### Built-in
+nterm includes 12 built-in themes covering dark, light, and hybrid styles.
+
+### Built-in Themes
 
 ```python
-Theme.default()         # Catppuccin Mocha
-Theme.dracula()         # Dracula
-Theme.nord()            # Nord
-Theme.solarized_dark()  # Solarized Dark
-Theme.gruvbox_dark()    # Gruvbox Dark
-Theme.gruvbox_light()   # Gruvbox Light
-Theme.gruvbox_hybrid()  # Dark UI + Light terminal
+# Dark themes
+Theme.default()           # Catppuccin Mocha
+Theme.dracula()           # Dracula
+Theme.nord()              # Nord
+Theme.solarized_dark()    # Solarized Dark
+Theme.gruvbox_dark()      # Gruvbox Dark
+Theme.enterprise_dark()   # Microsoft-inspired dark
+
+# Light themes
+Theme.gruvbox_light()     # Gruvbox Light
+Theme.enterprise_light()  # Microsoft-inspired light
+Theme.clean()             # Warm paper tones
+
+# Hybrid themes (dark UI + light terminal)
+Theme.gruvbox_hybrid()    # Gruvbox dark chrome, light terminal
+Theme.nord_hybrid()       # Nord polar night chrome, snow storm terminal
+Theme.enterprise_hybrid() # VS Code-style dark/light split
 ```
 
-### Custom YAML
+**Hybrid themes** combine a dark application chrome (menus, tabs, sidebars) with a light terminal for maximum readability — ideal for long sessions reviewing configs or logs.
+
+### Custom YAML Themes
 
 ```yaml
 # ~/.nterm/themes/my-theme.yaml
@@ -302,6 +318,19 @@ accent_color: "#7aa2f7"
 
 ---
 
+## Session Capture
+
+Capture session output to a file for documentation, auditing, or extracting config snippets.
+
+**Right-click in terminal → Start Capture...** to begin recording. Output is saved as clean text with ANSI escape sequences stripped — ready for grep, diff, or pasting into tickets.
+
+- Per-session capture (each tab independent)
+- File dialog for save location
+- Menu shows active capture filename
+- Auto-stops when session closes
+
+---
+
 ## Jump Hosts
 
 ```python

{ntermqt-0.1.3 → ntermqt-0.1.5}/nterm/__main__.py

@@ -20,6 +20,8 @@ from nterm.manager import (
     SessionTreeWidget, SessionStore, SavedSession, QuickConnectDialog,
     SettingsDialog, ExportDialog, ImportDialog, ImportTerminalTelemetryDialog
 )
+from nterm.parser.ntc_download_dialog import NTCDownloadDialog
+from nterm.parser.api_help_dialog import APIHelpDialog
 from nterm.terminal.widget import TerminalWidget
 from nterm.session.ssh import SSHSession
 from nterm.session.local_terminal import LocalTerminal
@@ -457,6 +459,25 @@ class MainWindow(QMainWindow):
         shell_window_action.triggered.connect(lambda: self._open_local("Shell", LocalTerminal(), "window"))
         shell_menu.addAction(shell_window_action)
 
+        # Separator before tools
+        dev_menu.addSeparator()
+
+        # Download NTC Templates
+        download_templates_action = QAction("Download &NTC Templates...", self)
+        download_templates_action.triggered.connect(self._on_download_ntc_templates)
+        dev_menu.addAction(download_templates_action)
+
+        # TextFSM Template Tester
+        template_tester_action = QAction("TextFSM &Template Tester...", self)
+        template_tester_action.triggered.connect(self._on_textfsm_tester)
+        dev_menu.addAction(template_tester_action)
+
+        # API Help
+        api_help_action = QAction("&API Help...", self)
+        api_help_action.setShortcut(QKeySequence("F1"))
+        api_help_action.triggered.connect(self._on_api_help)
+        dev_menu.addAction(api_help_action)
+
     def _on_import_sessions(self):
         """Show import dialog."""
         dialog = ImportDialog(self.session_store, self)
@@ -474,6 +495,33 @@ class MainWindow(QMainWindow):
         if dialog.exec():
             self.session_tree.refresh()
 
+    def _on_download_ntc_templates(self):
+        """Show NTC template download dialog."""
+        # Use the same db path as the TextFSM engine would use
+        db_path = Path.cwd() / "tfsm_templates.db"
+        dialog = NTCDownloadDialog(self, str(db_path))
+        dialog.exec()
+
+    def _on_textfsm_tester(self):
+        """Launch TextFSM Template Tester."""
+        import subprocess
+        import sys
+
+        # Launch as separate process
+        try:
+            subprocess.Popen([sys.executable, "-m", "nterm.parser.tfsm_fire_tester"])
+        except Exception as e:
+            QMessageBox.critical(
+                self,
+                "Launch Error",
+                f"Failed to launch TextFSM Template Tester:\n{e}"
+            )
+
+    def _on_api_help(self):
+        """Show API help dialog."""
+        dialog = APIHelpDialog(self)
+        dialog.exec()
+
     def _on_settings(self):
         """Show settings dialog."""
         dialog = SettingsDialog(self.theme_engine, self.current_theme, self)

{ntermqt-0.1.3 → ntermqt-0.1.5}/nterm/manager/tree.py

@@ -26,121 +26,140 @@ class ItemType(Enum):
     SESSION = auto()
 
 
+class DragDropTreeWidget(QTreeWidget):
+    """
+    QTreeWidget subclass that emits a signal after internal drag-drop operations.
+    """
+
+    items_moved = pyqtSignal()  # Emitted after a drop completes
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+    def dropEvent(self, event):
+        """Handle drop - let Qt do the visual move, then signal for persistence."""
+        # Let Qt handle the visual rearrangement
+        super().dropEvent(event)
+        # Signal that items have moved and need persistence
+        self.items_moved.emit()
+
+
 class SessionTreeWidget(QWidget):
     """
     Tree-based session browser with filtering.
-    
+
     Signals:
         connect_requested(session, mode): Emitted when user wants to connect
         session_selected(session): Emitted when selection changes
     """
-    
+
     # Connect modes
     MODE_TAB = "tab"
     MODE_WINDOW = "window"
     MODE_QUICK = "quick"
-    
+
     # Signals
     connect_requested = pyqtSignal(object, str)  # (SavedSession, mode)
     session_selected = pyqtSignal(object)  # SavedSession or None
     quick_connect_requested = pyqtSignal()  # For quick connect dialog
-    
+
     def __init__(self, store: SessionStore = None, parent: QWidget = None):
         super().__init__(parent)
         self.store = store or SessionStore()
-        
+
         self._filter_timer = QTimer()
         self._filter_timer.setSingleShot(True)
         self._filter_timer.timeout.connect(self._apply_filter)
-        
+
         self._setup_ui()
         self.refresh()
-    
+
     def _setup_ui(self) -> None:
         """Build the UI."""
         layout = QVBoxLayout(self)
         layout.setContentsMargins(0, 0, 0, 0)
         layout.setSpacing(4)
-        
+
         # Toolbar row
         toolbar = QHBoxLayout()
         toolbar.setSpacing(4)
-        
+
         # Filter input
         self._filter_input = QLineEdit()
         self._filter_input.setPlaceholderText("Filter sessions...")
         self._filter_input.setClearButtonEnabled(True)
         self._filter_input.textChanged.connect(self._on_filter_changed)
         toolbar.addWidget(self._filter_input, 1)
-        
+
         # Quick connect button
         self._quick_btn = QPushButton("Quick Connect")
         self._quick_btn.clicked.connect(self.quick_connect_requested.emit)
         toolbar.addWidget(self._quick_btn)
-        
+
         layout.addLayout(toolbar)
-        
-        # Tree widget
-        self._tree = QTreeWidget()
+
+        # Tree widget (using our custom subclass)
+        self._tree = DragDropTreeWidget()
         self._tree.setHeaderHidden(True)
         self._tree.setRootIsDecorated(True)
         self._tree.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
         self._tree.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self._tree.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove)
         self._tree.setAnimated(True)
-        
+
         # Signals
         self._tree.itemDoubleClicked.connect(self._on_double_click)
         self._tree.itemSelectionChanged.connect(self._on_selection_changed)
         self._tree.customContextMenuRequested.connect(self._show_context_menu)
         self._tree.itemExpanded.connect(self._on_item_expanded)
         self._tree.itemCollapsed.connect(self._on_item_collapsed)
-        
+        self._tree.items_moved.connect(self._persist_tree_state)  # Handle drag-drop
+
         layout.addWidget(self._tree)
-        
+
         # Action buttons row
         btn_row = QHBoxLayout()
         btn_row.setSpacing(4)
-        
+
         self._connect_tab_btn = QPushButton("Connect")
         self._connect_tab_btn.setToolTip("Connect in new tab")
         self._connect_tab_btn.clicked.connect(lambda: self._connect_selected(self.MODE_TAB))
         self._connect_tab_btn.setEnabled(False)
         btn_row.addWidget(self._connect_tab_btn)
-        
+
         self._connect_win_btn = QPushButton("New")
         self._connect_win_btn.setToolTip("Connect in separate window")
         self._connect_win_btn.clicked.connect(lambda: self._connect_selected(self.MODE_WINDOW))
         self._connect_win_btn.setEnabled(False)
         btn_row.addWidget(self._connect_win_btn)
-        
+
         btn_row.addStretch()
-        
+
         self._add_btn = QPushButton("+")
         self._add_btn.setFixedWidth(32)
         self._add_btn.setToolTip("Add session or folder")
         self._add_btn.clicked.connect(self._show_add_menu)
         btn_row.addWidget(self._add_btn)
-        
+
         layout.addLayout(btn_row)
-    
+
     # -------------------------------------------------------------------------
     # Public API
     # -------------------------------------------------------------------------
-    
+
     def refresh(self) -> None:
         """Reload tree from store."""
         self._tree.clear()
         tree_data = self.store.get_tree()
-        
+
         # Build folder lookup
         folder_items: dict[int, QTreeWidgetItem] = {}
-        
+
         # First pass: create all folder items
         for folder in tree_data["folders"]:
             item = self._create_folder_item(folder)
             folder_items[folder.id] = item
-        
+
         # Second pass: parent folders correctly
         for folder in tree_data["folders"]:
             item = folder_items[folder.id]
@@ -148,10 +167,10 @@ class SessionTreeWidget(QWidget):
                 folder_items[folder.parent_id].addChild(item)
             else:
                 self._tree.addTopLevelItem(item)
-            
+
             # Restore expanded state
             item.setExpanded(folder.expanded)
-        
+
         # Add sessions
         for session in tree_data["sessions"]:
             item = self._create_session_item(session)
@@ -159,9 +178,9 @@ class SessionTreeWidget(QWidget):
                 folder_items[session.folder_id].addChild(item)
             else:
                 self._tree.addTopLevelItem(item)
-        
+
         self._apply_filter()
-    
+
     def get_selected_session(self) -> Optional[SavedSession]:
         """Get currently selected session, or None."""
         items = self._tree.selectedItems()
@@ -172,17 +191,17 @@ class SessionTreeWidget(QWidget):
             session_id = item.data(0, ROLE_ITEM_ID)
             return self.store.get_session(session_id)
         return None
-    
+
     def select_session(self, session_id: int) -> None:
         """Select a session by ID."""
         item = self._find_session_item(session_id)
         if item:
             self._tree.setCurrentItem(item)
-    
+
     # -------------------------------------------------------------------------
     # Item creation
     # -------------------------------------------------------------------------
-    
+
     def _create_folder_item(self, folder: SessionFolder) -> QTreeWidgetItem:
         """Create tree item for a folder."""
         item = QTreeWidgetItem()
@@ -190,31 +209,32 @@ class SessionTreeWidget(QWidget):
         item.setData(0, ROLE_ITEM_TYPE, ItemType.FOLDER)
         item.setData(0, ROLE_ITEM_ID, folder.id)
         item.setFlags(
-            item.flags() | 
+            item.flags() |
+            Qt.ItemFlag.ItemIsDragEnabled |  # Folders can be dragged too
             Qt.ItemFlag.ItemIsDropEnabled
         )
         return item
-    
+
     def _create_session_item(self, session: SavedSession) -> QTreeWidgetItem:
         """Create tree item for a session."""
         item = QTreeWidgetItem()
-        
+
         # Display text
         display = f"🖥 {session.name}"
         if session.description:
             display += f"  ({session.description})"
         item.setText(0, display)
         item.setToolTip(0, f"{session.hostname}:{session.port}")
-        
+
         item.setData(0, ROLE_ITEM_TYPE, ItemType.SESSION)
         item.setData(0, ROLE_ITEM_ID, session.id)
         item.setFlags(
-            item.flags() | 
+            item.flags() |
             Qt.ItemFlag.ItemIsDragEnabled |
             Qt.ItemFlag.ItemNeverHasChildren
         )
         return item
-    
+
     def _find_session_item(self, session_id: int) -> Optional[QTreeWidgetItem]:
         """Find tree item for a session ID."""
         iterator = self._tree_iterator()
@@ -223,7 +243,7 @@ class SessionTreeWidget(QWidget):
                 item.data(0, ROLE_ITEM_ID) == session_id):
                 return item
         return None
-    
+
     def _tree_iterator(self):
         """Iterate all items in tree."""
         def recurse(parent):
@@ -231,11 +251,74 @@ class SessionTreeWidget(QWidget):
                 child = parent.child(i)
                 yield child
                 yield from recurse(child)
-        
+
         for i in range(self._tree.topLevelItemCount()):
             item = self._tree.topLevelItem(i)
             yield item
             yield from recurse(item)
+
+    # -------------------------------------------------------------------------
+    # Drag-drop persistence
+    # -------------------------------------------------------------------------
+
+    def _persist_tree_state(self) -> None:
+        """
+        Persist the current tree state to the store after drag-drop.
+
+        Walks the visual tree and updates folder_id/parent_id and positions
+        to match the current visual arrangement.
+        """
+        def get_folder_id_for_item(item: QTreeWidgetItem) -> Optional[int]:
+            """Get the folder ID that contains this item, or None for root."""
+            parent = item.parent()
+            if parent is None:
+                return None
+            # Parent should be a folder
+            if parent.data(0, ROLE_ITEM_TYPE) == ItemType.FOLDER:
+                return parent.data(0, ROLE_ITEM_ID)
+            return None
+
+        def process_children(parent_item, parent_folder_id: Optional[int]) -> None:
+            """Process all children of a parent (either root or folder)."""
+            if parent_item is None:
+                # Processing root level
+                count = self._tree.topLevelItemCount()
+                for pos in range(count):
+                    item = self._tree.topLevelItem(pos)
+                    process_item(item, None, pos)
+            else:
+                # Processing folder children
+                count = parent_item.childCount()
+                for pos in range(count):
+                    item = parent_item.child(pos)
+                    process_item(item, parent_folder_id, pos)
+
+        def process_item(item: QTreeWidgetItem, parent_folder_id: Optional[int], position: int) -> None:
+            """Process a single item - update its position and parent."""
+            item_type = item.data(0, ROLE_ITEM_TYPE)
+            item_id = item.data(0, ROLE_ITEM_ID)
+
+            if item_type == ItemType.SESSION:
+                # Update session's folder and position
+                session = self.store.get_session(item_id)
+                if session and (session.folder_id != parent_folder_id or session.position != position):
+                    session.folder_id = parent_folder_id
+                    session.position = position
+                    self.store.update_session(session)
+
+            elif item_type == ItemType.FOLDER:
+                # Update folder's parent and position
+                folder = self.store.get_folder(item_id)
+                if folder and (folder.parent_id != parent_folder_id or folder.position != position):
+                    folder.parent_id = parent_folder_id
+                    folder.position = position
+                    self.store.update_folder(folder)
+
+                # Recursively process folder's children
+                process_children(item, item_id)
+
+        # Start processing from root level
+        process_children(None, None)
     
     # -------------------------------------------------------------------------
     # Filtering