Fix UI to add widget for Admin overrides

Author: kPatch

coffee_ws/src/coffee_voice_agent/coffee_voice_agent/voice_agent_bridge.py

@@ -22,7 +22,7 @@
 from rclpy.parameter import Parameter
 from std_msgs.msg import String, Bool
 from geometry_msgs.msg import Twist
-from coffee_voice_agent_msgs.msg import AgentStatus, ToolEvent
+from coffee_voice_agent_msgs.msg import AgentStatus, ToolEvent, VipDetection, ExtensionEvent
 
 try:
     import websockets
@@ -103,6 +103,20 @@ def __init__(self):
             callback_group=self.callback_group
         )
 
+        self.vip_detection_pub = self.create_publisher(
+            VipDetection,
+            'voice_agent/vip_detections',
+            10,
+            callback_group=self.callback_group
+        )
+        
+        self.extension_event_pub = self.create_publisher(
+            ExtensionEvent,
+            'voice_agent/extension_events',
+            10,
+            callback_group=self.callback_group
+        )
+        
         # ROS2 Subscribers (ROS2 → Voice Agent)
         self.virtual_request_sub = self.create_subscription(
             String,
@@ -264,6 +278,60 @@ async def _handle_websocket_message(self, message: str):
                 speech_msg.data = user_text
                 self.user_speech_pub.publish(speech_msg)
 
+            elif message_type == 'VIP_DETECTED':
+                # Handle VIP user detection events
+                vip_data = data.get('data', {})
+                
+                self.get_logger().info(f"VIP Detection: {vip_data.get('user_identifier', 'unknown')} - {vip_data.get('importance_level', 'unknown')}")
+                
+                # Publish VIP detection to ROS2 topic
+                vip_msg = VipDetection()
+                vip_msg.user_identifier = vip_data.get('user_identifier', '')
+                vip_msg.matched_keywords = vip_data.get('matched_keywords', [])
+                vip_msg.importance_level = vip_data.get('importance_level', 'normal')
+                vip_msg.recommended_extension_minutes = vip_data.get('recommended_extension_minutes', 0)
+                
+                # Parse timestamp if provided, otherwise use current time
+                timestamp_str = vip_data.get('timestamp')
+                if timestamp_str:
+                    try:
+                        dt = datetime.datetime.fromisoformat(timestamp_str.replace('Z', '+00:00'))
+                        vip_msg.timestamp.sec = int(dt.timestamp())
+                        vip_msg.timestamp.nanosec = int((dt.timestamp() % 1) * 1e9)
+                    except:
+                        vip_msg.timestamp = self.get_clock().now().to_msg()
+                else:
+                    vip_msg.timestamp = self.get_clock().now().to_msg()
+                    
+                self.vip_detection_pub.publish(vip_msg)
+                
+            elif message_type == 'EXTENSION_GRANTED':
+                # Handle conversation extension events
+                extension_data = data.get('data', {})
+                
+                self.get_logger().info(f"Extension Event: {extension_data.get('action', 'unknown')} - {extension_data.get('extension_minutes', 0)} minutes")
+                
+                # Publish extension event to ROS2 topic
+                extension_msg = ExtensionEvent()
+                extension_msg.action = extension_data.get('action', 'unknown')
+                extension_msg.extension_minutes = extension_data.get('extension_minutes', 0)
+                extension_msg.reason = extension_data.get('reason', '')
+                extension_msg.granted_by = extension_data.get('granted_by', 'unknown')
+                
+                # Parse timestamp if provided, otherwise use current time
+                timestamp_str = extension_data.get('timestamp')
+                if timestamp_str:
+                    try:
+                        dt = datetime.datetime.fromisoformat(timestamp_str.replace('Z', '+00:00'))
+                        extension_msg.timestamp.sec = int(dt.timestamp())
+                        extension_msg.timestamp.nanosec = int((dt.timestamp() % 1) * 1e9)
+                    except:
+                        extension_msg.timestamp = self.get_clock().now().to_msg()
+                else:
+                    extension_msg.timestamp = self.get_clock().now().to_msg()
+                    
+                self.extension_event_pub.publish(extension_msg)
+                
             elif message_type == 'ACKNOWLEDGMENT':
                 # Handle acknowledgment messages from voice agent
                 status = data.get('status', 'unknown')

coffee_ws/src/coffee_voice_agent/scripts/tools/coffee_tools.py

@@ -157,6 +157,17 @@ async def manage_conversation_time_impl(
         # Actually extend the conversation by calling state manager
         if _agent_instance and hasattr(_agent_instance, 'state_manager') and extension_minutes > 0:
             await _agent_instance.state_manager.extend_conversation(extension_minutes, reason)
+            
+            # Send extension granted event via WebSocket
+            if hasattr(_agent_instance, '_send_websocket_event'):
+                await _agent_instance._send_websocket_event("EXTENSION_GRANTED", {
+                    "action": "granted",
+                    "extension_minutes": extension_minutes,
+                    "reason": reason,
+                    "granted_by": "tool",
+                    "timestamp": datetime.now().isoformat()
+                })
+            
             logger.info(f"Conversation extended by {extension_minutes} minutes: {reason}")
             result = f"Conversation extended by {extension_minutes} minutes: {reason}"
         else:
@@ -201,6 +212,17 @@ async def check_user_status_impl(
     is_vip = any(keyword in user_lower for keyword in vip_keywords)
 
     if is_vip:
+        # Send VIP detection event via WebSocket
+        if _agent_instance and hasattr(_agent_instance, '_send_websocket_event'):
+            matched_keywords = [keyword for keyword in vip_keywords if keyword in user_lower]
+            await _agent_instance._send_websocket_event("VIP_DETECTED", {
+                "user_identifier": user_identifier,
+                "matched_keywords": matched_keywords,
+                "importance_level": "vip",
+                "recommended_extension_minutes": 3,
+                "timestamp": datetime.now().isoformat()
+            })
+        
         result = f"VIP user detected: {user_identifier}. Recommended extension: 3 minutes. Enhanced service advised."
         logger.info(f"VIP user identified: {user_identifier}")
     else:

coffee_ws/src/coffee_voice_agent_msgs/CMakeLists.txt

@@ -16,6 +16,8 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   "msg/AgentStatus.msg"
   "msg/ToolEvent.msg"
   "msg/ConfigurationUpdate.msg"
+  "msg/VipDetection.msg"
+  "msg/ExtensionEvent.msg"
   DEPENDENCIES builtin_interfaces std_msgs
 )
 

coffee_ws/src/coffee_voice_agent_msgs/msg/ExtensionEvent.msg

@@ -0,0 +1,5 @@
+string action  # "granted", "expired", "updated", "status"
+int32 extension_minutes
+string reason
+string granted_by  # "tool", "manual", "system"
+builtin_interfaces/Time timestamp 

coffee_ws/src/coffee_voice_agent_msgs/msg/VipDetection.msg

@@ -0,0 +1,5 @@
+string user_identifier
+string[] matched_keywords  
+string importance_level
+int32 recommended_extension_minutes
+builtin_interfaces/Time timestamp 

coffee_ws/src/coffee_voice_agent_ui/coffee_voice_agent_ui/voice_agent_monitor.py

@@ -21,7 +21,7 @@
 
 # ROS2 Messages
 from std_msgs.msg import String, Bool
-from coffee_voice_agent_msgs.msg import AgentStatus, ToolEvent
+from coffee_voice_agent_msgs.msg import AgentStatus, ToolEvent, VipDetection, ExtensionEvent
 
 # Import custom widgets
 from .widgets.agent_status_widget import AgentStatusWidget
@@ -30,16 +30,19 @@
 from .widgets.tool_monitor_widget import ToolMonitorWidget
 from .widgets.analytics_widget import AnalyticsWidget
 from .widgets.virtual_request_widget import VirtualRequestWidget
+from .widgets.admin_override_widget import AdminOverrideWidget
 
 
 class VoiceAgentMonitorNode(Node):
     """ROS2 Node for handling voice agent monitoring subscriptions"""
 
     # PyQt signals for thread-safe UI updates
     agent_status_received = pyqtSignal(AgentStatus)
-    tool_event_received = pyqtSignal(ToolEvent) 
+    tool_event_received = pyqtSignal(ToolEvent)
     user_speech_received = pyqtSignal(str)
     connection_status_received = pyqtSignal(bool)
+    vip_detection_received = pyqtSignal(VipDetection)
+    extension_event_received = pyqtSignal(ExtensionEvent)
 
     def __init__(self):
         super().__init__('voice_agent_monitor_node')
@@ -73,6 +76,20 @@ def __init__(self):
             10
         )
 
+        self.vip_detection_sub = self.create_subscription(
+            VipDetection,
+            'voice_agent/vip_detections',
+            self.vip_detection_callback,
+            10
+        )
+        
+        self.extension_event_sub = self.create_subscription(
+            ExtensionEvent,
+            'voice_agent/extension_events',
+            self.extension_event_callback,
+            10
+        )
+        
         # Publisher for sending virtual requests
         self.virtual_request_pub = self.create_publisher(
             String,
@@ -97,6 +114,14 @@ def speech_callback(self, msg):
     def connection_callback(self, msg):
         """Handle connection status messages"""
         self.connection_status_received.emit(msg.data)
+    
+    def vip_detection_callback(self, msg):
+        """Handle VipDetection messages"""
+        self.vip_detection_received.emit(msg)
+    
+    def extension_event_callback(self, msg):
+        """Handle ExtensionEvent messages"""
+        self.extension_event_received.emit(msg)
 
 
 class VoiceAgentMonitor(Plugin):
@@ -136,20 +161,30 @@ def _setup_ui(self):
         self.tool_monitor_widget = ToolMonitorWidget()
         self.analytics_widget = AnalyticsWidget()
         self.virtual_request_widget = VirtualRequestWidget()
+        self.admin_override_widget = AdminOverrideWidget()
 
-        # Arrange widgets in dashboard layout
-        # Row 0: Agent Status | Conversation Flow | Analytics
-        main_layout.addWidget(self.agent_status_widget, 0, 0)
+        # Create left column container with vertical layout
+        left_column_widget = QWidget()
+        left_column_layout = QVBoxLayout()
+        left_column_widget.setLayout(left_column_layout)
+        
+        # Add widgets to left column container
+        left_column_layout.addWidget(self.agent_status_widget)
+        left_column_layout.addWidget(self.emotion_widget)
+        left_column_layout.addWidget(self.admin_override_widget)
+        
+        # Arrange widgets in dashboard layout (back to 2-row layout)
+        # Row 0: Left Column Container (spans 2 rows) | Conversation Flow | Analytics
+        main_layout.addWidget(left_column_widget, 0, 0, 2, 1)  # span 2 rows, 1 column
         main_layout.addWidget(self.conversation_widget, 0, 1)
         main_layout.addWidget(self.analytics_widget, 0, 2)
 
-        # Row 1: Emotion Display | Tool Monitor | Controls
-        main_layout.addWidget(self.emotion_widget, 1, 0)
+        # Row 1: (Left Column continues) | Tool Monitor | Virtual Requests
         main_layout.addWidget(self.tool_monitor_widget, 1, 1)
         main_layout.addWidget(self.virtual_request_widget, 1, 2)
 
         # Set column stretch to make conversation widget wider
-        main_layout.setColumnStretch(0, 1)  # Status/Emotion column
+        main_layout.setColumnStretch(0, 1)  # Left column container
         main_layout.setColumnStretch(1, 2)  # Conversation/Tools column (wider)
         main_layout.setColumnStretch(2, 1)  # Analytics/Controls column
 
@@ -170,6 +205,8 @@ def _init_ros(self):
         self.ros_node.tool_event_received.connect(self._update_tool_event)
         self.ros_node.user_speech_received.connect(self._update_user_speech)
         self.ros_node.connection_status_received.connect(self._update_connection_status)
+        self.ros_node.vip_detection_received.connect(self._update_vip_detection)
+        self.ros_node.extension_event_received.connect(self._update_extension_event)
 
         # Connect virtual request widget signals to publishers
         self.virtual_request_widget.virtual_request_signal.connect(self._send_virtual_request)
@@ -288,6 +325,10 @@ def _update_agent_status(self, status):
         self.agent_status_widget.update_status(status)
         self.emotion_widget.update_emotion(status.emotion, status.previous_emotion)
         self.conversation_widget.update_agent_state(status)
+        
+        # Reset admin override widget when conversation ends
+        if status.behavioral_mode == "dormant":
+            self.admin_override_widget.reset_vip_status()
 
     @pyqtSlot(ToolEvent)
     def _update_tool_event(self, event):
@@ -305,6 +346,26 @@ def _update_connection_status(self, connected):
         """Update UI with connection status"""
         self.agent_status_widget.update_connection(connected)
 
+    @pyqtSlot(VipDetection)
+    def _update_vip_detection(self, detection):
+        """Update UI with new VIP detection"""
+        self.admin_override_widget.update_vip_detection(
+            detection.user_identifier,
+            list(detection.matched_keywords),
+            detection.importance_level,
+            detection.recommended_extension_minutes
+        )
+    
+    @pyqtSlot(ExtensionEvent)
+    def _update_extension_event(self, event):
+        """Update UI with new extension event"""
+        self.admin_override_widget.update_extension_event(
+            event.action,
+            event.extension_minutes,
+            event.reason,
+            event.granted_by
+        )
+    
     @pyqtSlot(str)
     def _send_virtual_request(self, request_json):
         """Send virtual request through ROS2"""