update

app.py

@@ -21,7 +21,7 @@ load_dotenv()
 
 # MQTT Configuration
 HOST = os.getenv("host")
-PORT = int(os.getenv("port", 8883))
+PORT = int(os.getenv("port"))
 USERNAME = os.getenv("username")
 PASSWORD = os.getenv("password")
 PRINTER_SERIAL = os.getenv("PRINTER_SERIAL", "0309CA471800852")
@@ -47,6 +47,63 @@ latest_data = {
 optimizer = MOPrintOptimizer()
 detector = DefectDetector()
 
+# MQTT Topics structure
+TOPICS = {
+    'printer': {
+        'command': 'bambu/printer/command',     # HF -> Pi 4B
+        'status': 'bambu/printer/status',       # Pi 4B -> HF
+        'response': 'bambu/printer/response'    # Pi 4B -> HF
+    },
+    'camera': {
+        'command': 'bambu/camera/command',      # HF -> Pi Zero
+        'status': 'bambu/camera/status',        # Pi Zero -> HF
+        'image': 'bambu/camera/image'           # Pi Zero -> HF (S3 URL)
+    }
+}
+
+# Workflow status tracking
+WORKFLOW_STATUS = {
+    'print_started': False,
+    'print_completed': False,
+    'image_captured': False,
+    'analysis_completed': False,
+    'current_square_id': None,
+    'start_time': None,
+    'completion_time': None
+}
+
+def update_workflow_status(status_type: str, value: bool = True):
+    """Update workflow status
+    
+    Args:
+        status_type: Type of status to update
+        value: New status value
+    """
+    WORKFLOW_STATUS[status_type] = value
+    if status_type == 'print_started':
+        WORKFLOW_STATUS['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S')
+    elif status_type == 'analysis_completed':
+        WORKFLOW_STATUS['completion_time'] = time.strftime('%Y-%m-%d %H:%M:%S')
+
+# Message formats
+def create_print_command(params):
+    return {
+        'type': 'print',
+        'timestamp': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'params': {
+            'nozzle_temp': params['nozzle_temp'],
+            'print_speed': params['print_speed'],
+            # ... other params
+        }
+    }
+
+def create_capture_command(square_id):
+    return {
+        'type': 'capture',
+        'timestamp': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'square_id': square_id
+    }
+
 def create_3mf_package(gcode_content: str, gcode_filename: str = "Metadata/plate_1.gcode") -> BytesIO:
     """Create a 3MF package from G-code content"""
     zip_buffer = BytesIO()
@@ -74,71 +131,38 @@ def on_connect(client, userdata, flags, rc):
     """MQTT connection callback"""
     logger.info(f"Connected with result code {rc}")
     if rc == 0:
-        # Subscribe to printer response topic
-        response_topic = f"bambu_a1_mini/response/{PRINTER_SERIAL}"
+        serial = os.getenv("PRINTER_SERIAL", "0309CA471800852")
+        response_topic = f"bambu_a1_mini/response/{serial}"
         client.subscribe(response_topic)
         logger.info(f"Subscribed to {response_topic}")
-        
-        # Subscribe to printer status topic
-        status_topic = f"bambu_a1_mini/status/{PRINTER_SERIAL}"
-        client.subscribe(status_topic)
-        logger.info(f"Subscribed to {status_topic}")
-        
-        # Subscribe to camera image topic
-        image_topic = f"bambu_a1_mini/image/{PRINTER_SERIAL}"
-        client.subscribe(image_topic)
-        logger.info(f"Subscribed to {image_topic}")
 
 def on_message(client, userdata, message):
-    """MQTT message callback"""
+    """Handle incoming MQTT messages"""
     try:
         data = json.loads(message.payload)
-        
-        if "image" in message.topic:
-            # handle new image URL
-            image_url = data.get("image_url")
-            if image_url:
-                latest_data.update({
-                    "current_image_url": image_url,
-                    "image_timestamp": data.get("timestamp"),
-                    "square_id": data.get("square_id")
-                })
-                # update interface display
-                s3_image.update(value=image_url)
-        
-        elif "status" in message.topic:
-            # update status
-            latest_data.update({
-                "status": data.get("status"),
-                "print_progress": data.get("progress", 0),
-                "current_square_id": data.get("square_id"),
-                "print_timestamp": data.get("timestamp"),
-                "update_time": time.strftime("%Y-%m-%d %H:%M:%S")
-            })
+        latest_data.update({
+            "bed_temperature": data.get("bed_temperature", "N/A"),
+            "nozzle_temperature": data.get("nozzle_temperature", "N/A"),
+            "status": data.get("status", "N/A"),
+            "update_time": time.strftime("%Y-%m-%d %H:%M:%S")
+        })
     except Exception as e:
         logger.error(f"Error processing message: {e}")
 
 def send_print_command(params):
-    """Send print parameters to Pi Zero via MQTT"""
-    command = {
-        "action": "print",
-        "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
-        "square_id": params.get("square_id"),  # get from position_manager
-        "parameters": {
-            "bed_temp": float(params["bed_temp"]),
-            "nozzle_temp": float(params["nozzle_temp"]),
-            "print_speed": float(params["print_speed"]),
-            "layer_height": float(params["layer_height"]),
-            "flow_rate": float(params["flow_rate"]),
-            "retraction_distance": float(params["retraction_distance"]),
-            "fan_speed": float(params["fan_speed"])
-        }
-    }
-    
-    command_topic = f"bambu_a1_mini/command/{PRINTER_SERIAL}"
-    mqtt_client.publish(command_topic, json.dumps(command))
+    """Send print parameters to Pi 4B"""
+    command = create_print_command(params)
+    mqtt_client.publish(TOPICS['printer']['command'], json.dumps(command))
+    logger.info(f"Print command sent for square {params.get('square_id')}")
     return "Print command sent successfully"
 
+def send_camera_command(square_id: str):
+    """Send capture command to Pi Zero"""
+    command = create_capture_command(square_id)
+    mqtt_client.publish(TOPICS['camera']['command'], json.dumps(command))
+    logger.info(f"Camera command sent for square {square_id}")
+    return "Camera command sent successfully"
+
 # Initialize MQTT client
 mqtt_client = create_client(HOST, PORT, USERNAME, PASSWORD)
 
@@ -147,21 +171,18 @@ def update_printer_status():
     if mqtt_client is None:
         return "MQTT not connected", "No connection"
     
-    status_text = (
+    serial = os.getenv("PRINTER_SERIAL", "0309CA471800852")
+    request_topic = f"bambu_a1_mini/request/{serial}"
+    mqtt_client.publish(request_topic, json.dumps("HI"))
+    
+    time.sleep(1)  # Wait for response
+    
+    return (
         f"Status: {latest_data['status']}\n"
-        f"Progress: {latest_data['print_progress']}%\n"
-        f"Bed Temp: {latest_data['bed_temperature']}°C\n"
-        f"Nozzle Temp: {latest_data['nozzle_temperature']}°C\n"
+        f"Bed Temp: {latest_data['bed_temperature']}\n"
+        f"Nozzle Temp: {latest_data['nozzle_temperature']}",
         f"Last Update: {latest_data['update_time']}"
     )
-    
-    job_text = (
-        f"Square ID: {latest_data.get('current_square_id', 'N/A')}\n"
-        f"Print Time: {latest_data.get('print_time', 'N/A')}\n"
-        f"Image Status: {'Captured' if latest_data.get('current_image_url') else 'Waiting'}"
-    )
-    
-    return status_text, job_text
 
 def analyze_print(image,
                  nozzle_temp, print_speed, layer_height,
@@ -321,26 +342,10 @@ with gr.Blocks(title="Bambu A1 Mini Print Analysis") as demo:
         ]
     )
     
-    # add image refresh function
-    def refresh_images():
-        """refresh image display"""
-        image_url = latest_data.get("current_image_url")
-        if image_url:
-            return image_url
-        return None
-
     # connect refresh button
     refresh_btn.click(
-        fn=lambda: (
-            update_printer_status()[0],
-            update_printer_status()[1],
-            refresh_images()
-        ),
-        outputs=[
-            printer_status,
-            current_job_status,
-            s3_image
-        ]
+        fn=update_printer_status,
+        outputs=[printer_status, current_job_status]
     )
 
     # Auto-refresh printer status
@@ -351,12 +356,33 @@ with gr.Blocks(title="Bambu A1 Mini Print Analysis") as demo:
             printer_status.update(status)
             current_job_status.update(job_status)
             # update image
-            image_url = refresh_images()
+            image_url = latest_data.get("current_image_url")
             if image_url:
                 s3_image.update(image_url)
     
     threading.Thread(target=auto_refresh, daemon=True).start()
 
+def handle_print_workflow(params):
+    """Coordinate print and capture workflow"""
+    try:
+        # 1. Send print command to Pi 4B
+        printer_command = create_print_command(params)
+        mqtt_client.publish(TOPICS['printer']['command'], json.dumps(printer_command))
+        
+        # 2. Wait for printer ready status
+        # (handle by on_message callback)
+        
+        # 3. Send capture command to Pi Zero
+        camera_command = create_capture_command(params['square_id'])
+        mqtt_client.publish(TOPICS['camera']['command'], json.dumps(camera_command))
+        
+        # 4. Wait for image URL
+        # (handle by on_message callback)
+        
+        return "Workflow started successfully"
+    except Exception as e:
+        return f"Error: {str(e)}"
+
 # Launch the app
 if __name__ == "__main__":
     demo.launch()