update

app.py

@@ -218,6 +218,51 @@ def health_check():
     logger.info(f"Health check: {status}")
     return status
 
+# API端点函数
+def api_get_status(serial=DEFAULT_SERIAL):
+    """API端点：获取状态"""
+    logger.info(f"API call: get_status for {serial}")
+    try:
+        return get_data(serial)
+    except Exception as e:
+        logger.error(f"Error in api_get_status: {e}")
+        return ("Error", "N/A", "N/A", str(e))
+
+def api_get_image():
+    """API端点：获取图像"""
+    logger.info("API call: get_image")
+    try:
+        img = capture_image()
+        return get_image_base64(img)
+    except Exception as e:
+        logger.error(f"Error in api_get_image: {e}")
+        return None
+
+def api_send_parameters(params):
+    """API端点：发送参数"""
+    logger.info(f"API call: send_parameters with {params}")
+    try:
+        serial = params.get('serial', DEFAULT_SERIAL)
+        return send_print_parameters(
+            params.get('nozzle_temp', 200),
+            params.get('bed_temp', 60),
+            params.get('print_speed', 60),
+            params.get('fan_speed', 100),
+            serial
+        )
+    except Exception as e:
+        logger.error(f"Error in api_send_parameters: {e}")
+        return f"Error: {str(e)}"
+
+def api_health_check():
+    """API端点：健康检查"""
+    logger.info("API call: health_check")
+    try:
+        return health_check()
+    except Exception as e:
+        logger.error(f"Error in api_health_check: {e}")
+        return {"status": "error", "error": str(e)}
+
 # 初始化MQTT客户端
 try:
     logger.info("Initializing MQTT client")
@@ -228,7 +273,7 @@ except Exception as e:
     logger.error(f"Failed to initialize MQTT: {e}")
     logger.warning("Starting without MQTT connection")
 
-# Gradio界面
+# 创建主界面
 with gr.Blocks(title="Bambu A1 Mini Print Control") as demo:
     gr.Markdown("# Bambu A1 Mini Print Control")
     
@@ -256,78 +301,57 @@ with gr.Blocks(title="Bambu A1 Mini Print Control") as demo:
             
             send_params_btn = gr.Button("Send Print Parameters")
 
-    # API端点
-    def api_get_status(serial=DEFAULT_SERIAL):
-        """API端点：获取状态"""
-        logger.info(f"API call: get_status for {serial}")
-        try:
-            return get_data(serial)
-        except Exception as e:
-            logger.error(f"Error in api_get_status: {e}")
-            return ("Error", "N/A", "N/A", str(e))
-    
-    def api_get_image():
-        """API端点：获取图像"""
-        logger.info("API call: get_image")
-        try:
-            img = capture_image()
-            return get_image_base64(img)
-        except Exception as e:
-            logger.error(f"Error in api_get_image: {e}")
-            return None
-    
-    def api_send_parameters(params):
-        """API端点：发送参数"""
-        logger.info(f"API call: send_parameters with {params}")
-        try:
-            serial = params.get('serial', DEFAULT_SERIAL)
-            return send_print_parameters(
-                params.get('nozzle_temp', 200),
-                params.get('bed_temp', 60),
-                params.get('print_speed', 60),
-                params.get('fan_speed', 100),
-                serial
-            )
-        except Exception as e:
-            logger.error(f"Error in api_send_parameters: {e}")
-            return f"Error: {str(e)}"
-    
-    def api_health_check():
-        """API端点：健康检查"""
-        logger.info("API call: health_check")
-        try:
-            return health_check()
-        except Exception as e:
-            logger.error(f"Error in api_health_check: {e}")
-            return {"status": "error", "error": str(e)}
-    
     # 连接按钮
     refresh_btn.click(
         fn=get_data,
         inputs=[serial],
-        outputs=[current_status, current_bed_temp, current_nozzle_temp, last_update],
-        api_name="refresh_status"
+        outputs=[current_status, current_bed_temp, current_nozzle_temp, last_update]
     )
     
     capture_btn.click(
         fn=capture_image,
-        outputs=[captured_image],
-        api_name="capture_image"
+        outputs=[captured_image]
     )
     
     send_params_btn.click(
         fn=send_print_parameters,
         inputs=[nozzle_temp, bed_temp, print_speed, fan_speed, serial],
-        outputs=[current_status],
-        api_name="send_parameters"
+        outputs=[current_status]
+    )
+
+# 创建API端点
+with gr.Blocks() as api_blocks:
+    gr.Interface(
+        fn=api_get_status, 
+        inputs=gr.Textbox(value=DEFAULT_SERIAL, label="Serial Number"),
+        outputs="json",
+        title="Get Printer Status",
+        description="Get the current status of the printer"
+    )
+    
+    gr.Interface(
+        fn=api_get_image,
+        inputs=None,
+        outputs="json",
+        title="Get Print Image",
+        description="Get the current print image as base64"
     )
     
-    # 定义API端点
-    demo.queue()
-    gr.Interface(fn=api_get_status, inputs=[serial], outputs="json", title="Get Printer Status").launch(share=True)
-    gr.Interface(fn=api_get_image, inputs=None, outputs="json", title="Get Print Image").launch(share=True)
-    gr.Interface(fn=api_send_parameters, inputs="json", outputs="text", title="Send Print Parameters").launch(share=True)
-    gr.Interface(fn=api_health_check, inputs=None, outputs="json", title="Health Check").launch(share=True)
+    gr.Interface(
+        fn=api_send_parameters,
+        inputs="json",
+        outputs="text",
+        title="Send Print Parameters",
+        description="Send parameters to the printer"
+    )
+    
+    gr.Interface(
+        fn=api_health_check,
+        inputs=None,
+        outputs="json",
+        title="Health Check",
+        description="Check the health of the application"
+    )
 
 # 自动刷新线程
 def auto_refresh():
@@ -353,4 +377,9 @@ threading.Thread(target=auto_refresh, daemon=True).start()
 # 启动应用
 if __name__ == "__main__":
     logger.info("Starting Bambu A1 Mini Print Control application")
-    demo.launch(show_error=True)  # 启用详细错误报告
+    # 启动主界面
+    demo.queue().launch(show_error=True)
+    
+    # 启动API端点
+    # 注意：在实际部署中，这些API端点应该与主界面集成在一起
+    # 这里分开只是为了演示目的