Update app.py

app.py

@@ -47,8 +47,9 @@ latest_data = {
     "status": "N/A",
     "update_time": "Waiting for data...",
     "image_url": "N/A",
-    "progress": 0,  
-    "message": "",  
+    "auto_capture_requested": False,
+    "last_capture_job": "None",
+    "last_capture_time": "None"
 }
 
 bambu_client = None
@@ -103,30 +104,34 @@ def rpi_on_message(client, userdata, msg):
         payload = msg.payload.decode("utf-8")
         logger.info(f"Received message from RPI: {payload}")
         
-        data = json.loads(payload)
-        status = data.get("status", "Unknown")
-        
-        latest_data["status"] = status
-        latest_data["update_time"] = data.get("update_time", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
-        
-        if "nozzle_temperature" in data:
-            latest_data["nozzle_temperature"] = data["nozzle_temperature"]
-        
-        if "bed_temperature" in data:
-            latest_data["bed_temperature"] = data["bed_temperature"]
-        
-        if "error" in data:
-            logger.error(f"Error from RPI: {data['error']}")
-       
-        if status == "Ready":
-            latest_data["progress"] = 0
-            latest_data["message"] = "Printer ready"
-        elif status == "Processing":
-            latest_data["progress"] = 25
-            latest_data["message"] = "Processing G-code..."
-        
+        try:
+            data = json.loads(payload)
+            
+            # 处理状态更新
+            if "status" in data:
+                latest_data["status"] = data["status"]
+                latest_data["update_time"] = data.get("update_time", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
+                
+                if "nozzle_temperature" in data:
+                    latest_data["nozzle_temperature"] = data["nozzle_temperature"]
+                
+                if "bed_temperature" in data:
+                    latest_data["bed_temperature"] = data["bed_temperature"]
+                
+                if "error" in data:
+                    logger.error(f"Error from RPI: {data['error']}")
+            
+            # 添加对自动拍照命令的处理
+            if "command" in data and data["command"] == "capture_image" and data.get("auto_triggered", False):
+                logger.info("收到自动拍照命令")
+                # 异步处理拍照请求，避免阻塞MQTT回调
+                threading.Thread(target=handle_auto_capture, args=(data,), daemon=True).start()
+                
+        except json.JSONDecodeError:
+            logger.error(f"Invalid JSON in message: {payload}")
+            
     except Exception as e:
-        logger.error(f"Error processing message from RPI: {e}")
+        logger.error(f"Error processing RPI message: {e}")
 
 
 def get_data(serial=DEFAULT_SERIAL):
@@ -198,12 +203,6 @@ def send_print_parameters(nozzle_temp, bed_temp, print_speed, fan_speed):
         logger.error(f"Error sending parameters: {e}")
         return f"Error sending parameters: {e}"
 
-      
-    latest_data["status"] = "Sending"
-    latest_data["progress"] = 10
-    latest_data["message"] = "Sending parameters to printer..."
-
-
 
 def get_image_base64(image):
     if image is None:
@@ -307,17 +306,6 @@ def capture_image(url=None, use_test_image=False, test_image_name=None):
     else:
         raise Exception("url is 'N/A'")
 
-def update_print_status():
-   global latest_data
-   return (
-       latest_data["status"],
-       latest_data["nozzle_temperature"],
-       latest_data["bed_temperature"],
-       latest_data["update_time"],
-       latest_data.get("progress", 0),
-       latest_data.get("message", ""),
-   )
-
 
 def health_check():
     status = {
@@ -328,17 +316,65 @@ def health_check():
         "latest_update": latest_data["update_time"],
     }
     logger.info(f"Health check: {status}")
-    return status
+    
+    # 修改返回值，确保返回6个值
+    return (
+        status.get("app", "unknown"),
+        "N/A",  # 作为nozzle_temperature
+        "N/A",  # 作为bed_temperature
+        status.get("time", "unknown"),
+        0,      # 作为progress
+        f"MQTT: Bambu={status.get('bambu_mqtt_connected')}, RPI={status.get('rpi_mqtt_connected')}"  # 作为message
+    )
+
+
+def update_print_status():
+    """更新打印状态显示"""
+    global latest_data
+    return (
+        latest_data["status"],
+        latest_data["nozzle_temperature"],
+        latest_data["bed_temperature"],
+        latest_data["update_time"],
+        latest_data.get("progress", 0),
+        latest_data.get("message", ""),
+    )
+
+
+def handle_auto_capture(message):
+    """处理自动拍照请求"""
+    try:
+        logger.info(f"收到自动拍照请求: {message}")
+        
+        # 提取信息
+        print_job = message.get("print_job", "unknown_job")
+        timestamp = message.get("timestamp", time.strftime("%Y-%m-%d %H:%M:%S"))
+        
+        # 记录到最新数据中
+        latest_data["auto_capture_requested"] = True
+        latest_data["last_capture_job"] = print_job
+        latest_data["last_capture_time"] = timestamp
+        
+        # 执行拍照操作 - 假设capture_image函数已存在
+        image, status = capture_image()
+        
+        # 记录拍照结果
+        logger.info(f"自动拍照结果: {status}")
+        
+        return image, status
+    except Exception as e:
+        logger.error(f"处理自动拍照请求时出错: {e}")
+        return None, f"自动拍照失败: {str(e)}"
 
 
 demo = gr.Blocks(title="Bambu A1 Mini Print Control")
 
 with demo:
     gr.Markdown("# Bambu A1 Mini Print Control")
-
+    
     with gr.Row():
         refresh_btn = gr.Button("Refresh Status")
-
+    
     with gr.Row():
         current_status = gr.Textbox(
             label="Printer Status", value="N/A", interactive=False
@@ -350,7 +386,7 @@ with demo:
             label="Current Nozzle Temperature", value="N/A", interactive=False
         )
         last_update = gr.Textbox(label="Last Update", value="N/A", interactive=False)
-
+    
     with gr.Row():
         # Left column for image and capture button
         with gr.Column(scale=2):
@@ -400,7 +436,7 @@ with demo:
         fn=get_data,
         outputs=[current_status, current_bed_temp, current_nozzle_temp, last_update],
     )
-
+    
     capture_btn.click(
         fn=lambda: gr.update(interactive=False), outputs=capture_btn
     ).then(fn=capture_image, outputs=[captured_image]).then(
@@ -631,6 +667,26 @@ with demo:
         api_name="health_check",
     )
 
+    # 在Camera Control标签页中添加自动拍照状态显示
+    with gr.Tab("Camera Control"):
+        # 添加自动拍照状态显示
+        with gr.Row():
+            auto_capture_status = gr.Textbox(label="Auto Capture Status", value="Waiting")
+        
+        # 添加自动刷新，更新自动拍照状态
+        def update_capture_status():
+            auto_status = "Triggered" if latest_data.get("auto_capture_requested", False) else "Waiting"
+            last_time = latest_data.get("last_capture_time", "None")
+            last_job = latest_data.get("last_capture_job", "None")
+            return f"{auto_status} (Last: {last_job} at {last_time})"
+        
+        demo.load(
+            fn=update_capture_status,
+            inputs=[],
+            outputs=[auto_capture_status],
+            every=5  # 每5秒刷新一次
+        )
+
 if __name__ == "__main__":
     logger.info("Starting Bambu A1 Mini Print Control application")