coralnet-toolbox 0.0.75__py2.py3-none-any.whl → 0.0.76__py2.py3-none-any.whl

coralnet_toolbox/QtEventFilter.py

@@ -24,7 +24,7 @@ class GlobalEventFilter(QObject):
         self.segment_deploy_model_dialog = main_window.segment_deploy_model_dialog
         self.sam_deploy_generator_dialog = main_window.sam_deploy_generator_dialog
         self.see_anything_deploy_generator_dialog = main_window.see_anything_deploy_generator_dialog
-        self.auto_distill_deploy_model_dialog = main_window.auto_distill_deploy_model_dialog
+        self.transformers_deploy_model_dialog = main_window.transformers_deploy_model_dialog
         
     def eventFilter(self, obj, event):
         # Check for explorer window first - this applies to all event types
@@ -75,10 +75,10 @@ class GlobalEventFilter(QObject):
                 if event.key() == Qt.Key_5:
                     self.see_anything_deploy_generator_dialog.predict()
                     return True
-                
-                # Handle hotkey for auto distill prediction
+
+                # Handle hotkey for transformers prediction
                 if event.key() == Qt.Key_6:
-                    self.auto_distill_deploy_model_dialog.predict()
+                    self.transformers_deploy_model_dialog.predict()
                     return True
 
                 # Handle annotation cycling hotkeys

coralnet_toolbox/QtMainWindow.py

@@ -9,6 +9,9 @@ import requests
 
 from packaging import version
 
+import torch
+
+from PyQt5 import sip
 from PyQt5.QtGui import QIcon, QMouseEvent
 from PyQt5.QtCore import Qt, pyqtSignal, QEvent, QSize, QPoint
 from PyQt5.QtWidgets import (QListWidget, QCheckBox, QFrame, QComboBox)
@@ -18,6 +21,7 @@ from PyQt5.QtWidgets import (QMainWindow, QApplication, QToolBar, QAction, QSize
                              QGroupBox)
 
 from coralnet_toolbox.QtEventFilter import GlobalEventFilter
+
 from coralnet_toolbox.QtAnnotationWindow import AnnotationWindow
 from coralnet_toolbox.QtConfidenceWindow import ConfidenceWindow
 from coralnet_toolbox.QtImageWindow import ImageWindow
@@ -99,9 +103,9 @@ from coralnet_toolbox.SeeAnything import (
     BatchInferenceDialog as SeeAnythingBatchInferenceDialog
 )
 
