Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc1902a1bb | |||
| 86290274e5 | |||
| ee0f65ed39 | |||
| 18d0db8a0c |
@@ -5,19 +5,25 @@ the numbers: that is what lets a station's configuration change without touching
|
|||||||
the frontend or the recipes.
|
the frontend or the recipes.
|
||||||
"""
|
"""
|
||||||
import io
|
import io
|
||||||
|
import json
|
||||||
|
|
||||||
|
from fastapi.responses import FileResponse
|
||||||
from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status
|
from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
from src.backend.api.middleware.api_key import require_maker, require_measurement_tec
|
from src.backend.api.middleware.api_key import require_maker, require_measurement_tec
|
||||||
from src.backend.api.routers.files import ALLOWED_IMAGE_TYPES, validate_file_size
|
from src.backend.api.routers.files import (
|
||||||
|
ALLOWED_IMAGE_TYPES, resolve_upload_path, validate_file_size,
|
||||||
|
)
|
||||||
from src.backend.config import settings
|
from src.backend.config import settings
|
||||||
from src.backend.database import get_db
|
from src.backend.database import get_db
|
||||||
from src.backend.models.api.vision import (
|
from src.backend.models.api.vision import (
|
||||||
VisionExecuteResponse, VisionMeasurementResult, VisionReferenceImageResponse,
|
VisionExecuteResponse, VisionMeasurementResult, VisionRecipeResponse,
|
||||||
|
VisionRecipeUploadResponse, VisionReferenceImageResponse,
|
||||||
)
|
)
|
||||||
|
from src.backend.models.orm.vision import VisionResult
|
||||||
from src.backend.models.orm.task import RecipeTask
|
from src.backend.models.orm.task import RecipeTask
|
||||||
from src.backend.models.orm.user import User
|
from src.backend.models.orm.user import User
|
||||||
from src.backend.services import vision_service
|
from src.backend.services import vision_service
|
||||||
@@ -126,7 +132,7 @@ async def execute(
|
|||||||
) -> VisionExecuteResponse:
|
) -> VisionExecuteResponse:
|
||||||
task = await _task_or_404(db, task_id)
|
task = await _task_or_404(db, task_id)
|
||||||
|
|
||||||
result, saved = await vision_service.execute_task(
|
result, saved, report = await vision_service.execute_task(
|
||||||
db,
|
db,
|
||||||
task,
|
task,
|
||||||
await _read_image(image),
|
await _read_image(image),
|
||||||
@@ -135,6 +141,7 @@ async def execute(
|
|||||||
lot_number=lot_number,
|
lot_number=lot_number,
|
||||||
serial_number=serial_number,
|
serial_number=serial_number,
|
||||||
production_run_id=production_run_id,
|
production_run_id=production_run_id,
|
||||||
|
image_ext=_IMAGE_EXTENSIONS.get(image.content_type, "png"),
|
||||||
)
|
)
|
||||||
await db.commit()
|
await db.commit()
|
||||||
|
|
||||||
@@ -147,6 +154,111 @@ async def execute(
|
|||||||
)
|
)
|
||||||
for m in saved
|
for m in saved
|
||||||
],
|
],
|
||||||
|
outcome=report.get("outcome"),
|
||||||
|
overlay=report.get("overlay") or [],
|
||||||
|
image_url=f"/api/vision/results/{result.id}/image",
|
||||||
|
failures=report.get("failures") or [],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/results/{result_id}/image")
|
||||||
|
async def get_result_image(
|
||||||
|
result_id: int,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: User = Depends(require_measurement_tec),
|
||||||
|
) -> FileResponse:
|
||||||
|
"""The image a vision run measured, as saved by `execute` (#46)."""
|
||||||
|
result = (await db.execute(
|
||||||
|
select(VisionResult).where(VisionResult.id == result_id)
|
||||||
|
)).scalar_one_or_none()
|
||||||
|
if result is None or not result.image_path:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_404_NOT_FOUND, detail="Result image not found",
|
||||||
|
)
|
||||||
|
return FileResponse(resolve_upload_path(result.image_path))
|
||||||
|
|
||||||
|
|
||||||
|
def _422(errors: list[str]) -> HTTPException:
|
||||||
|
# detail e' una lista di stringhe: il frontend legge i 422 solo da `detail`.
|
||||||
|
return HTTPException(
|
||||||
|
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT, detail=errors,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/tasks/{task_id}/recipe", response_model=VisionRecipeUploadResponse)
|
||||||
|
async def upload_recipe(
|
||||||
|
task_id: int,
|
||||||
|
recipe: UploadFile = File(...),
|
||||||
|
files: list[UploadFile] = File(default=[]),
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: User = Depends(require_maker),
|
||||||
|
) -> VisionRecipeUploadResponse:
|
||||||
|
"""Load a VisionSuite v2 recipe plus its meta files onto a task (#46)."""
|
||||||
|
task = await _task_or_404(db, task_id)
|
||||||
|
if task.task_type not in vision_service.VISION_TASK_TYPES:
|
||||||
|
raise _422([f"task type {task.task_type!r} does not run a vision recipe"])
|
||||||
|
|
||||||
|
raw = await recipe.read()
|
||||||
|
if not validate_file_size(len(raw)):
|
||||||
|
raise _422([f"recipe exceeds {settings.max_upload_size_mb}MB"])
|
||||||
|
try:
|
||||||
|
graph = json.loads(raw)
|
||||||
|
except ValueError:
|
||||||
|
raise _422(["the recipe is not valid JSON"])
|
||||||
|
if not isinstance(graph, dict):
|
||||||
|
raise _422(["the recipe must be a JSON object"])
|
||||||
|
|
||||||
|
uploads: list[tuple[str, bytes]] = []
|
||||||
|
for f in files:
|
||||||
|
content = await f.read()
|
||||||
|
if not validate_file_size(len(content)):
|
||||||
|
raise _422([f"file {f.filename!r} exceeds {settings.max_upload_size_mb}MB"])
|
||||||
|
uploads.append((f.filename or "", content))
|
||||||
|
placed, errors = vision_service.match_recipe_files(graph, uploads)
|
||||||
|
if errors:
|
||||||
|
raise _422(errors)
|
||||||
|
|
||||||
|
# The folder is content-addressed and immutable; writing it before the
|
||||||
|
# validation is harmless (an orphan folder is never referenced) and the
|
||||||
|
# worker needs it on disk to validate meta files.
|
||||||
|
try:
|
||||||
|
recipe_dir = vision_service.store_recipe_folder(task.id, graph, placed)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise _422([str(exc)])
|
||||||
|
check = await vision_service.validate_recipe(graph, recipe_dir)
|
||||||
|
if not check["ok"]:
|
||||||
|
raise _422([str(e) for e in check["errors"]] or ["the recipe is not valid"])
|
||||||
|
|
||||||
|
task.vision_json = graph
|
||||||
|
task.vision_recipe_dir = recipe_dir
|
||||||
|
await db.commit()
|
||||||
|
return VisionRecipeUploadResponse(
|
||||||
|
task_id=task.id,
|
||||||
|
recipe_dir=recipe_dir,
|
||||||
|
files=vision_service.list_recipe_files(recipe_dir),
|
||||||
|
outputs=check["outputs"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/tasks/{task_id}/recipe", response_model=VisionRecipeResponse)
|
||||||
|
async def get_recipe(
|
||||||
|
task_id: int,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: User = Depends(require_maker),
|
||||||
|
) -> VisionRecipeResponse:
|
||||||
|
task = await _task_or_404(db, task_id)
|
||||||
|
outputs: list[dict] = []
|
||||||
|
if task.vision_json:
|
||||||
|
check = await vision_service.validate_recipe(
|
||||||
|
task.vision_json, task.vision_recipe_dir,
|
||||||
|
)
|
||||||
|
outputs = check.get("outputs", [])
|
||||||
|
return VisionRecipeResponse(
|
||||||
|
task_id=task.id,
|
||||||
|
recipe_dir=task.vision_recipe_dir,
|
||||||
|
recipe=task.vision_json,
|
||||||
|
files=vision_service.list_recipe_files(task.vision_recipe_dir),
|
||||||
|
outputs=outputs,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
"""recipe_tasks.vision_recipe_dir: cartella della ricetta VisionSuite v2 (#46)
|
||||||
|
|
||||||
|
Percorso relativo sotto upload_path della cartella immutabile che contiene
|
||||||
|
recipe.json e i file di meta (DXF, modelli .npz, ...).
|
||||||
|
|
||||||
|
Revision ID: 016_vision_recipe_dir
|
||||||
|
Revises: 015_api_key_hash
|
||||||
|
Create Date: 2026-10-07
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
revision: str = '016_vision_recipe_dir'
|
||||||
|
down_revision: Union[str, None] = '015_api_key_hash'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
# batch: SQLite non sa fare DROP COLUMN nativo su tutte le versioni
|
||||||
|
with op.batch_alter_table('recipe_tasks') as batch:
|
||||||
|
batch.add_column(sa.Column('vision_recipe_dir', sa.String(500), nullable=True))
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
with op.batch_alter_table('recipe_tasks') as batch:
|
||||||
|
batch.drop_column('vision_recipe_dir')
|
||||||
@@ -16,6 +16,34 @@ class VisionExecuteResponse(BaseModel):
|
|||||||
vision_result_id: int
|
vision_result_id: int
|
||||||
engine_version: str
|
engine_version: str
|
||||||
measurements: list[VisionMeasurementResult]
|
measurements: list[VisionMeasurementResult]
|
||||||
|
# Esito VisionSuite (informativo: il verdetto lo danno utl/ltl), overlay
|
||||||
|
# in px immagine, URL dell'immagine salvata e strumenti falliti (#46).
|
||||||
|
outcome: str | None = None
|
||||||
|
overlay: list[dict] = []
|
||||||
|
image_url: str | None = None
|
||||||
|
failures: list[dict] = []
|
||||||
|
|
||||||
|
|
||||||
|
class VisionRecipeOutput(BaseModel):
|
||||||
|
"""One numeric output a recipe offers to the quotes."""
|
||||||
|
key: str
|
||||||
|
quantity: str | None = None
|
||||||
|
unit: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class VisionRecipeUploadResponse(BaseModel):
|
||||||
|
task_id: int
|
||||||
|
recipe_dir: str
|
||||||
|
files: list[str]
|
||||||
|
outputs: list[VisionRecipeOutput]
|
||||||
|
|
||||||
|
|
||||||
|
class VisionRecipeResponse(BaseModel):
|
||||||
|
task_id: int
|
||||||
|
recipe_dir: str | None = None
|
||||||
|
recipe: dict | None = None
|
||||||
|
files: list[str]
|
||||||
|
outputs: list[VisionRecipeOutput]
|
||||||
|
|
||||||
|
|
||||||
class VisionReferenceImageResponse(BaseModel):
|
class VisionReferenceImageResponse(BaseModel):
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ if TYPE_CHECKING:
|
|||||||
TASK_TYPES = ("note", "measure", "drawing", "dxf_compare", "camera_measure")
|
TASK_TYPES = ("note", "measure", "drawing", "dxf_compare", "camera_measure")
|
||||||
|
|
||||||
# Types the operator screen treats as "there are quotes to take here".
|
# Types the operator screen treats as "there are quotes to take here".
|
||||||
MEASURING_TASK_TYPES = ("measure", "camera_measure")
|
# dxf_compare produce quote come camera_measure (#46)
|
||||||
|
MEASURING_TASK_TYPES = ("measure", "camera_measure", "dxf_compare")
|
||||||
|
|
||||||
|
|
||||||
class RecipeTask(Base):
|
class RecipeTask(Base):
|
||||||
@@ -51,6 +52,9 @@ class RecipeTask(Base):
|
|||||||
# server routes it and never interprets it, which is what keeps VisionSuite
|
# server routes it and never interprets it, which is what keeps VisionSuite
|
||||||
# out of this container.
|
# out of this container.
|
||||||
vision_json: Mapped[Optional[dict]] = mapped_column(JSON, nullable=True)
|
vision_json: Mapped[Optional[dict]] = mapped_column(JSON, nullable=True)
|
||||||
|
# Cartella immutabile (relativa a upload_path) con recipe.json e i file di
|
||||||
|
# meta della ricetta VisionSuite v2 (#46).
|
||||||
|
vision_recipe_dir: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
|
||||||
|
|
||||||
# Relationships
|
# Relationships
|
||||||
version: Mapped["RecipeVersion"] = relationship(back_populates="tasks")
|
version: Mapped["RecipeVersion"] = relationship(back_populates="tasks")
|
||||||
|
|||||||
@@ -115,6 +115,8 @@ async def _copy_tasks_to_version(
|
|||||||
# a camera_measure task unable to execute from the moment a
|
# a camera_measure task unable to execute from the moment a
|
||||||
# recipe with measurements is next edited.
|
# recipe with measurements is next edited.
|
||||||
vision_json=task.vision_json,
|
vision_json=task.vision_json,
|
||||||
|
# Cartella immutabile: basta il riferimento (#46).
|
||||||
|
vision_recipe_dir=task.vision_recipe_dir,
|
||||||
)
|
)
|
||||||
db.add(new_task)
|
db.add(new_task)
|
||||||
await db.flush() # get new_task.id
|
await db.flush() # get new_task.id
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ to the worker over HTTP and stays ignorant of how a number was produced.
|
|||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import math
|
import math
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -46,7 +47,13 @@ def _is_measurable(value: object) -> bool:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def _call_worker(image_bytes: bytes, graph: dict) -> dict:
|
async def _call_worker(
|
||||||
|
image_bytes: bytes,
|
||||||
|
graph: dict,
|
||||||
|
*,
|
||||||
|
recipe_dir: str | None = None,
|
||||||
|
calibration: dict | None = None,
|
||||||
|
) -> dict:
|
||||||
"""The one place that talks to the worker; the tests replace it.
|
"""The one place that talks to the worker; the tests replace it.
|
||||||
|
|
||||||
The worker's fault must not become the API's fault (spec's edge-case
|
The worker's fault must not become the API's fault (spec's edge-case
|
||||||
@@ -60,12 +67,19 @@ async def _call_worker(image_bytes: bytes, graph: dict) -> dict:
|
|||||||
is not the worker's JSON contract must not turn into a bare KeyError
|
is not the worker's JSON contract must not turn into a bare KeyError
|
||||||
further down.
|
further down.
|
||||||
"""
|
"""
|
||||||
|
# recipe_dir (relativo, #46) e calibration sono opzionali: se assenti non
|
||||||
|
# si mandano, il worker usa i suoi default.
|
||||||
|
data = {"graph": json.dumps(graph)}
|
||||||
|
if recipe_dir:
|
||||||
|
data["recipe_dir"] = recipe_dir
|
||||||
|
if calibration:
|
||||||
|
data["calibration"] = json.dumps(calibration)
|
||||||
try:
|
try:
|
||||||
async with httpx.AsyncClient(timeout=120.0) as client:
|
async with httpx.AsyncClient(timeout=120.0) as client:
|
||||||
response = await client.post(
|
response = await client.post(
|
||||||
f"{settings.vision_worker_url}/run",
|
f"{settings.vision_worker_url}/run",
|
||||||
files={"image": ("frame.png", image_bytes, "image/png")},
|
files={"image": ("frame.png", image_bytes, "image/png")},
|
||||||
data={"graph": json.dumps(graph)},
|
data=data,
|
||||||
)
|
)
|
||||||
except httpx.TimeoutException as exc:
|
except httpx.TimeoutException as exc:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
@@ -122,6 +136,188 @@ async def _call_worker(image_bytes: bytes, graph: dict) -> dict:
|
|||||||
return report
|
return report
|
||||||
|
|
||||||
|
|
||||||
|
async def validate_recipe(graph: dict, recipe_dir: str | None) -> dict:
|
||||||
|
"""Ask the worker's /validate whether a v2 recipe is loadable (#46).
|
||||||
|
|
||||||
|
Returns {"ok", "errors", "outputs"}. A worker 422 (e.g. recipe_dir
|
||||||
|
refused) is folded into ok=False; transport faults become 502/504 as in
|
||||||
|
`_call_worker`. Replaced by the tests.
|
||||||
|
"""
|
||||||
|
data = {"graph": json.dumps(graph)}
|
||||||
|
if recipe_dir:
|
||||||
|
data["recipe_dir"] = recipe_dir
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=60.0) as client:
|
||||||
|
response = await client.post(
|
||||||
|
f"{settings.vision_worker_url}/validate", data=data,
|
||||||
|
)
|
||||||
|
except httpx.TimeoutException as exc:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_504_GATEWAY_TIMEOUT,
|
||||||
|
detail=f"the vision worker did not answer in time: {exc}",
|
||||||
|
) from exc
|
||||||
|
except httpx.HTTPError as exc:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_502_BAD_GATEWAY,
|
||||||
|
detail=f"the vision worker is unreachable: {exc}",
|
||||||
|
) from exc
|
||||||
|
if response.status_code == status.HTTP_422_UNPROCESSABLE_CONTENT:
|
||||||
|
try:
|
||||||
|
detail = response.json().get("detail", response.text)
|
||||||
|
except ValueError:
|
||||||
|
detail = response.text
|
||||||
|
errors = detail if isinstance(detail, list) else [str(detail)]
|
||||||
|
return {"ok": False, "errors": [str(e) for e in errors], "outputs": []}
|
||||||
|
if response.status_code != 200:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_502_BAD_GATEWAY,
|
||||||
|
detail=f"the vision worker refused the job: {response.text}",
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
body = response.json()
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_502_BAD_GATEWAY,
|
||||||
|
detail="the vision worker's answer was malformed: not valid JSON",
|
||||||
|
) from exc
|
||||||
|
if not isinstance(body, dict) or "ok" not in body:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_502_BAD_GATEWAY,
|
||||||
|
detail="the vision worker's answer was malformed: missing ok",
|
||||||
|
)
|
||||||
|
body.setdefault("errors", [])
|
||||||
|
body.setdefault("outputs", [])
|
||||||
|
return body
|
||||||
|
|
||||||
|
|
||||||
|
# Task types that run a vision graph (#46).
|
||||||
|
VISION_TASK_TYPES = ("camera_measure", "dxf_compare")
|
||||||
|
|
||||||
|
|
||||||
|
def _safe_join(root: Path, relative: str) -> Path:
|
||||||
|
"""root/relative, refusing absolute paths, '..' and anything leaving root."""
|
||||||
|
candidate = Path(relative)
|
||||||
|
if candidate.is_absolute() or ".." in candidate.parts or not candidate.parts:
|
||||||
|
raise ValueError(f"unsafe path: {relative}")
|
||||||
|
full = (root / candidate).resolve()
|
||||||
|
if not full.is_relative_to(root.resolve()):
|
||||||
|
raise ValueError(f"unsafe path: {relative}")
|
||||||
|
return full
|
||||||
|
|
||||||
|
|
||||||
|
def collect_meta_paths(node: object) -> list[str]:
|
||||||
|
"""Every `path` string found in any dict under the recipe's `meta`."""
|
||||||
|
found: list[str] = []
|
||||||
|
if isinstance(node, dict):
|
||||||
|
for key, value in node.items():
|
||||||
|
if key == "path" and isinstance(value, str):
|
||||||
|
found.append(value)
|
||||||
|
else:
|
||||||
|
found.extend(collect_meta_paths(value))
|
||||||
|
elif isinstance(node, list):
|
||||||
|
for item in node:
|
||||||
|
found.extend(collect_meta_paths(item))
|
||||||
|
return found
|
||||||
|
|
||||||
|
|
||||||
|
def match_recipe_files(
|
||||||
|
recipe: dict, uploads: list[tuple[str, bytes]],
|
||||||
|
) -> tuple[dict[str, bytes], list[str]]:
|
||||||
|
"""Pair each uploaded file with a meta path by base name (#46).
|
||||||
|
|
||||||
|
Returns ({relative path: bytes}, errors). Errors list every upload that
|
||||||
|
has no name or matches no meta path, and every unsafe meta path. A meta
|
||||||
|
path left without a file is not an error here: /validate decides.
|
||||||
|
"""
|
||||||
|
paths = collect_meta_paths(recipe.get("meta", {}))
|
||||||
|
by_name: dict[str, str] = {}
|
||||||
|
for p in paths:
|
||||||
|
by_name.setdefault(Path(p.replace("\\", "/")).name, p)
|
||||||
|
placed: dict[str, bytes] = {}
|
||||||
|
errors: list[str] = []
|
||||||
|
for name, content in uploads:
|
||||||
|
if not name:
|
||||||
|
errors.append("a file has no name")
|
||||||
|
continue
|
||||||
|
target = by_name.get(Path(name.replace("\\", "/")).name)
|
||||||
|
if target is None:
|
||||||
|
errors.append(f"file {name!r} matches no path in the recipe's meta")
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
_safe_join(Path("."), target)
|
||||||
|
except ValueError:
|
||||||
|
errors.append(f"meta path {target!r} is not allowed")
|
||||||
|
continue
|
||||||
|
placed[target] = content
|
||||||
|
return placed, errors
|
||||||
|
|
||||||
|
|
||||||
|
def store_recipe_folder(
|
||||||
|
task_id: int, recipe: dict, files: dict[str, bytes],
|
||||||
|
) -> str:
|
||||||
|
"""Write the immutable recipe folder; return its path relative to uploads.
|
||||||
|
|
||||||
|
Folder name = first 16 hex of the recipe's sha256. If it already exists it
|
||||||
|
is left untouched (immutable: other task versions may reference it).
|
||||||
|
"""
|
||||||
|
canonical = json.dumps(recipe, sort_keys=True, separators=(",", ":"))
|
||||||
|
# Il digest copre anche i file (path ordinato + sha256 del contenuto): la
|
||||||
|
# stessa ricetta con file diversi (es. primo upload senza il DXF) deve dare
|
||||||
|
# una cartella diversa, altrimenti quella incompleta resterebbe per sempre
|
||||||
|
# perche' immutabile (#46).
|
||||||
|
h = hashlib.sha256(canonical.encode("utf-8"))
|
||||||
|
for rel in sorted(files):
|
||||||
|
h.update(b"\0" + rel.encode("utf-8") + b"\0")
|
||||||
|
h.update(hashlib.sha256(files[rel]).digest())
|
||||||
|
digest = h.hexdigest()[:16]
|
||||||
|
relative = f"vision/recipes/{task_id}/{digest}"
|
||||||
|
folder = settings.upload_path / relative
|
||||||
|
if folder.exists():
|
||||||
|
return relative
|
||||||
|
folder.mkdir(parents=True, exist_ok=True)
|
||||||
|
(folder / "recipe.json").write_text(
|
||||||
|
json.dumps(recipe, indent=2, ensure_ascii=False), encoding="utf-8",
|
||||||
|
)
|
||||||
|
for rel, content in files.items():
|
||||||
|
target = _safe_join(folder, rel)
|
||||||
|
target.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
target.write_bytes(content)
|
||||||
|
return relative
|
||||||
|
|
||||||
|
|
||||||
|
def list_recipe_files(recipe_dir: str | None) -> list[str]:
|
||||||
|
"""Files of a recipe folder, relative to it (recipe.json excluded)."""
|
||||||
|
if not recipe_dir:
|
||||||
|
return []
|
||||||
|
try:
|
||||||
|
folder = _safe_join(settings.upload_path, recipe_dir)
|
||||||
|
except ValueError:
|
||||||
|
return []
|
||||||
|
if not folder.is_dir():
|
||||||
|
return []
|
||||||
|
return sorted(
|
||||||
|
p.relative_to(folder).as_posix()
|
||||||
|
for p in folder.rglob("*") if p.is_file() and p.name != "recipe.json"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def save_result_files(
|
||||||
|
task_id: int, image_bytes: bytes, overlay: list, image_ext: str = "png",
|
||||||
|
) -> tuple[str, str]:
|
||||||
|
"""Save the executed image and its overlay JSON side by side (#46).
|
||||||
|
|
||||||
|
Returns (image_path, overlay_path), both relative to uploads.
|
||||||
|
"""
|
||||||
|
stem = uuid4().hex
|
||||||
|
base = Path("vision") / "results" / str(task_id)
|
||||||
|
(settings.upload_path / base).mkdir(parents=True, exist_ok=True)
|
||||||
|
image_rel = (base / f"{stem}.{image_ext}").as_posix()
|
||||||
|
overlay_rel = (base / f"{stem}.overlay.json").as_posix()
|
||||||
|
(settings.upload_path / image_rel).write_bytes(image_bytes)
|
||||||
|
(settings.upload_path / overlay_rel).write_text(json.dumps(overlay), encoding="utf-8")
|
||||||
|
return image_rel, overlay_rel
|
||||||
|
|
||||||
|
|
||||||
async def execute_task(
|
async def execute_task(
|
||||||
db: AsyncSession,
|
db: AsyncSession,
|
||||||
task: RecipeTask,
|
task: RecipeTask,
|
||||||
@@ -132,8 +328,9 @@ async def execute_task(
|
|||||||
lot_number: str | None = None,
|
lot_number: str | None = None,
|
||||||
serial_number: str | None = None,
|
serial_number: str | None = None,
|
||||||
production_run_id: int | None = None,
|
production_run_id: int | None = None,
|
||||||
) -> tuple[VisionResult, list[Measurement]]:
|
image_ext: str = "png",
|
||||||
if task.task_type != "camera_measure":
|
) -> tuple[VisionResult, list[Measurement], dict]:
|
||||||
|
if task.task_type not in VISION_TASK_TYPES:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
|
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
|
||||||
detail=f"task type {task.task_type!r} is not a camera measurement",
|
detail=f"task type {task.task_type!r} is not a camera measurement",
|
||||||
@@ -210,7 +407,11 @@ async def execute_task(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
report = await _call_worker(image_bytes, task.vision_json)
|
# Nessuna fonte di calibrazione esiste oggi (ne' task ne' stazione): non si
|
||||||
|
# passa `calibration`, la ricetta porta la sua (#46).
|
||||||
|
report = await _call_worker(
|
||||||
|
image_bytes, task.vision_json, recipe_dir=task.vision_recipe_dir,
|
||||||
|
)
|
||||||
outputs = report["outputs"]
|
outputs = report["outputs"]
|
||||||
|
|
||||||
# Every quote or none. A half-measured piece read as a whole one is worse
|
# Every quote or none. A half-measured piece read as a whole one is worse
|
||||||
@@ -231,8 +432,12 @@ async def execute_task(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
overlay = report.get("overlay") or []
|
||||||
|
image_path, overlay_path = save_result_files(task.id, image_bytes, overlay, image_ext)
|
||||||
result = VisionResult(
|
result = VisionResult(
|
||||||
task_id=task.id,
|
task_id=task.id,
|
||||||
|
image_path=image_path,
|
||||||
|
overlay_path=overlay_path,
|
||||||
engine_version=report["engine_version"],
|
engine_version=report["engine_version"],
|
||||||
executed_on="server",
|
executed_on="server",
|
||||||
graph_snapshot=task.vision_json,
|
graph_snapshot=task.vision_json,
|
||||||
@@ -257,7 +462,7 @@ async def execute_task(
|
|||||||
enforce_tolerance_gate=False,
|
enforce_tolerance_gate=False,
|
||||||
))
|
))
|
||||||
|
|
||||||
return result, saved
|
return result, saved, report
|
||||||
|
|
||||||
|
|
||||||
def _reference_file_path(reference: VisionReferenceImage) -> Path:
|
def _reference_file_path(reference: VisionReferenceImage) -> Path:
|
||||||
@@ -377,4 +582,6 @@ async def preview(db: AsyncSession, task: RecipeTask, image_bytes: bytes) -> dic
|
|||||||
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
|
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
|
||||||
detail="this task carries no vision graph",
|
detail="this task carries no vision graph",
|
||||||
)
|
)
|
||||||
return await _call_worker(image_bytes, task.vision_json)
|
return await _call_worker(
|
||||||
|
image_bytes, task.vision_json, recipe_dir=task.vision_recipe_dir,
|
||||||
|
)
|
||||||
|
|||||||
@@ -131,3 +131,21 @@ class TestApiKeyHashMigration:
|
|||||||
|
|
||||||
command.upgrade(cfg, "head") # and up again
|
command.upgrade(cfg, "head") # and up again
|
||||||
assert "api_keys" in _inspect(db_path).get_table_names()
|
assert "api_keys" in _inspect(db_path).get_table_names()
|
||||||
|
|
||||||
|
|
||||||
|
class TestVisionRecipeDirMigration:
|
||||||
|
"""016_vision_recipe_dir: recipe_tasks.vision_recipe_dir, su e giu (#46)."""
|
||||||
|
|
||||||
|
def test_016_upgrade_and_downgrade(self, sqlite_database_url):
|
||||||
|
db_path, _ = sqlite_database_url
|
||||||
|
cfg = _alembic_config()
|
||||||
|
|
||||||
|
def cols():
|
||||||
|
return {c["name"] for c in _inspect(db_path).get_columns("recipe_tasks")}
|
||||||
|
|
||||||
|
command.upgrade(cfg, "head")
|
||||||
|
assert "vision_recipe_dir" in cols()
|
||||||
|
command.downgrade(cfg, "015_api_key_hash")
|
||||||
|
assert "vision_recipe_dir" not in cols()
|
||||||
|
command.upgrade(cfg, "head") # e di nuovo su
|
||||||
|
assert "vision_recipe_dir" in cols()
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ async def two_vision_quotes(db_session, recipe_id: int):
|
|||||||
def worker_says(monkeypatch):
|
def worker_says(monkeypatch):
|
||||||
"""The worker does not run in tests: its response is faked here."""
|
"""The worker does not run in tests: its response is faked here."""
|
||||||
def _install(outputs: dict, failures: list | None = None):
|
def _install(outputs: dict, failures: list | None = None):
|
||||||
async def fake_call(image_bytes: bytes, graph: dict) -> dict:
|
async def fake_call(image_bytes: bytes, graph: dict, **kwargs) -> dict:
|
||||||
return {
|
return {
|
||||||
"outputs": outputs,
|
"outputs": outputs,
|
||||||
"failures": failures or [],
|
"failures": failures or [],
|
||||||
@@ -316,7 +316,7 @@ async def test_a_pending_fail_blocks_before_the_worker_is_called(
|
|||||||
)
|
)
|
||||||
await db_session.commit()
|
await db_session.commit()
|
||||||
|
|
||||||
async def worker_must_not_be_called(image_bytes: bytes, graph: dict) -> dict:
|
async def worker_must_not_be_called(image_bytes: bytes, graph: dict, **kwargs) -> dict:
|
||||||
raise AssertionError("the worker must not run while the operator is blocked")
|
raise AssertionError("the worker must not run while the operator is blocked")
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"src.backend.services.vision_service._call_worker", worker_must_not_be_called,
|
"src.backend.services.vision_service._call_worker", worker_must_not_be_called,
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ async def a_camera_task(db_session, recipe_id: int):
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def worker_says(monkeypatch):
|
def worker_says(monkeypatch):
|
||||||
def _install(outputs: dict):
|
def _install(outputs: dict):
|
||||||
async def fake_call(image_bytes: bytes, graph: dict) -> dict:
|
async def fake_call(image_bytes: bytes, graph: dict, **kwargs) -> dict:
|
||||||
return {"outputs": outputs, "failures": [],
|
return {"outputs": outputs, "failures": [],
|
||||||
"engine_version": "e" * 40, "duration_ms": 3}
|
"engine_version": "e" * 40, "duration_ms": 3}
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
|
|||||||
@@ -0,0 +1,282 @@
|
|||||||
|
"""Ricetta VisionSuite v2 su un task, execute dxf_compare, copy-on-write (#46)."""
|
||||||
|
import io
|
||||||
|
import json
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from PIL import Image
|
||||||
|
from sqlalchemy import select
|
||||||
|
|
||||||
|
from src.backend.config import settings
|
||||||
|
from src.backend.models.orm.recipe import RecipeVersion
|
||||||
|
from src.backend.models.orm.task import RecipeSubtask, RecipeTask
|
||||||
|
from src.backend.models.orm.vision import VisionResult
|
||||||
|
from src.backend.tests.conftest import auth_headers, create_test_recipe
|
||||||
|
|
||||||
|
RECIPE = {
|
||||||
|
"schema_version": 2, "name": "dxf", "tools": [],
|
||||||
|
"meta": {"dxf": {"d1": {"path": "dxf/part.dxf"}}, "models": {"m": {"path": "models/m.npz"}}},
|
||||||
|
}
|
||||||
|
OUTPUTS = [{"key": "cmp.points_in_pct", "quantity": "ratio", "unit": "%"}]
|
||||||
|
GOOD_FILES = (("part.dxf", b"0 EOF"), ("m.npz", b"npz"))
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(autouse=True)
|
||||||
|
def redirect_uploads(monkeypatch, tmp_path):
|
||||||
|
# upload_path = parents[2] / upload_dir: un assoluto sostituisce la base
|
||||||
|
monkeypatch.setattr(settings, "upload_dir", str(tmp_path))
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def validate_says(monkeypatch):
|
||||||
|
"""Il worker /validate non gira nei test: risposta finta."""
|
||||||
|
def _install(ok=True, errors=None, outputs=None):
|
||||||
|
async def fake(graph, recipe_dir):
|
||||||
|
return {
|
||||||
|
"ok": ok, "errors": errors or [],
|
||||||
|
"outputs": outputs if outputs is not None else OUTPUTS,
|
||||||
|
}
|
||||||
|
monkeypatch.setattr("src.backend.services.vision_service.validate_recipe", fake)
|
||||||
|
return _install
|
||||||
|
|
||||||
|
|
||||||
|
def an_image() -> bytes:
|
||||||
|
buf = io.BytesIO()
|
||||||
|
Image.new("L", (32, 32)).save(buf, format="PNG")
|
||||||
|
return buf.getvalue()
|
||||||
|
|
||||||
|
|
||||||
|
async def make_task(db_session, user, task_type="dxf_compare"):
|
||||||
|
recipe = await create_test_recipe(db_session, user.id)
|
||||||
|
version = (await db_session.execute(
|
||||||
|
select(RecipeVersion).where(RecipeVersion.recipe_id == recipe.id)
|
||||||
|
)).scalars().first()
|
||||||
|
task = (await db_session.execute(
|
||||||
|
select(RecipeTask).where(RecipeTask.version_id == version.id)
|
||||||
|
)).scalars().first()
|
||||||
|
subtask = (await db_session.execute(
|
||||||
|
select(RecipeSubtask).where(RecipeSubtask.task_id == task.id)
|
||||||
|
)).scalars().first()
|
||||||
|
task.task_type = task_type
|
||||||
|
await db_session.commit()
|
||||||
|
return task, subtask
|
||||||
|
|
||||||
|
|
||||||
|
def upload(client, user, task, recipe=RECIPE, files=()):
|
||||||
|
return client.post(
|
||||||
|
f"/api/vision/tasks/{task.id}/recipe",
|
||||||
|
headers=auth_headers(user),
|
||||||
|
files=[("recipe", ("r.json", json.dumps(recipe).encode(), "application/json"))]
|
||||||
|
+ [("files", (n, c, "application/octet-stream")) for n, c in files],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_upload_ok_stores_folder_and_task(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
resp = await upload(client, maker_user, task, files=GOOD_FILES)
|
||||||
|
assert resp.status_code == 200, resp.text
|
||||||
|
body = resp.json()
|
||||||
|
assert body["outputs"] == OUTPUTS
|
||||||
|
assert sorted(body["files"]) == ["dxf/part.dxf", "models/m.npz"]
|
||||||
|
assert body["recipe_dir"].startswith(f"vision/recipes/{task.id}/")
|
||||||
|
folder = settings.upload_path / body["recipe_dir"]
|
||||||
|
assert (folder / "recipe.json").is_file() and (folder / "dxf" / "part.dxf").is_file()
|
||||||
|
await db_session.refresh(task)
|
||||||
|
assert task.vision_json == RECIPE and task.vision_recipe_dir == body["recipe_dir"]
|
||||||
|
|
||||||
|
got = await client.get(f"/api/vision/tasks/{task.id}/recipe", headers=auth_headers(maker_user))
|
||||||
|
assert got.status_code == 200
|
||||||
|
assert got.json()["recipe"] == RECIPE and got.json()["outputs"] == OUTPUTS
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_get_without_recipe_is_empty(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
got = await client.get(f"/api/vision/tasks/{task.id}/recipe", headers=auth_headers(maker_user))
|
||||||
|
assert got.json() == {
|
||||||
|
"task_id": task.id, "recipe_dir": None, "recipe": None, "files": [], "outputs": [],
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_unmatched_file_name_is_422_list(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
resp = await upload(client, maker_user, task, files=[("other.dxf", b"x")])
|
||||||
|
assert resp.status_code == 422
|
||||||
|
assert isinstance(resp.json()["detail"], list) and "other.dxf" in resp.json()["detail"][0]
|
||||||
|
await db_session.refresh(task)
|
||||||
|
assert task.vision_json is None and task.vision_recipe_dir is None
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_traversal_in_meta_path_is_422(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
evil = {"schema_version": 2, "tools": [], "meta": {"dxf": {"d": {"path": "../../evil.dxf"}}}}
|
||||||
|
resp = await upload(client, maker_user, task, recipe=evil, files=[("evil.dxf", b"x")])
|
||||||
|
assert resp.status_code == 422
|
||||||
|
assert not (settings.upload_path.parent / "evil.dxf").exists()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_wrong_task_type_is_422(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user, task_type="measure")
|
||||||
|
resp = await upload(client, maker_user, task, files=GOOD_FILES)
|
||||||
|
assert resp.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_invalid_json_is_422(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
resp = await client.post(
|
||||||
|
f"/api/vision/tasks/{task.id}/recipe", headers=auth_headers(maker_user),
|
||||||
|
files=[("recipe", ("r.json", b"{nope", "application/json"))],
|
||||||
|
)
|
||||||
|
assert resp.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_worker_not_ok_is_422_and_task_unchanged(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says(ok=False, errors=["meta file missing"])
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
task.vision_json = {"old": 1}
|
||||||
|
task.vision_recipe_dir = "vision/recipes/old"
|
||||||
|
await db_session.commit()
|
||||||
|
resp = await upload(client, maker_user, task, files=GOOD_FILES)
|
||||||
|
assert resp.status_code == 422
|
||||||
|
assert resp.json()["detail"] == ["meta file missing"]
|
||||||
|
await db_session.refresh(task)
|
||||||
|
assert task.vision_json == {"old": 1} and task.vision_recipe_dir == "vision/recipes/old"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_existing_folder_is_not_rewritten(client, db_session, maker_user, validate_says):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
first = (await upload(client, maker_user, task, files=GOOD_FILES)).json()
|
||||||
|
marker = settings.upload_path / first["recipe_dir"] / "dxf" / "part.dxf"
|
||||||
|
marker.write_bytes(b"CHANGED")
|
||||||
|
second = (await upload(client, maker_user, task, files=GOOD_FILES)).json()
|
||||||
|
assert second["recipe_dir"] == first["recipe_dir"]
|
||||||
|
assert marker.read_bytes() == b"CHANGED"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_upload_requires_maker(
|
||||||
|
client, db_session, maker_user, measurement_tec_user, validate_says,
|
||||||
|
):
|
||||||
|
validate_says()
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
resp = await upload(client, measurement_tec_user, task, files=GOOD_FILES)
|
||||||
|
assert resp.status_code in (401, 403)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_execute_dxf_compare_saves_files_and_extended_response(
|
||||||
|
client, db_session, measurement_tec_user, monkeypatch,
|
||||||
|
):
|
||||||
|
task, subtask = await make_task(db_session, measurement_tec_user)
|
||||||
|
task.vision_json = RECIPE
|
||||||
|
task.vision_recipe_dir = "vision/recipes/1/abc"
|
||||||
|
subtask.vision_output = "cmp.points_in_pct"
|
||||||
|
await db_session.commit()
|
||||||
|
seen = {}
|
||||||
|
overlay = [{"type": "contour", "role": "found", "rows": [1], "cols": [2], "tool_id": "cmp"}]
|
||||||
|
|
||||||
|
async def fake_call(image_bytes, graph, **kwargs):
|
||||||
|
seen.update(kwargs)
|
||||||
|
return {
|
||||||
|
"outputs": {"cmp.points_in_pct": float(subtask.nominal)},
|
||||||
|
"failures": [], "engine_version": "e" * 40, "duration_ms": 5,
|
||||||
|
"overlay": overlay, "outcome": "OK",
|
||||||
|
}
|
||||||
|
monkeypatch.setattr("src.backend.services.vision_service._call_worker", fake_call)
|
||||||
|
|
||||||
|
resp = await client.post(
|
||||||
|
"/api/vision/execute", headers=auth_headers(measurement_tec_user),
|
||||||
|
files={"image": ("p.png", an_image(), "image/png")},
|
||||||
|
data={"task_id": str(task.id)},
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200, resp.text
|
||||||
|
body = resp.json()
|
||||||
|
assert seen["recipe_dir"] == "vision/recipes/1/abc" and "calibration" not in seen
|
||||||
|
assert body["outcome"] == "OK" and body["overlay"] == overlay and body["failures"] == []
|
||||||
|
assert body["image_url"] == f"/api/vision/results/{body['vision_result_id']}/image"
|
||||||
|
assert body["measurements"][0]["pass_fail"] == "pass"
|
||||||
|
|
||||||
|
result = (await db_session.execute(select(VisionResult))).scalars().one()
|
||||||
|
assert (settings.upload_path / result.image_path).read_bytes() == an_image()
|
||||||
|
assert json.loads((settings.upload_path / result.overlay_path).read_text()) == overlay
|
||||||
|
|
||||||
|
img = await client.get(body["image_url"], headers=auth_headers(measurement_tec_user))
|
||||||
|
assert img.status_code == 200 and img.content == an_image()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_execute_dxf_compare_out_of_tolerance_fails(
|
||||||
|
client, db_session, measurement_tec_user, monkeypatch,
|
||||||
|
):
|
||||||
|
task, subtask = await make_task(db_session, measurement_tec_user)
|
||||||
|
task.vision_json = RECIPE
|
||||||
|
subtask.vision_output = "cmp.points_in_pct"
|
||||||
|
await db_session.commit()
|
||||||
|
|
||||||
|
async def fake_call(image_bytes, graph, **kwargs):
|
||||||
|
return {"outputs": {"cmp.points_in_pct": 99.0}, "failures": [],
|
||||||
|
"engine_version": "e" * 40, "outcome": "OK"}
|
||||||
|
monkeypatch.setattr("src.backend.services.vision_service._call_worker", fake_call)
|
||||||
|
resp = await client.post(
|
||||||
|
"/api/vision/execute", headers=auth_headers(measurement_tec_user),
|
||||||
|
files={"image": ("p.png", an_image(), "image/png")},
|
||||||
|
data={"task_id": str(task.id)},
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
# il verdetto e' delle tolleranze del subtask, non di outcome di VisionSuite
|
||||||
|
assert resp.json()["measurements"][0]["pass_fail"] == "fail"
|
||||||
|
assert resp.json()["overlay"] == []
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_copy_on_write_carries_recipe_dir(client, db_session, maker_user):
|
||||||
|
from src.backend.tests.test_vision_copy_on_write import (
|
||||||
|
_current_task_and_subtask, _seed_measurement,
|
||||||
|
)
|
||||||
|
recipe = await create_test_recipe(db_session, maker_user.id)
|
||||||
|
_, task, _ = await _current_task_and_subtask(db_session, recipe.id)
|
||||||
|
task.task_type = "dxf_compare"
|
||||||
|
task.vision_json = RECIPE
|
||||||
|
task.vision_recipe_dir = "vision/recipes/1/abc"
|
||||||
|
await db_session.flush()
|
||||||
|
await _seed_measurement(db_session, recipe.id, maker_user.id)
|
||||||
|
db_session.expunge_all()
|
||||||
|
resp = await client.put(
|
||||||
|
f"/api/recipes/{recipe.id}", headers=auth_headers(maker_user),
|
||||||
|
json={"change_notes": "cow"},
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
db_session.expunge_all()
|
||||||
|
version, new_task, _ = await _current_task_and_subtask(db_session, recipe.id)
|
||||||
|
assert version.version_number == 2
|
||||||
|
assert new_task.vision_recipe_dir == "vision/recipes/1/abc" and new_task.vision_json == RECIPE
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_retry_with_missing_file_then_complete_succeeds(
|
||||||
|
client, db_session, maker_user, monkeypatch,
|
||||||
|
):
|
||||||
|
# worker finto: ok solo se il DXF esiste nella cartella della ricetta
|
||||||
|
async def fake(graph, recipe_dir):
|
||||||
|
present = (settings.upload_path / recipe_dir / "dxf" / "part.dxf").is_file()
|
||||||
|
return {"ok": present, "errors": [] if present else ["dxf missing"], "outputs": OUTPUTS}
|
||||||
|
monkeypatch.setattr("src.backend.services.vision_service.validate_recipe", fake)
|
||||||
|
task, _ = await make_task(db_session, maker_user)
|
||||||
|
|
||||||
|
first = await upload(client, maker_user, task, files=[])
|
||||||
|
assert first.status_code == 422
|
||||||
|
second = await upload(client, maker_user, task, files=GOOD_FILES)
|
||||||
|
assert second.status_code == 200, second.text
|
||||||
@@ -39,7 +39,7 @@ async def recipe_parts(db_session, recipe_id: int):
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def worker_says(monkeypatch):
|
def worker_says(monkeypatch):
|
||||||
def _install(outputs: dict):
|
def _install(outputs: dict):
|
||||||
async def fake_call(image_bytes: bytes, graph: dict) -> dict:
|
async def fake_call(image_bytes: bytes, graph: dict, **kwargs) -> dict:
|
||||||
return {"outputs": outputs, "failures": [],
|
return {"outputs": outputs, "failures": [],
|
||||||
"engine_version": "b" * 40, "duration_ms": 7}
|
"engine_version": "b" * 40, "duration_ms": 7}
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ async def recipe_parts(db_session, recipe_id: int):
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def worker_says(monkeypatch):
|
def worker_says(monkeypatch):
|
||||||
def _install(outputs: dict):
|
def _install(outputs: dict):
|
||||||
async def fake_call(image_bytes: bytes, graph: dict) -> dict:
|
async def fake_call(image_bytes: bytes, graph: dict, **kwargs) -> dict:
|
||||||
return {"outputs": outputs, "failures": [],
|
return {"outputs": outputs, "failures": [],
|
||||||
"engine_version": "c" * 40, "duration_ms": 5}
|
"engine_version": "c" * 40, "duration_ms": 5}
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
|
|||||||
@@ -377,47 +377,6 @@ def api_upload_file():
|
|||||||
return jsonify(resp), 201
|
return jsonify(resp), 201
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# VISION RECIPE PROXY (#46)
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
@maker_bp.route("/api/vision/tasks/<int:task_id>/recipe", methods=["GET"])
|
|
||||||
@login_required
|
|
||||||
@role_required("Maker")
|
|
||||||
def api_get_vision_recipe(task_id: int):
|
|
||||||
"""Proxy: ricetta visione corrente del task (cartella, file, uscite)."""
|
|
||||||
resp = api_client.get(f"/api/vision/tasks/{task_id}/recipe")
|
|
||||||
|
|
||||||
if resp.get("error"):
|
|
||||||
return jsonify(resp), resp.get("status_code", 500)
|
|
||||||
|
|
||||||
return jsonify(resp), 200
|
|
||||||
|
|
||||||
|
|
||||||
@maker_bp.route("/api/vision/tasks/<int:task_id>/recipe", methods=["POST"])
|
|
||||||
@login_required
|
|
||||||
@role_required("Maker")
|
|
||||||
def api_upload_vision_recipe(task_id: int):
|
|
||||||
"""Proxy: carica ricetta .json + file allegati (multipart forward)."""
|
|
||||||
recipe = request.files.get("recipe")
|
|
||||||
if recipe is None or recipe.filename == "":
|
|
||||||
return jsonify({"error": True, "detail": _("Nessun file ricetta caricato")}), 400
|
|
||||||
|
|
||||||
# Ricetta + 0..n allegati (DXF, modelli .npz, calibrazione), stesso nome campo `files`
|
|
||||||
files = [("recipe", (recipe.filename, recipe.stream, recipe.content_type))]
|
|
||||||
for f in request.files.getlist("files"):
|
|
||||||
if f.filename:
|
|
||||||
files.append(("files", (f.filename, f.stream, f.content_type)))
|
|
||||||
|
|
||||||
resp = api_client.post(f"/api/vision/tasks/{task_id}/recipe", data={}, files=files)
|
|
||||||
|
|
||||||
# Il 422 (errori di validazione) arriva al browser com'è, con `errors`
|
|
||||||
if resp.get("error"):
|
|
||||||
return jsonify(resp), resp.get("status_code", 500)
|
|
||||||
|
|
||||||
return jsonify(resp), 200
|
|
||||||
|
|
||||||
|
|
||||||
@maker_bp.route("/api/files/<path:file_path>", methods=["GET"])
|
@maker_bp.route("/api/files/<path:file_path>", methods=["GET"])
|
||||||
@login_required
|
@login_required
|
||||||
def api_get_file(file_path: str):
|
def api_get_file(file_path: str):
|
||||||
|
|||||||
@@ -1,80 +0,0 @@
|
|||||||
// Ricetta visione del Maker (#46): componente Alpine per i task camera_measure / dxf_compare.
|
|
||||||
// Carica la ricetta VisionSuite v2 + i file allegati verso /maker/api/vision/tasks/<id>/recipe,
|
|
||||||
// mostra cartella, file e uscite numeriche; notifica le uscite al task editor con un evento.
|
|
||||||
// Uso: x-data="visionRecipe(task.id, csrfToken, msgs)". Dipende da Alpine.js.
|
|
||||||
function visionRecipe(taskId, csrf, msgs) {
|
|
||||||
return {
|
|
||||||
taskId: taskId,
|
|
||||||
recipeDir: null,
|
|
||||||
files: [],
|
|
||||||
outputs: [],
|
|
||||||
errors: [], // errori 422 elencati in chiaro
|
|
||||||
loading: false,
|
|
||||||
busy: false,
|
|
||||||
recipeFile: null,
|
|
||||||
attachments: [],
|
|
||||||
msgs: msgs || {},
|
|
||||||
|
|
||||||
async init() {
|
|
||||||
// All'apertura: ricetta corrente (GET); il 404/errore non blocca l'editor
|
|
||||||
this.loading = true;
|
|
||||||
try {
|
|
||||||
const resp = await fetch(`/maker/api/vision/tasks/${this.taskId}/recipe`);
|
|
||||||
if (resp.ok) this._apply(await resp.json());
|
|
||||||
} catch (e) { console.error('visionRecipe init', e); }
|
|
||||||
this.loading = false;
|
|
||||||
},
|
|
||||||
|
|
||||||
// Aggiorna lo stato e avvisa il task editor (select vision_output delle quote)
|
|
||||||
_apply(data) {
|
|
||||||
this.recipeDir = data.recipe_dir || null;
|
|
||||||
this.files = data.files || [];
|
|
||||||
this.outputs = data.outputs || [];
|
|
||||||
window.dispatchEvent(new CustomEvent('vision-outputs', {
|
|
||||||
detail: { taskId: this.taskId, outputs: this.outputs }
|
|
||||||
}));
|
|
||||||
},
|
|
||||||
|
|
||||||
// Il 422 porta `errors` (lista) oppure `detail` (stringa o lista di voci)
|
|
||||||
_errorsFrom(data) {
|
|
||||||
if (Array.isArray(data.errors) && data.errors.length) return data.errors.map(String);
|
|
||||||
const d = data.detail;
|
|
||||||
if (Array.isArray(d)) return d.map(x => (typeof x === 'string' ? x : (x.msg || JSON.stringify(x))));
|
|
||||||
if (d && typeof d === 'object') {
|
|
||||||
if (Array.isArray(d.errors)) return d.errors.map(String);
|
|
||||||
return [JSON.stringify(d)];
|
|
||||||
}
|
|
||||||
return [d || this.msgs.genericError || 'Error'];
|
|
||||||
},
|
|
||||||
|
|
||||||
async upload() {
|
|
||||||
if (!this.recipeFile) return;
|
|
||||||
this.busy = true;
|
|
||||||
this.errors = [];
|
|
||||||
try {
|
|
||||||
const fd = new FormData();
|
|
||||||
fd.append('recipe', this.recipeFile);
|
|
||||||
for (const f of this.attachments) fd.append('files', f);
|
|
||||||
const resp = await fetch(`/maker/api/vision/tasks/${this.taskId}/recipe`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'X-CSRFToken': typeof csrf === 'function' ? csrf() : csrf },
|
|
||||||
body: fd
|
|
||||||
});
|
|
||||||
const data = await resp.json();
|
|
||||||
if (!resp.ok || data.error) {
|
|
||||||
this.errors = this._errorsFrom(data);
|
|
||||||
} else {
|
|
||||||
this._apply(data);
|
|
||||||
this.recipeFile = null;
|
|
||||||
this.attachments = [];
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
this.errors = [this.msgs.genericError || String(e)];
|
|
||||||
}
|
|
||||||
this.busy = false;
|
|
||||||
},
|
|
||||||
|
|
||||||
onRecipe(ev) { this.recipeFile = ev.target.files[0] || null; },
|
|
||||||
onAttachments(ev) { this.attachments = Array.from(ev.target.files || []); }
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -277,8 +277,6 @@
|
|||||||
<option value="note">{{ _('Nota') }}</option>
|
<option value="note">{{ _('Nota') }}</option>
|
||||||
<option value="measure">{{ _('Misura') }}</option>
|
<option value="measure">{{ _('Misura') }}</option>
|
||||||
<option value="drawing">{{ _('Disegno') }}</option>
|
<option value="drawing">{{ _('Disegno') }}</option>
|
||||||
<option value="camera_measure">{{ _('Misura camera') }}</option>
|
|
||||||
<option value="dxf_compare">{{ _('Confronto profilo') }}</option>
|
|
||||||
</select>
|
</select>
|
||||||
<p class="mt-1 text-xs text-[var(--text-secondary)]">
|
<p class="mt-1 text-xs text-[var(--text-secondary)]">
|
||||||
{{ _('Un task di misura resta tale anche prima di inserire le quote') }}
|
{{ _('Un task di misura resta tale anche prima di inserire le quote') }}
|
||||||
@@ -462,55 +460,6 @@
|
|||||||
|
|
||||||
<div class="tmf-card-body space-y-4">
|
<div class="tmf-card-body space-y-4">
|
||||||
|
|
||||||
<!-- ========== Ricetta visione (#46): solo camera_measure / dxf_compare ========== -->
|
|
||||||
<template x-if="task.task_type === 'camera_measure' || task.task_type === 'dxf_compare'">
|
|
||||||
<div class="p-3 rounded-lg bg-[var(--bg-secondary)] border border-[var(--border-color)]"
|
|
||||||
x-data="visionRecipe(task.id, () => csrfToken(), {{ {'genericError': _('Errore durante il caricamento della ricetta')}|tojson_attr }})">
|
|
||||||
<p class="text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wide mb-2">
|
|
||||||
{{ _('Ricetta visione') }}
|
|
||||||
</p>
|
|
||||||
<!-- Stato corrente: cartella, file, uscite -->
|
|
||||||
<template x-if="recipeDir">
|
|
||||||
<div class="text-xs space-y-1 mb-3">
|
|
||||||
<p><span class="text-[var(--text-secondary)]">{{ _('Cartella') }}:</span>
|
|
||||||
<span class="font-mono" x-text="recipeDir"></span></p>
|
|
||||||
<p x-show="files.length"><span class="text-[var(--text-secondary)]">{{ _('File') }}:</span>
|
|
||||||
<span class="font-mono" x-text="files.join(', ')"></span></p>
|
|
||||||
<p x-show="outputs.length"><span class="text-[var(--text-secondary)]">{{ _('Uscite numeriche') }}:</span></p>
|
|
||||||
<ul class="list-disc pl-5" x-show="outputs.length">
|
|
||||||
<template x-for="o in outputs" :key="o.key">
|
|
||||||
<li><span class="font-mono" x-text="o.key"></span>
|
|
||||||
<span class="text-[var(--text-muted)]" x-text="(o.quantity || o.unit) ? '(' + [o.quantity, o.unit].filter(Boolean).join(', ') + ')' : ''"></span></li>
|
|
||||||
</template>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<p x-show="!recipeDir && !loading" class="text-xs text-[var(--text-muted)] mb-3">
|
|
||||||
{{ _('Nessuna ricetta caricata') }}
|
|
||||||
</p>
|
|
||||||
<!-- Caricamento: ricetta .json + allegati -->
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-3">
|
|
||||||
<div>
|
|
||||||
<label class="tmf-label text-xs">{{ _('Ricetta (.json)') }}</label>
|
|
||||||
<input type="file" accept=".json,application/json" class="tmf-input text-xs"
|
|
||||||
@change="onRecipe($event)">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label class="tmf-label text-xs">{{ _('File allegati (DXF, modelli, calibrazione)') }}</label>
|
|
||||||
<input type="file" multiple class="tmf-input text-xs" @change="onAttachments($event)">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-end mt-3">
|
|
||||||
<button type="button" class="btn btn-primary text-xs" @click="upload()"
|
|
||||||
:disabled="!recipeFile || busy">{{ _('Carica ricetta') }}</button>
|
|
||||||
</div>
|
|
||||||
<!-- Errori 422 in chiaro -->
|
|
||||||
<ul x-show="errors.length" class="mt-3 text-xs text-red-500 list-disc pl-5">
|
|
||||||
<template x-for="(e, i) in errors" :key="i"><li x-text="e"></li></template>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- ========== Task File Upload / Preview ========== -->
|
<!-- ========== Task File Upload / Preview ========== -->
|
||||||
<div class="p-3 rounded-lg bg-[var(--bg-secondary)] border border-[var(--border-color)]">
|
<div class="p-3 rounded-lg bg-[var(--bg-secondary)] border border-[var(--border-color)]">
|
||||||
<p class="text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wide mb-2">
|
<p class="text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wide mb-2">
|
||||||
@@ -594,8 +543,6 @@
|
|||||||
<option value="note">{{ _('Nota') }}</option>
|
<option value="note">{{ _('Nota') }}</option>
|
||||||
<option value="measure">{{ _('Misura') }}</option>
|
<option value="measure">{{ _('Misura') }}</option>
|
||||||
<option value="drawing">{{ _('Disegno') }}</option>
|
<option value="drawing">{{ _('Disegno') }}</option>
|
||||||
<option value="camera_measure">{{ _('Misura camera') }}</option>
|
|
||||||
<option value="dxf_compare">{{ _('Confronto profilo') }}</option>
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -752,18 +699,6 @@
|
|||||||
class="tmf-input"
|
class="tmf-input"
|
||||||
placeholder="{{ _('Es. Diametro foro principale') }}">
|
placeholder="{{ _('Es. Diametro foro principale') }}">
|
||||||
</div>
|
</div>
|
||||||
<!-- Uscita visione (#46): solo task camera_measure / dxf_compare -->
|
|
||||||
<div class="col-span-2 sm:col-span-3 lg:col-span-2"
|
|
||||||
x-show="task.task_type === 'camera_measure' || task.task_type === 'dxf_compare'">
|
|
||||||
<label class="tmf-label text-xs">{{ _('Uscita visione') }}</label>
|
|
||||||
<select x-model="newSubtask.vision_output" class="tmf-input">
|
|
||||||
<option value="">{{ _('Nessuna') }}</option>
|
|
||||||
<template x-for="o in (visionOutputs[task.id] || [])" :key="o.key">
|
|
||||||
<option :value="o.key" :selected="o.key === newSubtask.vision_output"
|
|
||||||
x-text="o.key + ((o.quantity || o.unit) ? ' (' + [o.quantity, o.unit].filter(Boolean).join(', ') + ')' : '')"></option>
|
|
||||||
</template>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<!-- Measurement Type -->
|
<!-- Measurement Type -->
|
||||||
<div>
|
<div>
|
||||||
<label class="tmf-label text-xs">{{ _('Tipo') }}</label>
|
<label class="tmf-label text-xs">{{ _('Tipo') }}</label>
|
||||||
@@ -1158,7 +1093,6 @@
|
|||||||
{% block extra_js %}
|
{% block extra_js %}
|
||||||
{# Bold and line breaks in descriptions: the same rules the server renders with. #}
|
{# Bold and line breaks in descriptions: the same rules the server renders with. #}
|
||||||
<script src="{{ url_for('static', filename='js/rich-text.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/rich-text.js') }}"></script>
|
||||||
<script src="{{ url_for('static', filename='js/vision_recipe.js') }}"></script>
|
|
||||||
<script src="{{ url_for('static', filename='vendor/pdf-3.11.174.min.js') }}"></script>
|
<script src="{{ url_for('static', filename='vendor/pdf-3.11.174.min.js') }}"></script>
|
||||||
<script>if(typeof pdfjsLib!=='undefined')pdfjsLib.GlobalWorkerOptions.workerSrc='{{ url_for('static', filename='vendor/pdf.worker-3.11.174.min.js') }}';</script>
|
<script>if(typeof pdfjsLib!=='undefined')pdfjsLib.GlobalWorkerOptions.workerSrc='{{ url_for('static', filename='vendor/pdf.worker-3.11.174.min.js') }}';</script>
|
||||||
<script src="{{ url_for('static', filename='js/annotation-viewer.js') }}?v=6"></script>
|
<script src="{{ url_for('static', filename='js/annotation-viewer.js') }}?v=6"></script>
|
||||||
@@ -1195,11 +1129,8 @@ function taskEditor() {
|
|||||||
addingSubtaskForTask: null,
|
addingSubtaskForTask: null,
|
||||||
newSubtask: {
|
newSubtask: {
|
||||||
marker_number: 1, description: '', measurement_type: '',
|
marker_number: 1, description: '', measurement_type: '',
|
||||||
nominal: null, utl: null, uwl: null, lwl: null, ltl: null, unit: 'mm',
|
nominal: null, utl: null, uwl: null, lwl: null, ltl: null, unit: 'mm'
|
||||||
vision_output: ''
|
|
||||||
},
|
},
|
||||||
// Uscite numeriche della ricetta visione per task (#46), riempite da vision_recipe.js
|
|
||||||
visionOutputs: {},
|
|
||||||
|
|
||||||
// ---- Delete modals ----
|
// ---- Delete modals ----
|
||||||
deleteTaskModal: false,
|
deleteTaskModal: false,
|
||||||
@@ -1222,10 +1153,6 @@ function taskEditor() {
|
|||||||
// Init
|
// Init
|
||||||
// ============================================================
|
// ============================================================
|
||||||
init() {
|
init() {
|
||||||
// Uscite della ricetta visione: evento dal componente visionRecipe (#46)
|
|
||||||
window.addEventListener('vision-outputs', (ev) => {
|
|
||||||
this.visionOutputs = { ...this.visionOutputs, [ev.detail.taskId]: ev.detail.outputs || [] };
|
|
||||||
});
|
|
||||||
// Sort tasks by order_index on load
|
// Sort tasks by order_index on load
|
||||||
this.tasks.sort((a, b) => (a.order_index || 0) - (b.order_index || 0));
|
this.tasks.sort((a, b) => (a.order_index || 0) - (b.order_index || 0));
|
||||||
|
|
||||||
@@ -1683,8 +1610,7 @@ function taskEditor() {
|
|||||||
uwl: null,
|
uwl: null,
|
||||||
lwl: null,
|
lwl: null,
|
||||||
ltl: null,
|
ltl: null,
|
||||||
unit: 'mm',
|
unit: 'mm'
|
||||||
vision_output: ''
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1708,8 +1634,7 @@ function taskEditor() {
|
|||||||
uwl: this.newSubtask.uwl,
|
uwl: this.newSubtask.uwl,
|
||||||
lwl: this.newSubtask.lwl,
|
lwl: this.newSubtask.lwl,
|
||||||
ltl: this.newSubtask.ltl,
|
ltl: this.newSubtask.ltl,
|
||||||
unit: this.newSubtask.unit || 'mm',
|
unit: this.newSubtask.unit || 'mm'
|
||||||
vision_output: this.newSubtask.vision_output || null // chiave uscita ricetta visione (#46)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -1762,8 +1687,7 @@ function taskEditor() {
|
|||||||
uwl: subtask.uwl,
|
uwl: subtask.uwl,
|
||||||
lwl: subtask.lwl,
|
lwl: subtask.lwl,
|
||||||
ltl: subtask.ltl,
|
ltl: subtask.ltl,
|
||||||
unit: subtask.unit || 'mm',
|
unit: subtask.unit || 'mm'
|
||||||
vision_output: subtask.vision_output || ''
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1787,8 +1711,7 @@ function taskEditor() {
|
|||||||
uwl: this.newSubtask.uwl,
|
uwl: this.newSubtask.uwl,
|
||||||
lwl: this.newSubtask.lwl,
|
lwl: this.newSubtask.lwl,
|
||||||
ltl: this.newSubtask.ltl,
|
ltl: this.newSubtask.ltl,
|
||||||
unit: this.newSubtask.unit || 'mm',
|
unit: this.newSubtask.unit || 'mm'
|
||||||
vision_output: this.newSubtask.vision_output || null // chiave uscita ricetta visione (#46)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -161,82 +161,3 @@ class TestVersionConflictProxy:
|
|||||||
|
|
||||||
assert resp.status_code == 409
|
assert resp.status_code == 409
|
||||||
assert resp.get_json()["detail"] == self._CONFLICT["detail"]
|
assert resp.get_json()["detail"] == self._CONFLICT["detail"]
|
||||||
|
|
||||||
|
|
||||||
class TestVisionRecipeProxy:
|
|
||||||
"""Proxy ricetta visione (#46): /maker/api/vision/tasks/<id>/recipe."""
|
|
||||||
|
|
||||||
def test_upload_forwards_recipe_and_files(self, logged_in_client, mock_api_client):
|
|
||||||
import io
|
|
||||||
|
|
||||||
mock_api_client.post.return_value = {
|
|
||||||
"task_id": 7, "recipe_dir": "vision/recipes/7/abc", "files": ["a.dxf"],
|
|
||||||
"outputs": [{"key": "n1.points_in_pct", "quantity": None, "unit": None}],
|
|
||||||
}
|
|
||||||
|
|
||||||
resp = logged_in_client.post(
|
|
||||||
"/maker/api/vision/tasks/7/recipe",
|
|
||||||
data={
|
|
||||||
"recipe": (io.BytesIO(b"{}"), "r.json"),
|
|
||||||
"files": [(io.BytesIO(b"dxf"), "a.dxf"), (io.BytesIO(b"npz"), "m.npz")],
|
|
||||||
},
|
|
||||||
content_type="multipart/form-data",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert resp.status_code == 200
|
|
||||||
assert resp.get_json()["outputs"][0]["key"] == "n1.points_in_pct"
|
|
||||||
endpoint = mock_api_client.post.call_args.args[0]
|
|
||||||
sent = mock_api_client.post.call_args.kwargs["files"]
|
|
||||||
assert endpoint == "/api/vision/tasks/7/recipe"
|
|
||||||
# un campo `recipe` e un campo `files` per ogni allegato
|
|
||||||
assert [name for name, _f in sent] == ["recipe", "files", "files"]
|
|
||||||
|
|
||||||
def test_upload_without_recipe_is_400(self, logged_in_client, mock_api_client):
|
|
||||||
resp = logged_in_client.post(
|
|
||||||
"/maker/api/vision/tasks/7/recipe", data={}, content_type="multipart/form-data"
|
|
||||||
)
|
|
||||||
assert resp.status_code == 400
|
|
||||||
mock_api_client.post.assert_not_called()
|
|
||||||
|
|
||||||
def test_upload_proxies_422(self, logged_in_client, mock_api_client):
|
|
||||||
import io
|
|
||||||
|
|
||||||
mock_api_client.post.return_value = {
|
|
||||||
"error": True, "status_code": 422, "detail": "file mancante: a.dxf",
|
|
||||||
}
|
|
||||||
resp = logged_in_client.post(
|
|
||||||
"/maker/api/vision/tasks/7/recipe",
|
|
||||||
data={"recipe": (io.BytesIO(b"{}"), "r.json")},
|
|
||||||
content_type="multipart/form-data",
|
|
||||||
)
|
|
||||||
assert resp.status_code == 422
|
|
||||||
assert "a.dxf" in resp.get_json()["detail"]
|
|
||||||
|
|
||||||
def test_get_recipe_proxies(self, logged_in_client, mock_api_client):
|
|
||||||
mock_api_client.get.return_value = {
|
|
||||||
"task_id": 7, "recipe_dir": None, "recipe": None, "files": [], "outputs": [],
|
|
||||||
}
|
|
||||||
resp = logged_in_client.get("/maker/api/vision/tasks/7/recipe")
|
|
||||||
assert resp.status_code == 200
|
|
||||||
mock_api_client.get.assert_called_once_with("/api/vision/tasks/7/recipe")
|
|
||||||
|
|
||||||
|
|
||||||
class TestTaskEditorVisionUi:
|
|
||||||
"""task_editor.html espone i tipi visione e la select vision_output (#46)."""
|
|
||||||
|
|
||||||
def test_editor_has_vision_types_and_section(self, logged_in_client, mock_api_client):
|
|
||||||
from tests.conftest import api_get_router
|
|
||||||
|
|
||||||
mock_api_client.get.side_effect = api_get_router({
|
|
||||||
"/api/recipes/3": {"id": 3, "code": "R", "name": "R"},
|
|
||||||
"/api/recipes/3/tasks": [{
|
|
||||||
"id": 11, "title": "T", "task_type": "dxf_compare", "subtasks": [],
|
|
||||||
"file_path": None, "order_index": 1,
|
|
||||||
}],
|
|
||||||
})
|
|
||||||
html = logged_in_client.get("/maker/recipes/3/tasks").get_data(as_text=True)
|
|
||||||
assert 'value="camera_measure"' in html
|
|
||||||
assert 'value="dxf_compare"' in html
|
|
||||||
assert "visionRecipe(" in html
|
|
||||||
assert "vision_output" in html
|
|
||||||
assert "js/vision_recipe.js" in html
|
|
||||||
|
|||||||
Reference in New Issue
Block a user