feat: processing flow enhancement + responsive UI
Phase 2 - Processing flow:
- Multi-task monitoring: store supports concurrent task tracking
- Task retry: POST /api/tasks/{id}/retry re-runs failed tasks
- Dashboard multi-task cards with progress, error details, retry/dismiss
- Log panel expanded from 10 to 50 lines with "view all" link
Phase 3 - UI/UX:
- Mobile sidebar drawer (< 768px) with hamburger menu
- Layout responsive styles (768px, 480px breakpoints)
- Tasks/Logs pages responsive (stat cards, filters, columns)
- File views responsive (header wrap, button sizing)
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -234,6 +234,7 @@ async def ocr_batch(
|
||||
"""Run OCR on all images in input/."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task("批量OCR识别")
|
||||
task.metadata = {"endpoint": "/api/processing/ocr-batch", "body": {}}
|
||||
|
||||
image_exts = {'.jpg', '.jpeg', '.png', '.bmp', '.tiff', '.tif'}
|
||||
files = _list_input_files(filter_ext=list(image_exts))
|
||||
@@ -296,6 +297,7 @@ async def process_excel(
|
||||
"""Convert OCR output Excel files to standardized purchase orders."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task("Excel标准化处理")
|
||||
task.metadata = {"endpoint": "/api/processing/excel", "body": body.dict()}
|
||||
|
||||
excel_exts = {'.xls', '.xlsx'}
|
||||
if body.files:
|
||||
@@ -354,6 +356,7 @@ async def merge_orders(
|
||||
"""Merge selected purchase order files into one PosPal template."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task("合并采购单")
|
||||
task.metadata = {"endpoint": "/api/processing/merge", "body": body.dict()}
|
||||
|
||||
# If specific files provided, use them; otherwise merge all
|
||||
if body.filenames:
|
||||
@@ -399,6 +402,7 @@ async def full_pipeline(
|
||||
"""Run the full pipeline: OCR -> Excel -> Result (NO merge)."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task("一键全流程处理")
|
||||
task.metadata = {"endpoint": "/api/processing/pipeline", "body": body.dict()}
|
||||
|
||||
async def _bg():
|
||||
def do_work():
|
||||
@@ -501,6 +505,7 @@ async def ocr_single(
|
||||
"""OCR a single image file."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task(f"OCR: {body.filename}")
|
||||
task.metadata = {"endpoint": "/api/processing/ocr-single", "body": body.dict()}
|
||||
|
||||
file_path = _input_dir / body.filename
|
||||
if not file_path.is_file():
|
||||
@@ -544,6 +549,7 @@ async def excel_single(
|
||||
"""Process a single Excel file to purchase order."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task(f"Excel处理: {body.filename}")
|
||||
task.metadata = {"endpoint": "/api/processing/excel-single", "body": body.dict()}
|
||||
|
||||
file_path = _output_dir / body.filename
|
||||
if not file_path.is_file():
|
||||
@@ -582,6 +588,7 @@ async def pipeline_single(
|
||||
"""Full pipeline for a single image: OCR -> Excel -> Result (no merge)."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task(f"全流程: {body.filename}")
|
||||
task.metadata = {"endpoint": "/api/processing/pipeline-single", "body": body.dict()}
|
||||
|
||||
file_path = _input_dir / body.filename
|
||||
if not file_path.is_file():
|
||||
@@ -659,6 +666,7 @@ async def merge_batch(
|
||||
"""Merge selected purchase order files into one PosPal template."""
|
||||
tm = _get_task_manager(request)
|
||||
task = tm.create_task("批量合并采购单")
|
||||
task.metadata = {"endpoint": "/api/processing/merge-batch", "body": body.dict()}
|
||||
|
||||
file_paths = [_result_dir / f for f in body.filenames if (_result_dir / f).is_file()]
|
||||
if not file_paths:
|
||||
|
||||
@@ -121,7 +121,34 @@ async def retry_task(
|
||||
"""Retry a failed task by re-invoking its processing endpoint.
|
||||
|
||||
Only tasks with status ``failed`` may be retried.
|
||||
For in-memory tasks with metadata, the original endpoint and request body
|
||||
are used to faithfully reproduce the original call. For historical DB-only
|
||||
tasks, the endpoint is looked up from ``_RETRY_ROUTE_MAP`` by task name.
|
||||
"""
|
||||
tm = request.state.task_manager
|
||||
|
||||
# --- Strategy 1: in-memory task with metadata ---
|
||||
new_task = tm.retry_task(task_id)
|
||||
if new_task is not None:
|
||||
meta = new_task.metadata or {}
|
||||
endpoint = meta.get("endpoint")
|
||||
body = meta.get("body", {})
|
||||
if endpoint:
|
||||
base_url = f"http://{request.url.hostname}:{request.url.port}"
|
||||
url = f"{base_url}{endpoint}"
|
||||
auth_header = request.headers.get("authorization")
|
||||
headers: dict[str, str] = {}
|
||||
if auth_header:
|
||||
headers["authorization"] = auth_header
|
||||
async with httpx.AsyncClient() as client:
|
||||
resp = await client.post(url, json=body, headers=headers)
|
||||
return {"task_id": new_task.id, "status": "retried", "original_response": resp.json()}
|
||||
|
||||
# Metadata present but no endpoint — fall through to DB strategy
|
||||
# (the new task was already created; caller can track it)
|
||||
return {"task_id": new_task.id, "status": "retried"}
|
||||
|
||||
# --- Strategy 2: DB-only historical task (no in-memory record) ---
|
||||
loop = asyncio.get_event_loop()
|
||||
task = await loop.run_in_executor(
|
||||
None, lambda: db_schema.query_task_by_id(task_id),
|
||||
@@ -142,18 +169,18 @@ async def retry_task(
|
||||
detail=f"未知的任务类型: {task_name}",
|
||||
)
|
||||
|
||||
# Build the internal URL to the processing endpoint.
|
||||
# Create a new in-memory task to track the retry.
|
||||
new_task = tm.create_task(task_name)
|
||||
|
||||
base_url = f"http://{request.url.hostname}:{request.url.port}"
|
||||
url = f"{base_url}{endpoint}"
|
||||
|
||||
# Forward the Authorization header so the processing endpoint can
|
||||
# authenticate the request.
|
||||
auth_header = request.headers.get("authorization")
|
||||
headers: dict[str, str] = {}
|
||||
headers = {}
|
||||
if auth_header:
|
||||
headers["authorization"] = auth_header
|
||||
|
||||
async with httpx.AsyncClient() as client:
|
||||
resp = await client.post(url, headers=headers)
|
||||
|
||||
return resp.json()
|
||||
return {"task_id": new_task.id, "status": "retried", "original_response": resp.json()}
|
||||
|
||||
@@ -28,9 +28,10 @@ class Task:
|
||||
result_files: List[str] = field(default_factory=list)
|
||||
error: Optional[str] = None
|
||||
log_lines: List[str] = field(default_factory=list)
|
||||
metadata: Optional[dict] = None
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
d = {
|
||||
"task_id": self.id,
|
||||
"name": self.name,
|
||||
"status": self.status.value,
|
||||
@@ -40,6 +41,9 @@ class Task:
|
||||
"error": self.error,
|
||||
"log_lines": self.log_lines[-100:],
|
||||
}
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
return d
|
||||
|
||||
|
||||
class TaskManager:
|
||||
@@ -135,6 +139,21 @@ class TaskManager:
|
||||
)
|
||||
self._schedule(self._broadcast(task_id))
|
||||
|
||||
def retry_task(self, task_id: str) -> Optional[Task]:
|
||||
"""Create a new task to retry a failed task with its original parameters.
|
||||
|
||||
Returns the new task if the original was failed and retryable, else None.
|
||||
The caller is responsible for dispatching the actual work based on
|
||||
``new_task.metadata``.
|
||||
"""
|
||||
original = self._tasks.get(task_id)
|
||||
if not original or original.status != TaskStatus.FAILED:
|
||||
return None
|
||||
new_task = self.create_task(original.name)
|
||||
if original.metadata:
|
||||
new_task.metadata = dict(original.metadata)
|
||||
return new_task
|
||||
|
||||
def set_failed(self, task_id: str, error: str):
|
||||
task = self._tasks.get(task_id)
|
||||
if not task:
|
||||
|
||||
Reference in New Issue
Block a user