diff --git a/take-away/docker-compose.yaml b/take-away/docker-compose.yaml index d53a6c3..70b0416 100755 --- a/take-away/docker-compose.yaml +++ b/take-away/docker-compose.yaml @@ -125,11 +125,11 @@ services: # GStreamer capture settings - CAPTURE_FPS: ${CAPTURE_FPS:-1} # Frames per second for pipeline (1fps for multi-station) + CAPTURE_FPS: ${CAPTURE_FPS:-10} # Frames per second for pipeline (10fps) # Frame pipeline tuning (order 384 fix: OCR models take ~30s to load) # Pre-buffer must hold frames until OCR is ready to detect orders - PRE_BUFFER_FRAMES: ${PRE_BUFFER_FRAMES:-100} # Frames to hold in buffer (100 @ 1fps = 100s) + PRE_BUFFER_FRAMES: ${PRE_BUFFER_FRAMES:-1000} # Frames to hold in buffer (1000 @ 10fps = 100s) OCR_WARMUP_FRAMES: ${OCR_WARMUP_FRAMES:-2} # Frames to wait before OCR ready signal (reduced for faster startup) # Performance tuning @@ -140,6 +140,11 @@ services: # Metrics logging CONTAINER_RESULTS_PATH: ${CONTAINER_RESULTS_PATH:-/results} USECASE_1: ${USECASE_1:-take-away-order-accuracy} + + # Order Recall - path where frame-selector writes debug frames + FRAME_SELECTOR_DEBUG_DIR: ${FRAME_SELECTOR_DEBUG_DIR:-/results/frame-selector-in} + # Playback FPS for stitched recall replay video + RECALL_REPLAY_FPS: ${RECALL_REPLAY_FPS:-10} # RabbitMQ disabled for simplicity (direct HTTP calls used) USE_RABBITMQ: ${USE_RABBITMQ:-false} diff --git a/take-away/gradio-ui/gradio_app.py b/take-away/gradio-ui/gradio_app.py index ff7f3fa..c7dc584 100755 --- a/take-away/gradio-ui/gradio_app.py +++ b/take-away/gradio-ui/gradio_app.py @@ -4,6 +4,8 @@ import threading import time import math +import tempfile +import os import numpy as np from typing import Optional, List, Dict from PIL import Image @@ -26,7 +28,7 @@ # Global processing state is_processing = False -APP_TITLE = "๐Ÿ“ฆ Take-Away Order Accuracy" +APP_TITLE = "Take-Away Order Accuracy" APP_DESCRIPTION = "AI-powered order validation for take-away operations" # Intel Brand CSS (matching dine-in styling) @@ -35,7 +37,7 @@ :root { --primary-500: #0071C5 !important; --primary-600: #005A9E !important; - --primary-700: #00285A !important; + --primary-700: #0258b5 !important; --neutral-50: #f8fafc; --neutral-100: #f1f5f9; --neutral-200: #e2e8f0; @@ -75,7 +77,7 @@ /* Header Banner - Intel Blue */ .header-banner { - background: linear-gradient(135deg, #0071C5 0%, #00285A 100%); + background: linear-gradient(135deg, #0071C5 0%, #0258b5 100%); color: white; padding: 28px 40px; border-radius: 12px; @@ -123,7 +125,7 @@ /* Primary Button - Intel Blue */ .primary-btn { - background: linear-gradient(135deg, #0071C5 0%, #00285A 100%) !important; + background: linear-gradient(135deg, #0071C5 0%, #0258b5 100%) !important; border: none !important; border-radius: 10px !important; font-weight: 600 !important; @@ -156,7 +158,7 @@ } .video-history-header { - background: linear-gradient(135deg, #0071C5 0%, #00285A 100%); + background: linear-gradient(135deg, #0071C5 0%, #0258b5 100%); color: white; padding: 14px 20px; cursor: pointer; @@ -181,7 +183,7 @@ padding: 12px 15px; text-align: left; font-weight: 600; - color: #00285A; + color: #0258b5; font-size: 13px; text-transform: uppercase; letter-spacing: 0.5px; @@ -231,7 +233,7 @@ /* Section Headers */ .section-header { font-weight: 600; - color: #00285A; + color: #0258b5; font-size: 14px; margin-bottom: 10px; } @@ -239,7 +241,7 @@ /* Footer */ .footer-info { text-align: center; - color: #00285A; + color: #0258b5; font-size: 13px; padding: 20px; border-top: 2px solid #E6F3FB; @@ -391,11 +393,11 @@ def start_smooth_stream(rtsp_url): current_time = time.time() if current_time - last_update >= 1.0: fps = fps_counter / (current_time - last_update) - status = f"โœ… Frame {frame_count} - Smooth stream active ({fps:.1f} FPS)" + status = f"Frame {frame_count} - Smooth stream active ({fps:.1f} FPS)" fps_counter = 0 last_update = current_time else: - status = f"โœ… Frame {frame_count} - Smooth stream active" + status = f"Frame {frame_count} - Smooth stream active" yield frame, status @@ -461,7 +463,7 @@ def upload_video_with_progress(file, progress=gr.Progress()): initial_stats = fetch_statistics() initial_processed = initial_stats.get("total_processed", 0) if initial_stats else 0 - progress(0.1, desc="๐Ÿ“ค Uploading video...") + progress(0.1, desc="Uploading video...") with open(file.name, "rb") as f: resp = _api.post( @@ -472,7 +474,7 @@ def upload_video_with_progress(file, progress=gr.Progress()): if resp.status_code != 200: is_processing = False - return f"โŒ Upload failed: {resp.text}", gr.update(interactive=True, value="๐Ÿš€ Upload & Start Processing") + return f"โŒ Upload failed: {resp.text}", gr.update(interactive=True, value="Upload & Start Processing") data = resp.json() video_id = data.get('video_id', 'unknown') @@ -503,11 +505,11 @@ def upload_video_with_progress(file, progress=gr.Progress()): if orders_completed > 0: # Bump progress when orders complete order_progress = min(0.9, time_progress + 0.1 * orders_completed) - progress(order_progress, desc=f"๐Ÿ”„ {orders_completed} order(s) detected") + progress(order_progress, desc=f"{orders_completed} order(s) detected") else: - progress(time_progress, desc=f"๐Ÿ” Analyzing video...") + progress(time_progress, desc=f"Analyzing video...") else: - progress(time_progress, desc=f"๐Ÿ”„ Processing...") + progress(time_progress, desc=f"Processing...") # Check if results are available results = fetch_results() @@ -520,7 +522,7 @@ def upload_video_with_progress(file, progress=gr.Progress()): results = fetch_results() break - progress(1.0, desc="โœ… Processing complete!") + progress(1.0, desc="Processing complete!") # Mark video as completed via API try: @@ -541,12 +543,12 @@ def upload_video_with_progress(file, progress=gr.Progress()): mismatch = stats.get("total_mismatch", 0) if stats else 0 return ( - f"โœ… Video processed successfully\n" + f"Video processed successfully\n" f"Video: {video_name}\n" f"Time: {upload_time}\n" f"Orders detected: {len(session_results)}\n" f"Validated: {validated} | Mismatch: {mismatch}", - gr.update(interactive=True, value="๐Ÿš€ Upload & Start Processing") + gr.update(interactive=True, value="Upload & Start Processing") ) except Exception as e: @@ -557,7 +559,7 @@ def upload_video_with_progress(file, progress=gr.Progress()): _api.post(f"{API_BASE}/videos/{video_id}/fail?error={str(e)}", timeout=5) except: pass - return f"โŒ Upload error: {e}", gr.update(interactive=True, value="๐Ÿš€ Upload & Start Processing") + return f"Upload error: {e}", gr.update(interactive=True, value="Upload & Start Processing") def generate_validation_summary(results): """Generate validation summary from results""" @@ -621,10 +623,10 @@ def start_rtsp_processing(rtsp_url): data = resp.json() video_id = data.get("video_id", "") return ( - f"โœ… RTSP pipeline started\n" + f"RTSP pipeline started\n" f"Source: {rtsp_url}\n" f"Video ID: {video_id}\n" - f"Results will appear in the '๐Ÿ“Š Detected Orders' tab." + f"Results will appear in the 'Detected Orders' tab." ) except Exception as e: @@ -661,24 +663,24 @@ def format_validation_summary_table(results): - - - + + + - - - + + + - + - + @@ -724,8 +726,8 @@ def format_order_card(result): items_rows += f''' - - + + ''' @@ -734,13 +736,13 @@ def format_order_card(result): validation_details = "" if missing: missing_items = ", ".join([f"{m.get('name', 'Unknown')} (ร—{m.get('quantity', 1)})" for m in missing]) - validation_details += f'
โš ๏ธ Missing: {missing_items}
' + validation_details += f'
Missing: {missing_items}
' if extra: extra_items = ", ".join([f"{e.get('name', 'Unknown')} (ร—{e.get('quantity', 1)})" for e in extra]) - validation_details += f'
โž• Extra: {extra_items}
' + validation_details += f'
Extra: {extra_items}
' if qty_mismatch: qty_items = ", ".join([f"{q.get('name', 'Unknown')}" for q in qty_mismatch]) - validation_details += f'
๐Ÿ“Š Qty Mismatch: {qty_items}
' + validation_details += f'
Qty Mismatch: {qty_items}
' return f'''
@@ -816,7 +818,7 @@ def format_history_html(): # Status badge for video if status == "processing": - video_status = 'โณ Processing' + video_status = 'Processing' elif status == "completed": video_status = 'โœ“ Completed' elif status == "failed": @@ -846,9 +848,9 @@ def format_history_html(): # Use Gradio accordion-compatible structure html_parts.append(f'''
- +
-
๐Ÿ“น {video_name}
+
{video_name}
{timestamp}
@@ -857,10 +859,10 @@ def format_history_html():
-
๐Ÿ“Š Validation Summary
+
Validation Summary
{summary_table if summary_table else '
No results available
'} -
๐Ÿงพ Order Details
+
Order Details
{order_cards if order_cards else '
No orders detected
'}
@@ -908,12 +910,12 @@ def format_detected_orders(): rows.append([ order_id, "\n".join(item_lines) if item_lines else "No items", - "โœ… VALIDATED" if status == "validated" else "โŒ MISMATCH" + "โœ… VALIDATED" if status == "validated" else "MISMATCH" ]) summaries.append( f"### Order {order_id}\n" - f"- Status: {'โœ… VALIDATED' if status == 'validated' else 'โŒ MISMATCH'}\n" + f"- Status: {'โœ… VALIDATED' if status == 'validated' else 'MISMATCH'}\n" f"- Missing: {missing or 'None'}\n" f"- Extra: {extra or 'None'}\n" f"- Quantity Mismatch: {qty_mismatch or 'None'}" @@ -925,6 +927,236 @@ def refresh_history(): """Refresh history display""" return format_history_html() + +# ----------------------------- +# ORDER RECALL HELPERS +# ----------------------------- + +def format_recall_card(order_id, result, upload_time, completed_time, source, frames_available): + """Format the order details card for the Recall tab.""" + if not result: + return f''' +
+
โš ๏ธ Order {order_id} found in history but result details are unavailable.
+
Processed: {upload_time}
+
+ ''' + + status = result.get('status', 'unknown') + detected_items = result.get('detected_items', []) + expected_items = result.get('expected_items', []) + validation = result.get('validation', {}) + missing = validation.get('missing', []) + extra = validation.get('extra', []) + qty_mismatch = validation.get('quantity_mismatch', []) + inference_time = result.get('inference_time_sec') + num_frames = result.get('num_frames', frames_available) + + status_icon = 'โœ…' if status == 'validated' else 'โŒ' + status_text = 'VALIDATED' if status == 'validated' else 'MISMATCH' + status_bg = '#d1fae5' if status == 'validated' else '#fee2e2' + status_color = '#10b981' if status == 'validated' else '#ef4444' + border_color = status_color + + # โ”€โ”€ Expected items table โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + exp_rows = '' + for item in expected_items: + exp_rows += f''' +
+ + + ''' + + # โ”€โ”€ Detected items table with per-item status โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + det_rows = '' + for item in detected_items: + name = item.get('name', '?') + qty = item.get('quantity', 0) + s, c = 'OK', '#10b981' + if any(m.get('name') == name for m in missing): + s, c = 'Missing', '#ef4444' + elif any(e.get('name') == name for e in extra): + s, c = 'Extra', '#f59e0b' + elif any(q.get('name') == name for q in qty_mismatch): + s, c = 'Qty Mismatch', '#f59e0b' + det_rows += f''' + + + + + ''' + + # โ”€โ”€ Mismatch summary โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + mismatch_detail = '' + if missing: + items_str = ', '.join(f"{m.get('name','?')} ร—{m.get('quantity',1)}" for m in missing) + mismatch_detail += f'
Missing: {items_str}
' + if extra: + items_str = ', '.join(f"{e.get('name','?')} ร—{e.get('quantity',1)}" for e in extra) + mismatch_detail += f'
Extra: {items_str}
' + if qty_mismatch: + items_str = ', '.join(q.get('name', '?') for q in qty_mismatch) + mismatch_detail += f'
Qty Mismatch: {items_str}
' + if not mismatch_detail: + mismatch_detail = '
No mismatches
' + + # โ”€โ”€ Meta row (source, timing, frames) โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + meta_items = [] + if upload_time: + meta_items.append(f'Processed: {upload_time}') + if source: + meta_items.append(f'Source: {source}') + if inference_time: + meta_items.append(f'Inference: {inference_time:.1f}s') + if num_frames: + meta_items.append(f'Frames: {num_frames}') + meta_html = '  |  '.join(meta_items) + + return f''' +
+ + +
+
Order #{order_id}
+ + {status_icon} {status_text} + +
+ + +
+ {meta_html} +
+ +
+ + +
Expected Items
+
MetricCountPercentageMetricCountPercentage
Total Orders{total}100%Total Orders{total}100%
โœ… ValidatedValidated {validated} {validated/total*100:.1f}%
โŒ MismatchMismatch {mismatch} {mismatch/total*100:.1f}%
{name}{qty}{name}{qty} {item_status}
{item.get("name","?")}{item.get("quantity",0)}
{name}{qty}{s}
+ + + + + {exp_rows if exp_rows else ""} +
ItemQty
No expected items
+ + +
Detected Items
+ + + + + + + {det_rows if det_rows else ""} +
ItemQtyStatus
No items detected
+ + +
Validation Summary
+
+ {mismatch_detail} +
+ + + + ''' + + +def recall_order_fn(order_id: str): + """Gradio callback for the Order Recall tab. + + Returns: + (details_html, video_path_or_None) + """ + order_id = (order_id or '').strip() + + if not order_id: + return ( + '
' \ + '
๐Ÿ”
' \ + '
Enter an order ID above and click Recall Order.
', + None + ) + + # โ”€โ”€ Call backend recall endpoint โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + try: + resp = _api.get(f"{API_BASE}/orders/{order_id}/recall", timeout=10) + data = resp.json() + except Exception as e: + return ( + f'
' + f'
โŒ Error contacting backend
' + f'
{e}
', + None + ) + + status = data.get('status') + + if status == 'not_found': + return ( + f'
' + f'
๐Ÿšซ
' + f'
Order {order_id} not found
' + f'
' + f'This order ID was never processed, or its history has been cleared.
', + None + ) + + if status == 'expired': + upload_time = data.get('upload_time', 'unknown') + max_age = data.get('max_age_hours', 24) + return ( + f'
' + f'
โฐ
' + f'
Recall window expired for order {order_id}
' + f'
' + f'This order was processed on {upload_time} โ€” ' + f'orders can only be recalled within the last {max_age} hours.
', + None + ) + + # โ”€โ”€ status == 'found' โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + result = data.get('result') or {} + upload_time = data.get('upload_time', '') + completed_time = data.get('completed_time', '') + source = data.get('source', '') + has_replay = data.get('has_replay', False) + frames_available = data.get('frames_available', 0) + + details_html = format_recall_card( + order_id, result, upload_time, completed_time, source, frames_available + ) + + # โ”€โ”€ Download replay MP4 from backend โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + video_path = None + if has_replay: + try: + video_resp = _api.get( + f"{API_BASE}/orders/{order_id}/replay", + timeout=60, + stream=True + ) + if video_resp.status_code == 200: + tmp = tempfile.NamedTemporaryFile( + delete=False, + suffix=f"_order_{order_id}_replay.mp4", + dir="/tmp" + ) + for chunk in video_resp.iter_content(chunk_size=8192): + if chunk: + tmp.write(chunk) + tmp.close() + video_path = tmp.name + else: + print(f"[Recall] Replay endpoint returned {video_resp.status_code} for order {order_id}") + except Exception as e: + print(f"[Recall] Failed to download replay video for order {order_id}: {e}") + + return details_html, video_path + + # ----------------------------- # UI # ----------------------------- @@ -962,21 +1194,21 @@ def refresh_history(): # ====================== # FILE UPLOAD TAB # ====================== - with gr.TabItem("๐Ÿ“ Upload Video"): + with gr.TabItem("Upload Video"): gr.HTML('
') with gr.Row(): with gr.Column(scale=2): upload_file = gr.File( - label="๐Ÿ“น Select Video File", + label="Select Video File", file_types=[".mp4", ".avi", ".mkv", ".mov"], elem_classes=["card-panel"] ) with gr.Column(scale=1): - gr.HTML('
๐ŸŽฌ Upload Controls
') + gr.HTML('
Upload Controls
') upload_btn = gr.Button( - "๐Ÿš€ Upload & Start Processing", + "Upload & Start Processing", variant="primary", elem_classes=["primary-btn"], size="lg", @@ -997,7 +1229,7 @@ def refresh_history(): # Connect upload function with button state management upload_btn.click( - fn=lambda: gr.update(interactive=False, value="โณ Processing..."), + fn=lambda: gr.update(interactive=False, value="Processing..."), outputs=upload_btn ).then( fn=upload_video_with_progress, @@ -1009,7 +1241,7 @@ def refresh_history(): # ====================== # RTSP STREAM TAB # ====================== - with gr.TabItem("๐Ÿ“ก RTSP Stream"): + with gr.TabItem("RTSP Stream"): gr.HTML('
') # โ”€โ”€ Row 1: Mode badge โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ @@ -1025,7 +1257,7 @@ def refresh_history(): with gr.Row(): # Left column: Controls with gr.Column(scale=1): - gr.HTML('
๐Ÿ”— Stream Configuration
') + gr.HTML('
Stream Configuration
') rtsp_url = gr.Textbox( label="RTSP URL", placeholder="rtsp://rtsp-streamer:8554/station_1", @@ -1033,21 +1265,21 @@ def refresh_history(): ) gr.HTML('
') - gr.HTML('
๐ŸŽฅ Stream Controls
') + gr.HTML('
Stream Controls
') with gr.Row(): - stream_start_btn = gr.Button("โ–ถ๏ธ Start Preview", variant="primary", elem_classes=["primary-btn"]) - stream_stop_btn = gr.Button("โน๏ธ Stop", variant="secondary") + stream_start_btn = gr.Button("Start Preview", variant="primary", elem_classes=["primary-btn"]) + stream_stop_btn = gr.Button("Stop", variant="secondary") gr.HTML('
') - gr.HTML('
๐Ÿ”„ Processing Pipeline
') - process_btn = gr.Button("๐Ÿš€ Start Processing", variant="primary", elem_classes=["primary-btn"]) + gr.HTML('
Processing Pipeline
') + process_btn = gr.Button("Start Processing", variant="primary", elem_classes=["primary-btn"]) processing_status = gr.Textbox(label="Pipeline Status", lines=2, interactive=False) # Right column: Stream display with gr.Column(scale=2): - gr.HTML('
๐Ÿ“บ Live Stream Preview
') + gr.HTML('
Live Stream Preview
') stream_image = gr.Image( label="", width=None, @@ -1065,10 +1297,10 @@ def _load_mode_status(): mode = info.get('service_mode', 'unknown') workers = info.get('workers', 1) if mode == 'parallel': - return f"โšก Parallel mode โ€” {workers} station(s) running. 'Start Processing' will show station status." + return f"Parallel mode โ€” {workers} station(s) running. 'Start Processing' will show station status." elif mode == 'single': - return "๐Ÿ”ต Single mode โ€” 'Start Processing' will launch a new GStreamer pipeline for this URL." - return f"โš ๏ธ Mode unknown ({mode})" + return "Single mode โ€” 'Start Processing' will launch a new GStreamer pipeline for this URL." + return f"Mode unknown ({mode})" demo.load(fn=_load_mode_status, inputs=None, outputs=[mode_status]) @@ -1093,10 +1325,10 @@ def _load_mode_status(): # ====================== # RESULTS TAB - History View # ====================== - with gr.TabItem("๐Ÿ“Š Detected Orders"): + with gr.TabItem("Detected Orders"): gr.HTML('
') - gr.HTML('
๐Ÿ“œ Video Processing History
') + gr.HTML('
Video Processing History
') gr.HTML('

Click on any video entry to expand and view detailed validation results.

') results_history_display = gr.HTML( @@ -1105,8 +1337,8 @@ def _load_mode_status(): ) with gr.Row(): - refresh_btn = gr.Button("๐Ÿ”„ Refresh Results", variant="secondary") - clear_history_btn = gr.Button("๐Ÿ—‘๏ธ Clear History", variant="secondary") + refresh_btn = gr.Button("Refresh Results", variant="secondary") + clear_history_btn = gr.Button("Clear History", variant="secondary") refresh_btn.click( fn=refresh_history, @@ -1118,6 +1350,74 @@ def _load_mode_status(): outputs=results_history_display ) + # ====================== + # ORDER RECALL TAB + # ====================== + with gr.TabItem("Order Recall"): + gr.HTML('
') + gr.HTML( + '
' + 'Order Recall
' + '

' + 'Enter an order ID to view its validation result and replay the footage. ' + 'Orders can be recalled within 24 hours of processing.

' + ) + + # โ”€โ”€ Search row โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + with gr.Row(): + recall_input = gr.Textbox( + label="Order ID", + placeholder="e.g. 384", + scale=4, + container=True + ) + recall_btn = gr.Button( + "Recall Order", + variant="primary", + elem_classes=["primary-btn"], + scale=1, + size="lg" + ) + + # โ”€โ”€ Results row: details card (left) | video player (right) โ”€โ”€โ”€โ”€โ”€โ”€ + with gr.Row(): + with gr.Column(scale=1): + recall_details = gr.HTML( + value='
' + '
๐Ÿ”
' + '
' + 'Enter an order ID above and click Recall Order.
', + label="Order Details" + ) + + with gr.Column(scale=2): + gr.HTML('
' + 'Order Replay
') + recall_video = gr.Video( + label="", + interactive=False, + show_download_button=True, + show_label=False, + height=420 + ) + gr.HTML( + '

' + 'Replay is built from all frames captured during the order window ' + '(1 fps capture โ†’ played back at 2 fps).

' + ) + + # โ”€โ”€ Wire up button and Enter key โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + recall_btn.click( + fn=recall_order_fn, + inputs=[recall_input], + outputs=[recall_details, recall_video] + ) + recall_input.submit( + fn=recall_order_fn, + inputs=[recall_input], + outputs=[recall_details, recall_video] + ) + # Footer with Intel Branding gr.HTML('''
diff --git a/take-away/src/api/endpoints.py b/take-away/src/api/endpoints.py index f798037..de7d1b8 100755 --- a/take-away/src/api/endpoints.py +++ b/take-away/src/api/endpoints.py @@ -3,11 +3,15 @@ FastAPI REST endpoints for video upload and processing """ import os +import re import logging import uuid import shutil -from fastapi import FastAPI, Body, UploadFile, File, Query +from pathlib import Path +from fastapi import FastAPI, Body, UploadFile, File, Query, HTTPException +from fastapi.responses import FileResponse from typing import Dict, Any, Optional, List +import cv2 from core.pipeline_runner import run_pipeline_async from core.order_results import get_results, get_statistics, clear_all_results @@ -16,7 +20,8 @@ from core.video_history import ( start_video, complete_video, fail_video, get_video, get_video_history, get_video_summary, - get_current_video_id, add_result_to_video, clear_video_history + get_current_video_id, add_result_to_video, clear_video_history, + get_video_by_order_id ) # Configure logging @@ -31,6 +36,15 @@ SERVICE_MODE = os.getenv('SERVICE_MODE', 'single') +# โ”€โ”€ Order Recall configuration โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ +# Directory where frame-selector saves ALL frames per order +# structure: {FRAME_SELECTOR_DIR}/{station_id}/{order_id}/frame_N.jpg +FRAME_SELECTOR_DIR = Path(os.getenv('FRAME_SELECTOR_DEBUG_DIR', '/results/frame-selector-in')) +# Cached MP4s are written here so a second recall is instant +RECALL_CACHE_DIR = Path(os.getenv('RESULTS_DIR', '/results')) / 'recall_cache' +# Playback speed for the stitched replay video (10 fps matches 10-fps capture) +REPLAY_FPS = float(os.getenv('RECALL_REPLAY_FPS', '10')) + def create_app() -> FastAPI: """Create and configure FastAPI application""" @@ -280,8 +294,171 @@ def delete_video_history(): "results_cleared": results_result.get('cleared_count', 0) } + # ==================== Order Recall Endpoints ==================== + + @app.get("/orders/{order_id}/recall") + def recall_order(order_id: str): + """Look up order details from history with 24-hour TTL. + + Returns: + 200 + status='not_found' โ€“ order ID was never processed + 200 + status='expired' โ€“ order was processed but > 24 h ago + 200 + status='found' โ€“ full result + frame availability flag + """ + logger.info(f"[API] Order recall requested: order_id={order_id}") + recall = get_video_by_order_id(order_id) + + if recall['status'] != 'found': + logger.info(f"[API] Recall result for order {order_id}: {recall['status']}") + return recall + + # Check whether frame-selector frames exist for this order + station_id = recall.get('station_id', 'station_1') + order_frame_dir = _find_order_frame_dir(station_id, order_id) + frame_files = _sorted_frames(order_frame_dir) if order_frame_dir else [] + + recall['frames_available'] = len(frame_files) + recall['has_replay'] = len(frame_files) > 0 + logger.info( + f"[API] Recall found for order {order_id}: " + f"{len(frame_files)} frames, station={station_id}" + ) + return recall + + @app.get("/orders/{order_id}/frames/{filename}") + def serve_order_frame(order_id: str, filename: str): + """Serve a single JPEG frame for an order. + + Bridges the volume gap: Gradio container cannot mount /results directly, + so it fetches each frame via this HTTP endpoint. + """ + logger.info(f"[API] Frame requested: order_id={order_id}, filename={filename}") + + recall = get_video_by_order_id(order_id) + if recall['status'] == 'not_found': + raise HTTPException(status_code=404, detail=f"Order {order_id} not found") + if recall['status'] == 'expired': + raise HTTPException(status_code=410, detail=f"Order {order_id} recall window has expired") + + station_id = recall.get('station_id', 'station_1') + order_frame_dir = _find_order_frame_dir(station_id, order_id) + if not order_frame_dir: + raise HTTPException(status_code=404, detail=f"No frames found for order {order_id}") + + frame_path = order_frame_dir / filename + if not frame_path.exists(): + raise HTTPException(status_code=404, detail=f"Frame {filename} not found") + + return FileResponse(path=str(frame_path), media_type="image/jpeg") + + @app.get("/orders/{order_id}/replay") + def replay_order(order_id: str): + """Generate (or serve cached) an MP4 replay for an order. + + Stitches all frame-selector JPEG frames for the order into an MP4 + at REPLAY_FPS (default 2 fps). The result is cached under + /results/recall_cache/ so subsequent requests are served instantly. + """ + logger.info(f"[API] Replay requested: order_id={order_id}") + + recall = get_video_by_order_id(order_id) + if recall['status'] == 'not_found': + raise HTTPException(status_code=404, detail=f"Order {order_id} not found") + if recall['status'] == 'expired': + raise HTTPException(status_code=410, detail=f"Order {order_id} recall window has expired") + + station_id = recall.get('station_id', 'station_1') + + # Serve from cache if already built + RECALL_CACHE_DIR.mkdir(parents=True, exist_ok=True) + cached_path = RECALL_CACHE_DIR / f"{station_id}_{order_id}.mp4" + + if not cached_path.exists(): + # Locate the frame directory + order_frame_dir = _find_order_frame_dir(station_id, order_id) + if not order_frame_dir: + raise HTTPException( + status_code=404, + detail=f"No frames found for order {order_id} โ€” replay unavailable" + ) + + frame_files = _sorted_frames(order_frame_dir) + if not frame_files: + raise HTTPException( + status_code=404, + detail=f"Frame directory for order {order_id} is empty" + ) + + # Read first frame to get video dimensions + first_frame = cv2.imread(str(frame_files[0])) + if first_frame is None: + raise HTTPException(status_code=500, detail="Failed to read frames from disk") + + height, width = first_frame.shape[:2] + fourcc = cv2.VideoWriter_fourcc(*'mp4v') + writer = cv2.VideoWriter(str(cached_path), fourcc, REPLAY_FPS, (width, height)) + + for fp in frame_files: + frame = cv2.imread(str(fp)) + if frame is not None: + writer.write(frame) + + writer.release() + logger.info( + f"[API] Replay MP4 built for order {order_id}: " + f"{len(frame_files)} frames โ†’ {cached_path}" + ) + + return FileResponse( + path=str(cached_path), + media_type="video/mp4", + filename=f"order_{order_id}_replay.mp4" + ) + return app +# โ”€โ”€ Private helpers โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ + +def _find_order_frame_dir(station_id: str, order_id: str) -> Optional[Path]: + """Return the Path to the frame-selector debug folder for this order. + + Tries {FRAME_SELECTOR_DIR}/{station_id}/{order_id} first (fast path). + Falls back to scanning all station subdirectories so the code stays + correct even if station_id stored in history differs from the folder name. + """ + candidate = FRAME_SELECTOR_DIR / station_id / order_id + if candidate.exists(): + return candidate + + # Broader scan across all station dirs + if FRAME_SELECTOR_DIR.exists(): + for station_dir in FRAME_SELECTOR_DIR.iterdir(): + if station_dir.is_dir(): + alt = station_dir / order_id + if alt.exists(): + logger.debug( + f"[API] Found frames for order {order_id} in {alt} " + f"(expected station_id={station_id})" + ) + return alt + + logger.warning(f"[API] No frame directory found for order {order_id}") + return None + + +def _sorted_frames(order_dir: Path) -> List[Path]: + """Return JPEG files in order_dir sorted numerically by the number in the filename.""" + files = [ + f for f in order_dir.iterdir() + if f.suffix.lower() in ('.jpg', '.jpeg', '.png') + ] + return sorted( + files, + key=lambda f: int(re.search(r'(\d+)', f.stem).group(1)) + if re.search(r'(\d+)', f.stem) else 0 + ) + + # Export for module-level imports __all__ = ['create_app'] diff --git a/take-away/src/core/pipeline_runner.py b/take-away/src/core/pipeline_runner.py index e874a35..2009141 100755 --- a/take-away/src/core/pipeline_runner.py +++ b/take-away/src/core/pipeline_runner.py @@ -37,8 +37,8 @@ def build_gstreamer_pipeline(source_type: str, source: str) -> str: "! videoconvert " "! video/x-raw,format=BGR " "! videorate " - "! video/x-raw,framerate=1/1 " - "! queue max-size-time=0 max-size-bytes=0 max-size-buffers=200 leaky=no " + "! video/x-raw,framerate=10/1 " + "! queue max-size-time=0 max-size-bytes=0 max-size-buffers=1000 leaky=no " "! gvapython module=frame_pipeline function=process_frame " "! fakesink sync=true" # sync=true ensures real-time playback so OCR can keep up ) diff --git a/take-away/src/core/video_history.py b/take-away/src/core/video_history.py index 07124c3..c05848f 100644 --- a/take-away/src/core/video_history.py +++ b/take-away/src/core/video_history.py @@ -7,7 +7,7 @@ import logging from collections import deque from threading import Lock -from datetime import datetime +from datetime import datetime, timedelta from pathlib import Path from typing import Dict, List, Optional, Any from dataclasses import dataclass, field, asdict @@ -24,6 +24,7 @@ RESULTS_DIR = Path(os.environ.get('RESULTS_DIR', '/results')) HISTORY_FILE = RESULTS_DIR / 'video_history.json' MAX_HISTORY = 50 # Keep last 50 videos +MAX_RECALL_AGE_HOURS = 24 # Orders older than this cannot be recalled @dataclass @@ -202,6 +203,68 @@ def get_video(self, video_id: str) -> Optional[Dict]: return self._video_map[video_id].to_dict() return None + def get_video_by_order_id(self, order_id: str, max_age_hours: int = MAX_RECALL_AGE_HOURS) -> Dict: + """ + Look up video history by order ID with a TTL check. + + Returns a dict with one of three shapes: + {'status': 'not_found'} โ€” order ID never seen in history + {'status': 'expired', 'order_id': ..., 'upload_time': ...} โ€” outside TTL window + {'status': 'found', 'order_id': ..., 'video_id': ..., + 'station_id': ..., 'upload_time': ..., 'completed_time': ..., + 'source': ..., 'result': {...}} โ€” full details + """ + with self._lock: + cutoff = datetime.now() - timedelta(hours=max_age_hours) + + matched_entry: Optional[VideoEntry] = None + matched_result: Optional[Dict] = None + + # Walk history (newest first โ€” history is appendleft) + for entry in self._history: + if order_id in entry.orders_detected: + matched_entry = entry + # Find the specific result for this order inside the entry + for r in entry.results: + if str(r.get('order_id')) == str(order_id): + matched_result = r + break + break + + if matched_entry is None: + logger.info(f"[VIDEO-HISTORY] Recall: order {order_id} not found in history") + return {'status': 'not_found', 'order_id': order_id} + + # Parse upload_time for TTL check + try: + upload_dt = datetime.strptime(matched_entry.upload_time, '%Y-%m-%d %H:%M:%S') + except Exception: + upload_dt = datetime.now() # Fallback: treat as fresh + + if upload_dt < cutoff: + logger.info( + f"[VIDEO-HISTORY] Recall: order {order_id} expired " + f"(processed at {matched_entry.upload_time}, cutoff {cutoff.strftime('%Y-%m-%d %H:%M:%S')})" + ) + return { + 'status': 'expired', + 'order_id': order_id, + 'upload_time': matched_entry.upload_time, + 'max_age_hours': max_age_hours, + } + + logger.info(f"[VIDEO-HISTORY] Recall: order {order_id} found in video {matched_entry.video_id}") + return { + 'status': 'found', + 'order_id': order_id, + 'video_id': matched_entry.video_id, + 'station_id': matched_entry.station_id, + 'upload_time': matched_entry.upload_time, + 'completed_time': matched_entry.completed_time, + 'source': matched_entry.filename, + 'result': matched_result, + } + def get_current_video_id(self) -> Optional[str]: """Get the current processing video ID""" return self._current_video_id @@ -312,3 +375,12 @@ def get_current_video_id() -> Optional[str]: def clear_video_history() -> Dict: """Clear all video history""" return get_video_tracker().clear_history() + + +def get_video_by_order_id(order_id: str, max_age_hours: int = MAX_RECALL_AGE_HOURS) -> Dict: + """Look up a video entry by order ID, with a 24-hour TTL check by default. + + Returns: + dict with 'status' = 'found' | 'not_found' | 'expired' + """ + return get_video_tracker().get_video_by_order_id(order_id, max_age_hours) diff --git a/take-away/src/parallel/station_worker.py b/take-away/src/parallel/station_worker.py index 37cee21..f9f5a6e 100755 --- a/take-away/src/parallel/station_worker.py +++ b/take-away/src/parallel/station_worker.py @@ -905,7 +905,7 @@ def _build_persistent_gstreamer_pipeline(self) -> str: # Capture framerate for the GStreamer pipeline. # NOTE: 1fps is the recommended rate for CPU-based EasyOCR + YOLO processing. - capture_fps = int(os.environ.get("CAPTURE_FPS", "1")) + capture_fps = int(os.environ.get("CAPTURE_FPS", "10")) # Check if source is RTSP - use optimized low-latency rtspsrc if self.rtsp_url.startswith("rtsp://"):