Merge branch 'improve' into main

Author: CVHub520

anylabeling/views/labeling/chatbot/chat.py

@@ -1,5 +1,6 @@
 from PyQt5.QtCore import (
     QEasingCurve,
+    QEvent,
     QPropertyAnimation,
     QTimer,
     Qt,
@@ -13,6 +14,7 @@
     QMessageBox,
     QMenu,
     QPushButton,
+    QScrollArea,
     QSizePolicy,
     QVBoxLayout,
     QTextEdit,
@@ -367,6 +369,7 @@ def _create_content_label(self, processed_content):
             self.original_content = processed_content
             web_view.page().urlChanged.connect(self.handle_external_link)
             web_view.setHtml(convert_markdown_to_html(processed_content))
+            web_view.installEventFilter(self)
             return web_view
 
     def set_action_buttons_enabled(self, enabled):
@@ -419,6 +422,27 @@ def resizeEvent(self, event):
         if not self.resize_in_progress:
             self.update_width_constraint()
 
+    def wheelEvent(self, event):
+        """Forward wheel events to parent scroll area"""
+        parent = self.parent()
+        while parent:
+            if isinstance(parent, QScrollArea):
+                parent.wheelEvent(event)
+                return
+            parent = parent.parent()
+        super().wheelEvent(event)
+
+    def eventFilter(self, obj, event):
+        """Filter events to forward wheel events from QWebEngineView to scroll area"""
+        if isinstance(obj, QWebEngineView) and event.type() == QEvent.Wheel:
+            parent = self.parent()
+            while parent:
+                if isinstance(parent, QScrollArea):
+                    parent.wheelEvent(event)
+                    return True
+                parent = parent.parent()
+        return super().eventFilter(obj, event)
+
     def copy_content_to_clipboard(self, button=None):
         """Copy message content to clipboard with visual feedback"""
         # Copy the content to clipboard
@@ -446,8 +470,10 @@ def adjust_height_after_animation(self):
         self.resize_in_progress = True
         try:
             if isinstance(self.content_label, QWebEngineView):
+                # Check if document.body exists before accessing scrollHeight
                 self.content_label.page().runJavaScript(
-                    "document.body.scrollHeight;", self.apply_webview_height
+                    "document.body ? document.body.scrollHeight : 0;",
+                    self.apply_webview_height,
                 )
                 return
 

anylabeling/views/labeling/chatbot/general.py

@@ -1,3 +1,5 @@
+import os
+
 from PyQt5.QtCore import (
     Qt,
     pyqtSignal,
@@ -9,6 +11,7 @@
     QPushButton,
     QVBoxLayout,
     QTextEdit,
+    QSpinBox,
 )
 
 
@@ -22,6 +25,11 @@ def __init__(self, parent=None):
         self.parent = parent
         self.setWindowTitle(self.tr("Batch Process All Images"))
         self.setMinimumWidth(450)
+        
+        self.cpu_count = os.cpu_count() or 1
+        self.max_concurrency = max(1, int(self.cpu_count * 0.95))
+        self.default_concurrency = max(1, int(self.cpu_count * 0.8))
+        
         self.setup_ui()
 
     def setup_ui(self):
@@ -98,6 +106,61 @@ def setup_ui(self):
         )
         dialog_layout.addWidget(self.batch_message_input)
 
+        # Concurrency setting
+        settings_container = QHBoxLayout()
+        settings_container.setContentsMargins(0, 0, 0, 0)
+        settings_container.setSpacing(8)
+        settings_container.addStretch()
+
+        concurrency_label = QLabel(self.tr("Concurrency:"))
+        concurrency_label.setStyleSheet(
+            """
+            QLabel {
+                font-size: 12px;
+                color: #6B7280;
+                font-weight: 400;
+            }
+        """
+        )
+        settings_container.addWidget(concurrency_label)
+
+        self.concurrency_spinbox = QSpinBox()
+        self.concurrency_spinbox.setMinimum(1)
+        self.concurrency_spinbox.setMaximum(self.max_concurrency)
+        self.concurrency_spinbox.setValue(self.default_concurrency)
+        tooltip_text = self.tr("Max: {}").format(self.max_concurrency)
+        self.concurrency_spinbox.setToolTip(tooltip_text)
+        self.concurrency_spinbox.setSuffix(f" / {self.max_concurrency}")
+        self.concurrency_spinbox.setStyleSheet(
+            """
+            QSpinBox {
+                border: 1px solid #E5E7EB;
+                border-radius: 4px;
+                background-color: #FFFFFF;
+                color: #1F2937;
+                font-size: 12px;
+                padding: 4px 8px;
+                min-width: 80px;
+                max-width: 80px;
+            }
+            QSpinBox:focus {
+                border: 1px solid #6366F1;
+                background-color: #F9FAFB;
+            }
+            QSpinBox::up-button, QSpinBox::down-button {
+                width: 16px;
+                border: none;
+                background: transparent;
+            }
+            QSpinBox::up-button:hover, QSpinBox::down-button:hover {
+                background-color: #F3F4F6;
+            }
+        """
+        )
+        settings_container.addWidget(self.concurrency_spinbox)
+
+        dialog_layout.addLayout(settings_container)
+
         # Button layout
         button_layout = QHBoxLayout()
         button_layout.setContentsMargins(0, 8, 0, 0)
@@ -178,6 +241,10 @@ def get_prompt(self):
         """Get the user input prompt"""
         return self.batch_message_input.toPlainText().strip()
 
+    def get_concurrency(self):
+        """Get the concurrency setting"""
+        return self.concurrency_spinbox.value()
+
     def exec_(self):
         """Override exec_ method to adjust position before showing the dialog"""
         self.adjustSize()
@@ -186,7 +253,8 @@ def exec_(self):
 
         if result == QDialog.Accepted:
             prompt = self.get_prompt()
+            concurrency = self.get_concurrency()
             if prompt:
                 self.promptReady.emit(prompt)
-                return prompt
-        return ""
+                return (prompt, concurrency)
+        return None