Worker: endpoint /recipes/dxf-compare con test (#83)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

src/frontend/flask_app/blueprints/maker.py

@@ -4,9 +4,7 @@ import math
 
 import requests as http_requests
 
-from functools import wraps
-
-from flask import Blueprint, Response, abort, flash, jsonify, redirect, render_template, request, session, url_for
+from flask import Blueprint, flash, jsonify, redirect, render_template, request, session, url_for
 from flask_babel import gettext as _
 
 from blueprints.auth import login_required, role_required
@@ -485,173 +483,6 @@ def api_upload_vision_recipe(task_id: int):
     return jsonify(resp), 200
 
 
-# ============================================================================
-# RICETTA DXF DA CAMERA (#83): stazioni, camera, calibrazione, creazione ricetta
-# ============================================================================
-
-def maker_or_admin_required(f):
-    """Maker dell'editor oppure admin della pagina stazioni (#83: stesse rotte camera)."""
-    @wraps(f)
-    def decorated(*args, **kwargs):
-        user = session.get("user", {})
-        if not (user.get("is_admin") or "Maker" in user.get("roles", [])):
-            abort(403)
-        return f(*args, **kwargs)
-    return decorated
-
-
-def _stations_for_maker() -> list[dict]:
-    """Stazioni visibili al chiamante.
-
-    GET /api/stations e' solo admin: un Maker non admin ripiega sulla stazione
-    corrente (by-code, aperta a tutti), cosi' l'editor funziona comunque.
-    """
-    resp = api_client.get("/api/stations")
-    if isinstance(resp, list):
-        return resp
-    if Config.STATION_CODE:
-        one = api_client.get_station_by_code(Config.STATION_CODE)
-        if isinstance(one, dict) and not one.get("error"):
-            return [one]
-    return []
-
-
-def _camera_of_station(station_id: int) -> tuple[str, str] | None:
-    """(camera_url, camera_source) della stazione con questo id, None se senza camera."""
-    for st in _stations_for_maker():
-        if st.get("id") == station_id:
-            if st.get("camera_url") and st.get("camera_source"):
-                return str(st["camera_url"]), str(st["camera_source"])
-            return None
-    return None
-
-
-@maker_bp.route("/api/stations", methods=["GET"])
-@login_required
-@maker_or_admin_required
-def api_list_stations_for_maker():
-    """Elenco stazioni con camera per il pannello «Crea ricetta da DXF»."""
-    out = []
-    for st in _stations_for_maker():
-        if st.get("camera_url") and st.get("camera_source"):
-            out.append({
-                "id": st.get("id"), "code": st.get("code"), "name": st.get("name"),
-                "camera_url": st.get("camera_url"),
-            })
-    return jsonify(out), 200
-
-
-# Copia minima della logica di measure.api_vision_grab, ma per una stazione scelta per id
-@maker_bp.route("/api/stations/<int:station_id>/camera/grab", methods=["GET", "POST"])
-@login_required
-@maker_or_admin_required
-def api_station_camera_grab(station_id: int):
-    """Proxy: un frame dalla camera della stazione, risposta PNG."""
-    camera = _camera_of_station(station_id)
-    if camera is None:
-        return jsonify({
-            "error": True,
-            "detail": _("Camera non configurata per questa stazione"),
-        }), 409
-    camera_url, camera_source = camera
-    try:
-        resp = http_requests.post(
-            f"{camera_url.rstrip('/')}/camera/grab",
-            json={"source": camera_source, "trigger": "continuo", "timeout_ms": 5000},
-            timeout=15,
-        )
-    except http_requests.RequestException as exc:
-        return jsonify({
-            "error": True,
-            "detail": _("Servizio camera non raggiungibile: %(detail)s", detail=str(exc)),
-        }), 502
-    if resp.status_code != 200:
-        detail = ""
-        try:
-            body = resp.json()
-            detail = body.get("detail", "") if isinstance(body, dict) else ""
-        except ValueError:
-            detail = (resp.text or "")[:200]
-        return jsonify({
-            "error": True,
-            "detail": _("Acquisizione non riuscita (%(status)s): %(detail)s",
-                        status=resp.status_code, detail=detail),
-        }), 502
-    return Response(resp.content, content_type="image/png")
-
-
-@maker_bp.route("/api/stations/<int:station_id>/camera/calibration", methods=["GET"])
-@login_required
-@maker_or_admin_required
-def api_station_camera_calibration(station_id: int):
-    """Proxy: calibrazione della camera letta dall'acquisitore (C1).
-
-    Risponde sempre 200 con `state`: calibrated | uncalibrated | unreachable,
-    cosi' la UI mostra lo stato senza trattare «non calibrata» come errore.
-    409 solo se la stazione non ha camera.
-    """
-    camera = _camera_of_station(station_id)
-    if camera is None:
-        return jsonify({
-            "error": True,
-            "detail": _("Camera non configurata per questa stazione"),
-        }), 409
-    camera_url, camera_source = camera
-    base = camera_url.rstrip("/")
-    link = f"{base}/calibrazione"  # pagina di calibrazione dell'acquisitore (C4)
-    try:
-        resp = http_requests.get(
-            f"{base}/camera/calibration",
-            params={"source": camera_source},
-            timeout=10,
-        )
-    except http_requests.RequestException as exc:
-        return jsonify({"state": "unreachable", "detail": str(exc), "calibration_url": link}), 200
-    if resp.status_code == 404:
-        return jsonify({"state": "uncalibrated", "calibration_url": link}), 200
-    if resp.status_code != 200:
-        return jsonify({
-            "state": "unreachable", "calibration_url": link,
-            "detail": _("Risposta %(status)s dall'acquisitore", status=resp.status_code),
-        }), 200
-    try:
-        calibration = resp.json()
-    except ValueError:
-        return jsonify({"state": "unreachable", "calibration_url": link,
-                        "detail": _("Risposta non valida dall'acquisitore")}), 200
-    return jsonify({"state": "calibrated", "calibration": calibration, "calibration_url": link}), 200
-
-
-@maker_bp.route("/api/vision/tasks/<int:task_id>/recipe/dxf-compare", methods=["POST"])
-@login_required
-@role_required("Maker")
-def api_dxf_compare_recipe(task_id: int):
-    """Proxy: crea (o prova, save=false) la ricetta DXF compare da camera (B3)."""
-    image = request.files.get("image")
-    dxf = request.files.get("dxf")
-    if image is None or not image.filename or dxf is None or not dxf.filename:
-        return jsonify({"error": True, "detail": _("Servono l'immagine e il file DXF")}), 400
-
-    # Solo i campi del contratto B3; i vuoti non si inoltrano (il backend ha i default)
-    data = {}
-    for key in ("station_id", "px_per_mm", "band_mm", "min_points_pct", "polarity", "save"):
-        value = request.form.get(key)
-        if value not in (None, ""):
-            data[key] = value
-
-    resp = api_client.post(
-        f"/api/vision/tasks/{task_id}/recipe/dxf-compare",
-        data=data,
-        files={
-            "image": (image.filename, image.read(), image.mimetype or "application/octet-stream"),
-            "dxf": (dxf.filename, dxf.read(), dxf.mimetype or "application/octet-stream"),
-        },
-    )
-    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"])
 @login_required
 def api_get_file(file_path: str):

src/frontend/flask_app/static/js/dxf_recipe_wizard.js

@@ -1,181 +0,0 @@
-// «Crea ricetta da DXF» dell'editor task (#83): da un'immagine della camera e un DXF
-// genera la ricetta dxf_compare (POST /maker/api/vision/tasks/<id>/recipe/dxf-compare).
-// «Prova» (save=false) mostra overlay e quattro valori, «Salva ricetta» (save=true)
-// la scrive e avvisa il componente visionRecipe con l'evento 'dxf-recipe-saved'.
-// Uso: x-data="dxfRecipeWizard(task.id, csrfFn, msgs)". Dipende da Alpine.js e station_calibration.js.
-function dxfRecipeWizard(taskId, csrf, msgs) {
-  // Colori overlay per ruolo, uguali a vision_execute.js (reference, roi, found)
-  const ROLE_COLORS = { reference: '#2563eb', found: '#16a34a', roi: '#f59e0b' };
-  const VALUE_KEYS = ['dxf.points_in_pct', 'dxf.distance_avg', 'dxf.distance_min', 'dxf.distance_max'];
-
-  return {
-    taskId: taskId,
-    msgs: msgs || {},
-    open: false,
-    stations: [],
-    stationId: '',
-    calState: '',          // '' | calibrated | uncalibrated | unreachable
-    calLabel: '',
-    calUrl: '',
-    imageFile: null,       // immagine caricata o acquisita
-    imageName: '',
-    imageSrc: '',
-    dxfFile: null,
-    bandMm: 0.1,
-    minPointsPct: 95,
-    dark: true,            // spuntato = pezzo scuro su fondo chiaro (controluce)
-    busy: false,
-    grabbing: false,
-    error: '',
-    notice: '',
-    result: null,          // corpo B3 {result, saved, recipe_dir, outputs}
-
-    async toggle() {
-      this.open = !this.open;
-      if (this.open && !this.stations.length) await this.loadStations();
-    },
-
-    async loadStations() {
-      try {
-        const resp = await fetch('/maker/api/stations');
-        if (resp.ok) this.stations = await resp.json();
-      } catch (e) { console.error('dxfRecipeWizard stations', e); }
-      // Una sola stazione con camera: preselezionata
-      if (this.stations.length === 1) {
-        this.stationId = String(this.stations[0].id);
-        await this.onStation();
-      }
-    },
-
-    // Cambio stazione: rilegge lo stato di calibrazione dall'acquisitore
-    async onStation() {
-      this.calState = ''; this.calLabel = ''; this.calUrl = '';
-      this.result = null;
-      if (!this.stationId) return;
-      const r = await fetchStationCalibration(this.stationId);
-      this.calState = r.state || 'unreachable';
-      this.calUrl = r.calibration_url || '';
-      if (this.calState === 'calibrated') this.calLabel = formatCalibration(r.calibration || {});
-    },
-
-    get calibrated() { return this.calState === 'calibrated'; },
-    get canRun() {
-      return !!(this.stationId && this.calibrated && this.imageFile && this.dxfFile) && !this.busy;
-    },
-
-    _setImage(file) {
-      if (this.imageSrc) URL.revokeObjectURL(this.imageSrc);
-      this.imageFile = file;
-      this.imageName = file.name || '';
-      this.imageSrc = URL.createObjectURL(file);
-      this.result = null;
-    },
-
-    onImage(ev) {
-      const f = ev.target.files && ev.target.files[0];
-      if (f) this._setImage(f);
-    },
-    onDxf(ev) { this.dxfFile = (ev.target.files && ev.target.files[0]) || null; this.result = null; },
-
-    // Frame dalla camera della stazione scelta
-    async grab() {
-      if (!this.stationId || this.grabbing) return;
-      this.grabbing = true;
-      this.error = '';
-      try {
-        const resp = await fetch(`/maker/api/stations/${this.stationId}/camera/grab`, {
-          method: 'POST', headers: { 'X-CSRFToken': this._csrf() },
-        });
-        if (!resp.ok) {
-          const body = await resp.json().catch(() => ({}));
-          this.error = body.detail || this.msgs.requestFailed || 'Error';
-        } else {
-          const blob = await resp.blob();
-          this._setImage(new File([blob], 'camera.png', { type: blob.type || 'image/png' }));
-        }
-      } catch (e) {
-        this.error = this.msgs.requestFailed || String(e);
-      }
-      this.grabbing = false;
-    },
-
-    _csrf() { return typeof csrf === 'function' ? csrf() : csrf; },
-
-    // Il 422 porta `detail` (stringa o lista) oppure `errors`
-    _errorText(body) {
-      if (Array.isArray(body.errors) && body.errors.length) return body.errors.map(String).join('; ');
-      const d = body.detail;
-      if (Array.isArray(d)) return d.map(x => (typeof x === 'string' ? x : (x.msg || JSON.stringify(x)))).join('; ');
-      if (d && typeof d === 'object') return JSON.stringify(d);
-      return d || this.msgs.requestFailed || 'Error';
-    },
-
-    async run(save) {
-      if (!this.canRun) return;
-      this.busy = true;
-      this.error = '';
-      this.notice = '';
-      try {
-        const fd = new FormData();
-        fd.append('image', this.imageFile, this.imageFile.name || 'capture.png');
-        fd.append('dxf', this.dxfFile, this.dxfFile.name);
-        fd.append('station_id', this.stationId);
-        fd.append('band_mm', String(this.bandMm));
-        fd.append('min_points_pct', String(this.minPointsPct));
-        fd.append('polarity', this.dark ? 'dark' : 'light');
-        fd.append('save', save ? 'true' : 'false');
-        const resp = await fetch(`/maker/api/vision/tasks/${this.taskId}/recipe/dxf-compare`, {
-          method: 'POST', headers: { 'X-CSRFToken': this._csrf() }, body: fd,
-        });
-        const body = await resp.json().catch(() => ({}));
-        if (!resp.ok || body.error) {
-          this.error = this._errorText(body);
-        } else {
-          this.result = body;
-          this.$nextTick(() => this.drawOverlay());
-          if (save && body.saved) {
-            this.notice = this.msgs.saved || 'Saved';
-            // Il componente visionRecipe ricarica cartella, file e uscite delle quote
-            this.$dispatch('dxf-recipe-saved', { taskId: this.taskId });
-          }
-        }
-      } catch (e) {
-        this.error = this.msgs.requestFailed || String(e);
-      }
-      this.busy = false;
-    },
-
-    // Le quattro uscite del confronto, nell'ordine fisso
-    get values() {
-      const out = (this.result && this.result.result && this.result.result.outputs) || {};
-      return VALUE_KEYS.map(k => ({ key: k, value: out[k] }));
-    },
-
-    fmt(v) {
-      return (typeof v === 'number') ? v.toLocaleString(document.documentElement.lang || 'it',
-        { maximumFractionDigits: 3 }) : '-';
-    },
-
-    // Come vision_execute.js: canvas della dimensione dell'immagine, coordinate in pixel immagine
-    drawOverlay() {
-      const img = this.$refs.img, cv = this.$refs.overlay;
-      if (!img || !cv || !img.naturalWidth) return;
-      cv.width = img.naturalWidth;
-      cv.height = img.naturalHeight;
-      const g = cv.getContext('2d');
-      g.clearRect(0, 0, cv.width, cv.height);
-      g.lineWidth = Math.max(2, cv.width / 400);
-      g.lineJoin = 'round';
-      const shapes = (this.result && this.result.result && this.result.result.overlay) || [];
-      for (const item of shapes) {
-        const rows = item.rows || [], cols = item.cols || [];
-        if (!rows.length || rows.length !== cols.length) continue;
-        g.strokeStyle = ROLE_COLORS[item.role] || '#ef4444';
-        g.beginPath();
-        g.moveTo(cols[0], rows[0]);
-        for (let i = 1; i < rows.length; i++) g.lineTo(cols[i], rows[i]);
-        g.stroke();
-      }
-    },
-  };
-}

src/frontend/flask_app/static/js/station_calibration.js

@@ -1,50 +0,0 @@
-// Stato di calibrazione della camera di una stazione (#83).
-// La calibrazione vive nell'acquisitore (camera_service): qui si legge solo lo stato
-// tramite il proxy Flask e si offre il link alla sua pagina «Calibra».
-// Uso: x-data="stationCalibrationCell(station, msgs)" (msgs: stringhe tradotte). Dipende da Alpine.js.
-
-// Formatta px/mm e data nella lingua della pagina (es. «20,03 px/mm · 23/10/2026»)
-function formatCalibration(cal) {
-  const lang = document.documentElement.lang || 'it';
-  let text = new Intl.NumberFormat(lang, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-    .format(Number(cal.px_per_mm)) + ' px/mm';
-  if (cal.calibrated_at) {
-    const d = new Date(cal.calibrated_at);
-    if (!isNaN(d)) text += ' · ' + d.toLocaleDateString(lang);
-  }
-  return text;
-}
-
-// Legge lo stato dal proxy: ritorna {state, calibration, calibration_url, detail}
-async function fetchStationCalibration(stationId) {
-  try {
-    const resp = await fetch(`/maker/api/stations/${stationId}/camera/calibration`);
-    const body = await resp.json().catch(() => ({}));
-    if (!resp.ok) return { state: 'unreachable', detail: body.detail || '' };
-    return body;
-  } catch (e) {
-    return { state: 'unreachable', detail: String(e) };
-  }
-}
-
-function stationCalibrationCell(station, msgs) {
-  return {
-    hasCamera: !!(station.camera_url && station.camera_source),
-    cameraUrl: station.camera_url || '',
-    state: '',          // '' = in lettura | calibrated | uncalibrated | unreachable
-    label: '',
-    calibrationUrl: '',
-    msgs: msgs || {},
-
-    async init() {
-      if (!this.hasCamera) return;
-      const r = await fetchStationCalibration(station.id);
-      this.state = r.state || 'unreachable';
-      // Link «Calibra»: dal proxy, altrimenti costruito dall'indirizzo della camera
-      this.calibrationUrl = r.calibration_url || (this.cameraUrl.replace(/\/+$/, '') + '/calibrazione');
-      if (this.state === 'calibrated') this.label = formatCalibration(r.calibration || {});
-      else if (this.state === 'uncalibrated') this.label = this.msgs.uncalibrated || 'not calibrated';
-      else this.label = this.msgs.unreachable || 'camera service unreachable';
-    },
-  };
-}

src/frontend/flask_app/templates/admin/stations.html

@@ -50,7 +50,6 @@
             <th class="text-left px-4 py-3 text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wider">{{ _('Nome') }}</th>
             <th class="text-left px-4 py-3 text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wider hidden md:table-cell">{{ _('Postazione') }}</th>
             <th class="text-left px-4 py-3 text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wider hidden lg:table-cell">{{ _('Ricette collegate') }}</th>
-            <th class="text-left px-4 py-3 text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wider hidden md:table-cell">{{ _('Calibrazione') }}</th>
             <th class="text-center px-4 py-3 text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wider">{{ _('Stato') }}</th>
             <th class="text-right px-4 py-3 text-xs font-semibold text-[var(--text-secondary)] uppercase tracking-wider">{{ _('Azioni') }}</th>
           </tr>
@@ -82,25 +81,6 @@
                   </div>
                 </template>
               </td>
-              {# Calibrazione (#83): stato letto dall'acquisitore della camera, link alla sua pagina «Calibra» #}
-              <td class="px-4 py-3 hidden md:table-cell" @click.stop
-                  x-data="stationCalibrationCell(station, {{ {'uncalibrated': _('non calibrata'), 'unreachable': _('acquisitore non raggiungibile')}|tojson_attr }})">
-                <template x-if="!hasCamera">
-                  <span class="text-xs italic text-[var(--text-secondary)]">{{ _('Nessuna camera') }}</span>
-                </template>
-                <template x-if="hasCamera">
-                  <div class="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs">
-                    <span :class="state === 'calibrated' ? 'text-emerald-700 dark:text-emerald-300'
-                                  : (state === 'uncalibrated' || state === 'unreachable') ? 'text-amber-700 dark:text-amber-300'
-                                  : 'text-[var(--text-secondary)]'">
-                      <span x-show="state === 'calibrated'">{{ _('Calibrazione') }}: </span><span x-text="state ? label : '...'"></span>
-                    </span>
-                    <a :href="calibrationUrl" target="_blank" rel="noopener"
-                       x-show="calibrationUrl"
-                       class="font-medium text-primary hover:underline">{{ _('Calibra') }}</a>
-                  </div>
-                </template>
-              </td>
               <td class="px-4 py-3 text-center">
                 <span class="inline-flex items-center px-2 py-0.5 rounded-full text-[11px] font-medium"
                       :class="station.active
@@ -479,7 +459,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/station_calibration.js') }}"></script>
 <script>
 function stationManagement(initialStations, initialRecipes) {
   return {

src/frontend/flask_app/templates/maker/task_editor.html

@@ -550,8 +550,7 @@
             <!-- ========== 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 }})"
-                   @dxf-recipe-saved="init()">{# #83: dopo «Salva ricetta» da DXF si rilegge la ricetta #}
+                   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>
@@ -594,93 +593,6 @@
                 <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>
-                <!-- ========== Crea ricetta da DXF (#83): solo dxf_compare ========== -->
-                <template x-if="task.task_type === 'dxf_compare'">
-                  <div class="mt-4 pt-3 border-t border-[var(--border-color)]"
-                       x-data="dxfRecipeWizard(task.id, () => csrfToken(), {{ {'requestFailed': _('Richiesta non riuscita'), 'saved': _('Ricetta salvata')}|tojson_attr }})">
-                    <button type="button" class="btn btn-secondary text-xs" @click="toggle()">
-                      {{ _('Crea ricetta da DXF') }}
-                    </button>
-                    <div x-show="open" x-cloak class="mt-3 space-y-3">
-                      <!-- Stazione -->
-                      <div>
-                        <label class="tmf-label text-xs">{{ _('Stazione') }}</label>
-                        <select class="tmf-input text-xs" x-model="stationId" @change="onStation()">
-                          <option value="">{{ _('Scegli la stazione') }}</option>
-                          <template x-for="st in stations" :key="st.id">
-                            <option :value="String(st.id)" x-text="st.code + ' - ' + st.name"></option>
-                          </template>
-                        </select>
-                        <p x-show="!stations.length" class="mt-1 text-xs text-[var(--text-muted)]">{{ _('Nessuna stazione con camera configurata') }}</p>
-                        <p x-show="stationId && calibrated" class="mt-1 text-xs text-emerald-600">
-                          {{ _('Calibrazione') }}: <span x-text="calLabel"></span>
-                        </p>
-                        <p x-show="stationId && calState && !calibrated" class="mt-1 text-xs text-amber-600">
-                          <span x-text="calState === 'uncalibrated' ? {{ _('Stazione non calibrata: calibrala prima di creare la ricetta.')|tojson_attr }} : {{ _('Acquisitore non raggiungibile: impossibile leggere la calibrazione.')|tojson_attr }}"></span>
-                          <a :href="calUrl" target="_blank" rel="noopener" x-show="calUrl"
-                             class="font-medium text-primary hover:underline">{{ _('Calibra') }}</a>
-                          <span class="text-[var(--text-muted)]">({{ _('oppure vedi la pagina Stazioni') }})</span>
-                        </p>
-                      </div>
-                      <!-- Immagine: camera o file -->
-                      <div class="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                        <div>
-                          <label class="tmf-label text-xs">{{ _('Immagine del pezzo') }}</label>
-                          <div class="flex flex-wrap items-center gap-2">
-                            <button type="button" class="btn btn-secondary text-xs" @click="grab()"
-                                    :disabled="!stationId || grabbing">{{ _('Acquisisci dalla camera') }}</button>
-                            <label class="btn btn-secondary text-xs cursor-pointer">
-                              {{ _('Carica immagine') }}
-                              <input type="file" accept="image/*" class="hidden" @change="onImage($event)">
-                            </label>
-                          </div>
-                          <p class="mt-1 text-xs text-[var(--text-muted)]" x-text="imageName"></p>
-                        </div>
-                        <div>
-                          <label class="tmf-label text-xs">{{ _('Disegno (.dxf)') }}</label>
-                          <input type="file" accept=".dxf" class="tmf-input text-xs" @change="onDxf($event)">
-                        </div>
-                      </div>
-                      <!-- Pochi parametri -->
-                      <div class="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                        <div>
-                          <label class="tmf-label text-xs">{{ _('Banda ± mm') }}</label>
-                          <input type="number" step="0.01" min="0.001" class="tmf-input text-xs" x-model.number="bandMm">
-                        </div>
-                        <div>
-                          <label class="tmf-label text-xs">{{ _('Soglia punti in banda %%') }}</label>
-                          <input type="number" step="1" min="1" max="100" class="tmf-input text-xs" x-model.number="minPointsPct">
-                        </div>
-                      </div>
-                      <label class="flex items-center gap-2 text-xs">
-                        <input type="checkbox" x-model="dark">
-                        {{ _('Pezzo scuro su fondo chiaro (controluce)') }}
-                      </label>
-                      <!-- Azioni -->
-                      <div class="flex justify-end gap-2">
-                        <button type="button" class="btn btn-secondary text-xs" @click="run(false)"
-                                :disabled="!canRun">{{ _('Prova') }}</button>
-                        <button type="button" class="btn btn-primary text-xs" @click="run(true)"
-                                :disabled="!canRun || !result">{{ _('Salva ricetta') }}</button>
-                      </div>
-                      <p x-show="error" class="text-xs text-red-500" x-text="error"></p>
-                      <p x-show="notice" class="text-xs text-emerald-600" x-text="notice"></p>
-                      <!-- Anteprima con overlay e quattro valori -->
-                      <div x-show="imageSrc" class="relative">
-                        <img x-ref="img" :src="imageSrc" alt="" class="block w-full rounded border border-[var(--border-color)]"
-                             @load="drawOverlay()">
-                        <canvas x-ref="overlay" class="absolute inset-0 w-full h-full pointer-events-none"></canvas>
-                      </div>
-                      <table x-show="result" class="tmf-table text-xs">
-                        <tbody>
-                          <template x-for="v in values" :key="v.key">
-                            <tr><td class="font-mono" x-text="v.key"></td><td class="text-right" x-text="fmt(v.value)"></td></tr>
-                          </template>
-                        </tbody>
-                      </table>
-                    </div>
-                  </div>
-                </template>
               </div>
             </template>
 
@@ -1333,8 +1245,6 @@
 {# 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/vision_recipe.js') }}"></script>
-<script src="{{ url_for('static', filename='js/station_calibration.js') }}"></script>
-<script src="{{ url_for('static', filename='js/dxf_recipe_wizard.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 src="{{ url_for('static', filename='js/annotation-viewer.js') }}?v=6"></script>

src/frontend/flask_app/tests/test_dxf_recipe_routes.py

@@ -1,232 +0,0 @@
-"""gitea:Adriano/TieMeasureFlow#83 - ricetta DXF compare da camera: rotte Flask nuove.
-
-api_client e requests sono finti: backend (B3) e acquisitore (C1) rispondono
-come da contratto del piano.
-"""
-import io
-from unittest.mock import MagicMock, patch
-
-import requests
-
-from tests.conftest import api_get_router
-
-STATION = {
-    "id": 4, "code": "ST-4", "name": "Banco",
-    "camera_url": "http://acq:8765/", "camera_source": "camera:folder",
-}
-NO_CAMERA = {"id": 5, "code": "ST-5", "name": "Senza", "camera_url": None, "camera_source": None}
-PNG = b"\x89PNG\r\n\x1a\n fake"
-CAL = {
-    "source": "camera:folder", "px_per_mm": 20.03, "mm_per_px": 0.0499, "rms_px": 0.2,
-    "n_corners": 54, "cols": 9, "rows": 6, "square_mm": 5.0,
-    "image_width": 2448, "image_height": 2048, "scale_spread_pct": 0.3,
-    "calibrated_at": "2026-10-23T10:00:00",
-}
-
-
-def _fake(status=200, content=PNG, json_body=None):
-    resp = MagicMock(status_code=status, content=content, text=content.decode("latin-1"))
-    if json_body is None:
-        resp.json.side_effect = ValueError("no json")
-    else:
-        resp.json.return_value = json_body
-    return resp
-
-
-def _stations(mock_api_client, stations=(STATION, NO_CAMERA)):
-    mock_api_client.get.side_effect = api_get_router({"/api/stations": list(stations)})
-
-
-class TestStationList:
-    def test_only_stations_with_camera(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        resp = logged_in_client.get("/maker/api/stations")
-        assert resp.status_code == 200
-        assert [s["id"] for s in resp.get_json()] == [4]
-
-    def test_non_admin_list_falls_back_to_current_station(
-            self, logged_in_client, mock_api_client, monkeypatch):
-        # /api/stations e' solo admin: il Maker vede la stazione corrente (by-code)
-        monkeypatch.setattr("blueprints.maker.Config.STATION_CODE", "ST-4")
-        mock_api_client.get.side_effect = api_get_router(
-            {"/api/stations": {"error": True, "status_code": 403, "detail": "no"}})
-        mock_api_client.get_station_by_code.return_value = STATION
-        resp = logged_in_client.get("/maker/api/stations")
-        assert [s["id"] for s in resp.get_json()] == [4]
-        mock_api_client.get_station_by_code.assert_called_once_with("ST-4")
-
-    def test_requires_maker_or_admin(self, logged_in_client, mock_api_client):
-        with logged_in_client.session_transaction() as sess:
-            sess["user"] = {**sess["user"], "roles": ["MeasurementTec"], "is_admin": False}
-        assert logged_in_client.get("/maker/api/stations").status_code == 403
-
-
-class TestStationCameraGrab:
-    def test_png_pass_through(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        with patch("blueprints.maker.http_requests.post", return_value=_fake()) as post:
-            resp = logged_in_client.post("/maker/api/stations/4/camera/grab")
-        assert resp.status_code == 200
-        assert resp.mimetype == "image/png"
-        assert resp.data == PNG
-        args, kwargs = post.call_args
-        assert args[0] == "http://acq:8765/camera/grab"  # slash finale tolto
-        assert kwargs["json"] == {"source": "camera:folder", "trigger": "continuo", "timeout_ms": 5000}
-
-    def test_get_also_works(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        with patch("blueprints.maker.http_requests.post", return_value=_fake()):
-            assert logged_in_client.get("/maker/api/stations/4/camera/grab").status_code == 200
-
-    def test_station_without_camera_is_409(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        with patch("blueprints.maker.http_requests.post") as post:
-            resp = logged_in_client.post("/maker/api/stations/5/camera/grab")
-        assert resp.status_code == 409
-        post.assert_not_called()
-
-    def test_unknown_station_is_409(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        assert logged_in_client.post("/maker/api/stations/99/camera/grab").status_code == 409
-
-    def test_service_down_is_502(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        with patch("blueprints.maker.http_requests.post",
-                   side_effect=requests.ConnectionError("refused")):
-            resp = logged_in_client.post("/maker/api/stations/4/camera/grab")
-        assert resp.status_code == 502
-        assert resp.get_json()["error"]
-
-    def test_service_503_is_502_with_detail(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        fake = _fake(503, b"{}", {"detail": "camera occupata"})
-        with patch("blueprints.maker.http_requests.post", return_value=fake):
-            resp = logged_in_client.post("/maker/api/stations/4/camera/grab")
-        assert resp.status_code == 502
-        assert "camera occupata" in resp.get_json()["detail"]
-
-
-class TestStationCameraCalibration:
-    def _get(self, client, fake=None, exc=None):
-        with patch("blueprints.maker.http_requests.get", return_value=fake,
-                   side_effect=exc) as get:
-            resp = client.get("/maker/api/stations/4/camera/calibration")
-        return resp, get
-
-    def test_calibrated(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        resp, get = self._get(logged_in_client, _fake(200, b"{}", CAL))
-        body = resp.get_json()
-        assert resp.status_code == 200
-        assert body["state"] == "calibrated"
-        assert body["calibration"]["px_per_mm"] == 20.03
-        assert body["calibration_url"] == "http://acq:8765/calibrazione"
-        args, kwargs = get.call_args
-        assert args[0] == "http://acq:8765/camera/calibration"
-        assert kwargs["params"] == {"source": "camera:folder"}
-
-    def test_404_is_uncalibrated(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        resp, _ = self._get(logged_in_client, _fake(404, b"{}", {"detail": "no"}))
-        assert resp.status_code == 200
-        assert resp.get_json()["state"] == "uncalibrated"
-        assert resp.get_json()["calibration_url"] == "http://acq:8765/calibrazione"
-
-    def test_unreachable(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        resp, _ = self._get(logged_in_client, exc=requests.ConnectionError("down"))
-        assert resp.status_code == 200
-        assert resp.get_json()["state"] == "unreachable"
-
-    def test_server_error_is_unreachable(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        resp, _ = self._get(logged_in_client, _fake(500, b"boom"))
-        assert resp.get_json()["state"] == "unreachable"
-
-    def test_station_without_camera_is_409(self, logged_in_client, mock_api_client):
-        _stations(mock_api_client)
-        with patch("blueprints.maker.http_requests.get") as get:
-            resp = logged_in_client.get("/maker/api/stations/5/camera/calibration")
-        assert resp.status_code == 409
-        get.assert_not_called()
-
-
-class TestDxfCompareProxy:
-    URL = "/maker/api/vision/tasks/7/recipe/dxf-compare"
-    OK = {
-        "result": {"outputs": {"dxf.points_in_pct": 99.1}, "overlay": [], "outcome": "pass"},
-        "saved": False, "recipe_dir": None, "outputs": None,
-    }
-
-    def _post(self, client, **form):
-        data = {"image": (io.BytesIO(PNG), "p.png"), "dxf": (io.BytesIO(b"0\nEOF"), "d.dxf"), **form}
-        return client.post(self.URL, data=data, content_type="multipart/form-data")
-
-    def test_forwards_files_and_fields(self, logged_in_client, mock_api_client):
-        mock_api_client.post.return_value = self.OK
-        resp = self._post(logged_in_client, station_id="4", band_mm="0.1",
-                          min_points_pct="95", polarity="dark", save="false", px_per_mm="")
-        assert resp.status_code == 200
-        assert resp.get_json()["result"]["outputs"]["dxf.points_in_pct"] == 99.1
-        args, kwargs = mock_api_client.post.call_args
-        assert args[0] == "/api/vision/tasks/7/recipe/dxf-compare"
-        # campi del contratto B3; px_per_mm vuoto non si inoltra
-        assert kwargs["data"] == {
-            "station_id": "4", "band_mm": "0.1", "min_points_pct": "95",
-            "polarity": "dark", "save": "false",
-        }
-        assert set(kwargs["files"]) == {"image", "dxf"}
-        assert kwargs["files"]["image"][1] == PNG
-
-    def test_save_true_forwarded(self, logged_in_client, mock_api_client):
-        mock_api_client.post.return_value = {**self.OK, "saved": True, "recipe_dir": "vision/recipes/7/x"}
-        resp = self._post(logged_in_client, save="true")
-        assert resp.get_json()["saved"] is True
-        assert mock_api_client.post.call_args.kwargs["data"]["save"] == "true"
-
-    def test_missing_files_is_400(self, logged_in_client, mock_api_client):
-        resp = logged_in_client.post(self.URL, data={"station_id": "4"},
-                                     content_type="multipart/form-data")
-        assert resp.status_code == 400
-        mock_api_client.post.assert_not_called()
-
-    def test_backend_422_propagates(self, logged_in_client, mock_api_client):
-        mock_api_client.post.return_value = {
-            "error": True, "status_code": 422, "detail": "stazione non calibrata"}
-        resp = self._post(logged_in_client)
-        assert resp.status_code == 422
-        assert resp.get_json()["detail"] == "stazione non calibrata"
-
-    def test_requires_maker_role(self, logged_in_client, mock_api_client):
-        with logged_in_client.session_transaction() as sess:
-            sess["user"] = {**sess["user"], "roles": ["MeasurementTec"]}
-        assert self._post(logged_in_client).status_code == 403
-        mock_api_client.post.assert_not_called()
-
-
-class TestPages:
-    def test_stations_page_has_calibration_cell(self, logged_in_client):
-        with patch("blueprints.admin.api_client") as admin_api:
-            admin_api.get.side_effect = api_get_router({"/api/stations": [STATION], "/api/recipes": []})
-            html = logged_in_client.get("/admin/stations").get_data(as_text=True)
-        assert "js/station_calibration.js" in html
-        assert "stationCalibrationCell(" in html
-        # niente piu' pannello di calibrazione nella pagina: solo il link all'acquisitore
-        assert "calibration-panel" not in html
-
-    def _editor(self, client, mock_api_client, task_type):
-        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": task_type, "subtasks": [],
-                "file_path": None, "order_index": 1,
-            }],
-        })
-        return client.get("/maker/recipes/3/tasks").get_data(as_text=True)
-
-    def test_editor_has_dxf_wizard(self, logged_in_client, mock_api_client):
-        html = self._editor(logged_in_client, mock_api_client, "dxf_compare")
-        assert "js/dxf_recipe_wizard.js" in html
-        assert "dxfRecipeWizard(" in html
-        assert "@dxf-recipe-saved" in html
-        assert "Pezzo scuro su fondo chiaro" in html or "Dark part on light" in html

src/frontend/flask_app/translations/en/LC_MESSAGES/messages.po

@@ -3359,96 +3359,3 @@ msgstr "Camera service unreachable: %(detail)s"
 #, python-format
 msgid "Acquisizione non riuscita (%(status)s): %(detail)s"
 msgstr "Capture failed (%(status)s): %(detail)s"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-#, python-format
-msgid "Risposta %(status)s dall'acquisitore"
-msgstr "Response %(status)s from the camera service"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Risposta non valida dall'acquisitore"
-msgstr "Invalid response from the camera service"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Servono l'immagine e il file DXF"
-msgstr "Both the image and the DXF file are required"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Calibrazione"
-msgstr "Calibration"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "non calibrata"
-msgstr "not calibrated"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "acquisitore non raggiungibile"
-msgstr "camera service unreachable"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Nessuna camera"
-msgstr "No camera"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Calibra"
-msgstr "Calibrate"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Ricetta salvata"
-msgstr "Recipe saved"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Crea ricetta da DXF"
-msgstr "Create recipe from DXF"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Scegli la stazione"
-msgstr "Choose the station"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Nessuna stazione con camera configurata"
-msgstr "No station with a camera configured"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Stazione non calibrata: calibrala prima di creare la ricetta."
-msgstr "Station not calibrated: calibrate it before creating the recipe."
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Acquisitore non raggiungibile: impossibile leggere la calibrazione."
-msgstr "Camera service unreachable: cannot read the calibration."
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "oppure vedi la pagina Stazioni"
-msgstr "or see the Stations page"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Immagine del pezzo"
-msgstr "Part image"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Carica immagine"
-msgstr "Upload image"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Disegno (.dxf)"
-msgstr "Drawing (.dxf)"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Banda ± mm"
-msgstr "Band ± mm"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Soglia punti in banda %%"
-msgstr "Points-in-band threshold %%"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Pezzo scuro su fondo chiaro (controluce)"
-msgstr "Dark part on light background (backlight)"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Prova"
-msgstr "Try"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Salva ricetta"
-msgstr "Save recipe"

src/frontend/flask_app/translations/it/LC_MESSAGES/messages.po

@@ -3347,96 +3347,3 @@ msgstr "Servizio camera non raggiungibile: %(detail)s"
 #, python-format
 msgid "Acquisizione non riuscita (%(status)s): %(detail)s"
 msgstr "Acquisizione non riuscita (%(status)s): %(detail)s"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-#, python-format
-msgid "Risposta %(status)s dall'acquisitore"
-msgstr "Risposta %(status)s dall'acquisitore"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Risposta non valida dall'acquisitore"
-msgstr "Risposta non valida dall'acquisitore"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Servono l'immagine e il file DXF"
-msgstr "Servono l'immagine e il file DXF"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Calibrazione"
-msgstr "Calibrazione"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "non calibrata"
-msgstr "non calibrata"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "acquisitore non raggiungibile"
-msgstr "acquisitore non raggiungibile"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Nessuna camera"
-msgstr "Nessuna camera"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Calibra"
-msgstr "Calibra"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Ricetta salvata"
-msgstr "Ricetta salvata"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Crea ricetta da DXF"
-msgstr "Crea ricetta da DXF"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Scegli la stazione"
-msgstr "Scegli la stazione"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Nessuna stazione con camera configurata"
-msgstr "Nessuna stazione con camera configurata"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Stazione non calibrata: calibrala prima di creare la ricetta."
-msgstr "Stazione non calibrata: calibrala prima di creare la ricetta."
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Acquisitore non raggiungibile: impossibile leggere la calibrazione."
-msgstr "Acquisitore non raggiungibile: impossibile leggere la calibrazione."
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "oppure vedi la pagina Stazioni"
-msgstr "oppure vedi la pagina Stazioni"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Immagine del pezzo"
-msgstr "Immagine del pezzo"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Carica immagine"
-msgstr "Carica immagine"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Disegno (.dxf)"
-msgstr "Disegno (.dxf)"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Banda ± mm"
-msgstr "Banda ± mm"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Soglia punti in banda %%"
-msgstr "Soglia punti in banda %%"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Pezzo scuro su fondo chiaro (controluce)"
-msgstr "Pezzo scuro su fondo chiaro (controluce)"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Prova"
-msgstr "Prova"
-
-#: templates/maker/task_editor.html templates/admin/stations.html blueprints/maker.py
-msgid "Salva ricetta"
-msgstr "Salva ricetta"

src/vision/costruttori.py

@@ -0,0 +1,228 @@
+"""Costruttore di ricette DXF compare dal campo (immagine + DXF + scala -> ricetta v2).
+
+Logica pura, niente FastAPI ne' database: il worker (src/vision_worker/main.py)
+lo espone come /recipes/dxf-compare, i test lo chiamano direttamente. Tutta la
+visione sta in TieVision-Core (visionsuite.*). La calibrazione a scacchiera NON
+sta qui: vive nell'acquisitore (scripts/calibrazione.py, #83).
+
+Errori di input (pezzo non trovato, DXF illeggibile, parametri fuori range)
+sono `CostruttoreError`: il worker li mappa a 422.
+"""
+from __future__ import annotations
+
+import base64
+import hashlib
+import json
+import math
+import tempfile
+from pathlib import Path
+
+import numpy as np
+from visionsuite.core.image import Image
+
+from src.vision.runner import RunOutcome, run_graph
+
+
+class CostruttoreError(ValueError):
+    """Input che non permette di costruire (422 per il worker), non un guasto."""
+
+
+# Nomi/id fissi della ricetta (contratto #83 con backend e frontend).
+DXF_FILE = "disegno.dxf"
+CALIBRATION_FILE = "calibrazione.json"
+_POLARITIES = ("dark", "light")
+# Pose iniziali del disegno provate (gradi): il verso del pezzo non e' noto.
+_OUTPUT_KEYS = ("dxf.points_in_pct", "dxf.distance_avg", "dxf.distance_min", "dxf.distance_max")
+_START_ANGLES = (0.0, 90.0, 180.0, 270.0)
+
+
+def _b64(data: bytes) -> str:
+    return base64.b64encode(data).decode("ascii")
+
+
+def _gray_u8(pixels: np.ndarray) -> np.ndarray:
+    """Immagine -> grigio uint8 2D (LocateBlob accetta solo uint8)."""
+    px = np.asarray(pixels)
+    if px.ndim == 3:
+        px = px[..., 0]  # multicanale: il primo, come fa LocateBlob
+    if px.dtype != np.uint8:
+        # float/uint16 -> scala sul massimo, come _to_gray_uint8 di vs-core
+        m = float(px.max()) if px.size else 1.0
+        px = np.clip(px.astype(np.float32) / max(m, 1e-9) * 255, 0, 255).astype(np.uint8)
+    return np.ascontiguousarray(px)
+
+
+# ------------------------------------------------------------------ W2
+
+def _graph(dxf_sha: str, cal_sha: str, band_mm: float, min_points_pct: float, polarity: str,
+           reference_pose: dict, anchor: tuple[float, float, float] | None) -> dict:
+    """Ricetta v2 fissa: LocateBlob "pezzo" + CompareDxf "dxf" agganciato a `align`.
+
+    `anchor` = (riga, colonna, angolo) dell'origine del disegno nell'immagine di
+    riferimento; None = solo il localizzatore (passo intermedio).
+    """
+    tools: list[dict] = [{
+        "id": "pezzo", "name": "Pezzo", "kind": "LocateBlob",
+        "values": {"polarity": polarity, "reference_pose": reference_pose},
+        "links": {},
+    }]
+    if anchor is not None:
+        row, col, angle = anchor
+        tools.append({
+            "id": "dxf", "name": "Confronto DXF", "kind": "CompareDxf",
+            "values": {
+                "dxf": "disegno",
+                "anchor": "align",
+                "anchor_offset_row_px": float(row),
+                "anchor_offset_col_px": float(col),
+                "offset_angle_deg": float(angle),
+                "band_plus": float(band_mm),
+                "band_minus": float(band_mm),
+                "nominal_unit": "mm",
+                # tolleranza di points_in_pct: nominale = limite, plus = 100 - limite
+                "points_in_pct_nominal": float(min_points_pct),
+                "points_in_pct_plus": float(100.0 - min_points_pct),
+                "points_in_pct_minus": 0.0,
+            },
+            "links": {"align": {"tool": "pezzo", "property": "poses"}},
+        })
+    return {
+        "schema_version": 2,
+        "name": "Confronto DXF",
+        # sha256 obbligatorio per vs-task (verifica i file della cartella ricetta)
+        "meta": {"dxf": {"disegno": {"path": DXF_FILE, "sha256": dxf_sha}},
+                 "calibration": {"path": CALIBRATION_FILE, "sha256": cal_sha}},
+        "tools": tools,
+    }
+
+
+def _locate_reference(gray: np.ndarray, polarity: str) -> dict:
+    """Posa del pezzo sull'immagine di riferimento (LocateBlob, soglia Otsu)."""
+    from visionsuite.task import Task, load_tools
+
+    load_tools()
+    graph = _graph('', '', 1.0, 95.0, polarity, {"row": 0.0, "col": 0.0, "angle_deg": 0.0}, None)
+    task = Task.from_dict(graph)
+    task.run(context={"image": Image(gray)})
+    pezzo = task["Pezzo"]
+    if not pezzo.found_poses:
+        raise CostruttoreError(
+            "pezzo non trovato nell'immagine di riferimento "
+            f"(polarity={polarity}): controllare luce, sfondo e polarita'"
+        )
+    return pezzo.found_poses[0].to_dict()
+
+
+def _candidate_anchors(gray: np.ndarray, dxf_path: Path, px_per_mm: float) -> list[tuple[float, float, float]]:
+    """Pose (riga, col, angolo) del disegno sull'immagine: ICP da 4 orientamenti.
+
+    Il disegno e' in px (origine DXF, y capovolta); si parte da ognuno dei 4
+    angoli con i centroidi sovrapposti e l'ICP rifinisce. Ritorna le posa trovate
+    (anche per orientamenti che non convergono: le giudica la ricetta eseguita).
+    """
+    from visionsuite.calibration import ScaleCalibration
+    from visionsuite.dxf.compare import DXFCompare, _stack
+    from visionsuite.task.pose import Pose
+
+    cmp_ = DXFCompare(dxf_path, ScaleCalibration(px_per_mm=px_per_mm))
+    drawing = _stack(cmp_.drawing_contours())
+    measured = _stack(cmp_.measured_contours(Image(gray)))
+    if len(drawing) < 3:
+        raise CostruttoreError("DXF senza geometria utilizzabile")
+    if len(measured) < 3:
+        raise CostruttoreError("pezzo non trovato: nessun bordo nell'immagine")
+    dc, mc = drawing.mean(axis=0), measured.mean(axis=0)
+
+    anchors = []
+    for theta in _START_ANGLES:
+        # traslazione che porta il centroide del disegno ruotato sul misurato
+        rr, cc = Pose(0.0, 0.0, theta).apply(dc[0], dc[1])
+        start = Pose(float(mc[0] - rr), float(mc[1] - cc), theta)
+        try:
+            result = cmp_.compare(Image(gray), initial_pose=start)
+        except Exception:  # noqa: BLE001 - un orientamento che cade non ferma gli altri
+            continue
+        # transform: misurato -> disegno; la posa del disegno e' l'inversa
+        m = np.linalg.inv(result.transform)
+        angle = math.degrees(math.atan2(m[1, 0], m[0, 0]))
+        anchors.append((float(m[0, 2]), float(m[1, 2]), angle))
+    return anchors
+
+
+def _run(gray, graph, px_per_mm, folder) -> RunOutcome:
+    return run_graph(gray, graph, calibration={"px_per_mm": px_per_mm}, recipe_dir=folder)
+
+
+def build_dxf_compare(
+    gray,
+    dxf_bytes: bytes,
+    px_per_mm: float,
+    band_mm: float = 0.1,
+    min_points_pct: float = 95.0,
+    polarity: str = "dark",
+) -> dict:
+    """Ricetta DXF compare dall'immagine di riferimento + disegno + scala.
+
+    Ritorna {graph, files, outputs, overlay, outcome}. `files` sono i due file
+    della cartella ricetta (b64): disegno.dxf e calibrazione.json.
+    """
+    if not (px_per_mm > 0 and math.isfinite(px_per_mm)):
+        raise CostruttoreError("px_per_mm deve essere > 0")
+    if not (band_mm > 0 and math.isfinite(band_mm)):
+        raise CostruttoreError("band_mm deve essere > 0")
+    if not (0 < min_points_pct <= 100):
+        raise CostruttoreError("min_points_pct deve stare in (0, 100]")
+    if polarity not in _POLARITIES:
+        raise CostruttoreError(f"polarity deve essere una di {list(_POLARITIES)}")
+    if not dxf_bytes:
+        raise CostruttoreError("DXF vuoto")
+
+    frame = _gray_u8(gray)
+    calibration_bytes = json.dumps({"px_per_mm": px_per_mm}).encode("utf-8")
+    dxf_sha = hashlib.sha256(dxf_bytes).hexdigest()
+    cal_sha = hashlib.sha256(calibration_bytes).hexdigest()
+
+    with tempfile.TemporaryDirectory() as tmp:
+        folder = Path(tmp)
+        dxf_path = folder / DXF_FILE
+        dxf_path.write_bytes(dxf_bytes)
+        (folder / CALIBRATION_FILE).write_bytes(calibration_bytes)
+
+        # DXF leggibile? (ezdxf solleva su file corrotto/non DXF)
+        from visionsuite.io.dxf import read_xld_dxf
+        try:
+            drawing = list(read_xld_dxf(str(dxf_path), sampling_distance=0.1,
+                                        scale=px_per_mm, flip_y=True))
+        except Exception as exc:  # noqa: BLE001 - qualunque errore di lettura = DXF illeggibile
+            raise CostruttoreError(f"DXF illeggibile: {type(exc).__name__}: {exc}") from exc
+        if not drawing:
+            raise CostruttoreError("DXF illeggibile: nessuna entita' geometrica")
+
+        reference_pose = _locate_reference(frame, polarity)
+        anchors = _candidate_anchors(frame, dxf_path, px_per_mm)
+        if not anchors:
+            raise CostruttoreError("disegno non sovrapponibile al pezzo (ICP fallito)")
+
+        # Verita' = eseguire davvero la ricetta sul riferimento: vince il maggior points_in_pct
+        best: tuple[float, dict, RunOutcome] | None = None
+        for anchor in anchors:
+            graph = _graph(dxf_sha, cal_sha, band_mm, min_points_pct, polarity, reference_pose, anchor)
+            outcome = _run(frame, graph, px_per_mm, folder)
+            pct = outcome.outputs.get("dxf.points_in_pct")
+            if pct is not None and (best is None or pct > best[0]):
+                best = (pct, graph, outcome)
+        if best is None:
+            raise CostruttoreError(
+                "disegno non sovrapponibile al pezzo: il confronto non ha prodotto punti"
+            )
+        _, graph, outcome = best
+
+    # solo le quattro uscite del contratto (n_points resta fuori)
+    outputs = {k: v for k, v in outcome.outputs.items() if k in _OUTPUT_KEYS}
+    return {
+        "graph": graph,
+        "files": {DXF_FILE: _b64(dxf_bytes), CALIBRATION_FILE: _b64(calibration_bytes)},
+        "outputs": outputs,
+        "overlay": outcome.overlay,
+        "outcome": outcome.outcome,
+    }

src/vision/tests/test_costruttori.py

@@ -0,0 +1,114 @@
+"""Costruttore di ricette dal campo: immagine + DXF + scala -> ricetta v2."""
+import pytest
+
+# Come test_runner.py: l'albero vision richiede Python >=3.13; su 3.11 e' skipped.
+pytest.importorskip(
+    "visionsuite.task",
+    reason=(
+        "the vision tree requires Python >=3.13; run it with "
+        "`uv run --python 3.13 --extra vision --extra dev pytest src/vision/tests`"
+    ),
+)
+
+import base64
+import json
+from pathlib import Path
+
+import cv2
+import numpy as np
+
+from src.vision.costruttori import (
+    CALIBRATION_FILE,
+    DXF_FILE,
+    CostruttoreError,
+    build_dxf_compare,
+)
+from src.vision.runner import run_graph
+
+SAMPLE_DXF = (
+    Path(__file__).resolve().parents[3]
+    / "vendor/visionsuite/packages/vs-dxf/tests/fixtures/sample.dxf"
+)
+DXF_WIDTH_MM, DXF_HEIGHT_MM, DXF_HOLE_R_MM = 200.0, 100.0, 10.0
+PX_PER_MM = 4.0
+
+
+def a_scene(angle_deg: float = 0.0, shift_px: tuple[float, float] = (0.0, 0.0),
+            margin_mm: float = 60.0) -> np.ndarray:
+    """Il pezzo del sample.dxf (scuro su bianco) a 4 px/mm, ruotato e traslato."""
+    w = int((DXF_WIDTH_MM + 2 * margin_mm) * PX_PER_MM)
+    h = int((DXF_HEIGHT_MM + 2 * margin_mm) * PX_PER_MM)
+    img = np.full((h, w), 255, np.uint8)
+    cx, cy = w // 2, h // 2
+    hw, hh = int(DXF_WIDTH_MM * PX_PER_MM / 2), int(DXF_HEIGHT_MM * PX_PER_MM / 2)
+    cv2.rectangle(img, (cx - hw, cy - hh), (cx + hw, cy + hh), 0, -1)
+    cv2.circle(img, (cx, cy), int(DXF_HOLE_R_MM * PX_PER_MM), 255, -1)
+    if angle_deg or any(shift_px):
+        m = cv2.getRotationMatrix2D((cx, cy), angle_deg, 1.0)  # >0 = antiorario a video
+        m[0, 2] += shift_px[0]
+        m[1, 2] += shift_px[1]
+        img = cv2.warpAffine(img, m, (w, h), flags=cv2.INTER_LINEAR, borderValue=255)
+    return img
+
+
+# ------------------------------------------------------------------ ricetta DXF
+
+def test_ricetta_dxf_gira_su_riferimento_e_su_scena_ruotata(tmp_path):
+    dxf = SAMPLE_DXF.read_bytes()
+    risultato = build_dxf_compare(a_scene(0.0), dxf, px_per_mm=PX_PER_MM, band_mm=2.0)
+
+    assert risultato["outputs"]["dxf.points_in_pct"] > 95.0  # sul riferimento
+    assert set(risultato["outputs"]) == {
+        "dxf.points_in_pct", "dxf.distance_avg", "dxf.distance_min", "dxf.distance_max"}
+    assert set(risultato["files"]) == {DXF_FILE, CALIBRATION_FILE}
+    assert json.loads(base64.b64decode(risultato["files"][CALIBRATION_FILE])) == {
+        "px_per_mm": PX_PER_MM}
+    assert risultato["overlay"] and risultato["outcome"] is not None
+
+    graph = risultato["graph"]
+    assert graph["schema_version"] == 2
+    # path come da contratto; lo sha256 lo esige vs-task per ogni file in meta
+    assert graph["meta"]["dxf"]["disegno"]["path"] == "disegno.dxf"
+    assert graph["meta"]["calibration"]["path"] == "calibrazione.json"
+    assert len(graph["meta"]["dxf"]["disegno"]["sha256"]) == 64
+    pezzo, dxf_tool = graph["tools"]
+    assert (pezzo["id"], pezzo["kind"], pezzo["name"]) == ("pezzo", "LocateBlob", "Pezzo")
+    assert (dxf_tool["id"], dxf_tool["kind"], dxf_tool["name"]) == ("dxf", "CompareDxf", "Confronto DXF")
+    assert dxf_tool["links"] == {"align": {"tool": "pezzo", "property": "poses"}}
+
+    # La cartella ricetta come la scriverebbe il backend, poi la scena ruotata di 5 gradi
+    for nome, b64 in risultato["files"].items():
+        (tmp_path / nome).write_bytes(base64.b64decode(b64))
+    ruotata = a_scene(5.0, shift_px=(30.0, 20.0))
+    esito = run_graph(ruotata, graph, calibration={"px_per_mm": PX_PER_MM}, recipe_dir=tmp_path)
+    assert not esito.failures, esito.failures
+    assert esito.outputs["dxf.points_in_pct"] > 95.0
+
+
+def test_ricetta_dxf_con_riferimento_gia_ruotato(tmp_path):
+    # il riferimento non e' a 0 gradi: la ricetta si costruisce lo stesso
+    risultato = build_dxf_compare(a_scene(20.0, shift_px=(-15.0, 10.0)),
+                                  SAMPLE_DXF.read_bytes(), PX_PER_MM, band_mm=2.0)
+    assert risultato["outputs"]["dxf.points_in_pct"] > 95.0
+
+
+def test_immagine_senza_pezzo_solleva():
+    bianca = np.full((600, 800), 255, np.uint8)
+    with pytest.raises(CostruttoreError, match="pezzo"):
+        build_dxf_compare(bianca, SAMPLE_DXF.read_bytes(), PX_PER_MM)
+
+
+def test_dxf_illeggibile_solleva():
+    with pytest.raises(CostruttoreError, match="DXF"):
+        build_dxf_compare(a_scene(), b"questo non e' un dxf", PX_PER_MM)
+
+
+@pytest.mark.parametrize("kwargs", [
+    {"px_per_mm": 0.0}, {"px_per_mm": PX_PER_MM, "band_mm": 0.0},
+    {"px_per_mm": PX_PER_MM, "min_points_pct": 0.0},
+    {"px_per_mm": PX_PER_MM, "min_points_pct": 101.0},
+    {"px_per_mm": PX_PER_MM, "polarity": "grigio"},
+])
+def test_parametri_ricetta_invalidi(kwargs):
+    with pytest.raises(CostruttoreError):
+        build_dxf_compare(a_scene(), SAMPLE_DXF.read_bytes(), **kwargs)

src/vision_worker/main.py

@@ -17,6 +17,7 @@ import numpy as np
 from fastapi import FastAPI, File, Form, HTTPException, UploadFile, status
 from PIL import Image, UnidentifiedImageError
 
+from src.vision.costruttori import CostruttoreError, build_dxf_compare  # #83
 from src.vision.runner import (
     GraphBuildError,
     RunOutcome,
@@ -223,3 +224,67 @@ async def validate(
         validate_graph, parsed_graph, resolved_dir
     )
     return {"ok": ok, "errors": errors, "outputs": outputs}
+
+
+def _decode_and_build_dxf(content: bytes, dxf: bytes, px_per_mm: float,
+                          band_mm: float, min_points_pct: float,
+                          polarity: str) -> dict:
+    """#83: meta' sincrona di /recipes/dxf-compare (decodifica + costruzione),
+    in un thread come `_decode_and_run`."""
+    try:
+        frame = np.array(Image.open(io.BytesIO(content)).convert("L"))
+    except (UnidentifiedImageError, OSError) as exc:
+        raise _ImageDecodeError(str(exc)) from exc
+    return build_dxf_compare(frame, dxf, px_per_mm, band_mm, min_points_pct, polarity)
+
+
+@app.post("/recipes/dxf-compare")
+async def recipes_dxf_compare(
+    image: UploadFile = File(...),
+    dxf: UploadFile = File(...),
+    px_per_mm: float = Form(...),
+    band_mm: float = Form(0.1),
+    min_points_pct: float = Form(95.0),
+    polarity: str = Form("dark"),
+) -> dict:
+    """#83: costruisce una ricetta DXF compare dall'immagine di riferimento, il
+    disegno e la scala. Stessi semaforo, timeout e mappa errori di /run."""
+    content = await image.read()
+    dxf_bytes = await dxf.read()
+
+    if _run_slots.locked():
+        raise HTTPException(
+            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+            detail=f"worker busy: already running {_MAX_CONCURRENCY} job(s)",
+        )
+
+    async with _run_slots:
+        try:
+            return await asyncio.wait_for(
+                asyncio.to_thread(
+                    _decode_and_build_dxf, content, dxf_bytes, px_per_mm,
+                    band_mm, min_points_pct, polarity,
+                ),
+                timeout=_RUN_TIMEOUT_S,
+            )
+        except asyncio.TimeoutError as exc:
+            raise HTTPException(
+                status_code=status.HTTP_504_GATEWAY_TIMEOUT,
+                detail=f"vision run exceeded {_RUN_TIMEOUT_S}s",
+            ) from exc
+        except _ImageDecodeError as exc:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+                detail=f"image is not decodable: {exc}",
+            ) from exc
+        except (CostruttoreError, GraphBuildError) as exc:
+            # pezzo non trovato, DXF illeggibile, parametri invalidi: input, non guasto
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+                detail=str(exc),
+            ) from exc
+        except Exception as exc:
+            raise HTTPException(
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail=f"recipe build failed: {type(exc).__name__}: {exc}",
+            ) from exc

src/vision_worker/tests/test_dxf_compare.py

@@ -0,0 +1,82 @@
+"""POST /recipes/dxf-compare del worker (#83): forma della risposta ed errori."""
+import pytest
+
+# Come test_worker.py: serve l'albero vision (Python >=3.13), altrimenti skipped.
+pytest.importorskip(
+    "visionsuite.task",
+    reason="the vision tree requires Python >=3.13; see test_worker.py",
+)
+
+import base64
+import io
+import time
+
+import numpy as np
+from httpx import ASGITransport, AsyncClient
+from PIL import Image
+
+from src.vision.tests.test_costruttori import PX_PER_MM, SAMPLE_DXF, a_scene
+from src.vision_worker.main import app
+
+
+def _png(array: np.ndarray) -> bytes:
+    buffer = io.BytesIO()
+    Image.fromarray(array).save(buffer, format="PNG")
+    return buffer.getvalue()
+
+
+async def _post(image: bytes, dxf: bytes, **data):
+    transport = ASGITransport(app=app)
+    async with AsyncClient(transport=transport, base_url="http://worker") as client:
+        return await client.post(
+            "/recipes/dxf-compare",
+            files={"image": ("riferimento.png", image, "image/png"),
+                   "dxf": ("disegno.dxf", dxf, "application/octet-stream")},
+            data={"px_per_mm": str(PX_PER_MM), "band_mm": "2.0", **data},
+        )
+
+
+@pytest.mark.asyncio
+async def test_dxf_compare_200_con_le_chiavi_del_contratto():
+    inizio = time.monotonic()
+    response = await _post(_png(a_scene(0.0)), SAMPLE_DXF.read_bytes())
+    durata = time.monotonic() - inizio
+
+    assert response.status_code == 200, response.text
+    body = response.json()
+    assert {"graph", "files", "outputs", "overlay", "outcome"} <= set(body)
+    assert set(body["files"]) == {"disegno.dxf", "calibrazione.json"}
+    assert base64.b64decode(body["files"]["disegno.dxf"]) == SAMPLE_DXF.read_bytes()
+    assert set(body["outputs"]) == {
+        "dxf.points_in_pct", "dxf.distance_avg", "dxf.distance_min", "dxf.distance_max"}
+    assert body["outputs"]["dxf.points_in_pct"] > 95.0
+    assert body["graph"]["schema_version"] == 2
+    print(f"\nW2 sulla scena di prova: {durata:.2f}s")  # riportato nel rapporto
+
+
+@pytest.mark.asyncio
+async def test_dxf_compare_immagine_senza_pezzo_e_422():
+    bianca = np.full((600, 800), 255, np.uint8)
+    response = await _post(_png(bianca), SAMPLE_DXF.read_bytes())
+    assert response.status_code == 422
+    assert "pezzo" in response.json()["detail"]
+
+
+@pytest.mark.asyncio
+async def test_dxf_compare_dxf_illeggibile_e_422():
+    response = await _post(_png(a_scene(0.0)), b"non e' un dxf")
+    assert response.status_code == 422
+    assert "DXF" in response.json()["detail"]
+
+
+@pytest.mark.asyncio
+async def test_dxf_compare_immagine_non_decodificabile_e_422():
+    response = await _post(b"non e' un'immagine", SAMPLE_DXF.read_bytes())
+    assert response.status_code == 422
+    assert "not decodable" in response.json()["detail"].lower()
+
+
+@pytest.mark.asyncio
+async def test_dxf_compare_parametro_fuori_range_e_422():
+    response = await _post(_png(a_scene(0.0)), SAMPLE_DXF.read_bytes(), polarity="grigio")
+    assert response.status_code == 422