-from coralnet_toolbox.AutoDistill import (
-    DeployModelDialog as AutoDistillDeployModelDialog,
-    BatchInferenceDialog as AutoDistillBatchInferenceDialog
+from coralnet_toolbox.Transformers import (
+    DeployModelDialog as TransformersDeployModelDialog,
+    BatchInferenceDialog as TransformersBatchInferenceDialog
 )
 
 from coralnet_toolbox.CoralNet import (
@@ -114,9 +118,9 @@ from coralnet_toolbox.BreakTime import (
     BreakoutGame
 )
 
-from coralnet_toolbox.Icons import get_icon
+from coralnet_toolbox.QtSystemMonitor import SystemMonitor
 
-from coralnet_toolbox.utilities import get_available_device
+from coralnet_toolbox.Icons import get_icon
 
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -155,6 +159,7 @@ class MainWindow(QMainWindow):
         self.opaque_icon = get_icon("opaque.png")
         self.all_icon = get_icon("all.png")
         self.parameters_icon = get_icon("parameters.png")
+        self.system_monitor_icon = get_icon("system_monitor.png")
         self.add_icon = get_icon("add.png")
         self.remove_icon = get_icon("remove.png")
         self.edit_icon = get_icon("edit.png")
@@ -193,6 +198,8 @@ class MainWindow(QMainWindow):
         self.label_window = LabelWindow(self)
         self.confidence_window = ConfidenceWindow(self)
         
+        self.system_monitor = None
+        
         self.explorer_window = None  # Initialized in open_explorer_window
 
         # TODO update IO classes to have dialogs
@@ -262,9 +269,9 @@ class MainWindow(QMainWindow):
         self.see_anything_deploy_generator_dialog = SeeAnythingDeployGeneratorDialog(self)
         self.see_anything_batch_inference_dialog = SeeAnythingBatchInferenceDialog(self)
 
-        # Create dialogs (AutoDistill)
-        self.auto_distill_deploy_model_dialog = AutoDistillDeployModelDialog(self)
-        self.auto_distill_batch_inference_dialog = AutoDistillBatchInferenceDialog(self)
+        # Create dialogs (Transformers)
+        self.transformers_deploy_model_dialog = TransformersDeployModelDialog(self)
+        self.transformers_batch_inference_dialog = TransformersBatchInferenceDialog(self)
 
         # Create dialogs (Tile)
         self.classify_tile_dataset_dialog = ClassifyTileDatasetDialog(self)
@@ -601,6 +608,17 @@ class MainWindow(QMainWindow):
         self.ml_segment_video_inference_action = QAction("Segment", self)
         self.ml_segment_video_inference_action.triggered.connect(self.open_segment_video_inference_dialog)
         self.ml_video_inference_menu.addAction(self.ml_segment_video_inference_action) 
+        
+        # Transformers menu
+        self.transformers_menu = self.menu_bar.addMenu("Transformers")
+        # Deploy Model
+        self.transformers_deploy_model_action = QAction("Deploy Model", self)
+        self.transformers_deploy_model_action.triggered.connect(self.open_transformers_deploy_model_dialog)
+        self.transformers_menu.addAction(self.transformers_deploy_model_action)
+        # Batch Inference
+        self.transformers_batch_inference_action = QAction("Batch Inference", self)
+        self.transformers_batch_inference_action.triggered.connect(self.open_transformers_batch_inference_dialog)
+        self.transformers_menu.addAction(self.transformers_batch_inference_action)
 
         # SAM menu
         self.sam_menu = self.menu_bar.addMenu("SAM")
@@ -640,17 +658,6 @@ class MainWindow(QMainWindow):
         self.see_anything_batch_inference_action.triggered.connect(self.open_see_anything_batch_inference_dialog)
         self.see_anything_menu.addAction(self.see_anything_batch_inference_action)
 
-        # Auto Distill menu
-        self.auto_distill_menu = self.menu_bar.addMenu("AutoDistill")
-        # Deploy Model
-        self.auto_distill_deploy_model_action = QAction("Deploy Model", self)
-        self.auto_distill_deploy_model_action.triggered.connect(self.open_auto_distill_deploy_model_dialog)
-        self.auto_distill_menu.addAction(self.auto_distill_deploy_model_action)
-        # Batch Inference
-        self.auto_distill_batch_inference_action = QAction("Batch Inference", self)
-        self.auto_distill_batch_inference_action.triggered.connect(self.open_auto_distill_batch_inference_dialog)
-        self.auto_distill_menu.addAction(self.auto_distill_batch_inference_action)
-
         # Help menu
         self.help_menu = self.menu_bar.addMenu("Help")
 
@@ -659,9 +666,13 @@ class MainWindow(QMainWindow):
         self.check_for_updates_action.triggered.connect(self.open_check_for_updates_dialog)
         self.help_menu.addAction(self.check_for_updates_action)
         # Usage
-        self.usage_action = QAction("Usage", self)
+        self.usage_action = QAction("Usage / Hotkeys", self)
         self.usage_action.triggered.connect(self.open_usage_dialog)
         self.help_menu.addAction(self.usage_action)
+        # System Monitor
+        self.system_monitor_action = QAction("System Monitor", self)
+        self.system_monitor_action.triggered.connect(self.open_system_monitor_dialog)
+        self.help_menu.addAction(self.system_monitor_action)
         # Issues / Feature Requests
         self.create_issue_action = QAction("Issues / Feature Requests", self)
         self.create_issue_action.triggered.connect(self.open_create_new_issue_dialog)
@@ -828,15 +839,15 @@ class MainWindow(QMainWindow):
         self.toolbar.addWidget(spacer)
 
         # Add the device label widget as an action in the toolbar
-        self.devices = get_available_device()
-        self.current_device_index = 0
-        self.device = self.devices[self.current_device_index]
+        self.devices = self.get_available_devices()
+        # Get the 'best' device available
+        self.device = self.devices[-1]
 
         if self.device.startswith('cuda'):
-            if len(self.devices) == 1:
-                device_icon = self.rabbit_icon
-            else:
+            if len([d for d in self.devices if d.endswith('cuda')]) > 1:
                 device_icon = self.rocket_icon
+            else:
+                device_icon = self.rabbit_icon
             device_tooltip = self.device
         elif self.device == 'mps':
             device_icon = self.apple_icon
@@ -1028,9 +1039,9 @@ class MainWindow(QMainWindow):
         self.left_layout.addWidget(self.annotation_window, 85)
         self.left_layout.addWidget(self.label_window, 15)
 
-        # Add widgets to right layout
-        self.right_layout.addWidget(self.image_window, 54)
-        self.right_layout.addWidget(self.confidence_window, 46)
+        # Adjust the right layout with new proportions
+        self.right_layout.addWidget(self.image_window, 54)  # 54% for image window
+        self.right_layout.addWidget(self.confidence_window, 46)  # 46% for confidence window
 
         # Add left and right layouts to main layout
         self.main_layout.addLayout(self.left_layout, 85)
@@ -1054,12 +1065,17 @@ class MainWindow(QMainWindow):
         self.showMaximized()
 
     def closeEvent(self, event):
-        """Ensure the explorer window is closed when the main window closes."""
+        """Ensure the explorer window and system monitor are closed when the main window closes."""
         if self.explorer_window:
             # Setting parent to None prevents it from being deleted with main window
             # before it can be properly handled.
             self.explorer_window.setParent(None)
             self.explorer_window.close()
+        
+        # Close the system monitor if it exists
+        if self.system_monitor:
+            self.system_monitor.close()
+            
         super().closeEvent(event)
 
     def changeEvent(self, event):
@@ -1374,6 +1390,20 @@ class MainWindow(QMainWindow):
             self.sam_tool_action.setChecked(False)
             self.see_anything_tool_action.setChecked(False)
             self.work_area_tool_action.setChecked(False)
+    
+    def get_available_devices(self):
+        """
+        Get available devices
+
+        :return:
+        """
+        devices = ['cpu',]
+        if torch.backends.mps.is_available():
+            devices.append('mps')
+        if torch.cuda.is_available():
+            for i in range(torch.cuda.device_count()):
+                devices.append(f'cuda:{i}')
+        return devices
 
     def toggle_device(self):
         dialog = DeviceSelectionDialog(self.devices, self)
@@ -2211,6 +2241,40 @@ class MainWindow(QMainWindow):
             self.segment_video_inference_dialog.exec_()
         except Exception as e:
             QMessageBox.critical(self, "Critical Error", f"{e}")
+            
+    def open_transformers_deploy_model_dialog(self):
+        """Open the Transformers Deploy Model dialog to deploy an Transformers model."""
+        if not self.image_window.raster_manager.image_paths:
+            QMessageBox.warning(self,
+                                "Transformers Deploy Model",
+                                "No images are present in the project.")
+            return
+
+        try:
+            self.untoggle_all_tools()
+            self.transformers_deploy_model_dialog.exec_()
+        except Exception as e:
+            QMessageBox.critical(self, "Critical Error", f"{e}")
+
+    def open_transformers_batch_inference_dialog(self):
+        """Open the Transformers Batch Inference dialog to run batch inference with Transformers."""
+        if not self.image_window.raster_manager.image_paths:
+            QMessageBox.warning(self,
+                                "Transformers Batch Inference",
+                                "No images are present in the project.")
+            return
+
+        if not self.transformers_deploy_model_dialog.loaded_model:
+            QMessageBox.warning(self,
+                                "Transformers Batch Inference",
+                                "Please deploy a model before running batch inference.")
+            return
+
+        try:
+            self.untoggle_all_tools()
+            self.transformers_batch_inference_dialog.exec_()
+        except Exception as e:
+            QMessageBox.critical(self, "Critical Error", f"{e}")
 
     def open_sam_deploy_predictor_dialog(self):
         """Open the SAM Deploy Predictor dialog to deploy a SAM predictor."""
@@ -2328,40 +2392,16 @@ class MainWindow(QMainWindow):
             self.see_anything_batch_inference_dialog.exec_()
         except Exception as e:
             QMessageBox.critical(self, "Critical Error", f"{e}")
-
-    def open_auto_distill_deploy_model_dialog(self):
-        """Open the AutoDistill Deploy Model dialog to deploy an AutoDistill model."""
-        if not self.image_window.raster_manager.image_paths:
-            QMessageBox.warning(self,
-                                "AutoDistill Deploy Model",
-                                "No images are present in the project.")
-            return
-
-        try:
-            self.untoggle_all_tools()
-            self.auto_distill_deploy_model_dialog.exec_()
-        except Exception as e:
-            QMessageBox.critical(self, "Critical Error", f"{e}")
-
-    def open_auto_distill_batch_inference_dialog(self):
-        """Open the AutoDistill Batch Inference dialog to run batch inference with AutoDistill."""
-        if not self.image_window.raster_manager.image_paths:
-            QMessageBox.warning(self,
-                                "AutoDistill Batch Inference",
-                                "No images are present in the project.")
-            return
-
-        if not self.auto_distill_deploy_model_dialog.loaded_model:
-            QMessageBox.warning(self,
-                                "AutoDistill Batch Inference",
-                                "Please deploy a model before running batch inference.")
-            return
-
-        try:
-            self.untoggle_all_tools()
-            self.auto_distill_batch_inference_dialog.exec_()
-        except Exception as e:
-            QMessageBox.critical(self, "Critical Error", f"{e}")
+            
+    def open_system_monitor_dialog(self):
+        """Open the system system monitor window."""
+        if self.system_monitor is None or sip.isdeleted(self.system_monitor):
+            self.system_monitor = SystemMonitor()
+        
+        # Show the monitor window
+        self.system_monitor.show()
+        self.system_monitor.activateWindow()
+        self.system_monitor.raise_()
             
     def open_usage_dialog(self):
         """Display QMessageBox with link to create new issue on GitHub."""

coralnet_toolbox/QtProgressBar.py

@@ -39,6 +39,7 @@ class ProgressBar(QDialog):
 
         # Create cancel button
         self.cancel_button = QPushButton("Cancel", self)
+        self.cancel_button.setEnabled(False)
         self.cancel_button.clicked.connect(self.cancel)
 
         # Setup layout