Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3899d5ecd9 | |||
| f986c172c2 | |||
| c1c7ae8d0e | |||
| cf49695140 | |||
| c9e01a223b | |||
| 3690c35c47 | |||
| fc1902a1bb | |||
| 86290274e5 | |||
| ee0f65ed39 | |||
| 18d0db8a0c | |||
| 3856ee335a | |||
| e640c4a36e | |||
| accf416cc9 | |||
| 84a4b5f34d | |||
| 9238f8926b | |||
| a829bf3eb0 | |||
| 7ac291b8ac | |||
| 486e1288bf | |||
| 0d004c43ff | |||
| 35f46926a9 |
@@ -92,6 +92,8 @@ SESSION_COOKIE_SECURE=true
|
|||||||
VISION_RUN_TIMEOUT_S=100
|
VISION_RUN_TIMEOUT_S=100
|
||||||
# Quante esecuzioni di visione in parallelo accetta il worker.
|
# Quante esecuzioni di visione in parallelo accetta il worker.
|
||||||
VISION_MAX_CONCURRENCY=2
|
VISION_MAX_CONCURRENCY=2
|
||||||
|
# #46: radice sotto cui il worker legge le cartelle ricetta (recipe_dir relativo).
|
||||||
|
VISION_RECIPES_ROOT=/app/uploads
|
||||||
|
|
||||||
# --- Docker ---
|
# --- Docker ---
|
||||||
# DB_ROOT_PASSWORD: in produzione (docker-compose.yml) obbligatoria, senza default.
|
# DB_ROOT_PASSWORD: in produzione (docker-compose.yml) obbligatoria, senza default.
|
||||||
|
|||||||
@@ -289,6 +289,8 @@ Nginx (dev): gzip abilitato, `client_max_body_size 50M`, `proxy_read_timeout 120
|
|||||||
|
|
||||||
Il runner di visione (`src/vision/`) e il suo worker FastAPI (`src/vision_worker/`) dipendono da `vendor/visionsuite`, un **submodule** su `ssh://git.tielogic.xyz:222`: un `git clone` senza `--recurse-submodules` lascia la cartella vuota (chi ha già clonato: `git submodule update --init`). Le librerie di VisionSuite richiedono **Python 3.13**, mentre backend e frontend restano su Python 3.11 — è un albero a parte nel monorepo, isolato con il proprio extra `uv`.
|
Il runner di visione (`src/vision/`) e il suo worker FastAPI (`src/vision_worker/`) dipendono da `vendor/visionsuite`, un **submodule** su `ssh://git.tielogic.xyz:222`: un `git clone` senza `--recurse-submodules` lascia la cartella vuota (chi ha già clonato: `git submodule update --init`). Le librerie di VisionSuite richiedono **Python 3.13**, mentre backend e frontend restano su Python 3.11 — è un albero a parte nel monorepo, isolato con il proprio extra `uv`.
|
||||||
|
|
||||||
|
Regola (Adriano, 07/10/2026): il submodule `vendor/visionsuite` segue `origin/main`: a ogni integrazione si porta all'ultimo commit (`git -C vendor/visionsuite fetch origin && git -C vendor/visionsuite checkout origin/main`) e si rilanciano i test della visione. Pin attuale: bc0df16.
|
||||||
|
|
||||||
Il worker gira in un container separato (`Dockerfile.vision`), non pubblica porte verso l'esterno ed è raggiungibile solo dal server all'indirizzo interno `http://vision:8100`. Il container non ha accesso al repository Git del progetto principale, quindi il commit di VisionSuite in uso (`engine_version`) non può essere scoperto dentro l'immagine: va stampato al momento del build leggendo il commit dalla macchina che esegue `docker compose build`, con la variabile `VISION_ENGINE_VERSION`. Una build senza questa variabile fallisce subito, invece di produrre un worker che risponde con una versione indovinata:
|
Il worker gira in un container separato (`Dockerfile.vision`), non pubblica porte verso l'esterno ed è raggiungibile solo dal server all'indirizzo interno `http://vision:8100`. Il container non ha accesso al repository Git del progetto principale, quindi il commit di VisionSuite in uso (`engine_version`) non può essere scoperto dentro l'immagine: va stampato al momento del build leggendo il commit dalla macchina che esegue `docker compose build`, con la variabile `VISION_ENGINE_VERSION`. Una build senza questa variabile fallisce subito, invece di produrre un worker che risponde con una versione indovinata:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ services:
|
|||||||
--authentication-policy=mysql_native_password
|
--authentication-policy=mysql_native_password
|
||||||
--character-set-server=utf8mb4
|
--character-set-server=utf8mb4
|
||||||
--collation-server=utf8mb4_unicode_ci
|
--collation-server=utf8mb4_unicode_ci
|
||||||
|
--default-time-zone=+00:00
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ services:
|
|||||||
--authentication-policy=mysql_native_password
|
--authentication-policy=mysql_native_password
|
||||||
--character-set-server=utf8mb4
|
--character-set-server=utf8mb4
|
||||||
--collation-server=utf8mb4_unicode_ci
|
--collation-server=utf8mb4_unicode_ci
|
||||||
|
--default-time-zone=+00:00
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -70,6 +71,9 @@ services:
|
|||||||
VISION_ENGINE_VERSION: ${VISION_ENGINE_VERSION:-}
|
VISION_ENGINE_VERSION: ${VISION_ENGINE_VERSION:-}
|
||||||
container_name: tmflow-vision
|
container_name: tmflow-vision
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
# #46: radice delle cartelle ricetta (volume uploads, sola lettura)
|
||||||
|
VISION_RECIPES_ROOT: /app/uploads
|
||||||
volumes:
|
volumes:
|
||||||
- upload_data:/app/uploads:ro
|
- upload_data:/app/uploads:ro
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ vision = [
|
|||||||
"vs-task; python_version>='3.13'",
|
"vs-task; python_version>='3.13'",
|
||||||
"vs-measure; python_version>='3.13'",
|
"vs-measure; python_version>='3.13'",
|
||||||
"vs-pm2d; python_version>='3.13'",
|
"vs-pm2d; python_version>='3.13'",
|
||||||
|
# #46: tutti gli strumenti della suite (locate/MatchPattern e dxf/CompareDxf)
|
||||||
|
"vs-tools[locate,dxf]; python_version>='3.13'",
|
||||||
"numpy; python_version>='3.13'",
|
"numpy; python_version>='3.13'",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -101,6 +103,8 @@ visionsuite = { path = "vendor/visionsuite/packages/vs-core", editable = true }
|
|||||||
vs-task = { path = "vendor/visionsuite/packages/vs-task", editable = true }
|
vs-task = { path = "vendor/visionsuite/packages/vs-task", editable = true }
|
||||||
vs-measure = { path = "vendor/visionsuite/packages/vs-measure", editable = true }
|
vs-measure = { path = "vendor/visionsuite/packages/vs-measure", editable = true }
|
||||||
vs-pm2d = { path = "vendor/visionsuite/packages/vs-pm2d", editable = true }
|
vs-pm2d = { path = "vendor/visionsuite/packages/vs-pm2d", editable = true }
|
||||||
|
vs-tools = { path = "vendor/visionsuite/packages/vs-tools", editable = true } # #46
|
||||||
|
vs-dxf = { path = "vendor/visionsuite/packages/vs-dxf", editable = true } # #46
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
asyncio_mode = "auto"
|
asyncio_mode = "auto"
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
"""API Key authentication dependency for FastAPI."""
|
"""API Key authentication dependency for FastAPI."""
|
||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
from fastapi import Depends, HTTPException, Request, status
|
from fastapi import Depends, HTTPException, Request, status
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
from src.backend.database import get_db
|
from src.backend.database import get_db
|
||||||
|
from src.backend.config import settings
|
||||||
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
from src.backend.models.orm.user import User
|
from src.backend.models.orm.user import User
|
||||||
|
from src.backend.services.auth_service import hash_api_key
|
||||||
|
from src.backend.utils.tempo import utcnow
|
||||||
|
|
||||||
|
_RENEW_INTERVAL = timedelta(minutes=5)
|
||||||
|
|
||||||
|
|
||||||
async def get_current_user(
|
async def get_current_user(
|
||||||
@@ -24,15 +32,25 @@ async def get_current_user(
|
|||||||
)
|
)
|
||||||
|
|
||||||
result = await db.execute(
|
result = await db.execute(
|
||||||
select(User).where(User.api_key == api_key, User.active == True)
|
select(ApiKey, User)
|
||||||
|
.join(User, User.id == ApiKey.user_id)
|
||||||
|
.where(ApiKey.key_hash == hash_api_key(api_key), User.active == True)
|
||||||
)
|
)
|
||||||
user = result.scalar_one_or_none()
|
row = result.first()
|
||||||
|
now = utcnow()
|
||||||
|
|
||||||
if user is None:
|
if row is None or row[0].expires_at <= now:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
detail="Invalid or inactive API key",
|
detail="Invalid or expired API key",
|
||||||
)
|
)
|
||||||
|
key_row, user = row
|
||||||
|
|
||||||
|
# Sliding TTL, written at most once per _RENEW_INTERVAL to spare the DB.
|
||||||
|
if key_row.last_used_at is None or now - key_row.last_used_at > _RENEW_INTERVAL:
|
||||||
|
key_row.last_used_at = now
|
||||||
|
key_row.expires_at = now + timedelta(hours=settings.api_key_ttl_hours)
|
||||||
|
await db.flush()
|
||||||
|
|
||||||
# Store user_id in request state for access logging middleware
|
# Store user_id in request state for access logging middleware
|
||||||
request.state.user_id = user.id
|
request.state.user_id = user.id
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Authentication router - login, logout, profile."""
|
"""Authentication router - login, logout, profile."""
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
from src.backend.database import get_db
|
from src.backend.database import get_db
|
||||||
@@ -34,15 +34,16 @@ async def login(data: LoginRequest, db: AsyncSession = Depends(get_db)):
|
|||||||
|
|
||||||
@router.post("/logout", status_code=status.HTTP_204_NO_CONTENT)
|
@router.post("/logout", status_code=status.HTTP_204_NO_CONTENT)
|
||||||
async def logout(
|
async def logout(
|
||||||
|
request: Request,
|
||||||
all_sessions: bool = False,
|
all_sessions: bool = False,
|
||||||
user: User = Depends(get_current_user),
|
user: User = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
):
|
):
|
||||||
"""Logout. The API key is shared across stations logged in as the same
|
"""Logout. Deletes this session's API key only; ?all_sessions=true
|
||||||
user, so by default this does not invalidate it - only this station's
|
deletes every key of the user."""
|
||||||
session (its Flask session, on the client side) ends. Pass
|
await logout_user(
|
||||||
?all_sessions=true to invalidate the key everywhere."""
|
db, user, key=request.headers.get("X-API-Key"), all_sessions=all_sessions
|
||||||
await logout_user(db, user, all_sessions=all_sessions)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/me", response_model=UserResponse)
|
@router.get("/me", response_model=UserResponse)
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
import csv
|
import csv
|
||||||
import io
|
import io
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from src.backend.models.api.tipi import UtcNaiveInput
|
||||||
|
from src.backend.utils.tempo import as_utc_naive, iso_utc, to_local, utcnow
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||||
from fastapi.responses import StreamingResponse
|
from fastapi.responses import StreamingResponse
|
||||||
@@ -232,8 +234,8 @@ async def get_measurements(
|
|||||||
measured_by: int | None = Query(None),
|
measured_by: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
pass_fail: str | None = Query(None, pattern="^(pass|warning|fail)$"),
|
pass_fail: str | None = Query(None, pattern="^(pass|warning|fail)$"),
|
||||||
production_run_id: int | None = Query(None, gt=0),
|
production_run_id: int | None = Query(None, gt=0),
|
||||||
page: int = Query(1, ge=1),
|
page: int = Query(1, ge=1),
|
||||||
@@ -290,8 +292,8 @@ async def export_measurements_csv(
|
|||||||
measured_by: int | None = Query(None),
|
measured_by: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
pass_fail: str | None = Query(None, pattern="^(pass|warning|fail)$"),
|
pass_fail: str | None = Query(None, pattern="^(pass|warning|fail)$"),
|
||||||
user: User = Depends(get_current_user),
|
user: User = Depends(get_current_user),
|
||||||
db: AsyncSession = Depends(get_db),
|
db: AsyncSession = Depends(get_db),
|
||||||
@@ -372,7 +374,7 @@ async def export_measurements_csv(
|
|||||||
neutralise_csv_cell(m.lot_number or ""),
|
neutralise_csv_cell(m.lot_number or ""),
|
||||||
neutralise_csv_cell(m.serial_number or ""),
|
neutralise_csv_cell(m.serial_number or ""),
|
||||||
m.input_method,
|
m.input_method,
|
||||||
m.measured_at.isoformat(),
|
iso_utc(m.measured_at),
|
||||||
m.synced_to_csv,
|
m.synced_to_csv,
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -382,6 +384,6 @@ async def export_measurements_csv(
|
|||||||
iter([output.getvalue()]),
|
iter([output.getvalue()]),
|
||||||
media_type="text/csv",
|
media_type="text/csv",
|
||||||
headers={
|
headers={
|
||||||
"Content-Disposition": f"attachment; filename=measurements_{datetime.now().strftime('%Y%m%d_%H%M%S')}.csv"
|
"Content-Disposition": f"attachment; filename=measurements_{to_local(utcnow()).strftime('%Y%m%d_%H%M%S')}.csv"
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Reports router — PDF report generation endpoints for Metrologist."""
|
"""Reports router — PDF report generation endpoints for Metrologist."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcNaiveInput
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||||
from fastapi.responses import Response
|
from fastapi.responses import Response
|
||||||
@@ -18,8 +18,8 @@ async def download_spc_report(
|
|||||||
recipe_id: int = Query(...),
|
recipe_id: int = Query(...),
|
||||||
subtask_id: int = Query(...),
|
subtask_id: int = Query(...),
|
||||||
version_id: int | None = Query(None),
|
version_id: int | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
operator_id: int | None = Query(None),
|
operator_id: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
@@ -52,8 +52,8 @@ async def download_measurement_report(
|
|||||||
recipe_id: int = Query(...),
|
recipe_id: int = Query(...),
|
||||||
subtask_id: int | None = Query(None),
|
subtask_id: int | None = Query(None),
|
||||||
version_id: int | None = Query(None),
|
version_id: int | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
operator_id: int | None = Query(None),
|
operator_id: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ NOT protected by API Key auth (standalone access).
|
|||||||
"""
|
"""
|
||||||
import hmac
|
import hmac
|
||||||
import random
|
import random
|
||||||
import secrets
|
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
from src.backend.utils.tempo import iso_utc, utcnow
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from alembic import command
|
from alembic import command
|
||||||
@@ -25,7 +25,7 @@ from src.backend.models.orm import (
|
|||||||
User, Recipe, RecipeVersion, RecipeTask, RecipeSubtask, Measurement,
|
User, Recipe, RecipeVersion, RecipeTask, RecipeSubtask, Measurement,
|
||||||
)
|
)
|
||||||
from src.backend.models.orm.station import Station, StationRecipeAssignment
|
from src.backend.models.orm.station import Station, StationRecipeAssignment
|
||||||
from src.backend.services.auth_service import hash_password
|
from src.backend.services.auth_service import hash_password, issue_api_key, revoke_all_keys
|
||||||
from src.backend.services.measurement_service import calculate_pass_fail
|
from src.backend.services.measurement_service import calculate_pass_fail
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/setup", tags=["setup"])
|
router = APIRouter(prefix="/api/setup", tags=["setup"])
|
||||||
@@ -321,8 +321,6 @@ async def create_admin(body: CreateAdminBody):
|
|||||||
"""Create an admin user with all roles."""
|
"""Create an admin user with all roles."""
|
||||||
_check_password(body.password)
|
_check_password(body.password)
|
||||||
|
|
||||||
api_key = secrets.token_hex(32)
|
|
||||||
|
|
||||||
async with async_session_factory() as session:
|
async with async_session_factory() as session:
|
||||||
async with session.begin():
|
async with session.begin():
|
||||||
user = User(
|
user = User(
|
||||||
@@ -332,9 +330,10 @@ async def create_admin(body: CreateAdminBody):
|
|||||||
display_name=body.admin_display_name,
|
display_name=body.admin_display_name,
|
||||||
roles=["Maker", "MeasurementTec", "Metrologist"],
|
roles=["Maker", "MeasurementTec", "Metrologist"],
|
||||||
is_admin=True,
|
is_admin=True,
|
||||||
api_key=api_key,
|
|
||||||
)
|
)
|
||||||
session.add(user)
|
session.add(user)
|
||||||
|
await session.flush()
|
||||||
|
api_key = await issue_api_key(session, user)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
@@ -404,7 +403,6 @@ async def seed_demo_data(body: PasswordBody):
|
|||||||
email=u["email"],
|
email=u["email"],
|
||||||
roles=u["roles"],
|
roles=u["roles"],
|
||||||
is_admin=u["is_admin"],
|
is_admin=u["is_admin"],
|
||||||
api_key=secrets.token_hex(32),
|
|
||||||
)
|
)
|
||||||
session.add(user)
|
session.add(user)
|
||||||
created_users.append(user)
|
created_users.append(user)
|
||||||
@@ -558,7 +556,7 @@ async def seed_demo_data(body: PasswordBody):
|
|||||||
tec_user = created_users[2] # tec1
|
tec_user = created_users[2] # tec1
|
||||||
lot_numbers = ["LOT-2025-001", "LOT-2025-002", "LOT-2025-003", "LOT-2025-004"]
|
lot_numbers = ["LOT-2025-001", "LOT-2025-002", "LOT-2025-003", "LOT-2025-004"]
|
||||||
serial_numbers = [f"SN-{i:04d}" for i in range(1, 13)]
|
serial_numbers = [f"SN-{i:04d}" for i in range(1, 13)]
|
||||||
base_date = datetime.now()
|
base_date = utcnow()
|
||||||
|
|
||||||
all_subtasks = subtasks_1 + subtasks_2
|
all_subtasks = subtasks_1 + subtasks_2
|
||||||
measurements_created = 0
|
measurements_created = 0
|
||||||
@@ -606,8 +604,8 @@ async def list_users(body: PasswordBody):
|
|||||||
"roles": u.roles or [],
|
"roles": u.roles or [],
|
||||||
"is_admin": u.is_admin,
|
"is_admin": u.is_admin,
|
||||||
"active": u.active,
|
"active": u.active,
|
||||||
"created_at": u.created_at.isoformat() if u.created_at else None,
|
"created_at": iso_utc(u.created_at) or None,
|
||||||
"last_login": u.last_login.isoformat() if u.last_login else None,
|
"last_login": iso_utc(u.last_login) or None,
|
||||||
}
|
}
|
||||||
for u in users
|
for u in users
|
||||||
],
|
],
|
||||||
@@ -652,7 +650,6 @@ async def manage_user(body: ManageUserBody):
|
|||||||
email=body.email,
|
email=body.email,
|
||||||
roles=body.roles,
|
roles=body.roles,
|
||||||
is_admin=body.is_admin,
|
is_admin=body.is_admin,
|
||||||
api_key=secrets.token_hex(32),
|
|
||||||
)
|
)
|
||||||
session.add(user)
|
session.add(user)
|
||||||
await session.flush()
|
await session.flush()
|
||||||
@@ -707,7 +704,7 @@ async def change_user_password(body: ChangeUserPasswordBody):
|
|||||||
detail=f"User ID {body.user_id} not found",
|
detail=f"User ID {body.user_id} not found",
|
||||||
)
|
)
|
||||||
user.password_hash = hash_password(body.new_password)
|
user.password_hash = hash_password(body.new_password)
|
||||||
user.api_key = None # Invalidate sessions
|
await revoke_all_keys(session, user.id) # Invalidate sessions
|
||||||
|
|
||||||
return {"status": "ok", "message": f"Password changed for '{user.username}'"}
|
return {"status": "ok", "message": f"Password changed for '{user.username}'"}
|
||||||
|
|
||||||
@@ -730,7 +727,7 @@ async def toggle_user_active(body: ToggleUserActiveBody):
|
|||||||
)
|
)
|
||||||
user.active = not user.active
|
user.active = not user.active
|
||||||
if not user.active:
|
if not user.active:
|
||||||
user.api_key = None # Invalidate sessions on deactivation
|
await revoke_all_keys(session, user.id) # on deactivation
|
||||||
new_status = "active" if user.active else "inactive"
|
new_status = "active" if user.active else "inactive"
|
||||||
|
|
||||||
return {"status": "ok", "message": f"User '{user.username}' is now {new_status}", "active": user.active}
|
return {"status": "ok", "message": f"User '{user.username}' is now {new_status}", "active": user.active}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
"""Statistics router - SPC endpoints for Metrologist dashboard."""
|
"""Statistics router - SPC endpoints for Metrologist dashboard."""
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from src.backend.models.api.tipi import UtcNaiveInput
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||||
from sqlalchemy import and_, select
|
from sqlalchemy import and_, select
|
||||||
@@ -100,8 +101,8 @@ async def get_summary(
|
|||||||
recipe_id: int = Query(...),
|
recipe_id: int = Query(...),
|
||||||
version_id: int | None = Query(None),
|
version_id: int | None = Query(None),
|
||||||
subtask_id: int | None = Query(None),
|
subtask_id: int | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
operator_id: int | None = Query(None),
|
operator_id: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
@@ -122,8 +123,8 @@ async def get_capability(
|
|||||||
recipe_id: int = Query(...),
|
recipe_id: int = Query(...),
|
||||||
subtask_id: int = Query(...),
|
subtask_id: int = Query(...),
|
||||||
version_id: int | None = Query(None),
|
version_id: int | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
operator_id: int | None = Query(None),
|
operator_id: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
@@ -145,8 +146,8 @@ async def get_control_chart(
|
|||||||
recipe_id: int = Query(...),
|
recipe_id: int = Query(...),
|
||||||
subtask_id: int = Query(...),
|
subtask_id: int = Query(...),
|
||||||
version_id: int | None = Query(None),
|
version_id: int | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
operator_id: int | None = Query(None),
|
operator_id: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
@@ -172,8 +173,8 @@ async def get_histogram(
|
|||||||
recipe_id: int = Query(...),
|
recipe_id: int = Query(...),
|
||||||
subtask_id: int = Query(...),
|
subtask_id: int = Query(...),
|
||||||
version_id: int | None = Query(None),
|
version_id: int | None = Query(None),
|
||||||
date_from: datetime | None = Query(None),
|
date_from: UtcNaiveInput = Query(None),
|
||||||
date_to: datetime | None = Query(None),
|
date_to: UtcNaiveInput = Query(None),
|
||||||
operator_id: int | None = Query(None),
|
operator_id: int | None = Query(None),
|
||||||
lot_number: str | None = Query(None),
|
lot_number: str | None = Query(None),
|
||||||
serial_number: str | None = Query(None),
|
serial_number: str | None = Query(None),
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from src.backend.database import get_db
|
|||||||
from src.backend.api.middleware.api_key import require_admin_user
|
from src.backend.api.middleware.api_key import require_admin_user
|
||||||
from src.backend.models.orm.user import User
|
from src.backend.models.orm.user import User
|
||||||
from src.backend.models.api.user import UserCreate, UserPasswordChange, UserResponse, UserUpdate
|
from src.backend.models.api.user import UserCreate, UserPasswordChange, UserResponse, UserUpdate
|
||||||
from src.backend.services.auth_service import create_user, hash_password, regenerate_api_key
|
from src.backend.services.auth_service import create_user, hash_password, regenerate_api_key, revoke_all_keys
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/users", tags=["users"])
|
router = APIRouter(prefix="/api/users", tags=["users"])
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@ async def change_user_password(
|
|||||||
if user is None:
|
if user is None:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||||
user.password_hash = hash_password(data.password)
|
user.password_hash = hash_password(data.password)
|
||||||
user.api_key = None
|
await revoke_all_keys(db, user.id)
|
||||||
await db.flush()
|
await db.flush()
|
||||||
return {"message": f"Password changed for user {user.username}"}
|
return {"message": f"Password changed for user {user.username}"}
|
||||||
|
|
||||||
@@ -168,7 +168,7 @@ async def deactivate_user(
|
|||||||
detail="Cannot deactivate yourself",
|
detail="Cannot deactivate yourself",
|
||||||
)
|
)
|
||||||
user.active = False
|
user.active = False
|
||||||
user.api_key = None
|
await revoke_all_keys(db, user.id)
|
||||||
await db.flush()
|
await db.flush()
|
||||||
|
|
||||||
|
|
||||||
@@ -183,5 +183,5 @@ async def regenerate_user_key(
|
|||||||
user = result.scalar_one_or_none()
|
user = result.scalar_one_or_none()
|
||||||
if user is None:
|
if user is None:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||||
new_key = await regenerate_api_key(db, user_id)
|
new_key = await regenerate_api_key(db, user)
|
||||||
return {"api_key": new_key, "message": f"API key regenerated for user {user.username}"}
|
return {"api_key": new_key, "message": f"API key regenerated for user {user.username}"}
|
||||||
|
|||||||
@@ -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,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,9 @@ class Settings(BaseSettings):
|
|||||||
db_user: str = "tmflow"
|
db_user: str = "tmflow"
|
||||||
db_password: str = _DEFAULT_DB_PASSWORD
|
db_password: str = _DEFAULT_DB_PASSWORD
|
||||||
|
|
||||||
|
# Presentation time zone (DB is UTC, #42)
|
||||||
|
display_timezone: str = "Europe/Rome"
|
||||||
|
|
||||||
# Server
|
# Server
|
||||||
server_host: str = "0.0.0.0"
|
server_host: str = "0.0.0.0"
|
||||||
server_port: int = 8000
|
server_port: int = 8000
|
||||||
@@ -38,6 +41,9 @@ class Settings(BaseSettings):
|
|||||||
# configured limits to keep the cluster-wide effective limit close to what
|
# configured limits to keep the cluster-wide effective limit close to what
|
||||||
# was configured instead of multiplying it by N.
|
# was configured instead of multiplying it by N.
|
||||||
web_concurrency: int = 1
|
web_concurrency: int = 1
|
||||||
|
|
||||||
|
# API key session lifetime (hours); renewed on use (env API_KEY_TTL_HOURS).
|
||||||
|
api_key_ttl_hours: int = 24
|
||||||
# How many reverse proxies between the client and this API are trusted to
|
# How many reverse proxies between the client and this API are trusted to
|
||||||
# have appended their own hop to X-Forwarded-For (Nginx, in the default
|
# have appended their own hop to X-Forwarded-For (Nginx, in the default
|
||||||
# deploy). Used by RateLimitMiddleware._client_ip. 0 disables proxy header
|
# deploy). Used by RateLimitMiddleware._client_ip. 0 disables proxy header
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
"""API keys as SHA-256 hashes, one per session (#41)
|
||||||
|
|
||||||
|
Replaces the plaintext `users.api_key` column with an `api_keys` table: one
|
||||||
|
row per login, holding only the SHA-256 hex digest, an expiry and the last
|
||||||
|
use. Existing keys are invalidated on purpose, not migrated - the plaintext
|
||||||
|
is exactly what must stop existing, so everybody logs in once again.
|
||||||
|
|
||||||
|
Revision ID: 015_api_key_hash
|
||||||
|
Revises: 014_vision_fk_ondelete
|
||||||
|
Create Date: 2026-10-06
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
revision: str = '015_api_key_hash'
|
||||||
|
down_revision: Union[str, None] = '014_vision_fk_ondelete'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
op.create_table(
|
||||||
|
'api_keys',
|
||||||
|
sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
|
||||||
|
sa.Column('user_id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('key_hash', sa.String(64), nullable=False),
|
||||||
|
sa.Column('created_at', sa.DateTime(), nullable=False),
|
||||||
|
sa.Column('expires_at', sa.DateTime(), nullable=False),
|
||||||
|
sa.Column('last_used_at', sa.DateTime(), nullable=True),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
['user_id'], ['users.id'], name='fk_api_keys_user_id', ondelete='CASCADE'
|
||||||
|
),
|
||||||
|
)
|
||||||
|
op.create_index('ix_api_keys_key_hash', 'api_keys', ['key_hash'], unique=True)
|
||||||
|
op.create_index('ix_api_keys_user_id', 'api_keys', ['user_id'])
|
||||||
|
|
||||||
|
with op.batch_alter_table('users') as batch:
|
||||||
|
batch.drop_index('ix_users_api_key')
|
||||||
|
batch.drop_constraint('uq_users_api_key', type_='unique')
|
||||||
|
batch.drop_column('api_key')
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
with op.batch_alter_table('users') as batch:
|
||||||
|
batch.add_column(sa.Column('api_key', sa.String(64), nullable=True))
|
||||||
|
batch.create_unique_constraint('uq_users_api_key', ['api_key'])
|
||||||
|
batch.create_index('ix_users_api_key', ['api_key'])
|
||||||
|
|
||||||
|
op.drop_index('ix_api_keys_user_id', table_name='api_keys')
|
||||||
|
op.drop_index('ix_api_keys_key_hash', table_name='api_keys')
|
||||||
|
op.drop_table('api_keys')
|
||||||
@@ -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')
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for Measurement operations."""
|
"""Pydantic schemas for Measurement operations."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime, UtcNaiveInput
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, Field
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
@@ -54,8 +54,8 @@ class MeasurementResponse(BaseModel):
|
|||||||
# Who let this value stand, when it was out of tolerance. Null on a value in
|
# Who let this value stand, when it was out of tolerance. Null on a value in
|
||||||
# tolerance - and on one that is not and is still waiting for an answer.
|
# tolerance - and on one that is not and is still waiting for an answer.
|
||||||
supervisor_id: Optional[int] = None
|
supervisor_id: Optional[int] = None
|
||||||
authorised_at: Optional[datetime] = None
|
authorised_at: Optional[UtcDateTime] = None
|
||||||
measured_at: datetime
|
measured_at: UtcDateTime
|
||||||
synced_to_csv: bool
|
synced_to_csv: bool
|
||||||
|
|
||||||
|
|
||||||
@@ -97,7 +97,7 @@ class CycleMeasurementResponse(BaseModel):
|
|||||||
subtask_id: int
|
subtask_id: int
|
||||||
value: float
|
value: float
|
||||||
pass_fail: str
|
pass_fail: str
|
||||||
measured_at: datetime
|
measured_at: UtcDateTime
|
||||||
|
|
||||||
|
|
||||||
class CurrentCycleResponse(BaseModel):
|
class CurrentCycleResponse(BaseModel):
|
||||||
@@ -114,8 +114,8 @@ class MeasurementQuery(BaseModel):
|
|||||||
measured_by: Optional[int] = None
|
measured_by: Optional[int] = None
|
||||||
lot_number: Optional[str] = None
|
lot_number: Optional[str] = None
|
||||||
serial_number: Optional[str] = None
|
serial_number: Optional[str] = None
|
||||||
date_from: Optional[datetime] = None
|
date_from: UtcNaiveInput = None
|
||||||
date_to: Optional[datetime] = None
|
date_to: UtcNaiveInput = None
|
||||||
pass_fail: Optional[str] = Field(None, pattern="^(pass|warning|fail)$")
|
pass_fail: Optional[str] = Field(None, pattern="^(pass|warning|fail)$")
|
||||||
page: int = Field(1, ge=1)
|
page: int = Field(1, ge=1)
|
||||||
per_page: int = Field(50, ge=1, le=500)
|
per_page: int = Field(50, ge=1, le=500)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for production runs and their events."""
|
"""Pydantic schemas for production runs and their events."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime
|
||||||
from typing import Literal, Optional
|
from typing import Literal, Optional
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, Field
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
@@ -21,7 +21,7 @@ class ProductionEventResponse(BaseModel):
|
|||||||
supervisor_id: Optional[int]
|
supervisor_id: Optional[int]
|
||||||
task_id: Optional[int] = None
|
task_id: Optional[int] = None
|
||||||
note: Optional[str]
|
note: Optional[str]
|
||||||
created_at: datetime
|
created_at: UtcDateTime
|
||||||
|
|
||||||
|
|
||||||
class ProductionRunResponse(BaseModel):
|
class ProductionRunResponse(BaseModel):
|
||||||
@@ -36,11 +36,11 @@ class ProductionRunResponse(BaseModel):
|
|||||||
serial_number: Optional[str]
|
serial_number: Optional[str]
|
||||||
status: str
|
status: str
|
||||||
measurement_interval_minutes: Optional[int]
|
measurement_interval_minutes: Optional[int]
|
||||||
next_measurement_at: Optional[datetime]
|
next_measurement_at: Optional[UtcDateTime]
|
||||||
cycle_count: int
|
cycle_count: int
|
||||||
started_at: datetime
|
started_at: UtcDateTime
|
||||||
paused_at: Optional[datetime]
|
paused_at: Optional[UtcDateTime]
|
||||||
closed_at: Optional[datetime]
|
closed_at: Optional[UtcDateTime]
|
||||||
closed_by: Optional[int]
|
closed_by: Optional[int]
|
||||||
statistics_path: Optional[str] = None
|
statistics_path: Optional[str] = None
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ class ProductionRunResponse(BaseModel):
|
|||||||
# overdue is a fact the operator must see, not deduce.
|
# overdue is a fact the operator must see, not deduce.
|
||||||
seconds_to_next_measurement: Optional[int] = None
|
seconds_to_next_measurement: Optional[int] = None
|
||||||
overdue: bool = False
|
overdue: bool = False
|
||||||
server_time: Optional[datetime] = None
|
server_time: Optional[UtcDateTime] = None
|
||||||
|
|
||||||
# The measurement tasks of this run's version, in execution order. The client
|
# The measurement tasks of this run's version, in execution order. The client
|
||||||
# needs them to bring the operator back to the measurement when the interval
|
# needs them to bring the operator back to the measurement when the interval
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for Recipe and RecipeVersion operations."""
|
"""Pydantic schemas for Recipe and RecipeVersion operations."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime
|
||||||
from typing import Optional, TYPE_CHECKING
|
from typing import Optional, TYPE_CHECKING
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, Field
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
@@ -51,7 +51,7 @@ class RecipeVersionResponse(BaseModel):
|
|||||||
version_number: int
|
version_number: int
|
||||||
is_current: bool
|
is_current: bool
|
||||||
created_by: int
|
created_by: int
|
||||||
created_at: datetime
|
created_at: UtcDateTime
|
||||||
change_notes: Optional[str] = None
|
change_notes: Optional[str] = None
|
||||||
tasks: list["TaskResponse"] = []
|
tasks: list["TaskResponse"] = []
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ class RecipeResponse(BaseModel):
|
|||||||
requires_serial: bool = False
|
requires_serial: bool = False
|
||||||
allow_manual_input: bool = False
|
allow_manual_input: bool = False
|
||||||
created_by: int
|
created_by: int
|
||||||
created_at: datetime
|
created_at: UtcDateTime
|
||||||
active: bool
|
active: bool
|
||||||
current_version: Optional[RecipeVersionResponse] = None
|
current_version: Optional[RecipeVersionResponse] = None
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for Station and StationRecipeAssignment."""
|
"""Pydantic schemas for Station and StationRecipeAssignment."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, Field
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
@@ -29,7 +29,7 @@ class StationResponse(BaseModel):
|
|||||||
notes: Optional[str]
|
notes: Optional[str]
|
||||||
active: bool
|
active: bool
|
||||||
created_by: int
|
created_by: int
|
||||||
created_at: datetime
|
created_at: UtcDateTime
|
||||||
|
|
||||||
|
|
||||||
class StationRecipeAssignmentCreate(BaseModel):
|
class StationRecipeAssignmentCreate(BaseModel):
|
||||||
@@ -42,7 +42,7 @@ class StationRecipeAssignmentResponse(BaseModel):
|
|||||||
station_id: int
|
station_id: int
|
||||||
recipe_id: int
|
recipe_id: int
|
||||||
assigned_by: int
|
assigned_by: int
|
||||||
assigned_at: datetime
|
assigned_at: UtcDateTime
|
||||||
|
|
||||||
|
|
||||||
class RecipeSummary(BaseModel):
|
class RecipeSummary(BaseModel):
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for SPC statistics responses."""
|
"""Pydantic schemas for SPC statistics responses."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime, UtcNaiveInput
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
@@ -10,8 +10,8 @@ class StatisticsQuery(BaseModel):
|
|||||||
recipe_id: int
|
recipe_id: int
|
||||||
version_id: Optional[int] = None
|
version_id: Optional[int] = None
|
||||||
subtask_id: Optional[int] = None
|
subtask_id: Optional[int] = None
|
||||||
date_from: Optional[datetime] = None
|
date_from: UtcNaiveInput = None
|
||||||
date_to: Optional[datetime] = None
|
date_to: UtcNaiveInput = None
|
||||||
operator_id: Optional[int] = None
|
operator_id: Optional[int] = None
|
||||||
lot_number: Optional[str] = None
|
lot_number: Optional[str] = None
|
||||||
serial_number: Optional[str] = None
|
serial_number: Optional[str] = None
|
||||||
@@ -20,7 +20,7 @@ class StatisticsQuery(BaseModel):
|
|||||||
class ControlChartData(BaseModel):
|
class ControlChartData(BaseModel):
|
||||||
"""Data for X-bar/R control chart."""
|
"""Data for X-bar/R control chart."""
|
||||||
values: list[float]
|
values: list[float]
|
||||||
timestamps: list[datetime]
|
timestamps: list[UtcDateTime]
|
||||||
mean: float
|
mean: float
|
||||||
ucl: float # Upper Control Limit
|
ucl: float # Upper Control Limit
|
||||||
lcl: float # Lower Control Limit
|
lcl: float # Lower Control Limit
|
||||||
@@ -60,7 +60,7 @@ class CapabilityData(BaseModel):
|
|||||||
|
|
||||||
class TrendData(BaseModel):
|
class TrendData(BaseModel):
|
||||||
"""Temporal trend data for capability indices."""
|
"""Temporal trend data for capability indices."""
|
||||||
dates: list[datetime]
|
dates: list[UtcDateTime]
|
||||||
cpk_values: list[Optional[float]]
|
cpk_values: list[Optional[float]]
|
||||||
ppk_values: list[Optional[float]]
|
ppk_values: list[Optional[float]]
|
||||||
n_per_period: list[int]
|
n_per_period: list[int]
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
"""Shared Pydantic types for datetimes (#42): UTC in the DB, explicit +00:00 on the wire."""
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Annotated, Optional
|
||||||
|
|
||||||
|
from pydantic import AfterValidator, PlainSerializer
|
||||||
|
|
||||||
|
from src.backend.utils.tempo import as_utc_naive, to_utc_aware
|
||||||
|
|
||||||
|
UtcDateTime = Annotated[
|
||||||
|
datetime, PlainSerializer(lambda v: to_utc_aware(v).isoformat(), return_type=str)
|
||||||
|
]
|
||||||
|
|
||||||
|
# Input: aware values are converted to UTC naive, naive is taken as UTC.
|
||||||
|
UtcNaiveInput = Annotated[Optional[datetime], AfterValidator(as_utc_naive)]
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for User operations."""
|
"""Pydantic schemas for User operations."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, Field
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
@@ -48,8 +48,8 @@ class UserResponse(BaseModel):
|
|||||||
language_pref: str
|
language_pref: str
|
||||||
theme_pref: str
|
theme_pref: str
|
||||||
active: bool
|
active: bool
|
||||||
created_at: datetime
|
created_at: UtcDateTime
|
||||||
last_login: Optional[datetime] = None
|
last_login: Optional[UtcDateTime] = None
|
||||||
|
|
||||||
|
|
||||||
class UserPasswordChange(BaseModel):
|
class UserPasswordChange(BaseModel):
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for the vision execution response."""
|
"""Pydantic schemas for the vision execution response."""
|
||||||
from datetime import datetime
|
from src.backend.models.api.tipi import UtcDateTime
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict
|
from pydantic import BaseModel, ConfigDict
|
||||||
|
|
||||||
@@ -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):
|
||||||
@@ -28,4 +56,4 @@ class VisionReferenceImageResponse(BaseModel):
|
|||||||
note: str | None = None
|
note: str | None = None
|
||||||
station_id: int | None = None
|
station_id: int | None = None
|
||||||
device_code: str | None = None
|
device_code: str | None = None
|
||||||
acquired_at: datetime
|
acquired_at: UtcDateTime
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
"""SQLAlchemy models for TieMeasureFlow."""
|
"""SQLAlchemy models for TieMeasureFlow."""
|
||||||
from src.backend.models.orm.user import User
|
from src.backend.models.orm.user import User
|
||||||
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
from src.backend.models.orm.recipe import Recipe, RecipeVersion
|
from src.backend.models.orm.recipe import Recipe, RecipeVersion
|
||||||
from src.backend.models.orm.task import RecipeTask, RecipeSubtask
|
from src.backend.models.orm.task import RecipeTask, RecipeSubtask
|
||||||
from src.backend.models.orm.measurement import Measurement
|
from src.backend.models.orm.measurement import Measurement
|
||||||
@@ -11,6 +12,7 @@ from src.backend.models.orm.vision import VisionReferenceImage, VisionResult
|
|||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"User",
|
"User",
|
||||||
|
"ApiKey",
|
||||||
"Recipe",
|
"Recipe",
|
||||||
"RecipeVersion",
|
"RecipeVersion",
|
||||||
"RecipeTask",
|
"RecipeTask",
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
"""API key sessions: one row per login, stored as a SHA-256 hash."""
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, ForeignKey, Integer, String
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
|
||||||
|
from src.backend.database import Base
|
||||||
|
|
||||||
|
|
||||||
|
class ApiKey(Base):
|
||||||
|
"""One API key per login session.
|
||||||
|
|
||||||
|
Only the SHA-256 hex digest is stored, never the key. Dates are naive UTC.
|
||||||
|
"""
|
||||||
|
__tablename__ = "api_keys"
|
||||||
|
|
||||||
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||||
|
user_id: Mapped[int] = mapped_column(
|
||||||
|
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True
|
||||||
|
)
|
||||||
|
key_hash: Mapped[str] = mapped_column(String(64), nullable=False, unique=True, index=True)
|
||||||
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False)
|
||||||
|
expires_at: Mapped[datetime] = mapped_column(DateTime, nullable=False)
|
||||||
|
last_used_at: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True)
|
||||||
@@ -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")
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ class User(Base):
|
|||||||
|
|
||||||
# Status
|
# Status
|
||||||
active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||||
api_key: Mapped[Optional[str]] = mapped_column(String(64), unique=True, nullable=True, index=True)
|
|
||||||
|
|
||||||
# Timestamps
|
# Timestamps
|
||||||
created_at: Mapped[datetime] = mapped_column(
|
created_at: Mapped[datetime] = mapped_column(
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
"""Authentication service - password hashing, API key management."""
|
"""Authentication service - password hashing, API key management."""
|
||||||
|
import hashlib
|
||||||
import secrets
|
import secrets
|
||||||
from datetime import datetime
|
from datetime import datetime, timedelta
|
||||||
|
from src.backend.utils.tempo import utcnow
|
||||||
|
|
||||||
import bcrypt
|
import bcrypt
|
||||||
from fastapi import HTTPException, status
|
from fastapi import HTTPException, status
|
||||||
from sqlalchemy import select, update
|
from sqlalchemy import delete, select, update
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
|
from src.backend.config import settings
|
||||||
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
from src.backend.models.orm.user import User
|
from src.backend.models.orm.user import User
|
||||||
|
|
||||||
|
|
||||||
@@ -58,8 +62,8 @@ async def authorise_supervisor(db: AsyncSession, username: str, password: str) -
|
|||||||
of them because it is the same question every time - who is this, and are they
|
of them because it is the same question every time - who is this, and are they
|
||||||
allowed to say yes.
|
allowed to say yes.
|
||||||
|
|
||||||
Uses authenticate_user rather than a full login: logging in would rotate the
|
Uses authenticate_user rather than a full login: logging in would issue a
|
||||||
supervisor's API key and knock out whatever session they have open elsewhere.
|
needless API key for the supervisor.
|
||||||
"""
|
"""
|
||||||
supervisor = await authenticate_user(db, username, password)
|
supervisor = await authenticate_user(db, username, password)
|
||||||
if supervisor is None:
|
if supervisor is None:
|
||||||
@@ -75,39 +79,67 @@ async def authorise_supervisor(db: AsyncSession, username: str, password: str) -
|
|||||||
return supervisor
|
return supervisor
|
||||||
|
|
||||||
|
|
||||||
async def login_user(db: AsyncSession, user: User) -> str:
|
def hash_api_key(key: str) -> str:
|
||||||
"""Generate (or reuse) the API key and update last_login for user.
|
"""SHA-256 hex digest of an API key; this is all the DB ever stores."""
|
||||||
|
return hashlib.sha256(key.encode("utf-8")).hexdigest()
|
||||||
|
|
||||||
Reuses an existing key rather than rotating it on every login: the same
|
|
||||||
account logged in from two stations at once (a common shift-account
|
async def issue_api_key(db: AsyncSession, user: User) -> str:
|
||||||
pattern here) must keep both sessions working. Rotating the key would
|
"""Create a new session key for the user and return it in clear (once)."""
|
||||||
silently log the other station out.
|
key = generate_api_key()
|
||||||
"""
|
now = utcnow()
|
||||||
api_key = user.api_key or generate_api_key()
|
# Housekeeping: drop this user's expired keys so the table does not grow forever.
|
||||||
await db.execute(
|
await db.execute(
|
||||||
update(User)
|
delete(ApiKey).where(ApiKey.user_id == user.id, ApiKey.expires_at <= now)
|
||||||
.where(User.id == user.id)
|
)
|
||||||
.values(api_key=api_key, last_login=datetime.utcnow())
|
db.add(
|
||||||
|
ApiKey(
|
||||||
|
user_id=user.id,
|
||||||
|
key_hash=hash_api_key(key),
|
||||||
|
created_at=now,
|
||||||
|
expires_at=now + timedelta(hours=settings.api_key_ttl_hours),
|
||||||
|
last_used_at=now,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
await db.flush()
|
||||||
|
return key
|
||||||
|
|
||||||
|
|
||||||
|
async def revoke_all_keys(db: AsyncSession, user_id: int) -> None:
|
||||||
|
"""Invalidate every session key of a user."""
|
||||||
|
await db.execute(delete(ApiKey).where(ApiKey.user_id == user_id))
|
||||||
|
await db.flush()
|
||||||
|
|
||||||
|
|
||||||
|
async def login_user(db: AsyncSession, user: User) -> str:
|
||||||
|
"""Issue a new API key for this login and update last_login.
|
||||||
|
|
||||||
|
One key per login: the same account used from several stations at once
|
||||||
|
(#25) keeps every station working, because no login revokes another's key.
|
||||||
|
"""
|
||||||
|
api_key = await issue_api_key(db, user)
|
||||||
|
await db.execute(
|
||||||
|
update(User).where(User.id == user.id).values(last_login=utcnow())
|
||||||
)
|
)
|
||||||
await db.flush()
|
await db.flush()
|
||||||
return api_key
|
return api_key
|
||||||
|
|
||||||
|
|
||||||
async def logout_user(
|
async def logout_user(
|
||||||
db: AsyncSession, user: User, all_sessions: bool = False
|
db: AsyncSession, user: User, key: str | None = None, all_sessions: bool = False
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Log out. By default a no-op on the shared API key.
|
"""Log out. Deletes only the key of this session; all_sessions=True
|
||||||
|
deletes every key of the user."""
|
||||||
Clearing the key on every logout would kick out any other station still
|
if all_sessions:
|
||||||
using the same shift account. `all_sessions=True` is the explicit
|
await revoke_all_keys(db, user.id)
|
||||||
override for a supervisor who wants every session logged out.
|
|
||||||
"""
|
|
||||||
if not all_sessions:
|
|
||||||
return
|
return
|
||||||
await db.execute(
|
if key:
|
||||||
update(User).where(User.id == user.id).values(api_key=None)
|
await db.execute(
|
||||||
)
|
delete(ApiKey).where(
|
||||||
await db.flush()
|
ApiKey.user_id == user.id, ApiKey.key_hash == hash_api_key(key)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
await db.flush()
|
||||||
|
|
||||||
|
|
||||||
async def create_user(
|
async def create_user(
|
||||||
@@ -138,11 +170,7 @@ async def create_user(
|
|||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
async def regenerate_api_key(db: AsyncSession, user_id: int) -> str:
|
async def regenerate_api_key(db: AsyncSession, user: User) -> str:
|
||||||
"""Regenerate API key for a user."""
|
"""Revoke every key of the user and issue a fresh one."""
|
||||||
new_key = generate_api_key()
|
await revoke_all_keys(db, user.id)
|
||||||
await db.execute(
|
return await issue_api_key(db, user)
|
||||||
update(User).where(User.id == user_id).values(api_key=new_key)
|
|
||||||
)
|
|
||||||
await db.flush()
|
|
||||||
return new_key
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""Measurement service - pass/fail calculation, data storage."""
|
"""Measurement service - pass/fail calculation, data storage."""
|
||||||
import math
|
import math
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from src.backend.utils.tempo import utcnow
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
@@ -343,7 +344,7 @@ async def authorise_measurement(
|
|||||||
) -> Measurement:
|
) -> Measurement:
|
||||||
"""Let an out-of-tolerance value stand, on the supervisor's name."""
|
"""Let an out-of-tolerance value stand, on the supervisor's name."""
|
||||||
measurement.supervisor_id = supervisor.id
|
measurement.supervisor_id = supervisor.id
|
||||||
measurement.authorised_at = datetime.now()
|
measurement.authorised_at = utcnow()
|
||||||
await db.flush()
|
await db.flush()
|
||||||
await db.refresh(measurement)
|
await db.refresh(measurement)
|
||||||
return measurement
|
return measurement
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import csv
|
|||||||
import io
|
import io
|
||||||
import logging
|
import logging
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from src.backend.utils.tempo import iso_utc, to_local, utcnow
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from sqlalchemy import select, update
|
from sqlalchemy import select, update
|
||||||
@@ -169,9 +170,9 @@ async def build_statistics_csv(db: AsyncSession, run: ProductionRun) -> str:
|
|||||||
measurement.input_method,
|
measurement.input_method,
|
||||||
"" if measurement.input_duration_ms is None else measurement.input_duration_ms,
|
"" if measurement.input_duration_ms is None else measurement.input_duration_ms,
|
||||||
measurement.measured_by,
|
measurement.measured_by,
|
||||||
measurement.measured_at.isoformat() if measurement.measured_at else "",
|
iso_utc(measurement.measured_at),
|
||||||
measurement.supervisor_id or "",
|
measurement.supervisor_id or "",
|
||||||
measurement.authorised_at.isoformat() if measurement.authorised_at else "",
|
iso_utc(measurement.authorised_at),
|
||||||
])
|
])
|
||||||
|
|
||||||
return output.getvalue()
|
return output.getvalue()
|
||||||
@@ -191,7 +192,7 @@ async def export_run_statistics(db: AsyncSession, run: ProductionRun) -> str | N
|
|||||||
directory = Path(settings.upload_path) / EXPORT_SUBDIR
|
directory = Path(settings.upload_path) / EXPORT_SUBDIR
|
||||||
directory.mkdir(parents=True, exist_ok=True)
|
directory.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
stamp = (run.closed_at or datetime.now()).strftime("%Y%m%d_%H%M%S")
|
stamp = to_local(run.closed_at or utcnow()).strftime("%Y%m%d_%H%M%S")
|
||||||
filename = f"production_{run.id}_{stamp}.csv"
|
filename = f"production_{run.id}_{stamp}.csv"
|
||||||
# A large run's file can take a moment to write: off the event loop, so
|
# A large run's file can take a moment to write: off the event loop, so
|
||||||
# closing one run does not stall every other request being served.
|
# closing one run does not stall every other request being served.
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ the countdown would be off by the UTC offset. The number is the contract; the
|
|||||||
timestamp is only there for the audit trail.
|
timestamp is only there for the audit trail.
|
||||||
"""
|
"""
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
from src.backend.utils.tempo import utcnow
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from fastapi import HTTPException, status
|
from fastapi import HTTPException, status
|
||||||
@@ -34,10 +35,10 @@ from src.backend.services import (
|
|||||||
def _now() -> datetime:
|
def _now() -> datetime:
|
||||||
"""Single source of time for runs.
|
"""Single source of time for runs.
|
||||||
|
|
||||||
Naive local time, matching what the database writes for ``func.now()`` defaults,
|
Naive UTC, matching what the database writes for ``func.now()`` defaults,
|
||||||
so a run's started_at and its deadline are comparable.
|
so a run's started_at and its deadline are comparable.
|
||||||
"""
|
"""
|
||||||
return datetime.now()
|
return utcnow()
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import base64
|
import base64
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from src.backend.utils.tempo import to_local, utcnow
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
import plotly.graph_objects as go
|
import plotly.graph_objects as go
|
||||||
@@ -32,6 +33,11 @@ _jinja_env = Environment(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _giorno_locale(dt: datetime) -> str:
|
||||||
|
"""UTC naive filter bound -> local calendar day (YYYY-MM-DD)."""
|
||||||
|
return to_local(dt).strftime("%Y-%m-%d")
|
||||||
|
|
||||||
|
|
||||||
async def _query_measurements(
|
async def _query_measurements(
|
||||||
db: AsyncSession,
|
db: AsyncSession,
|
||||||
recipe_id: int,
|
recipe_id: int,
|
||||||
@@ -323,9 +329,9 @@ async def generate_spc_report(
|
|||||||
if version_id:
|
if version_id:
|
||||||
filters_desc.append(f"Version: {version_id}")
|
filters_desc.append(f"Version: {version_id}")
|
||||||
if date_from:
|
if date_from:
|
||||||
filters_desc.append(f"From: {date_from.strftime('%Y-%m-%d')}")
|
filters_desc.append(f"From: {_giorno_locale(date_from)}")
|
||||||
if date_to:
|
if date_to:
|
||||||
filters_desc.append(f"To: {date_to.strftime('%Y-%m-%d')}")
|
filters_desc.append(f"To: {_giorno_locale(date_to)}")
|
||||||
if lot_number:
|
if lot_number:
|
||||||
filters_desc.append(f"Lot: {lot_number}")
|
filters_desc.append(f"Lot: {lot_number}")
|
||||||
if serial_number:
|
if serial_number:
|
||||||
@@ -342,7 +348,7 @@ async def generate_spc_report(
|
|||||||
control_chart_svg=control_chart_svg,
|
control_chart_svg=control_chart_svg,
|
||||||
histogram_svg=histogram_svg,
|
histogram_svg=histogram_svg,
|
||||||
filters_desc=filters_desc,
|
filters_desc=filters_desc,
|
||||||
generated_at=datetime.now(),
|
generated_at=to_local(utcnow()),
|
||||||
n_measurements=len(measurements),
|
n_measurements=len(measurements),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -395,7 +401,7 @@ async def generate_measurement_report(
|
|||||||
"value": f"{float(m.value):.4f}",
|
"value": f"{float(m.value):.4f}",
|
||||||
"unit": st_info.get("unit", "mm"),
|
"unit": st_info.get("unit", "mm"),
|
||||||
"pass_fail": m.pass_fail,
|
"pass_fail": m.pass_fail,
|
||||||
"measured_at": m.measured_at.strftime("%Y-%m-%d %H:%M"),
|
"measured_at": to_local(m.measured_at).strftime("%Y-%m-%d %H:%M"),
|
||||||
"operator": operator_map.get(m.measured_by, f"ID {m.measured_by}"),
|
"operator": operator_map.get(m.measured_by, f"ID {m.measured_by}"),
|
||||||
"lot_number": m.lot_number or "—",
|
"lot_number": m.lot_number or "—",
|
||||||
"serial_number": m.serial_number or "—",
|
"serial_number": m.serial_number or "—",
|
||||||
@@ -414,9 +420,9 @@ async def generate_measurement_report(
|
|||||||
if version_id:
|
if version_id:
|
||||||
filters_desc.append(f"Version: {version_id}")
|
filters_desc.append(f"Version: {version_id}")
|
||||||
if date_from:
|
if date_from:
|
||||||
filters_desc.append(f"From: {date_from.strftime('%Y-%m-%d')}")
|
filters_desc.append(f"From: {_giorno_locale(date_from)}")
|
||||||
if date_to:
|
if date_to:
|
||||||
filters_desc.append(f"To: {date_to.strftime('%Y-%m-%d')}")
|
filters_desc.append(f"To: {_giorno_locale(date_to)}")
|
||||||
if lot_number:
|
if lot_number:
|
||||||
filters_desc.append(f"Lot: {lot_number}")
|
filters_desc.append(f"Lot: {lot_number}")
|
||||||
if serial_number:
|
if serial_number:
|
||||||
@@ -430,7 +436,7 @@ async def generate_measurement_report(
|
|||||||
rows=rows,
|
rows=rows,
|
||||||
summary=summary,
|
summary=summary,
|
||||||
filters_desc=filters_desc,
|
filters_desc=filters_desc,
|
||||||
generated_at=datetime.now(),
|
generated_at=to_local(utcnow()),
|
||||||
n_measurements=len(measurements),
|
n_measurements=len(measurements),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -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,
|
||||||
|
)
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ from src.backend.models.orm.measurement import Measurement
|
|||||||
from src.backend.models.orm.access_log import AccessLog
|
from src.backend.models.orm.access_log import AccessLog
|
||||||
from src.backend.models.orm.setting import SystemSetting, RecipeVersionAudit
|
from src.backend.models.orm.setting import SystemSetting, RecipeVersionAudit
|
||||||
from src.backend.models.orm.station import Station, StationRecipeAssignment
|
from src.backend.models.orm.station import Station, StationRecipeAssignment
|
||||||
from src.backend.services.auth_service import hash_password, generate_api_key
|
from src.backend.services.auth_service import hash_password, issue_api_key
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# In-memory SQLite engine for tests
|
# In-memory SQLite engine for tests
|
||||||
@@ -142,7 +142,6 @@ async def _create_user(
|
|||||||
active: bool = True,
|
active: bool = True,
|
||||||
) -> User:
|
) -> User:
|
||||||
"""Insert a user into the test DB and return it with an API key set."""
|
"""Insert a user into the test DB and return it with an API key set."""
|
||||||
api_key = generate_api_key()
|
|
||||||
user = User(
|
user = User(
|
||||||
username=username,
|
username=username,
|
||||||
password_hash=hash_password(password),
|
password_hash=hash_password(password),
|
||||||
@@ -150,13 +149,14 @@ async def _create_user(
|
|||||||
roles=roles or [],
|
roles=roles or [],
|
||||||
is_admin=is_admin,
|
is_admin=is_admin,
|
||||||
active=active,
|
active=active,
|
||||||
api_key=api_key,
|
|
||||||
language_pref="en",
|
language_pref="en",
|
||||||
theme_pref="light",
|
theme_pref="light",
|
||||||
)
|
)
|
||||||
session.add(user)
|
session.add(user)
|
||||||
await session.flush()
|
await session.flush()
|
||||||
await session.refresh(user)
|
await session.refresh(user)
|
||||||
|
# Clear key of this test session; the DB only keeps its hash.
|
||||||
|
user.plain_key = await issue_api_key(session, user)
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
@@ -278,4 +278,4 @@ async def create_test_recipe(
|
|||||||
|
|
||||||
def auth_headers(user: User) -> dict[str, str]:
|
def auth_headers(user: User) -> dict[str, str]:
|
||||||
"""Return headers dict with the user's API key for authenticated requests."""
|
"""Return headers dict with the user's API key for authenticated requests."""
|
||||||
return {"X-API-Key": user.api_key}
|
return {"X-API-Key": user.plain_key}
|
||||||
|
|||||||
+151
-46
@@ -78,75 +78,114 @@ class TestLogin:
|
|||||||
assert len(api_key) >= 32
|
assert len(api_key) >= 32
|
||||||
|
|
||||||
|
|
||||||
class TestLoginKeyReuse:
|
class TestLoginKeyPerSession:
|
||||||
"""login_user reuses an existing api_key instead of rotating it (#25)."""
|
"""Each login issues its own key; none revokes another (#25, #41)."""
|
||||||
|
|
||||||
async def test_two_logins_same_user_share_api_key(
|
async def test_two_logins_same_user_get_distinct_valid_keys(
|
||||||
self, client: AsyncClient, db_session
|
self, client: AsyncClient, db_session
|
||||||
):
|
):
|
||||||
"""Two stations logging in as the same shift account both keep working."""
|
|
||||||
await _create_user(db_session, username="twostations", password="TwoStations1")
|
await _create_user(db_session, username="twostations", password="TwoStations1")
|
||||||
resp1 = await client.post(
|
creds = {"username": "twostations", "password": "TwoStations1"}
|
||||||
"/api/auth/login",
|
resp1 = await client.post("/api/auth/login", json=creds)
|
||||||
json={"username": "twostations", "password": "TwoStations1"},
|
resp2 = await client.post("/api/auth/login", json=creds)
|
||||||
)
|
k1, k2 = resp1.json()["api_key"], resp2.json()["api_key"]
|
||||||
resp2 = await client.post(
|
assert k1 != k2
|
||||||
"/api/auth/login",
|
for k in (k1, k2):
|
||||||
json={"username": "twostations", "password": "TwoStations1"},
|
resp = await client.get("/api/auth/me", headers={"X-API-Key": k})
|
||||||
)
|
assert resp.status_code == 200
|
||||||
assert resp1.status_code == 200
|
|
||||||
assert resp2.status_code == 200
|
|
||||||
assert resp1.json()["api_key"] == resp2.json()["api_key"]
|
|
||||||
|
|
||||||
async def test_login_generates_key_when_user_has_none(
|
async def test_db_stores_hash_never_clear_key(
|
||||||
self, client: AsyncClient, db_session
|
self, client: AsyncClient, db_session
|
||||||
):
|
):
|
||||||
"""A user created without an api_key (e.g. via create_user) still gets one."""
|
from sqlalchemy import select
|
||||||
from src.backend.services.auth_service import create_user
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
|
from src.backend.services.auth_service import hash_api_key
|
||||||
|
|
||||||
await create_user(
|
await _create_user(db_session, username="hashed", password="HashedPass1")
|
||||||
db_session, username="brandnew", password="BrandNew1",
|
|
||||||
display_name="Brand New",
|
|
||||||
)
|
|
||||||
resp = await client.post(
|
resp = await client.post(
|
||||||
"/api/auth/login",
|
"/api/auth/login", json={"username": "hashed", "password": "HashedPass1"}
|
||||||
json={"username": "brandnew", "password": "BrandNew1"},
|
|
||||||
)
|
)
|
||||||
|
key = resp.json()["api_key"]
|
||||||
|
hashes = (await db_session.execute(select(ApiKey.key_hash))).scalars().all()
|
||||||
|
assert hash_api_key(key) in hashes
|
||||||
|
assert key not in hashes
|
||||||
|
assert all(len(h) == 64 for h in hashes)
|
||||||
|
|
||||||
|
async def test_expired_key_gives_401(self, client: AsyncClient, db_session):
|
||||||
|
from datetime import timedelta
|
||||||
|
from sqlalchemy import update
|
||||||
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
|
from src.backend.services.auth_service import utcnow
|
||||||
|
|
||||||
|
user = await _create_user(db_session, username="expired", password="ExpiredPass1")
|
||||||
|
await db_session.execute(
|
||||||
|
update(ApiKey).values(expires_at=utcnow() - timedelta(minutes=1))
|
||||||
|
)
|
||||||
|
resp = await client.get("/api/auth/me", headers=auth_headers(user))
|
||||||
|
assert resp.status_code == 401
|
||||||
|
assert "expired" in resp.json()["detail"].lower()
|
||||||
|
|
||||||
|
async def test_use_renews_expiry_only_after_interval(
|
||||||
|
self, client: AsyncClient, db_session
|
||||||
|
):
|
||||||
|
from datetime import timedelta
|
||||||
|
from sqlalchemy import select, update
|
||||||
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
|
from src.backend.services.auth_service import utcnow
|
||||||
|
|
||||||
|
user = await _create_user(db_session, username="renew", password="RenewPass1")
|
||||||
|
headers = auth_headers(user)
|
||||||
|
old = utcnow() - timedelta(hours=10)
|
||||||
|
|
||||||
|
# Recent use: no write, expiry untouched.
|
||||||
|
recent = utcnow() - timedelta(minutes=1)
|
||||||
|
await db_session.execute(
|
||||||
|
update(ApiKey).values(expires_at=old + timedelta(hours=24), last_used_at=recent)
|
||||||
|
)
|
||||||
|
await client.get("/api/auth/me", headers=headers)
|
||||||
|
row = (await db_session.execute(select(ApiKey))).scalar_one()
|
||||||
|
await db_session.refresh(row)
|
||||||
|
assert row.last_used_at == recent
|
||||||
|
|
||||||
|
# Stale last use: expiry is pushed forward.
|
||||||
|
await db_session.execute(
|
||||||
|
update(ApiKey).values(last_used_at=utcnow() - timedelta(minutes=10))
|
||||||
|
)
|
||||||
|
before = utcnow()
|
||||||
|
resp = await client.get("/api/auth/me", headers=headers)
|
||||||
assert resp.status_code == 200
|
assert resp.status_code == 200
|
||||||
assert resp.json()["api_key"]
|
await db_session.refresh(row)
|
||||||
|
assert row.expires_at >= before + timedelta(hours=23, minutes=59)
|
||||||
|
|
||||||
|
|
||||||
class TestLogout:
|
class TestLogout:
|
||||||
"""POST /api/auth/logout is a no-op on the shared api_key by default (#25)."""
|
"""Logout deletes only this session's key (#41)."""
|
||||||
|
|
||||||
async def test_logout_default_keeps_api_key_valid(
|
async def test_logout_removes_only_own_key(self, client: AsyncClient, db_session):
|
||||||
self, client: AsyncClient, db_session
|
await _create_user(db_session, username="shared_logout", password="SharedPass1")
|
||||||
):
|
creds = {"username": "shared_logout", "password": "SharedPass1"}
|
||||||
user = await _create_user(
|
k1 = (await client.post("/api/auth/login", json=creds)).json()["api_key"]
|
||||||
db_session, username="shared_logout", password="SharedPass1"
|
k2 = (await client.post("/api/auth/login", json=creds)).json()["api_key"]
|
||||||
)
|
resp = await client.post("/api/auth/logout", headers={"X-API-Key": k1})
|
||||||
headers = auth_headers(user)
|
|
||||||
resp = await client.post("/api/auth/logout", headers=headers)
|
|
||||||
assert resp.status_code == 204
|
assert resp.status_code == 204
|
||||||
|
|
||||||
# The key is still valid: another station on the same account keeps working.
|
assert (await client.get("/api/auth/me", headers={"X-API-Key": k1})).status_code == 401
|
||||||
resp = await client.get("/api/auth/me", headers=headers)
|
assert (await client.get("/api/auth/me", headers={"X-API-Key": k2})).status_code == 200
|
||||||
assert resp.status_code == 200
|
|
||||||
|
|
||||||
async def test_logout_all_sessions_invalidates_api_key(
|
async def test_logout_all_sessions_removes_every_key(
|
||||||
self, client: AsyncClient, db_session
|
self, client: AsyncClient, db_session
|
||||||
):
|
):
|
||||||
user = await _create_user(
|
await _create_user(db_session, username="shared_logout_all", password="SharedPass1")
|
||||||
db_session, username="shared_logout_all", password="SharedPass1"
|
creds = {"username": "shared_logout_all", "password": "SharedPass1"}
|
||||||
)
|
k1 = (await client.post("/api/auth/login", json=creds)).json()["api_key"]
|
||||||
headers = auth_headers(user)
|
k2 = (await client.post("/api/auth/login", json=creds)).json()["api_key"]
|
||||||
resp = await client.post(
|
resp = await client.post(
|
||||||
"/api/auth/logout", params={"all_sessions": "true"}, headers=headers
|
"/api/auth/logout", params={"all_sessions": "true"},
|
||||||
|
headers={"X-API-Key": k1},
|
||||||
)
|
)
|
||||||
assert resp.status_code == 204
|
assert resp.status_code == 204
|
||||||
|
for k in (k1, k2):
|
||||||
resp = await client.get("/api/auth/me", headers=headers)
|
assert (await client.get("/api/auth/me", headers={"X-API-Key": k})).status_code == 401
|
||||||
assert resp.status_code == 401
|
|
||||||
|
|
||||||
|
|
||||||
class TestAuthenticateUserTiming:
|
class TestAuthenticateUserTiming:
|
||||||
@@ -185,3 +224,69 @@ class TestHealthAndAuth:
|
|||||||
resp = await client.get("/api/users")
|
resp = await client.get("/api/users")
|
||||||
assert resp.status_code == 401
|
assert resp.status_code == 401
|
||||||
assert "API key" in resp.json()["detail"] or "Missing" in resp.json()["detail"]
|
assert "API key" in resp.json()["detail"] or "Missing" in resp.json()["detail"]
|
||||||
|
|
||||||
|
|
||||||
|
class TestRevokeAllKeys:
|
||||||
|
"""Password change, deactivation and regenerate invalidate every key (#41)."""
|
||||||
|
|
||||||
|
async def _two_keys(self, client, db_session, name):
|
||||||
|
user = await _create_user(db_session, username=name, password="KeysPass123")
|
||||||
|
creds = {"username": name, "password": "KeysPass123"}
|
||||||
|
keys = [
|
||||||
|
(await client.post("/api/auth/login", json=creds)).json()["api_key"]
|
||||||
|
for _ in range(2)
|
||||||
|
]
|
||||||
|
return user, keys
|
||||||
|
|
||||||
|
async def _all_401(self, client, keys):
|
||||||
|
for k in keys:
|
||||||
|
resp = await client.get("/api/auth/me", headers={"X-API-Key": k})
|
||||||
|
assert resp.status_code == 401
|
||||||
|
|
||||||
|
async def test_password_change_invalidates_all(self, client, db_session, admin_user):
|
||||||
|
user, keys = await self._two_keys(client, db_session, "pwkeys")
|
||||||
|
resp = await client.put(
|
||||||
|
f"/api/users/{user.id}/password",
|
||||||
|
headers=auth_headers(admin_user), json={"password": "NewSecurePass1"},
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
await self._all_401(client, keys)
|
||||||
|
|
||||||
|
async def test_deactivation_invalidates_all(self, client, db_session, admin_user):
|
||||||
|
user, keys = await self._two_keys(client, db_session, "offkeys")
|
||||||
|
resp = await client.delete(
|
||||||
|
f"/api/users/{user.id}", headers=auth_headers(admin_user)
|
||||||
|
)
|
||||||
|
assert resp.status_code == 204
|
||||||
|
await self._all_401(client, keys)
|
||||||
|
|
||||||
|
async def test_regenerate_invalidates_old_keys(self, client, db_session, admin_user):
|
||||||
|
user, keys = await self._two_keys(client, db_session, "regenkeys")
|
||||||
|
resp = await client.post(
|
||||||
|
f"/api/users/{user.id}/regenerate-key", headers=auth_headers(admin_user)
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
await self._all_401(client, keys)
|
||||||
|
new = resp.json()["api_key"]
|
||||||
|
assert (await client.get("/api/auth/me", headers={"X-API-Key": new})).status_code == 200
|
||||||
|
|
||||||
|
|
||||||
|
class TestExpiredKeyCleanup:
|
||||||
|
async def test_expired_key_removed_at_next_login(self, client, db_session):
|
||||||
|
from datetime import timedelta
|
||||||
|
from sqlalchemy import select, update
|
||||||
|
from src.backend.models.orm.api_key import ApiKey
|
||||||
|
from src.backend.services.auth_service import hash_api_key, utcnow
|
||||||
|
|
||||||
|
user = await _create_user(db_session, username="cleanup", password="CleanPass123")
|
||||||
|
old_hash = hash_api_key(user.plain_key)
|
||||||
|
await db_session.execute(
|
||||||
|
update(ApiKey).values(expires_at=utcnow() - timedelta(minutes=1))
|
||||||
|
)
|
||||||
|
resp = await client.post(
|
||||||
|
"/api/auth/login", json={"username": "cleanup", "password": "CleanPass123"}
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
hashes = (await db_session.execute(select(ApiKey.key_hash))).scalars().all()
|
||||||
|
assert old_hash not in hashes
|
||||||
|
assert len(hashes) == 1
|
||||||
|
|||||||
@@ -107,3 +107,45 @@ class TestBaseMigrationNoopsOnExistingSchema:
|
|||||||
assert "image_path" in {
|
assert "image_path" in {
|
||||||
c["name"] for c in insp.get_columns("recipes")
|
c["name"] for c in insp.get_columns("recipes")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class TestApiKeyHashMigration:
|
||||||
|
"""015_api_key_hash: users.api_key -> api_keys table, and back (#41)."""
|
||||||
|
|
||||||
|
def test_015_upgrade_and_downgrade(self, sqlite_database_url):
|
||||||
|
db_path, _ = sqlite_database_url
|
||||||
|
cfg = _alembic_config()
|
||||||
|
command.upgrade(cfg, "head")
|
||||||
|
|
||||||
|
insp = _inspect(db_path)
|
||||||
|
assert "api_keys" in insp.get_table_names()
|
||||||
|
assert "api_key" not in {c["name"] for c in insp.get_columns("users")}
|
||||||
|
assert {c["name"] for c in insp.get_columns("api_keys")} >= {
|
||||||
|
"user_id", "key_hash", "created_at", "expires_at", "last_used_at",
|
||||||
|
}
|
||||||
|
|
||||||
|
command.downgrade(cfg, "014_vision_fk_ondelete")
|
||||||
|
insp = _inspect(db_path)
|
||||||
|
assert "api_keys" not in insp.get_table_names()
|
||||||
|
assert "api_key" in {c["name"] for c in insp.get_columns("users")}
|
||||||
|
|
||||||
|
command.upgrade(cfg, "head") # and up again
|
||||||
|
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()
|
||||||
|
|||||||
@@ -0,0 +1,113 @@
|
|||||||
|
"""UTC in the DB, explicit +00:00 on the wire, local time only on presentation (#42)."""
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from httpx import AsyncClient
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
|
from src.backend.models.orm.user import User
|
||||||
|
from src.backend.services import report_service
|
||||||
|
from src.backend.tests.conftest import auth_headers, create_test_recipe
|
||||||
|
from src.backend.utils.tempo import as_utc_naive, to_local, utcnow
|
||||||
|
|
||||||
|
|
||||||
|
def test_utcnow_naive_and_close_to_utc():
|
||||||
|
now = utcnow()
|
||||||
|
assert now.tzinfo is None
|
||||||
|
delta = datetime.now(timezone.utc).replace(tzinfo=None) - now
|
||||||
|
assert abs(delta.total_seconds()) < 5
|
||||||
|
|
||||||
|
|
||||||
|
def test_as_utc_naive():
|
||||||
|
parsed = datetime.fromisoformat("2026-10-06T10:00:00+02:00")
|
||||||
|
assert as_utc_naive(parsed) == datetime(2026, 10, 6, 8, 0)
|
||||||
|
assert as_utc_naive(parsed).tzinfo is None
|
||||||
|
naive = datetime(2026, 10, 6, 8, 0)
|
||||||
|
assert as_utc_naive(naive) is naive
|
||||||
|
assert as_utc_naive(None) is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_to_local_is_rome():
|
||||||
|
assert to_local(datetime(2026, 10, 6, 8, 0)).strftime("%H:%M %z") == "10:00 +0200"
|
||||||
|
assert to_local(datetime(2026, 1, 6, 8, 0)).strftime("%H:%M %z") == "09:00 +0100"
|
||||||
|
|
||||||
|
|
||||||
|
async def _make_measurement(client, user, recipe_id) -> None:
|
||||||
|
tasks = (await client.get(f"/api/recipes/{recipe_id}/tasks", headers=auth_headers(user))).json()
|
||||||
|
await client.post(
|
||||||
|
"/api/measurements/",
|
||||||
|
headers=auth_headers(user),
|
||||||
|
json={
|
||||||
|
"subtask_id": tasks[0]["subtasks"][0]["id"],
|
||||||
|
"version_id": tasks[0]["version_id"],
|
||||||
|
"value": 10.0,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def test_api_datetimes_carry_utc_offset_and_filter_equivalence(
|
||||||
|
client: AsyncClient,
|
||||||
|
measurement_tec_user: User,
|
||||||
|
metrologist_user: User,
|
||||||
|
db_session: AsyncSession,
|
||||||
|
):
|
||||||
|
recipe = await create_test_recipe(db_session, measurement_tec_user.id)
|
||||||
|
await _make_measurement(client, measurement_tec_user, recipe.id)
|
||||||
|
|
||||||
|
resp = await client.get("/api/measurements/", headers=auth_headers(metrologist_user))
|
||||||
|
item = resp.json()["items"][0]
|
||||||
|
assert item["measured_at"].endswith("+00:00")
|
||||||
|
|
||||||
|
# Same instant written with +02:00 and as UTC: identical results.
|
||||||
|
future_utc = "2099-01-01T08:00:00+00:00"
|
||||||
|
future_rome = "2099-01-01T10:00:00+02:00"
|
||||||
|
past_utc = "2000-01-01T08:00:00+00:00"
|
||||||
|
past_rome = "2000-01-01T10:00:00+02:00"
|
||||||
|
for frm, to in ((past_utc, future_utc), (past_rome, future_rome)):
|
||||||
|
r = await client.get(
|
||||||
|
"/api/measurements/",
|
||||||
|
headers=auth_headers(metrologist_user),
|
||||||
|
params={"date_from": frm, "date_to": to},
|
||||||
|
)
|
||||||
|
assert r.status_code == 200
|
||||||
|
assert r.json()["total"] == 1
|
||||||
|
|
||||||
|
# Boundary: measurement is "now" in UTC; a date_from 1h ahead in UTC,
|
||||||
|
# written as +02:00 (now+3h local wall clock), must exclude it.
|
||||||
|
ahead = (utcnow().replace(microsecond=0)).replace(tzinfo=timezone.utc)
|
||||||
|
from datetime import timedelta
|
||||||
|
ahead_utc = (ahead + timedelta(hours=1)).isoformat()
|
||||||
|
ahead_rome = (ahead + timedelta(hours=1)).astimezone(
|
||||||
|
timezone(timedelta(hours=2))
|
||||||
|
).isoformat()
|
||||||
|
totals = []
|
||||||
|
for frm in (ahead_utc, ahead_rome):
|
||||||
|
r = await client.get(
|
||||||
|
"/api/measurements/",
|
||||||
|
headers=auth_headers(metrologist_user),
|
||||||
|
params={"date_from": frm},
|
||||||
|
)
|
||||||
|
totals.append(r.json()["total"])
|
||||||
|
assert totals == [0, 0]
|
||||||
|
|
||||||
|
|
||||||
|
async def test_report_generated_at_is_local_time(
|
||||||
|
db_session: AsyncSession, metrologist_user: User
|
||||||
|
):
|
||||||
|
recipe = await create_test_recipe(db_session, metrologist_user.id)
|
||||||
|
captured: dict[str, str] = {}
|
||||||
|
|
||||||
|
def fake_render(html: str) -> bytes:
|
||||||
|
captured["html"] = html
|
||||||
|
return b"%PDF"
|
||||||
|
|
||||||
|
with patch.object(report_service, "utcnow", return_value=datetime(2026, 10, 6, 8, 0)), \
|
||||||
|
patch.object(report_service, "_render_pdf", side_effect=fake_render):
|
||||||
|
await report_service.generate_measurement_report(db_session, recipe.id)
|
||||||
|
|
||||||
|
assert "Generated 2026-10-06 10:00" in captured["html"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_report_filter_day_is_local():
|
||||||
|
"""UTC naive 22:00 of Oct 5 is already Oct 6 in Europe/Rome (#42)."""
|
||||||
|
assert report_service._giorno_locale(datetime(2026, 10, 5, 22, 0, 0)) == "2026-10-06"
|
||||||
@@ -17,7 +17,7 @@ class TestChangeUserPassword:
|
|||||||
|
|
||||||
the same as setup.py's change-user-password (setup.py:634).
|
the same as setup.py's change-user-password (setup.py:634).
|
||||||
"""
|
"""
|
||||||
old_key = maker_user.api_key
|
old_key = maker_user.plain_key
|
||||||
old_username = maker_user.username
|
old_username = maker_user.username
|
||||||
assert old_key is not None
|
assert old_key is not None
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ class TestChangeUserPassword:
|
|||||||
|
|
||||||
# The old key no longer authenticates. Read it before the request
|
# The old key no longer authenticates. Read it before the request
|
||||||
# above: the client and app share one session (see conftest), so
|
# above: the client and app share one session (see conftest), so
|
||||||
# `maker_user.api_key` in this process reflects the mutation too.
|
# `maker_user.plain_key` in this process reflects the mutation too.
|
||||||
resp2 = await client.get("/api/auth/me", headers={"X-API-Key": old_key})
|
resp2 = await client.get("/api/auth/me", headers={"X-API-Key": old_key})
|
||||||
assert resp2.status_code == 401
|
assert resp2.status_code == 401
|
||||||
|
|
||||||
|
|||||||
@@ -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(
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
"""Time helpers: the DB holds naive UTC, presentation converts to display_timezone (#42)."""
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
|
|
||||||
|
from src.backend.config import settings
|
||||||
|
|
||||||
|
|
||||||
|
def utcnow() -> datetime:
|
||||||
|
"""Naive UTC now (the whole DB moves to naive UTC, #42)."""
|
||||||
|
return datetime.now(timezone.utc).replace(tzinfo=None)
|
||||||
|
|
||||||
|
|
||||||
|
def as_utc_naive(dt: datetime | None) -> datetime | None:
|
||||||
|
"""Aware -> UTC naive; naive is taken as UTC already; None stays None."""
|
||||||
|
if dt is None or dt.tzinfo is None:
|
||||||
|
return dt
|
||||||
|
return dt.astimezone(timezone.utc).replace(tzinfo=None)
|
||||||
|
|
||||||
|
|
||||||
|
def to_utc_aware(dt: datetime) -> datetime:
|
||||||
|
"""Naive (UTC) or aware datetime -> aware UTC."""
|
||||||
|
if dt.tzinfo is None:
|
||||||
|
return dt.replace(tzinfo=timezone.utc)
|
||||||
|
return dt.astimezone(timezone.utc)
|
||||||
|
|
||||||
|
|
||||||
|
def iso_utc(dt: datetime | None) -> str:
|
||||||
|
"""ISO 8601 with explicit +00:00; "" for None (CSV cells)."""
|
||||||
|
return to_utc_aware(dt).isoformat() if dt else ""
|
||||||
|
|
||||||
|
|
||||||
|
def to_local(dt: datetime) -> datetime:
|
||||||
|
"""Naive UTC (or aware) datetime -> aware datetime in settings.display_timezone."""
|
||||||
|
return to_utc_aware(dt).astimezone(ZoneInfo(settings.display_timezone))
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
from datetime import date
|
from datetime import date, datetime, timezone
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
from flask import Flask, flash, g, jsonify, redirect, url_for, session, request
|
from flask import Flask, flash, g, jsonify, redirect, url_for, session, request
|
||||||
@@ -154,6 +155,26 @@ def create_app() -> Flask:
|
|||||||
bolded = _BOLD_RX.sub(r"<strong>\1</strong>", escaped)
|
bolded = _BOLD_RX.sub(r"<strong>\1</strong>", escaped)
|
||||||
return Markup(bolded.replace("\n", "<br>"))
|
return Markup(bolded.replace("\n", "<br>"))
|
||||||
|
|
||||||
|
@app.template_filter("local_dt")
|
||||||
|
def local_dt_filter(value, fmt="%d/%m/%Y %H:%M"):
|
||||||
|
"""Show a UTC datetime (ISO string or datetime) in DISPLAY_TIMEZONE.
|
||||||
|
|
||||||
|
A value without timezone is taken as UTC. None or empty gives "-".
|
||||||
|
"""
|
||||||
|
if value is None or value == "":
|
||||||
|
return "-"
|
||||||
|
if isinstance(value, str):
|
||||||
|
try:
|
||||||
|
value = datetime.fromisoformat(value.strip().replace("Z", "+00:00"))
|
||||||
|
except ValueError:
|
||||||
|
return value
|
||||||
|
if not isinstance(value, datetime):
|
||||||
|
return str(value)
|
||||||
|
if value.tzinfo is None:
|
||||||
|
value = value.replace(tzinfo=timezone.utc)
|
||||||
|
tz = ZoneInfo(app.config.get("DISPLAY_TIMEZONE") or "Europe/Rome")
|
||||||
|
return value.astimezone(tz).strftime(fmt)
|
||||||
|
|
||||||
@app.template_filter("tojson_attr")
|
@app.template_filter("tojson_attr")
|
||||||
def tojson_attr_filter(value):
|
def tojson_attr_filter(value):
|
||||||
"""JSON encode safe for HTML attributes (x-data, etc.).
|
"""JSON encode safe for HTML attributes (x-data, etc.).
|
||||||
|
|||||||
@@ -377,6 +377,47 @@ 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,8 +1,10 @@
|
|||||||
"""MeasurementTec blueprint - recipe selection and measurement execution."""
|
"""MeasurementTec blueprint - recipe selection and measurement execution."""
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
|
||||||
|
import requests as http_requests
|
||||||
|
|
||||||
from flask import (
|
from flask import (
|
||||||
Blueprint, abort, flash, jsonify, redirect, render_template,
|
Blueprint, Response, abort, flash, jsonify, redirect, render_template,
|
||||||
request, session, url_for,
|
request, session, url_for,
|
||||||
)
|
)
|
||||||
from flask_babel import gettext as _
|
from flask_babel import gettext as _
|
||||||
@@ -820,3 +822,67 @@ def api_close_production(run_id: int):
|
|||||||
def api_get_file(file_path: str):
|
def api_get_file(file_path: str):
|
||||||
"""Proxy: Serve file from API server (browser can't send X-API-Key)."""
|
"""Proxy: Serve file from API server (browser can't send X-API-Key)."""
|
||||||
return proxy_file(file_path)
|
return proxy_file(file_path)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Route: vision execute (#46) - the browser sends an image, we relay it to
|
||||||
|
# POST /api/vision/execute (multipart) because it cannot send X-API-Key itself.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
@measure_bp.route("/api/vision/execute", methods=["POST"])
|
||||||
|
@login_required
|
||||||
|
@role_required("MeasurementTec")
|
||||||
|
def api_vision_execute():
|
||||||
|
"""Proxy: run the task's VisionSuite recipe on the uploaded image."""
|
||||||
|
image = request.files.get("image")
|
||||||
|
task_id = request.form.get("task_id")
|
||||||
|
if image is None or not task_id:
|
||||||
|
return jsonify({
|
||||||
|
"error": True,
|
||||||
|
"detail": _("Dati mancanti: task_id e image sono obbligatori"),
|
||||||
|
}), 400
|
||||||
|
|
||||||
|
# Same context fields as the manual flow; empty ones are left out so the
|
||||||
|
# backend sees them as absent rather than as "".
|
||||||
|
form = {"task_id": task_id}
|
||||||
|
for key in ("task_type", "lot_number", "serial_number", "production_run_id"):
|
||||||
|
val = request.form.get(key)
|
||||||
|
if val:
|
||||||
|
form[key] = val
|
||||||
|
form.setdefault("lot_number", session.get("lot_number", ""))
|
||||||
|
form.setdefault("serial_number", session.get("serial_number", ""))
|
||||||
|
|
||||||
|
resp = api_client.post(
|
||||||
|
"/api/vision/execute",
|
||||||
|
data=form,
|
||||||
|
files={"image": (
|
||||||
|
image.filename or "capture.jpg",
|
||||||
|
image.read(),
|
||||||
|
image.mimetype or "application/octet-stream",
|
||||||
|
)},
|
||||||
|
)
|
||||||
|
if resp.get("error"):
|
||||||
|
status_code = resp.get("status_code", 500)
|
||||||
|
body = {"error": True, "detail": resp.get("detail", _("Errore nell'esecuzione"))}
|
||||||
|
if resp.get("session_expired"):
|
||||||
|
body["session_expired"] = True
|
||||||
|
return jsonify(body), status_code if status_code >= 400 else 500
|
||||||
|
return jsonify(resp), 200
|
||||||
|
|
||||||
|
|
||||||
|
@measure_bp.route("/api/vision/results/<int:result_id>/image", methods=["GET"])
|
||||||
|
@login_required
|
||||||
|
@role_required("MeasurementTec")
|
||||||
|
def api_vision_result_image(result_id: int):
|
||||||
|
"""Proxy: the image saved with a vision result (needs X-API-Key)."""
|
||||||
|
base_url = Config.API_SERVER_URL.rstrip("/")
|
||||||
|
resp = http_requests.get(
|
||||||
|
f"{base_url}/api/vision/results/{result_id}/image",
|
||||||
|
headers={"X-API-Key": session.get("api_key", "")},
|
||||||
|
timeout=30,
|
||||||
|
)
|
||||||
|
if resp.status_code != 200:
|
||||||
|
return Response(resp.text, status=resp.status_code)
|
||||||
|
return Response(
|
||||||
|
resp.content,
|
||||||
|
content_type=resp.headers.get("content-type", "application/octet-stream"),
|
||||||
|
)
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ class Config:
|
|||||||
# Babel i18n
|
# Babel i18n
|
||||||
BABEL_DEFAULT_LOCALE = "it"
|
BABEL_DEFAULT_LOCALE = "it"
|
||||||
BABEL_DEFAULT_TIMEZONE = "Europe/Rome"
|
BABEL_DEFAULT_TIMEZONE = "Europe/Rome"
|
||||||
|
# Il DB e le API parlano UTC; si converte solo alla presentazione.
|
||||||
|
DISPLAY_TIMEZONE: str = os.getenv("DISPLAY_TIMEZONE", "Europe/Rome")
|
||||||
LANGUAGES = {"it": "Italiano", "en": "English"}
|
LANGUAGES = {"it": "Italiano", "en": "English"}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ function csvExport() {
|
|||||||
*/
|
*/
|
||||||
generateFilename(prefix) {
|
generateFilename(prefix) {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const dateStr = now.toISOString().slice(0, 10); // YYYY-MM-DD
|
const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`; // YYYY-MM-DD locale
|
||||||
const timeStr = now.toTimeString().slice(0, 5).replace(':', ''); // HHMM
|
const timeStr = now.toTimeString().slice(0, 5).replace(':', ''); // HHMM
|
||||||
|
|
||||||
return `${prefix}_${dateStr}_${timeStr}.csv`;
|
return `${prefix}_${dateStr}_${timeStr}.csv`;
|
||||||
|
|||||||
@@ -0,0 +1,125 @@
|
|||||||
|
/**
|
||||||
|
* Vision execute - Alpine component for camera_measure / dxf_compare tasks (#46).
|
||||||
|
*
|
||||||
|
* The operator takes (or picks) an image, `acquire(blob)` sends it to the Flask
|
||||||
|
* proxy, and the result - quote table, outcome, failures, overlay - is shown on
|
||||||
|
* the image. `acquire(blob)` is the single entry point on purpose: the agent
|
||||||
|
* camera (#3) will call it with its own blob and reuse everything below.
|
||||||
|
*
|
||||||
|
* Config comes from window.__visionCfg (set by the template):
|
||||||
|
* executeUrl, imageUrlTpl (with a 0 placeholder for the result id), taskId,
|
||||||
|
* taskType, subtasks, labels.
|
||||||
|
* Run context (lot, serial, production run) is read lazily through `ctx()`,
|
||||||
|
* which the template binds to the parent task component.
|
||||||
|
*/
|
||||||
|
function visionExecute() {
|
||||||
|
// Overlay colour per role (VisionSuite roles: reference, roi, found).
|
||||||
|
const ROLE_COLORS = { reference: '#2563eb', found: '#16a34a', roi: '#f59e0b' };
|
||||||
|
|
||||||
|
return {
|
||||||
|
busy: false,
|
||||||
|
error: '',
|
||||||
|
result: null, // last execute response
|
||||||
|
imageSrc: '', // object URL of the acquired image (shown under the overlay)
|
||||||
|
ctx: () => ({}), // replaced by the template: {lot, serial, runId}
|
||||||
|
|
||||||
|
// Entry point shared with the future agent camera.
|
||||||
|
async acquire(blob) {
|
||||||
|
if (!blob || this.busy) return;
|
||||||
|
const cfg = window.__visionCfg || {};
|
||||||
|
this.busy = true;
|
||||||
|
this.error = '';
|
||||||
|
this.result = null;
|
||||||
|
// Show the picked image at once: the overlay is drawn on top when the result arrives.
|
||||||
|
if (this.imageSrc) URL.revokeObjectURL(this.imageSrc);
|
||||||
|
this.imageSrc = URL.createObjectURL(blob);
|
||||||
|
try {
|
||||||
|
const c = this.ctx() || {};
|
||||||
|
const fd = new FormData();
|
||||||
|
fd.append('task_id', cfg.taskId);
|
||||||
|
fd.append('task_type', cfg.taskType || '');
|
||||||
|
fd.append('image', blob, blob.name || 'capture.jpg');
|
||||||
|
fd.append('lot_number', c.lot || '');
|
||||||
|
fd.append('serial_number', c.serial || '');
|
||||||
|
if (c.runId) fd.append('production_run_id', c.runId);
|
||||||
|
const csrf = document.querySelector('meta[name=csrf-token]')?.content || '';
|
||||||
|
const resp = await fetch(cfg.executeUrl, {
|
||||||
|
method: 'POST', headers: { 'X-CSRFToken': csrf }, body: fd,
|
||||||
|
});
|
||||||
|
const body = await resp.json().catch(() => ({}));
|
||||||
|
if (!resp.ok || body.error) {
|
||||||
|
this.error = body.detail || (cfg.labels && cfg.labels.requestFailed) || 'Error';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.result = body;
|
||||||
|
// Draw once Alpine has rendered the canvas.
|
||||||
|
this.$nextTick(() => this.drawOverlay());
|
||||||
|
} catch (e) {
|
||||||
|
this.error = (cfg.labels && cfg.labels.requestFailed) || 'Error';
|
||||||
|
} finally {
|
||||||
|
this.busy = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// Input change: take the file and allow picking the same one again.
|
||||||
|
onPick(ev) {
|
||||||
|
const f = ev.target.files && ev.target.files[0];
|
||||||
|
ev.target.value = '';
|
||||||
|
if (f) this.acquire(f);
|
||||||
|
},
|
||||||
|
|
||||||
|
// Image shown: the saved one from the server when available, else the local one.
|
||||||
|
get shownImage() {
|
||||||
|
const cfg = window.__visionCfg || {};
|
||||||
|
if (this.result && this.result.vision_result_id && cfg.imageUrlTpl) {
|
||||||
|
return cfg.imageUrlTpl.replace('/0/', '/' + this.result.vision_result_id + '/');
|
||||||
|
}
|
||||||
|
return this.imageSrc;
|
||||||
|
},
|
||||||
|
|
||||||
|
// Quote rows: server measurements joined with the subtask names.
|
||||||
|
get rows() {
|
||||||
|
const cfg = window.__visionCfg || {};
|
||||||
|
const subs = cfg.subtasks || [];
|
||||||
|
return ((this.result && this.result.measurements) || []).map((m) => {
|
||||||
|
const st = subs.find((s) => s.id === m.subtask_id) || {};
|
||||||
|
return {
|
||||||
|
label: (st.marker_number ? st.marker_number + '. ' : '') + (st.measurement_type || st.name || '#' + m.subtask_id),
|
||||||
|
value: m.value,
|
||||||
|
unit: st.unit || 'mm',
|
||||||
|
status: m.pass_fail,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
statusClass(s) {
|
||||||
|
// Same palette as the measurement markers of the manual flow.
|
||||||
|
if (s === 'pass') return 'bg-measure-pass/20 text-measure-pass border border-measure-pass/40';
|
||||||
|
if (s === 'fail') return 'bg-red-100 dark:bg-red-900/30 text-measure-fail border border-measure-fail/40';
|
||||||
|
if (s === 'warning') return 'bg-amber-100 dark:bg-amber-900/30 text-measure-warning border border-measure-warning/40';
|
||||||
|
return 'bg-[var(--bg-secondary)] text-[var(--text-muted)] border border-[var(--border-color)]';
|
||||||
|
},
|
||||||
|
|
||||||
|
// Canvas is sized to the natural image, so overlay coordinates (image px)
|
||||||
|
// are used as they are and CSS scales the whole thing to the displayed size.
|
||||||
|
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';
|
||||||
|
for (const item of ((this.result && this.result.overlay) || [])) {
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
// 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,6 +277,8 @@
|
|||||||
<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') }}
|
||||||
@@ -460,6 +462,55 @@
|
|||||||
|
|
||||||
<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">
|
||||||
@@ -543,6 +594,8 @@
|
|||||||
<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>
|
||||||
@@ -699,6 +752,18 @@
|
|||||||
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>
|
||||||
@@ -1093,6 +1158,7 @@
|
|||||||
{% 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>
|
||||||
@@ -1129,8 +1195,11 @@ 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,
|
||||||
@@ -1153,6 +1222,10 @@ 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));
|
||||||
|
|
||||||
@@ -1610,7 +1683,8 @@ function taskEditor() {
|
|||||||
uwl: null,
|
uwl: null,
|
||||||
lwl: null,
|
lwl: null,
|
||||||
ltl: null,
|
ltl: null,
|
||||||
unit: 'mm'
|
unit: 'mm',
|
||||||
|
vision_output: ''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1634,7 +1708,8 @@ 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 {
|
||||||
@@ -1687,7 +1762,8 @@ 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 || ''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1711,7 +1787,8 @@ 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 {
|
||||||
|
|||||||
@@ -183,7 +183,7 @@
|
|||||||
{% for m in measurements|sort(attribute='subtask.marker_number')|sort(attribute='task_info.order_index') %}
|
{% for m in measurements|sort(attribute='subtask.marker_number')|sort(attribute='task_info.order_index') %}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-center font-mono text-xs" style="color: var(--text-secondary);">
|
<td class="text-center font-mono text-xs" style="color: var(--text-secondary);">
|
||||||
{{ m.measured_at[:16]|replace('T', ' ') if m.measured_at else '-' }}
|
{{ m.measured_at|local_dt }}
|
||||||
</td>
|
</td>
|
||||||
<td style="color: var(--text-secondary);" class="text-sm">
|
<td style="color: var(--text-secondary);" class="text-sm">
|
||||||
{{ m.task_info.title if m.task_info else '-' }}
|
{{ m.task_info.title if m.task_info else '-' }}
|
||||||
|
|||||||
@@ -191,7 +191,8 @@
|
|||||||
{# ================================================================
|
{# ================================================================
|
||||||
MAIN — 3-column layout
|
MAIN — 3-column layout
|
||||||
================================================================ #}
|
================================================================ #}
|
||||||
<div class="flex-1 flex overflow-hidden">
|
{# #46: camera_measure / dxf_compare get the acquisition panel below instead of the manual layout #}
|
||||||
|
<div class="flex-1 flex overflow-hidden" x-show="!isVisionTask">
|
||||||
|
|
||||||
{# ──────────────────────────────────────────────
|
{# ──────────────────────────────────────────────
|
||||||
LEFT SIDEBAR — Marker list (vertical, hidden when no subtasks)
|
LEFT SIDEBAR — Marker list (vertical, hidden when no subtasks)
|
||||||
@@ -451,6 +452,63 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{# ================================================================
|
||||||
|
VISION PANEL (#46) - acquire an image, run the recipe server-side, show the
|
||||||
|
quotes and the overlay. acquire(blob) is the entry point the agent camera
|
||||||
|
(#3) will reuse.
|
||||||
|
================================================================ #}
|
||||||
|
<div x-show="isVisionTask" x-cloak
|
||||||
|
x-data="visionExecute()"
|
||||||
|
x-init="ctx = () => ({ lot: lotNumber, serial: serialNumber, runId: productionRun ? productionRun.id : null })"
|
||||||
|
class="flex-1 overflow-auto p-3 flex flex-col lg:flex-row gap-3">
|
||||||
|
|
||||||
|
<div class="flex-1 min-w-0 flex flex-col gap-2">
|
||||||
|
<div class="flex items-center gap-2 flex-wrap">
|
||||||
|
{# On a tablet this opens the camera; on a PC it picks a file. «Riprova» reuses the same input. #}
|
||||||
|
<label class="btn btn-primary text-sm gap-1.5 cursor-pointer" :class="busy ? 'opacity-50 pointer-events-none' : ''">
|
||||||
|
<span x-text="result ? '{{ _('Riprova') }}' : '{{ _('Acquisisci immagine') }}'"></span>
|
||||||
|
<input type="file" accept="image/*" capture="environment" class="hidden"
|
||||||
|
@change="onPick($event)" :disabled="busy">
|
||||||
|
</label>
|
||||||
|
<span x-show="busy" class="text-sm text-[var(--text-muted)]">{{ _('Elaborazione in corso...') }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div x-show="error" class="p-2 rounded-lg bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 text-sm text-measure-fail" x-text="error"></div>
|
||||||
|
|
||||||
|
<div x-show="shownImage" class="relative border border-[var(--border-color)] rounded-lg overflow-hidden bg-black/5">
|
||||||
|
<img x-ref="img" :src="shownImage" @load="drawOverlay()" alt="" class="block w-full h-auto">
|
||||||
|
<canvas x-ref="overlay" class="absolute inset-0 w-full h-full pointer-events-none"></canvas>
|
||||||
|
</div>
|
||||||
|
<div x-show="!shownImage" class="text-sm text-[var(--text-muted)]">
|
||||||
|
{{ _('Nessuna immagine acquisita: premi «Acquisisci immagine».') }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="lg:w-80 shrink-0 flex flex-col gap-2" x-show="result">
|
||||||
|
<div class="text-sm font-bold text-[var(--text-primary)]">
|
||||||
|
{{ _('Esito') }}: <span x-text="(result && result.outcome) || '-'"></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<table class="w-full text-sm" x-show="rows.length">
|
||||||
|
<template x-for="r in rows" :key="r.label">
|
||||||
|
<tr>
|
||||||
|
<td class="py-1 pr-2 text-[var(--text-secondary)]" x-text="r.label"></td>
|
||||||
|
<td class="py-1 pr-2 font-mono text-right" x-text="Number(r.value).toFixed(3) + ' ' + r.unit"></td>
|
||||||
|
<td class="py-1"><span class="inline-block px-2 py-0.5 rounded text-xs font-bold" :class="statusClass(r.status)" x-text="r.status"></span></td>
|
||||||
|
</tr>
|
||||||
|
</template>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<div x-show="result && result.failures && result.failures.length"
|
||||||
|
class="p-2 rounded-lg bg-amber-50 dark:bg-amber-900/20 border border-amber-300 dark:border-amber-700 text-xs">
|
||||||
|
<div class="font-bold mb-1">{{ _('Strumenti falliti') }}</div>
|
||||||
|
<template x-for="f in ((result && result.failures) || [])" :key="f.tool_id">
|
||||||
|
<div><span class="font-mono" x-text="f.tool_name || f.tool_id"></span>: <span x-text="f.error"></span></div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{# ================================================================
|
{# ================================================================
|
||||||
MEASUREMENT TIMER BANNER
|
MEASUREMENT TIMER BANNER
|
||||||
================================================================ #}
|
================================================================ #}
|
||||||
@@ -912,6 +970,18 @@
|
|||||||
<script src="{{ url_for('static', filename='js/numpad.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/numpad.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>
|
||||||
<script src="{{ url_for('static', filename='js/caliper.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/caliper.js') }}"></script>
|
||||||
|
{# #46: acquisition + overlay for camera_measure / dxf_compare #}
|
||||||
|
<script>
|
||||||
|
window.__visionCfg = {
|
||||||
|
executeUrl: '{{ url_for("measure.api_vision_execute") }}',
|
||||||
|
imageUrlTpl: '{{ url_for("measure.api_vision_result_image", result_id=0) }}',
|
||||||
|
taskId: {{ task.id|tojson }},
|
||||||
|
taskType: {{ (task.task_type or '')|tojson }},
|
||||||
|
subtasks: window.__taskSubtasks,
|
||||||
|
labels: { requestFailed: {{ _('Richiesta non riuscita')|tojson }} },
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
<script src="{{ url_for('static', filename='js/vision_execute.js') }}"></script>
|
||||||
{# The clock's rules - how a delay reads, when the buzzer goes, where the
|
{# The clock's rules - how a delay reads, when the buzzer goes, where the
|
||||||
measurement lives - are shared with the other screens rather than restated. #}
|
measurement lives - are shared with the other screens rather than restated. #}
|
||||||
<script src="{{ url_for('static', filename='js/production-clock.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/production-clock.js') }}"></script>
|
||||||
@@ -1776,6 +1846,12 @@ function taskExecute() {
|
|||||||
return declared === 'measure' || declared === 'camera_measure';
|
return declared === 'measure' || declared === 'camera_measure';
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/* #46: image-based tasks run a VisionSuite recipe on the server. */
|
||||||
|
get isVisionTask() {
|
||||||
|
const t = this.task.task_type;
|
||||||
|
return t === 'camera_measure' || t === 'dxf_compare';
|
||||||
|
},
|
||||||
|
|
||||||
/* A measurement task with no quotes yet: the recipe is unfinished. Said out
|
/* A measurement task with no quotes yet: the recipe is unfinished. Said out
|
||||||
loud rather than silently rendering an empty screen. */
|
loud rather than silently rendering an empty screen. */
|
||||||
get isMeasureTaskWithoutQuotes() {
|
get isMeasureTaskWithoutQuotes() {
|
||||||
|
|||||||
@@ -312,8 +312,8 @@ function spcDashboard() {
|
|||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.set('recipe_id', this.selectedRecipeId);
|
params.set('recipe_id', this.selectedRecipeId);
|
||||||
if (this.selectedSubtaskId) params.set('subtask_id', this.selectedSubtaskId);
|
if (this.selectedSubtaskId) params.set('subtask_id', this.selectedSubtaskId);
|
||||||
if (this.dateFrom) params.set('date_from', this.dateFrom + 'T00:00:00');
|
if (this.dateFrom) params.set('date_from', new Date(this.dateFrom + 'T00:00:00').toISOString());
|
||||||
if (this.dateTo) params.set('date_to', this.dateTo + 'T23:59:59');
|
if (this.dateTo) params.set('date_to', new Date(this.dateTo + 'T23:59:59.999').toISOString());
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Parallel fetch of all endpoints
|
// Parallel fetch of all endpoints
|
||||||
@@ -417,8 +417,8 @@ function spcDashboard() {
|
|||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.set('recipe_id', this.selectedRecipeId);
|
params.set('recipe_id', this.selectedRecipeId);
|
||||||
if (this.selectedSubtaskId) params.set('subtask_id', this.selectedSubtaskId);
|
if (this.selectedSubtaskId) params.set('subtask_id', this.selectedSubtaskId);
|
||||||
if (this.dateFrom) params.set('date_from', this.dateFrom + 'T00:00:00');
|
if (this.dateFrom) params.set('date_from', new Date(this.dateFrom + 'T00:00:00').toISOString());
|
||||||
if (this.dateTo) params.set('date_to', this.dateTo + 'T23:59:59');
|
if (this.dateTo) params.set('date_to', new Date(this.dateTo + 'T23:59:59.999').toISOString());
|
||||||
|
|
||||||
const url = '/statistics/api/report-' + type + '?' + params.toString();
|
const url = '/statistics/api/report-' + type + '?' + params.toString();
|
||||||
const resp = await fetch(url);
|
const resp = await fetch(url);
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
"""Filtro local_dt: il backend parla UTC, la presentazione e' in Europe/Rome (#42)."""
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def local_dt(flask_app):
|
||||||
|
return flask_app.jinja_env.filters["local_dt"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_summer_time(local_dt):
|
||||||
|
assert local_dt("2026-10-06T08:00:00+00:00") == "06/10/2026 10:00"
|
||||||
|
|
||||||
|
|
||||||
|
def test_winter_time(local_dt):
|
||||||
|
assert local_dt("2026-01-15T08:00:00+00:00") == "15/01/2026 09:00"
|
||||||
|
|
||||||
|
|
||||||
|
def test_naive_is_utc(local_dt):
|
||||||
|
assert local_dt("2026-10-06T08:00:00") == "06/10/2026 10:00"
|
||||||
|
|
||||||
|
|
||||||
|
def test_datetime_object_and_format(local_dt):
|
||||||
|
dt = datetime(2026, 10, 6, 8, 0, tzinfo=timezone.utc)
|
||||||
|
assert local_dt(dt, "%H:%M") == "10:00"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("empty", [None, ""])
|
||||||
|
def test_empty(local_dt, empty):
|
||||||
|
assert local_dt(empty) == "-"
|
||||||
@@ -161,3 +161,82 @@ 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
|
||||||
|
|||||||
@@ -407,6 +407,21 @@ class TestTaskComplete:
|
|||||||
assert resp.status_code == 200
|
assert resp.status_code == 200
|
||||||
assert b"productionClock(" in resp.data
|
assert b"productionClock(" in resp.data
|
||||||
|
|
||||||
|
def test_measured_at_shown_in_local_time(self, logged_in_client, mock_api_client):
|
||||||
|
"""#42: the API sends UTC; the summary shows Europe/Rome."""
|
||||||
|
mock_api_client.get.side_effect = [
|
||||||
|
{"id": 1, "code": "REC-001", "name": "Test Recipe", "version": 1},
|
||||||
|
[{"id": 1, "title": "Task 1", "order_index": 0, "subtasks": [
|
||||||
|
{"id": 1, "marker_number": 1, "description": "d", "nominal": 1.0,
|
||||||
|
"unit": "mm"}]}],
|
||||||
|
None,
|
||||||
|
{"items": [{"id": 1, "subtask_id": 1, "value": 1.0, "pass_fail": "pass",
|
||||||
|
"measured_at": "2026-10-06T08:00:00+00:00"}]},
|
||||||
|
]
|
||||||
|
resp = logged_in_client.get("/measure/complete/1?version_id=5")
|
||||||
|
assert resp.status_code == 200
|
||||||
|
assert "06/10/2026 10:00" in resp.get_data(as_text=True)
|
||||||
|
|
||||||
def test_measurements_filtered_by_lot_serial_and_operator(
|
def test_measurements_filtered_by_lot_serial_and_operator(
|
||||||
self, logged_in_client, mock_api_client,
|
self, logged_in_client, mock_api_client,
|
||||||
):
|
):
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
"""gitea:Adriano/TieMeasureFlow#46 - operator side of the vision tasks.
|
||||||
|
|
||||||
|
The backend of contract B is not merged yet: api_client is mocked.
|
||||||
|
"""
|
||||||
|
import io
|
||||||
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
from tests.conftest import api_get_router
|
||||||
|
|
||||||
|
TASK = {
|
||||||
|
"id": 12, "recipe_id": 3, "version_id": 5, "task_type": "camera_measure",
|
||||||
|
"title": "Foto", "directive": None, "description": None, "file_path": None,
|
||||||
|
"file_type": None, "annotations_json": None, "subtasks": [],
|
||||||
|
}
|
||||||
|
RECIPE = {
|
||||||
|
"id": 3, "code": "REC-1", "name": "Ricetta",
|
||||||
|
"measurement_interval_minutes": 30, "allow_manual_input": True,
|
||||||
|
"current_version": {"id": 5, "version_number": 1},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_execute_page_has_acquire_input(logged_in_client, mock_api_client, monkeypatch):
|
||||||
|
"""camera_measure screen offers the file/camera input and the acquire entry point."""
|
||||||
|
monkeypatch.setattr("blueprints.measure.Config.STATION_CODE", "ST-TEST")
|
||||||
|
mock_api_client.get_station_recipes.return_value = {"items": [{"id": 3}]}
|
||||||
|
mock_api_client.get.side_effect = api_get_router({
|
||||||
|
"/api/tasks/12": TASK,
|
||||||
|
"/api/recipes/3/tasks": [{"id": 12, "order_index": 0}],
|
||||||
|
"/api/recipes/3": RECIPE,
|
||||||
|
})
|
||||||
|
html = logged_in_client.get("/measure/execute/12").get_data(as_text=True)
|
||||||
|
assert 'capture="environment"' in html
|
||||||
|
assert 'accept="image/*"' in html
|
||||||
|
assert "visionExecute()" in html
|
||||||
|
assert "/measure/api/vision/execute" in html
|
||||||
|
|
||||||
|
|
||||||
|
def test_vision_execute_proxy_forwards_multipart(logged_in_client, mock_api_client):
|
||||||
|
mock_api_client.post.return_value = {
|
||||||
|
"vision_result_id": 7, "outcome": "ok", "overlay": [], "failures": [],
|
||||||
|
"measurements": [{"subtask_id": 1, "value": 9.9, "pass_fail": "pass"}],
|
||||||
|
}
|
||||||
|
resp = logged_in_client.post(
|
||||||
|
"/measure/api/vision/execute",
|
||||||
|
data={
|
||||||
|
"task_id": "12", "lot_number": "L1", "serial_number": "S1",
|
||||||
|
"production_run_id": "4",
|
||||||
|
"image": (io.BytesIO(b"\xff\xd8\xff fake"), "shot.jpg", "image/jpeg"),
|
||||||
|
},
|
||||||
|
content_type="multipart/form-data",
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
assert resp.get_json()["vision_result_id"] == 7
|
||||||
|
args, kwargs = mock_api_client.post.call_args
|
||||||
|
assert args[0] == "/api/vision/execute"
|
||||||
|
assert kwargs["data"]["task_id"] == "12"
|
||||||
|
assert kwargs["data"]["lot_number"] == "L1"
|
||||||
|
assert kwargs["data"]["production_run_id"] == "4"
|
||||||
|
name, content, mime = kwargs["files"]["image"]
|
||||||
|
assert name == "shot.jpg" and mime == "image/jpeg" and content.startswith(b"\xff\xd8")
|
||||||
|
|
||||||
|
|
||||||
|
def test_vision_execute_proxy_requires_image(logged_in_client, mock_api_client):
|
||||||
|
resp = logged_in_client.post("/measure/api/vision/execute", data={"task_id": "12"})
|
||||||
|
assert resp.status_code == 400
|
||||||
|
mock_api_client.post.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
def test_vision_execute_proxy_relays_backend_error(logged_in_client, mock_api_client):
|
||||||
|
mock_api_client.post.return_value = {"error": True, "status_code": 422, "detail": "bad"}
|
||||||
|
resp = logged_in_client.post(
|
||||||
|
"/measure/api/vision/execute",
|
||||||
|
data={"task_id": "12", "image": (io.BytesIO(b"x"), "a.jpg", "image/jpeg")},
|
||||||
|
content_type="multipart/form-data",
|
||||||
|
)
|
||||||
|
assert resp.status_code == 422
|
||||||
|
assert resp.get_json()["detail"] == "bad"
|
||||||
|
|
||||||
|
|
||||||
|
def test_vision_result_image_proxy(logged_in_client):
|
||||||
|
fake = MagicMock(status_code=200, content=b"IMG", headers={"content-type": "image/jpeg"})
|
||||||
|
with patch("blueprints.measure.http_requests.get", return_value=fake) as g:
|
||||||
|
resp = logged_in_client.get("/measure/api/vision/results/7/image")
|
||||||
|
assert resp.status_code == 200 and resp.data == b"IMG"
|
||||||
|
assert g.call_args[0][0].endswith("/api/vision/results/7/image")
|
||||||
|
assert g.call_args[1]["headers"]["X-API-Key"] == "test-api-key-12345"
|
||||||
+117
-22
@@ -9,6 +9,7 @@ from __future__ import annotations
|
|||||||
import math
|
import math
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import tempfile
|
||||||
import time
|
import time
|
||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass, field
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
@@ -18,6 +19,9 @@ from typing import Any
|
|||||||
import numpy as np
|
import numpy as np
|
||||||
from visionsuite.core.image import Image
|
from visionsuite.core.image import Image
|
||||||
from visionsuite.task import Task
|
from visionsuite.task import Task
|
||||||
|
from visionsuite.task.graph import RecipeError # #46: errori di ricetta v2
|
||||||
|
from visionsuite.task.registry import load_tools
|
||||||
|
from visionsuite.task.session import Session
|
||||||
|
|
||||||
_SUBMODULE = Path(__file__).resolve().parents[2] / "vendor" / "visionsuite"
|
_SUBMODULE = Path(__file__).resolve().parents[2] / "vendor" / "visionsuite"
|
||||||
|
|
||||||
@@ -49,6 +53,10 @@ class RunOutcome:
|
|||||||
# Kept apart from `failures`: the tool did not raise, it just produced a
|
# Kept apart from `failures`: the tool did not raise, it just produced a
|
||||||
# number the caller must not measure a part by. Value is the reason.
|
# number the caller must not measure a part by. Value is the reason.
|
||||||
invalid_outputs: dict[str, str] = field(default_factory=dict)
|
invalid_outputs: dict[str, str] = field(default_factory=dict)
|
||||||
|
# #46: contorni di tutti gli strumenti (px immagine, con tool_id) e esito
|
||||||
|
# del TaskReport (informativo: il verdetto quote lo dà il backend).
|
||||||
|
overlay: list[dict] = field(default_factory=list)
|
||||||
|
outcome: str | None = None
|
||||||
|
|
||||||
|
|
||||||
@lru_cache(maxsize=1)
|
@lru_cache(maxsize=1)
|
||||||
@@ -97,12 +105,46 @@ def engine_version() -> str:
|
|||||||
return _engine_version_from_git()
|
return _engine_version_from_git()
|
||||||
|
|
||||||
|
|
||||||
|
def _scale_calibration(calibration: dict | None):
|
||||||
|
"""Dict {"mm_per_px"|"px_per_mm"} -> ScaleCalibration (gli strumenti di
|
||||||
|
quota convertono con `in_millimetres`, che non accetta un dict)."""
|
||||||
|
if calibration is None:
|
||||||
|
return None
|
||||||
|
from visionsuite.calibration import ScaleCalibration
|
||||||
|
|
||||||
|
if not isinstance(calibration, dict) or not (
|
||||||
|
calibration.get("mm_per_px") or calibration.get("px_per_mm")
|
||||||
|
):
|
||||||
|
raise GraphBuildError(
|
||||||
|
"calibration must be {'mm_per_px': float} or {'px_per_mm': float}"
|
||||||
|
)
|
||||||
|
key = "mm_per_px" if calibration.get("mm_per_px") else "px_per_mm"
|
||||||
|
return ScaleCalibration(**{key: float(calibration[key])})
|
||||||
|
|
||||||
|
|
||||||
|
def _open_session(graph: dict, recipe_dir: Any, calibration: dict | None,
|
||||||
|
workdir: str) -> Session:
|
||||||
|
"""Costruisce la Session v2; RecipeError e grafo malformato -> GraphBuildError."""
|
||||||
|
cal = _scale_calibration(calibration)
|
||||||
|
try:
|
||||||
|
return Session.from_dict(
|
||||||
|
graph, Path(recipe_dir) if recipe_dir else Path(workdir), cal,
|
||||||
|
)
|
||||||
|
except RecipeError as exc:
|
||||||
|
raise GraphBuildError(f"malformed graph: {exc}") from exc
|
||||||
|
except (KeyError, TypeError, AttributeError, ValueError) as exc:
|
||||||
|
raise GraphBuildError(
|
||||||
|
f"malformed graph: {type(exc).__name__}: {exc}"
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
|
||||||
def run_graph(
|
def run_graph(
|
||||||
image: Any,
|
image: Any,
|
||||||
graph: dict,
|
graph: dict,
|
||||||
calibration: dict | None = None,
|
calibration: dict | None = None,
|
||||||
|
recipe_dir: Any = None,
|
||||||
) -> RunOutcome:
|
) -> RunOutcome:
|
||||||
"""Run a serialised vs-task graph against one image.
|
"""Run a serialised vs-task v2 graph against one image.
|
||||||
|
|
||||||
A tool that fails does not stop the others - on a crooked piece an edge may
|
A tool that fails does not stop the others - on a crooked piece an edge may
|
||||||
simply not be there, and the other quotes are still wanted. Failures come
|
simply not be there, and the other quotes are still wanted. Failures come
|
||||||
@@ -112,33 +154,35 @@ def run_graph(
|
|||||||
wrapped into the `visionsuite.core.image.Image` that vs-measure's tools
|
wrapped into the `visionsuite.core.image.Image` that vs-measure's tools
|
||||||
actually read via `.pixels`; an `Image` passed in is used as-is.
|
actually read via `.pixels`; an `Image` passed in is used as-is.
|
||||||
|
|
||||||
Two phases, on purpose: building the task from `graph` can fail on
|
`recipe_dir` is the folder of the recipe's files (meta.dxf, meta.models,
|
||||||
nothing but the caller's input (a bad schema version, a tool with no
|
...); without it an empty temporary folder is used, so a recipe that needs
|
||||||
"kind", a graph that is not a dict at all) - that is `GraphBuildError`,
|
a file fails as a malformed graph instead of reading from the CWD.
|
||||||
a 422 for the worker. Once the task exists, `task.run()` is the engine's
|
|
||||||
own business; an exception from there is not the caller's mistake, and
|
Two phases, on purpose: building the session can fail on nothing but the
|
||||||
the worker must not call it one.
|
caller's input (a bad schema version, a tool with no "kind", a missing
|
||||||
|
file) - that is `GraphBuildError`, a 422 for the worker. Once it exists,
|
||||||
|
running is the engine's own business; an exception from there is not the
|
||||||
|
caller's mistake, and the worker must not call it one.
|
||||||
"""
|
"""
|
||||||
try:
|
load_tools() # #46: registra gli strumenti degli entry point di vs-tools
|
||||||
task = Task.from_dict(graph)
|
with tempfile.TemporaryDirectory() as empty_dir:
|
||||||
except (KeyError, TypeError, AttributeError, ValueError) as exc:
|
session = _open_session(graph, recipe_dir, calibration, empty_dir)
|
||||||
raise GraphBuildError(
|
wrapped_image = (
|
||||||
f"malformed graph: {type(exc).__name__}: {exc}"
|
image if isinstance(image, Image) else Image(pixels=np.asarray(image))
|
||||||
) from exc
|
)
|
||||||
|
started = time.monotonic()
|
||||||
wrapped_image = image if isinstance(image, Image) else Image(pixels=np.asarray(image))
|
report = session.run(wrapped_image)
|
||||||
context: dict[str, Any] = {"image": wrapped_image}
|
elapsed_ms = int((time.monotonic() - started) * 1000)
|
||||||
if calibration is not None:
|
|
||||||
context["calibration"] = calibration
|
|
||||||
|
|
||||||
started = time.monotonic()
|
|
||||||
report = task.run(context=context)
|
|
||||||
elapsed_ms = int((time.monotonic() - started) * 1000)
|
|
||||||
|
|
||||||
outputs: dict[str, float] = {}
|
outputs: dict[str, float] = {}
|
||||||
failures: list[ToolFailure] = []
|
failures: list[ToolFailure] = []
|
||||||
invalid_outputs: dict[str, str] = {}
|
invalid_outputs: dict[str, str] = {}
|
||||||
|
overlay: list[dict] = []
|
||||||
for result in report:
|
for result in report:
|
||||||
|
# #46: overlay di ogni strumento, con il tool_id di chi lo ha prodotto
|
||||||
|
for item in result.overlay or []:
|
||||||
|
if isinstance(item, dict):
|
||||||
|
overlay.append({**item, "tool_id": result.tool_id})
|
||||||
if not result.ok:
|
if not result.ok:
|
||||||
failures.append(ToolFailure(
|
failures.append(ToolFailure(
|
||||||
tool_id=result.tool_id,
|
tool_id=result.tool_id,
|
||||||
@@ -164,4 +208,55 @@ def run_graph(
|
|||||||
engine_version=engine_version(),
|
engine_version=engine_version(),
|
||||||
duration_ms=elapsed_ms,
|
duration_ms=elapsed_ms,
|
||||||
invalid_outputs=invalid_outputs,
|
invalid_outputs=invalid_outputs,
|
||||||
|
overlay=overlay,
|
||||||
|
outcome=report.outcome,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _is_number(value: Any) -> bool:
|
||||||
|
return isinstance(value, (int, float)) and not isinstance(value, bool)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_graph(
|
||||||
|
graph: dict, recipe_dir: Any = None
|
||||||
|
) -> tuple[bool, list[str], list[dict]]:
|
||||||
|
"""Validate a v2 recipe without an image: (ok, errors, numeric outputs).
|
||||||
|
|
||||||
|
Not a draft: a missing meta file is an error. `outputs` lists the numeric
|
||||||
|
outputs the tools declare (OUT properties with a numeric default, plus the
|
||||||
|
`values` of dimension tools), with quantity/unit when declared.
|
||||||
|
"""
|
||||||
|
load_tools()
|
||||||
|
if not isinstance(graph, dict):
|
||||||
|
return False, ["graph must be a JSON object"], []
|
||||||
|
try:
|
||||||
|
task = Task.from_dict(
|
||||||
|
graph, recipe_dir=Path(recipe_dir) if recipe_dir else None
|
||||||
|
)
|
||||||
|
except RecipeError as exc:
|
||||||
|
return False, list(exc.errors), []
|
||||||
|
except (KeyError, TypeError, AttributeError, ValueError) as exc:
|
||||||
|
return False, [f"{type(exc).__name__}: {exc}"], []
|
||||||
|
|
||||||
|
outputs: list[dict] = []
|
||||||
|
for tool in task.tools:
|
||||||
|
value_quantities = getattr(tool, "value_quantities", None) or {}
|
||||||
|
values = tuple(getattr(tool, "values", ()) or ())
|
||||||
|
for prop in tool.outputs():
|
||||||
|
if not (_is_number(prop.default) or prop.name in values):
|
||||||
|
continue
|
||||||
|
quantity = value_quantities.get(prop.name, getattr(tool, "quantity", None))
|
||||||
|
if not isinstance(quantity, str):
|
||||||
|
quantity = None
|
||||||
|
unit = None
|
||||||
|
if quantity == "length":
|
||||||
|
nominal_unit = getattr(tool, "nominal_unit", None)
|
||||||
|
unit = nominal_unit if isinstance(nominal_unit, str) else None
|
||||||
|
elif quantity == "angle":
|
||||||
|
unit = "deg"
|
||||||
|
outputs.append({
|
||||||
|
"key": f"{tool.id}.{prop.name}",
|
||||||
|
"quantity": quantity,
|
||||||
|
"unit": unit,
|
||||||
|
})
|
||||||
|
return True, [], outputs
|
||||||
|
|||||||
+146
-13
@@ -34,14 +34,16 @@ def a_disc(radius: int = 60, size: int = 400) -> np.ndarray:
|
|||||||
def a_circle_graph() -> dict:
|
def a_circle_graph() -> dict:
|
||||||
"""A two-tool graph, built with vs-task's own API."""
|
"""A two-tool graph, built with vs-task's own API."""
|
||||||
from visionsuite.task import Task
|
from visionsuite.task import Task
|
||||||
from visionsuite.task.tools import DetectCircleTool, DiameterTool
|
from visionsuite.tools.detect import DetectCircle
|
||||||
|
from visionsuite.tools.dimensions import Diameter
|
||||||
|
|
||||||
task = Task(name="prova")
|
task = Task(name="prova")
|
||||||
found = task.add(DetectCircleTool(name="disco"))
|
found = task.add(DetectCircle(name="disco"))
|
||||||
found.center_row, found.center_col, found.radius = 200.0, 200.0, 60.0
|
found.center_row, found.center_col, found.radius = 200.0, 200.0, 60.0
|
||||||
found.scan_size = 30.0
|
found.scan_size = 30.0
|
||||||
|
|
||||||
quota = task.add(DiameterTool(name="diametro"))
|
quota = task.add(Diameter(name="diametro"))
|
||||||
|
quota.nominal_unit = "px" # #46: v2, senza calibrazione la quota resta in px
|
||||||
quota.link("circle", found, "circle")
|
quota.link("circle", found, "circle")
|
||||||
return task.to_dict()
|
return task.to_dict()
|
||||||
|
|
||||||
@@ -63,7 +65,7 @@ def test_a_broken_tool_does_not_sink_the_others():
|
|||||||
graph = a_circle_graph()
|
graph = a_circle_graph()
|
||||||
graph["tools"].append(
|
graph["tools"].append(
|
||||||
{"id": "ghost", "kind": "DetectCircle", "name": "assente",
|
{"id": "ghost", "kind": "DetectCircle", "name": "assente",
|
||||||
"properties": {"center_row": 5.0, "center_col": 5.0, "radius": 900.0}}
|
"values": {"center_row": 5.0, "center_col": 5.0, "radius": 900.0}}
|
||||||
)
|
)
|
||||||
|
|
||||||
outcome = run_graph(a_disc(), graph)
|
outcome = run_graph(a_disc(), graph)
|
||||||
@@ -81,14 +83,21 @@ class _FakeResult:
|
|||||||
self.ok = ok
|
self.ok = ok
|
||||||
self.outputs = outputs or {}
|
self.outputs = outputs or {}
|
||||||
self.error = error
|
self.error = error
|
||||||
|
self.overlay = [] # #46: v2, ogni risultato porta l'overlay
|
||||||
|
|
||||||
|
|
||||||
|
class _FakeReport(list):
|
||||||
|
"""#46: run_graph ora legge `.outcome` dal report di Session.run."""
|
||||||
|
|
||||||
|
outcome = "pass"
|
||||||
|
|
||||||
|
|
||||||
def test_a_nan_output_is_dropped_not_measured(monkeypatch):
|
def test_a_nan_output_is_dropped_not_measured(monkeypatch):
|
||||||
"""vs-measure emits NaN on an empty slice (caliper.py:112 per the
|
"""vs-measure emits NaN on an empty slice (caliper.py:112 per the
|
||||||
revisione) - a NaN must not become a quote's value (#16)."""
|
revisione) - a NaN must not become a quote's value (#16)."""
|
||||||
def fake_run(self, context=None):
|
def fake_run(self, image, tag=None):
|
||||||
return [_FakeResult("t1", "diametro", True, outputs={"diameter": float("nan")})]
|
return _FakeReport([_FakeResult("t1", "diametro", True, outputs={"diameter": float("nan")})])
|
||||||
monkeypatch.setattr(runner.Task, "run", fake_run)
|
monkeypatch.setattr(runner.Session, "run", fake_run)
|
||||||
|
|
||||||
outcome = run_graph(a_disc(), a_circle_graph())
|
outcome = run_graph(a_disc(), a_circle_graph())
|
||||||
|
|
||||||
@@ -97,9 +106,9 @@ def test_a_nan_output_is_dropped_not_measured(monkeypatch):
|
|||||||
|
|
||||||
|
|
||||||
def test_an_infinite_output_is_dropped_not_measured(monkeypatch):
|
def test_an_infinite_output_is_dropped_not_measured(monkeypatch):
|
||||||
def fake_run(self, context=None):
|
def fake_run(self, image, tag=None):
|
||||||
return [_FakeResult("t1", "diametro", True, outputs={"diameter": float("inf")})]
|
return _FakeReport([_FakeResult("t1", "diametro", True, outputs={"diameter": float("inf")})])
|
||||||
monkeypatch.setattr(runner.Task, "run", fake_run)
|
monkeypatch.setattr(runner.Session, "run", fake_run)
|
||||||
|
|
||||||
outcome = run_graph(a_disc(), a_circle_graph())
|
outcome = run_graph(a_disc(), a_circle_graph())
|
||||||
|
|
||||||
@@ -109,9 +118,9 @@ def test_an_infinite_output_is_dropped_not_measured(monkeypatch):
|
|||||||
|
|
||||||
def test_a_bool_output_is_not_treated_as_a_measurable_number(monkeypatch):
|
def test_a_bool_output_is_not_treated_as_a_measurable_number(monkeypatch):
|
||||||
"""bool is a subclass of int - a flag output must not become a quote."""
|
"""bool is a subclass of int - a flag output must not become a quote."""
|
||||||
def fake_run(self, context=None):
|
def fake_run(self, image, tag=None):
|
||||||
return [_FakeResult("t1", "flag", True, outputs={"present": True})]
|
return _FakeReport([_FakeResult("t1", "flag", True, outputs={"present": True})])
|
||||||
monkeypatch.setattr(runner.Task, "run", fake_run)
|
monkeypatch.setattr(runner.Session, "run", fake_run)
|
||||||
|
|
||||||
outcome = run_graph(a_disc(), a_circle_graph())
|
outcome = run_graph(a_disc(), a_circle_graph())
|
||||||
|
|
||||||
@@ -155,3 +164,127 @@ def test_engine_version_raises_rather_than_inventing_one(monkeypatch):
|
|||||||
engine_version()
|
engine_version()
|
||||||
finally:
|
finally:
|
||||||
runner._engine_version_from_git.cache_clear()
|
runner._engine_version_from_git.cache_clear()
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# #46: ricette v2 complete - overlay, calibrazione, recipe_dir con DXF.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import shutil
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
import cv2
|
||||||
|
|
||||||
|
_VS = Path(__file__).resolve().parents[3] / "vendor" / "visionsuite"
|
||||||
|
_SAMPLE_DXF = _VS / "packages" / "vs-dxf" / "tests" / "fixtures" / "sample.dxf"
|
||||||
|
# Il disegno di prova: rettangolo 200x100 mm con foro r=10 mm.
|
||||||
|
_PX_PER_MM = 4.0
|
||||||
|
|
||||||
|
|
||||||
|
def _dxf_scene() -> np.ndarray:
|
||||||
|
"""Il pezzo del disegno rasterizzato a 4 px/mm, margine 60 mm."""
|
||||||
|
margin = 60.0
|
||||||
|
w = int((200.0 + 2 * margin) * _PX_PER_MM)
|
||||||
|
h = int((100.0 + 2 * margin) * _PX_PER_MM)
|
||||||
|
img = np.full((h, w), 255, dtype=np.uint8)
|
||||||
|
cx, cy = w // 2, h // 2
|
||||||
|
hw, hh = 200.0 * _PX_PER_MM / 2, 100.0 * _PX_PER_MM / 2
|
||||||
|
cv2.rectangle(img, (int(cx - hw), int(cy - hh)), (int(cx + hw), int(cy + hh)), 0, -1)
|
||||||
|
cv2.circle(img, (cx, cy), int(10.0 * _PX_PER_MM), 255, -1)
|
||||||
|
return img
|
||||||
|
|
||||||
|
|
||||||
|
def _dxf_recipe() -> dict:
|
||||||
|
"""CompareDxf con ancora a due punti, collegati a due DetectPointScan.
|
||||||
|
|
||||||
|
Le due scansioni trovano i bordi sinistro e destro del pezzo una riga
|
||||||
|
sopra il lato in basso: origine del disegno = angolo in basso a sinistra,
|
||||||
|
direzione a -> b = asse x del disegno.
|
||||||
|
"""
|
||||||
|
h, w = _dxf_scene().shape
|
||||||
|
cx, cy = w // 2, h // 2
|
||||||
|
hw, hh = 200.0 * _PX_PER_MM / 2, 100.0 * _PX_PER_MM / 2
|
||||||
|
row = cy + hh - 1.0
|
||||||
|
|
||||||
|
def scan(tid: str, col: float) -> dict:
|
||||||
|
return {"id": tid, "name": tid, "kind": "DetectPointScan",
|
||||||
|
"values": {"start_row": row, "start_col": col - 30.0,
|
||||||
|
"end_row": row, "end_col": col + 30.0,
|
||||||
|
"width": 5.0, "select": "first"},
|
||||||
|
"links": {}}
|
||||||
|
|
||||||
|
return {
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "dxf",
|
||||||
|
"meta": {"dxf": {"disegno": { # sha256 obbligatorio in meta (v2)
|
||||||
|
"path": "disegno.dxf",
|
||||||
|
"sha256": hashlib.sha256(_SAMPLE_DXF.read_bytes()).hexdigest()}}},
|
||||||
|
"tools": [
|
||||||
|
scan("t-a", cx - hw),
|
||||||
|
scan("t-b", cx + hw),
|
||||||
|
{"id": "t-dxf", "name": "confronto", "kind": "CompareDxf",
|
||||||
|
"values": {"dxf": "disegno", "mm_per_px": 1.0 / _PX_PER_MM,
|
||||||
|
"anchor": "two_points",
|
||||||
|
"band_plus": 8.0, "band_minus": 8.0},
|
||||||
|
"links": {"point_a": {"tool": "t-a", "property": "point"},
|
||||||
|
"point_b": {"tool": "t-b", "property": "point"}}},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_a_circle_recipe_returns_overlay_and_outcome():
|
||||||
|
outcome = run_graph(a_disc(), a_circle_graph())
|
||||||
|
|
||||||
|
assert outcome.outcome in ("pass", "warning", "fail")
|
||||||
|
assert outcome.overlay, "DetectCircle must draw something"
|
||||||
|
assert all("tool_id" in item for item in outcome.overlay)
|
||||||
|
|
||||||
|
|
||||||
|
def test_calibration_dict_gives_mm_quotes():
|
||||||
|
graph = a_circle_graph()
|
||||||
|
for tool in graph["tools"]:
|
||||||
|
if tool["kind"] == "Diameter":
|
||||||
|
tool["values"]["nominal_unit"] = "mm"
|
||||||
|
|
||||||
|
outcome = run_graph(a_disc(), graph, calibration={"mm_per_px": 0.5})
|
||||||
|
|
||||||
|
assert outcome.failures == []
|
||||||
|
diameter = next(v for k, v in outcome.outputs.items() if k.endswith(".value"))
|
||||||
|
assert diameter == pytest.approx(60.0, abs=2.0) # 120 px * 0.5 mm/px
|
||||||
|
|
||||||
|
|
||||||
|
def test_compare_dxf_two_points_with_recipe_dir(tmp_path):
|
||||||
|
shutil.copy(_SAMPLE_DXF, tmp_path / "disegno.dxf")
|
||||||
|
|
||||||
|
outcome = run_graph(_dxf_scene(), _dxf_recipe(), recipe_dir=tmp_path)
|
||||||
|
|
||||||
|
assert outcome.failures == []
|
||||||
|
assert outcome.outputs["t-dxf.n_points"] > 1000
|
||||||
|
assert outcome.outputs["t-dxf.points_in_pct"] > 95.0
|
||||||
|
roles = {item.get("role") for item in outcome.overlay}
|
||||||
|
assert {"reference", "found"} <= roles
|
||||||
|
assert "t-dxf" in {item["tool_id"] for item in outcome.overlay}
|
||||||
|
|
||||||
|
|
||||||
|
def test_missing_meta_file_is_a_graph_build_error(tmp_path):
|
||||||
|
with pytest.raises(runner.GraphBuildError):
|
||||||
|
run_graph(_dxf_scene(), _dxf_recipe(), recipe_dir=tmp_path)
|
||||||
|
|
||||||
|
|
||||||
|
def test_validate_lists_numeric_outputs(tmp_path):
|
||||||
|
shutil.copy(_SAMPLE_DXF, tmp_path / "disegno.dxf")
|
||||||
|
graph = _dxf_recipe()
|
||||||
|
|
||||||
|
ok, errors, outputs = runner.validate_graph(graph, tmp_path)
|
||||||
|
|
||||||
|
assert ok, errors
|
||||||
|
keys = {o["key"] for o in outputs}
|
||||||
|
assert {"t-dxf.points_in_pct", "t-dxf.n_points"} <= keys
|
||||||
|
assert all(set(o) == {"key", "quantity", "unit"} for o in outputs)
|
||||||
|
|
||||||
|
|
||||||
|
def test_validate_reports_a_missing_file(tmp_path):
|
||||||
|
ok, errors, outputs = runner.validate_graph(_dxf_recipe(), tmp_path)
|
||||||
|
|
||||||
|
assert not ok and errors and outputs == []
|
||||||
|
|||||||
+109
-17
@@ -10,12 +10,20 @@ import asyncio
|
|||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
import re
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from fastapi import FastAPI, File, Form, HTTPException, UploadFile, status
|
from fastapi import FastAPI, File, Form, HTTPException, UploadFile, status
|
||||||
from PIL import Image, UnidentifiedImageError
|
from PIL import Image, UnidentifiedImageError
|
||||||
|
|
||||||
from src.vision.runner import GraphBuildError, RunOutcome, engine_version, run_graph
|
from src.vision.runner import (
|
||||||
|
GraphBuildError,
|
||||||
|
RunOutcome,
|
||||||
|
engine_version,
|
||||||
|
run_graph,
|
||||||
|
validate_graph,
|
||||||
|
)
|
||||||
|
|
||||||
app = FastAPI(title="TieMeasureFlow Vision Worker", version="0.1.0")
|
app = FastAPI(title="TieMeasureFlow Vision Worker", version="0.1.0")
|
||||||
|
|
||||||
@@ -31,6 +39,69 @@ _MAX_CONCURRENCY = int(os.environ.get("VISION_MAX_CONCURRENCY", "2"))
|
|||||||
_run_slots = asyncio.Semaphore(_MAX_CONCURRENCY)
|
_run_slots = asyncio.Semaphore(_MAX_CONCURRENCY)
|
||||||
|
|
||||||
|
|
||||||
|
# #46: radice sotto cui vivono le cartelle delle ricette (volume uploads,
|
||||||
|
# montato in sola lettura nel worker). `recipe_dir` e' relativo a questa radice.
|
||||||
|
_RECIPES_ROOT_DEFAULT = "/app/uploads"
|
||||||
|
|
||||||
|
|
||||||
|
def _unprocessable(detail: str) -> HTTPException:
|
||||||
|
return HTTPException(
|
||||||
|
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT, detail=detail
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_recipe_dir(recipe_dir: str | None) -> Path | None:
|
||||||
|
"""Percorso RELATIVO sotto VISION_RECIPES_ROOT -> cartella assoluta.
|
||||||
|
|
||||||
|
Assoluto, `..` o fuori radice (anche via symlink) -> 422. Vuoto -> None.
|
||||||
|
"""
|
||||||
|
if recipe_dir is None or not recipe_dir.strip():
|
||||||
|
return None
|
||||||
|
rel = recipe_dir.strip()
|
||||||
|
# Letto a ogni richiesta (non a import) cosi' i test possono cambiarlo.
|
||||||
|
root = Path(os.environ.get("VISION_RECIPES_ROOT", _RECIPES_ROOT_DEFAULT)).resolve()
|
||||||
|
if (
|
||||||
|
Path(rel).is_absolute()
|
||||||
|
# #46: lettera di unita (C:/x) rifiutata su ogni OS; UNC coperto da startswith("\\")
|
||||||
|
or re.match(r"^[A-Za-z]:", rel)
|
||||||
|
or rel.startswith(("/", "\\"))
|
||||||
|
or ".." in Path(rel.replace("\\", "/")).parts
|
||||||
|
):
|
||||||
|
raise _unprocessable("recipe_dir must be a relative path under the recipes root")
|
||||||
|
resolved = (root / rel).resolve()
|
||||||
|
if resolved != root and root not in resolved.parents:
|
||||||
|
raise _unprocessable("recipe_dir is outside the recipes root")
|
||||||
|
return resolved
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_graph(graph: str) -> dict:
|
||||||
|
try:
|
||||||
|
parsed = json.loads(graph)
|
||||||
|
except json.JSONDecodeError as exc:
|
||||||
|
raise _unprocessable(f"graph is not valid JSON: {exc}") from exc
|
||||||
|
if not isinstance(parsed, dict):
|
||||||
|
raise _unprocessable(
|
||||||
|
f"graph must be a JSON object, got {type(parsed).__name__}"
|
||||||
|
)
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_calibration(calibration: str | None) -> dict | None:
|
||||||
|
if calibration is None or not calibration.strip():
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parsed = json.loads(calibration)
|
||||||
|
except json.JSONDecodeError as exc:
|
||||||
|
raise _unprocessable(f"calibration is not valid JSON: {exc}") from exc
|
||||||
|
if not isinstance(parsed, dict) or not (
|
||||||
|
parsed.get("mm_per_px") or parsed.get("px_per_mm")
|
||||||
|
):
|
||||||
|
raise _unprocessable(
|
||||||
|
"calibration must be {'mm_per_px': float} or {'px_per_mm': float}"
|
||||||
|
)
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
class _ImageDecodeError(Exception):
|
class _ImageDecodeError(Exception):
|
||||||
"""The upload is not a decodable image - raised inside the worker thread
|
"""The upload is not a decodable image - raised inside the worker thread
|
||||||
so it survives the trip through `asyncio.to_thread`."""
|
so it survives the trip through `asyncio.to_thread`."""
|
||||||
@@ -44,7 +115,12 @@ async def health() -> dict:
|
|||||||
return {"status": "ok", "engine_version": engine_version()}
|
return {"status": "ok", "engine_version": engine_version()}
|
||||||
|
|
||||||
|
|
||||||
def _decode_and_run(content: bytes, graph: dict) -> RunOutcome:
|
def _decode_and_run(
|
||||||
|
content: bytes,
|
||||||
|
graph: dict,
|
||||||
|
calibration: dict | None = None,
|
||||||
|
recipe_dir: Path | None = None,
|
||||||
|
) -> RunOutcome:
|
||||||
"""The synchronous, CPU/IO-bound half of a request: PIL decode plus
|
"""The synchronous, CPU/IO-bound half of a request: PIL decode plus
|
||||||
`run_graph`. Runs in a worker thread (see `run` below) so the event loop -
|
`run_graph`. Runs in a worker thread (see `run` below) so the event loop -
|
||||||
and therefore `/health` - stays responsive while it executes. Once this
|
and therefore `/health` - stays responsive while it executes. Once this
|
||||||
@@ -56,27 +132,19 @@ def _decode_and_run(content: bytes, graph: dict) -> RunOutcome:
|
|||||||
frame = np.array(Image.open(io.BytesIO(content)).convert("L"))
|
frame = np.array(Image.open(io.BytesIO(content)).convert("L"))
|
||||||
except (UnidentifiedImageError, OSError) as exc:
|
except (UnidentifiedImageError, OSError) as exc:
|
||||||
raise _ImageDecodeError(str(exc)) from exc
|
raise _ImageDecodeError(str(exc)) from exc
|
||||||
return run_graph(frame, graph)
|
return run_graph(frame, graph, calibration=calibration, recipe_dir=recipe_dir)
|
||||||
|
|
||||||
|
|
||||||
@app.post("/run")
|
@app.post("/run")
|
||||||
async def run(
|
async def run(
|
||||||
image: UploadFile = File(...),
|
image: UploadFile = File(...),
|
||||||
graph: str = Form(...),
|
graph: str = Form(...),
|
||||||
|
recipe_dir: str | None = Form(None),
|
||||||
|
calibration: str | None = Form(None),
|
||||||
) -> dict:
|
) -> dict:
|
||||||
try:
|
parsed_graph = _parse_graph(graph)
|
||||||
parsed_graph = json.loads(graph)
|
resolved_dir = _resolve_recipe_dir(recipe_dir)
|
||||||
except json.JSONDecodeError as exc:
|
parsed_calibration = _parse_calibration(calibration)
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
|
|
||||||
detail=f"graph is not valid JSON: {exc}",
|
|
||||||
) from exc
|
|
||||||
|
|
||||||
if not isinstance(parsed_graph, dict):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
|
|
||||||
detail=f"graph must be a JSON object, got {type(parsed_graph).__name__}",
|
|
||||||
)
|
|
||||||
|
|
||||||
content = await image.read()
|
content = await image.read()
|
||||||
|
|
||||||
@@ -89,7 +157,13 @@ async def run(
|
|||||||
async with _run_slots:
|
async with _run_slots:
|
||||||
try:
|
try:
|
||||||
outcome = await asyncio.wait_for(
|
outcome = await asyncio.wait_for(
|
||||||
asyncio.to_thread(_decode_and_run, content, parsed_graph),
|
asyncio.to_thread(
|
||||||
|
_decode_and_run,
|
||||||
|
content,
|
||||||
|
parsed_graph,
|
||||||
|
parsed_calibration,
|
||||||
|
resolved_dir,
|
||||||
|
),
|
||||||
timeout=_RUN_TIMEOUT_S,
|
timeout=_RUN_TIMEOUT_S,
|
||||||
)
|
)
|
||||||
except asyncio.TimeoutError as exc:
|
except asyncio.TimeoutError as exc:
|
||||||
@@ -130,4 +204,22 @@ async def run(
|
|||||||
"engine_version": outcome.engine_version,
|
"engine_version": outcome.engine_version,
|
||||||
"duration_ms": outcome.duration_ms,
|
"duration_ms": outcome.duration_ms,
|
||||||
"invalid_outputs": outcome.invalid_outputs,
|
"invalid_outputs": outcome.invalid_outputs,
|
||||||
|
# #46: contorni per l'overlay sull'immagine e esito VisionSuite.
|
||||||
|
"overlay": outcome.overlay,
|
||||||
|
"outcome": outcome.outcome,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/validate")
|
||||||
|
async def validate(
|
||||||
|
graph: str = Form(...),
|
||||||
|
recipe_dir: str | None = Form(None),
|
||||||
|
) -> dict:
|
||||||
|
"""Validates a v2 recipe (not a draft: a missing meta file is an error)
|
||||||
|
and lists its numeric outputs. No image, so it is cheap: no run slot."""
|
||||||
|
parsed_graph = _parse_graph(graph)
|
||||||
|
resolved_dir = _resolve_recipe_dir(recipe_dir)
|
||||||
|
ok, errors, outputs = await asyncio.to_thread(
|
||||||
|
validate_graph, parsed_graph, resolved_dir
|
||||||
|
)
|
||||||
|
return {"ok": ok, "errors": errors, "outputs": outputs}
|
||||||
|
|||||||
@@ -45,13 +45,15 @@ def a_disc_png(radius: int = 60, size: int = 400) -> bytes:
|
|||||||
|
|
||||||
def a_circle_graph() -> dict:
|
def a_circle_graph() -> dict:
|
||||||
from visionsuite.task import Task
|
from visionsuite.task import Task
|
||||||
from visionsuite.task.tools import DetectCircleTool, DiameterTool
|
from visionsuite.tools.detect import DetectCircle
|
||||||
|
from visionsuite.tools.dimensions import Diameter
|
||||||
|
|
||||||
task = Task(name="prova")
|
task = Task(name="prova")
|
||||||
found = task.add(DetectCircleTool(name="disco"))
|
found = task.add(DetectCircle(name="disco"))
|
||||||
found.center_row, found.center_col, found.radius = 200.0, 200.0, 60.0
|
found.center_row, found.center_col, found.radius = 200.0, 200.0, 60.0
|
||||||
found.scan_size = 30.0
|
found.scan_size = 30.0
|
||||||
quota = task.add(DiameterTool(name="diametro"))
|
quota = task.add(Diameter(name="diametro"))
|
||||||
|
quota.nominal_unit = "px" # #46: v2, senza calibrazione la quota resta in px
|
||||||
quota.link("circle", found, "circle")
|
quota.link("circle", found, "circle")
|
||||||
return task.to_dict()
|
return task.to_dict()
|
||||||
|
|
||||||
@@ -140,7 +142,7 @@ async def test_a_graph_that_is_not_an_object_is_refused():
|
|||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_a_tool_without_a_kind_is_refused_not_crashed():
|
async def test_a_tool_without_a_kind_is_refused_not_crashed():
|
||||||
graph = {"schema_version": 1, "name": "p", "tools": [{"id": "a", "name": "x"}]}
|
graph = {"schema_version": 2, "name": "p", "tools": [{"id": "a", "name": "x"}]}
|
||||||
transport = ASGITransport(app=app)
|
transport = ASGITransport(app=app)
|
||||||
async with AsyncClient(transport=transport, base_url="http://worker") as client:
|
async with AsyncClient(transport=transport, base_url="http://worker") as client:
|
||||||
response = await client.post(
|
response = await client.post(
|
||||||
@@ -151,7 +153,7 @@ async def test_a_tool_without_a_kind_is_refused_not_crashed():
|
|||||||
|
|
||||||
assert response.status_code == 422
|
assert response.status_code == 422
|
||||||
assert "malformed graph" in response.json()["detail"].lower()
|
assert "malformed graph" in response.json()["detail"].lower()
|
||||||
assert "kind" in response.json()["detail"].lower()
|
assert "tipo sconosciuto" in response.json()["detail"].lower() # #46: messaggio v2
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -167,7 +169,7 @@ async def test_a_run_past_its_budget_answers_504_and_health_still_answers(
|
|||||||
):
|
):
|
||||||
monkeypatch.setattr(worker_main, "_RUN_TIMEOUT_S", 0.1)
|
monkeypatch.setattr(worker_main, "_RUN_TIMEOUT_S", 0.1)
|
||||||
|
|
||||||
def slow_run_graph(frame, graph):
|
def slow_run_graph(frame, graph, **kwargs):
|
||||||
time.sleep(0.5) # off the event loop - it runs inside asyncio.to_thread
|
time.sleep(0.5) # off the event loop - it runs inside asyncio.to_thread
|
||||||
return runner.RunOutcome(engine_version="a" * 40)
|
return runner.RunOutcome(engine_version="a" * 40)
|
||||||
|
|
||||||
@@ -197,7 +199,7 @@ async def test_a_third_concurrent_run_is_refused_not_queued(monkeypatch):
|
|||||||
monkeypatch.setattr(worker_main, "_run_slots", asyncio.Semaphore(1))
|
monkeypatch.setattr(worker_main, "_run_slots", asyncio.Semaphore(1))
|
||||||
monkeypatch.setattr(worker_main, "_RUN_TIMEOUT_S", 2.0)
|
monkeypatch.setattr(worker_main, "_RUN_TIMEOUT_S", 2.0)
|
||||||
|
|
||||||
def slow_run_graph(frame, graph):
|
def slow_run_graph(frame, graph, **kwargs):
|
||||||
time.sleep(0.3)
|
time.sleep(0.3)
|
||||||
return runner.RunOutcome(engine_version="a" * 40)
|
return runner.RunOutcome(engine_version="a" * 40)
|
||||||
|
|
||||||
@@ -222,3 +224,88 @@ async def test_a_third_concurrent_run_is_refused_not_queued(monkeypatch):
|
|||||||
|
|
||||||
assert second_response.status_code == 503
|
assert second_response.status_code == 503
|
||||||
assert first_response.status_code == 200
|
assert first_response.status_code == 200
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# #46: recipe_dir, calibration, overlay, /validate.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
async def _post(path: str, **kwargs):
|
||||||
|
transport = ASGITransport(app=app)
|
||||||
|
async with AsyncClient(transport=transport, base_url="http://worker") as client:
|
||||||
|
return await client.post(path, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_run_returns_overlay_and_outcome():
|
||||||
|
response = await _post(
|
||||||
|
"/run",
|
||||||
|
files={"image": ("piece.png", a_disc_png(), "image/png")},
|
||||||
|
data={"graph": json.dumps(a_circle_graph())},
|
||||||
|
)
|
||||||
|
|
||||||
|
body = response.json()
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert body["overlay"] and "tool_id" in body["overlay"][0]
|
||||||
|
assert body["outcome"] in ("pass", "warning", "fail")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_run_accepts_a_calibration():
|
||||||
|
graph = a_circle_graph()
|
||||||
|
for tool in graph["tools"]:
|
||||||
|
if tool["kind"] == "Diameter":
|
||||||
|
tool["values"]["nominal_unit"] = "mm"
|
||||||
|
response = await _post(
|
||||||
|
"/run",
|
||||||
|
files={"image": ("piece.png", a_disc_png(), "image/png")},
|
||||||
|
data={"graph": json.dumps(graph),
|
||||||
|
"calibration": json.dumps({"px_per_mm": 2.0})},
|
||||||
|
)
|
||||||
|
|
||||||
|
body = response.json()
|
||||||
|
assert response.status_code == 200, body
|
||||||
|
assert body["failures"] == []
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize("bad", ["../etc", "a/../../b", "/abs/path", "C:/x/y"])
|
||||||
|
async def test_a_recipe_dir_outside_the_root_is_refused(bad, monkeypatch, tmp_path):
|
||||||
|
monkeypatch.setenv("VISION_RECIPES_ROOT", str(tmp_path))
|
||||||
|
response = await _post(
|
||||||
|
"/run",
|
||||||
|
files={"image": ("piece.png", a_disc_png(), "image/png")},
|
||||||
|
data={"graph": json.dumps(a_circle_graph()), "recipe_dir": bad},
|
||||||
|
)
|
||||||
|
assert response.status_code == 422
|
||||||
|
|
||||||
|
response = await _post(
|
||||||
|
"/validate", data={"graph": json.dumps(a_circle_graph()), "recipe_dir": bad}
|
||||||
|
)
|
||||||
|
assert response.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_validate_ok_and_with_a_missing_file(monkeypatch, tmp_path):
|
||||||
|
monkeypatch.setenv("VISION_RECIPES_ROOT", str(tmp_path))
|
||||||
|
response = await _post("/validate", data={"graph": json.dumps(a_circle_graph())})
|
||||||
|
body = response.json()
|
||||||
|
assert response.status_code == 200 and body["ok"] is True
|
||||||
|
assert any(o["key"].endswith(".diameter") for o in body["outputs"])
|
||||||
|
|
||||||
|
(tmp_path / "r1").mkdir()
|
||||||
|
graph = {
|
||||||
|
"schema_version": 2, "name": "d",
|
||||||
|
"meta": {"dxf": {"d": {"path": "mancante.dxf"}}},
|
||||||
|
"tools": [{"id": "t", "name": "c", "kind": "CompareDxf",
|
||||||
|
"values": {"dxf": "d", "mm_per_px": 0.25,
|
||||||
|
"band_plus": 8.0, "band_minus": 8.0},
|
||||||
|
"links": {}}],
|
||||||
|
}
|
||||||
|
response = await _post(
|
||||||
|
"/validate", data={"graph": json.dumps(graph), "recipe_dir": "r1"}
|
||||||
|
)
|
||||||
|
body = response.json()
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert body["ok"] is False and body["errors"] and body["outputs"] == []
|
||||||
|
|||||||
@@ -626,6 +626,45 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/21/0e/8459ca4413e1a21a06c97d134bfaf18adfd27cea068813dc0faae06cbf00/cssselect2-0.9.0-py3-none-any.whl", hash = "sha256:6a99e5f91f9a016a304dd929b0966ca464bcfda15177b6fb4a118fc0fb5d9563", size = 15453, upload-time = "2026-02-12T17:16:38.317Z" },
|
{ url = "https://files.pythonhosted.org/packages/21/0e/8459ca4413e1a21a06c97d134bfaf18adfd27cea068813dc0faae06cbf00/cssselect2-0.9.0-py3-none-any.whl", hash = "sha256:6a99e5f91f9a016a304dd929b0966ca464bcfda15177b6fb4a118fc0fb5d9563", size = 15453, upload-time = "2026-02-12T17:16:38.317Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ezdxf"
|
||||||
|
version = "1.4.4"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "fonttools" },
|
||||||
|
{ name = "numpy" },
|
||||||
|
{ name = "pyparsing" },
|
||||||
|
{ name = "typing-extensions" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/5e/d7/1b7be8db364f1c4838dfc1a40ca96577aba405deabf896a4eb3aaeb15a62/ezdxf-1.4.4.tar.gz", hash = "sha256:da5a5e0e6bdbb6656f9c017b47edc7eafceb419d61a2b5de64ffb344c168e593", size = 1866886, upload-time = "2026-05-14T09:19:19.511Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/8f/d0/bc515b7f5596bc3d55b93fc9f2c2b4926e2587af6bfae0486ef7cc7ddf43/ezdxf-1.4.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:39aadab5bc7a05deddbd0db9b984c8a4bd28bd4c1ac2c5ee03f0d1b096272a88", size = 3553590, upload-time = "2026-05-14T09:25:28.042Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/a7/73/207132f13a5280d186f2441d9125639fdc7ddeabf56c2d5da4d691e81ce6/ezdxf-1.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2ed65b191113a82133ba47daa6ebdd540b487b17394b1e327e9511dde87ad924", size = 3008276, upload-time = "2026-05-14T09:25:29.424Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/82/73/b01af87269726e3719abc5ff694b843b710ef8fc345d21013e90d70e44d8/ezdxf-1.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7c3c8f2c2b62fe5b6c9b62ab8257b697535d62b0c79acf3a5040bd95edfab451", size = 3001750, upload-time = "2026-05-14T09:25:31.146Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/dd/92/284d7ca6a9da107966c7bd9d81c92245985235bc432fe0837982ef80630a/ezdxf-1.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d68d5ab9e1071319030da3af27590f34c38c8544a5ea638d9a4a800a96abb3c2", size = 5802382, upload-time = "2026-05-14T09:27:28.462Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/7d/fe/e4f37730ca5b5bf7de3a968a26126b404f60324d0b8ae9d59d11d6e55740/ezdxf-1.4.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f75a4f2924ebdda0f5b2779ff2135ba92de2596c95a8fa9b1d9ebcabea1be41", size = 5794671, upload-time = "2026-05-14T09:27:09.867Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/fe/3f/c3e7ab74f58cb69ef985fb71eda859b5c287cc506c65cbffe7e55c7cf2d4/ezdxf-1.4.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0eec8a2095b645420a67560e99041c0d25afefd39eab5bff8c736fdb32211a75", size = 5767366, upload-time = "2026-05-14T09:27:30.108Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/66/7a/b7070bf05e75b3e709a6fe5ae5bcd3bd899e987ef84ff25cf28327519c03/ezdxf-1.4.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d87a85052e92b9c28e54605dbad65f779a3b61e6288e992d6ef00df7bde4bed3", size = 5830221, upload-time = "2026-05-14T09:27:12.074Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/78/cf/a990289808c261c52f5b219484d136a8748773c99a6d25c84f55a0353fea/ezdxf-1.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:473d68c8f2b04ace513efa290a1cd0d3a4a589cdff48124f015f0e51034668b2", size = 2957599, upload-time = "2026-05-14T09:23:46.571Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/18/3d/98648d221ffa047b5ba898c8e152010861dc71a66b531dcf15053075010e/ezdxf-1.4.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d723d35d08223318c17080a32a05192a1449e544dee867c9d9c6f25998fac303", size = 3563916, upload-time = "2026-05-14T09:25:32.879Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/2c/f1/84bbaa571412f840c22deeae185e54d4a67aa52f03e1728fd8425748c548/ezdxf-1.4.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6b0c73b46085521bdbd4a3e7d88998da7bec5713ba89bbb502fdeffe6b42fc7e", size = 3016857, upload-time = "2026-05-14T09:25:34.607Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/b0/ff/f2eb77d22d26aa98abbe0961470871d8b85ef4e73e5527f544d25f958d6e/ezdxf-1.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ac3e83a70c1f866dd5114192a6fab6e75cc83b75e907bc08c5d94b98cce14cc0", size = 3003336, upload-time = "2026-05-14T09:25:35.947Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/65/7d/2a6ddd6beef5d9a8593078619f3920a0cd76b1db4c6a974ac37045543219/ezdxf-1.4.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8ebe09717ab6636bf48780eabdab51e3ab2135f7963bb52452444b6d95e03d12", size = 5788485, upload-time = "2026-05-14T09:27:32.176Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/e7/29/2094fd7719146ca7bb236be9751b5929d431f643cbab669aed89cf121883/ezdxf-1.4.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:44af248af0860fe8b1a39ca40e1cd2fa8ac37b22142b14b20c6a0caf1b50f932", size = 5816781, upload-time = "2026-05-14T09:27:13.96Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/19/8d/669b8047cca162204c53b874183d73b5f6c4b1d5d48fa1e515a32d56f5ac/ezdxf-1.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:02a097794625e9fc948e637dfe07057e98167b4fe215357a59645759fef6db3f", size = 5754006, upload-time = "2026-05-14T09:27:33.858Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/5b/44/b753997173327250e43ae50f11f0c69016b1e78482e0bd3857c3495236e7/ezdxf-1.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f093bd2228f5782d483aed3bd89cdb74b672b5f90c677c4125cd236ee5649151", size = 5861860, upload-time = "2026-05-14T09:27:15.758Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/0b/99/2e81cb168e0f09adfb05fb40e5f890ff87ac2c00e98079cf09837dd76330/ezdxf-1.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:3e518d9ed4dcbe525d57f14c25c5e592f82660a690fdec39b03b092e6cdc4771", size = 2963238, upload-time = "2026-05-14T09:23:47.924Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/be/ed/97aa3ba1ba923e4098169de5bca380ee1430e2b34d0dd85b73007e34df16/ezdxf-1.4.4-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:278a09a845d67a4f893aebe9ef8dcd8894ece9f255d7d8bb21719ffd902109b8", size = 3555283, upload-time = "2026-05-14T09:25:37.346Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/4e/b1/8ca9408a2b382a806837e72d35f10931fdd9f53fe66cf208a6340358fbc5/ezdxf-1.4.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b0a787f8ebcbdcb9798c6fcfe90c23afd1a0993c8d4302b6cce5d8f19ae052ae", size = 3012646, upload-time = "2026-05-14T09:25:39.01Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/8b/aa/1e8d3130eaabb780c5e8adfdc1ead023bb04468779b18169d60f7ce5b291/ezdxf-1.4.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c451d1c20f08b30c735ca4d650fee5b44147402f4b5662f8550053ed8a3009c2", size = 2999048, upload-time = "2026-05-14T09:25:40.348Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/cd/ca/1dd390b79df9c104c2d4b5964e80db25362edf704ac742c9db9b279658a5/ezdxf-1.4.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d3d9a6663993fc644751647fd7843057b51742ffac27c48ce28ea9f81239613", size = 5747890, upload-time = "2026-05-14T09:27:36.028Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/8f/1e/226a6e636ae533e0bc0afe4435d1058fac173564e4af4102862f055a46d9/ezdxf-1.4.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82c022cf094d21ad3db68557aa83628e4152355e8a8bef0fffd4f71a9ea325df", size = 5774707, upload-time = "2026-05-14T09:27:17.625Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/24/a3/7e33c9036de944b5446982bb629d698356e48b00c4d173768f52bdeeff4b/ezdxf-1.4.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3be59c2a3a93585412a2a37af29b3ad7574fa3e429e624924c3285d0573388b3", size = 5713753, upload-time = "2026-05-14T09:27:37.55Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/36/9e/ac0cdc3a8623fc38aa16670f6537aa810bc1381217a51ac3481299bbc986/ezdxf-1.4.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:44a9716860b59dddd49a3708c04ff4580ad1e7de92ac93bb3213d85fba5ac93f", size = 5813895, upload-time = "2026-05-14T09:27:19.514Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/dd/22/b511a8d9ea8f23447a67fe8977213fac5e4e69df30130a3ef31043613eaf/ezdxf-1.4.4-cp313-cp313-win_amd64.whl", hash = "sha256:207eed544417464ffaf2570880d58a792ecd2534c9c2dede45e895f3200b77e6", size = 2960937, upload-time = "2026-05-14T09:23:49.361Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/a0/09/5ecb6f82d35a2f4a4334d0a608fcf764827fa69dccdf5987ce309c16b6c1/ezdxf-1.4.4-py3-none-any.whl", hash = "sha256:666edda631ba717270293b734f5d58dd97a1d1aba4787187f09d0cc584645865", size = 1331217, upload-time = "2026-05-14T09:19:26.601Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fastapi"
|
name = "fastapi"
|
||||||
version = "0.136.1"
|
version = "0.136.1"
|
||||||
@@ -1079,8 +1118,8 @@ name = "numba"
|
|||||||
version = "0.67.0"
|
version = "0.67.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "llvmlite", marker = "python_full_version >= '3.13'" },
|
{ name = "llvmlite" },
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/7a/90/2544f4e3a61e501d6c9a5418fd4b905323222693d54a02cab0106a0af865/numba-0.67.0.tar.gz", hash = "sha256:cd75aa535b33fa05d9d930b1ae8af9f97a2881e96d72dfb38ec9b78284d9f851", size = 2836515, upload-time = "2026-08-11T23:04:00.174Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/7a/90/2544f4e3a61e501d6c9a5418fd4b905323222693d54a02cab0106a0af865/numba-0.67.0.tar.gz", hash = "sha256:cd75aa535b33fa05d9d930b1ae8af9f97a2881e96d72dfb38ec9b78284d9f851", size = 2836515, upload-time = "2026-08-11T23:04:00.174Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
@@ -1185,7 +1224,7 @@ name = "opencv-python"
|
|||||||
version = "5.0.0.93"
|
version = "5.0.0.93"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/79/4c/a438d23e09ce2033c09f7b784ad2fbdb0adf529e434101ed28f142226f98/opencv_python-5.0.0.93.tar.gz", hash = "sha256:66aac3e5b5faa48d4025816592f3af19e4bfc2c68dec067bae2dbb4ca10aa9e2", size = 81802749, upload-time = "2026-07-02T06:59:53.815Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/79/4c/a438d23e09ce2033c09f7b784ad2fbdb0adf529e434101ed28f142226f98/opencv_python-5.0.0.93.tar.gz", hash = "sha256:66aac3e5b5faa48d4025816592f3af19e4bfc2c68dec067bae2dbb4ca10aa9e2", size = 81802749, upload-time = "2026-07-02T06:59:53.815Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
@@ -1570,6 +1609,15 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
|
{ url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pyparsing"
|
||||||
|
version = "3.3.3"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/e4/11/b213bebff182584360cb8d17c72c1677fec5c5c228de439e63bcf8ab1c8f/pyparsing-3.3.3.tar.gz", hash = "sha256:928ae7e20211f3b6f3915a72f06a0cfd29ab9d24279dd6346b6b1a7146397d36", size = 1050487, upload-time = "2026-09-20T20:59:05.609Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/38/bb/d215ee7c73b61497b28a5503f9f53523f294fcc936762b7caf90e0c1c2b5/pyparsing-3.3.3-py3-none-any.whl", hash = "sha256:ece8c00a69cf01b45d0b1dedabb469c90d8caf996d4fda40f147627a122849a4", size = 126420, upload-time = "2026-09-20T20:59:04.025Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pypdfium2"
|
name = "pypdfium2"
|
||||||
version = "5.8.0"
|
version = "5.8.0"
|
||||||
@@ -1751,7 +1799,7 @@ name = "scipy"
|
|||||||
version = "1.18.0"
|
version = "1.18.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/a7/25/c2700dfaf6442b4effaa91af24ebce5dc9d31bb4a69706313aae70d72cd0/scipy-1.18.0.tar.gz", hash = "sha256:67b2ad2ad54c72ca6d04975a9b2df8c3638c34ddd5b28738e94fc2b57929d378", size = 30774447, upload-time = "2026-06-19T15:01:43.456Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/a7/25/c2700dfaf6442b4effaa91af24ebce5dc9d31bb4a69706313aae70d72cd0/scipy-1.18.0.tar.gz", hash = "sha256:67b2ad2ad54c72ca6d04975a9b2df8c3638c34ddd5b28738e94fc2b57929d378", size = 30774447, upload-time = "2026-06-19T15:01:43.456Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
@@ -1980,6 +2028,7 @@ vision = [
|
|||||||
{ name = "vs-measure", marker = "python_full_version >= '3.13'" },
|
{ name = "vs-measure", marker = "python_full_version >= '3.13'" },
|
||||||
{ name = "vs-pm2d", marker = "python_full_version >= '3.13'" },
|
{ name = "vs-pm2d", marker = "python_full_version >= '3.13'" },
|
||||||
{ name = "vs-task", marker = "python_full_version >= '3.13'" },
|
{ name = "vs-task", marker = "python_full_version >= '3.13'" },
|
||||||
|
{ name = "vs-tools", extra = ["dxf", "locate"], marker = "python_full_version >= '3.13'" },
|
||||||
]
|
]
|
||||||
vision-worker = [
|
vision-worker = [
|
||||||
{ name = "fastapi", marker = "python_full_version >= '3.13'" },
|
{ name = "fastapi", marker = "python_full_version >= '3.13'" },
|
||||||
@@ -1991,6 +2040,7 @@ vision-worker = [
|
|||||||
{ name = "vs-measure", marker = "python_full_version >= '3.13'" },
|
{ name = "vs-measure", marker = "python_full_version >= '3.13'" },
|
||||||
{ name = "vs-pm2d", marker = "python_full_version >= '3.13'" },
|
{ name = "vs-pm2d", marker = "python_full_version >= '3.13'" },
|
||||||
{ name = "vs-task", marker = "python_full_version >= '3.13'" },
|
{ name = "vs-task", marker = "python_full_version >= '3.13'" },
|
||||||
|
{ name = "vs-tools", extra = ["dxf", "locate"], marker = "python_full_version >= '3.13'" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
@@ -2032,6 +2082,7 @@ requires-dist = [
|
|||||||
{ name = "vs-measure", marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-measure" },
|
{ name = "vs-measure", marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-measure" },
|
||||||
{ name = "vs-pm2d", marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-pm2d" },
|
{ name = "vs-pm2d", marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-pm2d" },
|
||||||
{ name = "vs-task", marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-task" },
|
{ name = "vs-task", marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-task" },
|
||||||
|
{ name = "vs-tools", extras = ["locate", "dxf"], marker = "python_full_version >= '3.13' and extra == 'vision'", editable = "vendor/visionsuite/packages/vs-tools" },
|
||||||
{ name = "weasyprint", marker = "extra == 'server'", specifier = ">=62.0" },
|
{ name = "weasyprint", marker = "extra == 'server'", specifier = ">=62.0" },
|
||||||
]
|
]
|
||||||
provides-extras = ["server", "client", "dev", "vision", "vision-worker"]
|
provides-extras = ["server", "client", "dev", "vision", "vision-worker"]
|
||||||
@@ -2157,8 +2208,14 @@ name = "visionsuite"
|
|||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = { editable = "vendor/visionsuite/packages/vs-core" }
|
source = { editable = "vendor/visionsuite/packages/vs-core" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
{ name = "opencv-python", marker = "python_full_version >= '3.13'" },
|
{ name = "opencv-python" },
|
||||||
|
{ name = "pillow" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[package.optional-dependencies]
|
||||||
|
dxf = [
|
||||||
|
{ name = "ezdxf" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
@@ -2168,42 +2225,70 @@ requires-dist = [
|
|||||||
{ name = "numba", marker = "extra == 'fast'", specifier = ">=0.59" },
|
{ name = "numba", marker = "extra == 'fast'", specifier = ">=0.59" },
|
||||||
{ name = "numpy", specifier = ">=1.24" },
|
{ name = "numpy", specifier = ">=1.24" },
|
||||||
{ name = "opencv-python", specifier = ">=4.8" },
|
{ name = "opencv-python", specifier = ">=4.8" },
|
||||||
|
{ name = "pillow", specifier = ">=12.2.0" },
|
||||||
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
||||||
]
|
]
|
||||||
provides-extras = ["dev", "fast", "dxf"]
|
provides-extras = ["dev", "fast", "dxf"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "vs-dxf"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = { editable = "vendor/visionsuite/packages/vs-dxf" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "numpy" },
|
||||||
|
{ name = "opencv-python" },
|
||||||
|
{ name = "pydantic" },
|
||||||
|
{ name = "scipy" },
|
||||||
|
{ name = "visionsuite", extra = ["dxf"] },
|
||||||
|
{ name = "vs-measure" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[package.metadata]
|
||||||
|
requires-dist = [
|
||||||
|
{ name = "numpy", specifier = ">=1.26" },
|
||||||
|
{ name = "opencv-python", specifier = ">=4.9" },
|
||||||
|
{ name = "pydantic", specifier = ">=2.6" },
|
||||||
|
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=8.0" },
|
||||||
|
{ name = "pytest-cov", marker = "extra == 'dev'", specifier = ">=4.1" },
|
||||||
|
{ name = "scipy", specifier = ">=1.12" },
|
||||||
|
{ name = "visionsuite", extras = ["dxf"], editable = "vendor/visionsuite/packages/vs-core" },
|
||||||
|
{ name = "vs-measure", editable = "vendor/visionsuite/packages/vs-measure" },
|
||||||
|
]
|
||||||
|
provides-extras = ["dev"]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vs-measure"
|
name = "vs-measure"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = { editable = "vendor/visionsuite/packages/vs-measure" }
|
source = { editable = "vendor/visionsuite/packages/vs-measure" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
{ name = "scipy", marker = "python_full_version >= '3.13'" },
|
{ name = "scipy" },
|
||||||
{ name = "visionsuite", marker = "python_full_version >= '3.13'" },
|
{ name = "visionsuite" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
|
{ name = "numba", marker = "extra == 'fast'", specifier = ">=0.59" },
|
||||||
{ name = "numpy", specifier = ">=1.24" },
|
{ name = "numpy", specifier = ">=1.24" },
|
||||||
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
||||||
{ name = "scipy", specifier = ">=1.11" },
|
{ name = "scipy", specifier = ">=1.11" },
|
||||||
{ name = "visionsuite", editable = "vendor/visionsuite/packages/vs-core" },
|
{ name = "visionsuite", editable = "vendor/visionsuite/packages/vs-core" },
|
||||||
]
|
]
|
||||||
provides-extras = ["dev"]
|
provides-extras = ["dev", "fast"]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vs-pm2d"
|
name = "vs-pm2d"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = { editable = "vendor/visionsuite/packages/vs-pm2d" }
|
source = { editable = "vendor/visionsuite/packages/vs-pm2d" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "fastapi", marker = "python_full_version >= '3.13'" },
|
{ name = "fastapi" },
|
||||||
{ name = "numba", marker = "python_full_version >= '3.13'" },
|
{ name = "numba" },
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
{ name = "opencv-python", marker = "python_full_version >= '3.13'" },
|
{ name = "opencv-python" },
|
||||||
{ name = "pillow", marker = "python_full_version >= '3.13'" },
|
{ name = "pillow" },
|
||||||
{ name = "python-multipart", marker = "python_full_version >= '3.13'" },
|
{ name = "python-multipart" },
|
||||||
{ name = "uvicorn", extra = ["standard"], marker = "python_full_version >= '3.13'" },
|
{ name = "uvicorn", extra = ["standard"] },
|
||||||
{ name = "visionsuite", marker = "python_full_version >= '3.13'" },
|
{ name = "visionsuite" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
@@ -2226,19 +2311,54 @@ name = "vs-task"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = { editable = "vendor/visionsuite/packages/vs-task" }
|
source = { editable = "vendor/visionsuite/packages/vs-task" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "numpy", marker = "python_full_version >= '3.13'" },
|
{ name = "numpy" },
|
||||||
{ name = "visionsuite", marker = "python_full_version >= '3.13'" },
|
{ name = "visionsuite" },
|
||||||
{ name = "vs-measure", marker = "python_full_version >= '3.13'" },
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
|
{ name = "fastapi", marker = "extra == 'server'", specifier = ">=0.132" },
|
||||||
|
{ name = "httpx", marker = "extra == 'dev'", specifier = ">=0.27" },
|
||||||
|
{ name = "numpy", specifier = ">=1.24" },
|
||||||
|
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
||||||
|
{ name = "uvicorn", marker = "extra == 'server'", specifier = ">=0.34" },
|
||||||
|
{ name = "visionsuite", editable = "vendor/visionsuite/packages/vs-core" },
|
||||||
|
{ name = "vs-stat", marker = "extra == 'stat'", editable = "vendor/visionsuite/packages/vs-stat" },
|
||||||
|
]
|
||||||
|
provides-extras = ["dev", "stat", "server"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "vs-tools"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = { editable = "vendor/visionsuite/packages/vs-tools" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "numpy" },
|
||||||
|
{ name = "visionsuite" },
|
||||||
|
{ name = "vs-measure" },
|
||||||
|
{ name = "vs-task" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[package.optional-dependencies]
|
||||||
|
dxf = [
|
||||||
|
{ name = "vs-dxf" },
|
||||||
|
]
|
||||||
|
locate = [
|
||||||
|
{ name = "vs-pm2d" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[package.metadata]
|
||||||
|
requires-dist = [
|
||||||
|
{ name = "ezdxf", marker = "extra == 'dev'", specifier = ">=1.0" },
|
||||||
{ name = "numpy", specifier = ">=1.24" },
|
{ name = "numpy", specifier = ">=1.24" },
|
||||||
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=7" },
|
||||||
{ name = "visionsuite", editable = "vendor/visionsuite/packages/vs-core" },
|
{ name = "visionsuite", editable = "vendor/visionsuite/packages/vs-core" },
|
||||||
|
{ name = "vs-dxf", marker = "extra == 'dxf'", editable = "vendor/visionsuite/packages/vs-dxf" },
|
||||||
{ name = "vs-measure", editable = "vendor/visionsuite/packages/vs-measure" },
|
{ name = "vs-measure", editable = "vendor/visionsuite/packages/vs-measure" },
|
||||||
|
{ name = "vs-pm2d", marker = "extra == 'locate'", editable = "vendor/visionsuite/packages/vs-pm2d" },
|
||||||
|
{ name = "vs-task", editable = "vendor/visionsuite/packages/vs-task" },
|
||||||
|
{ name = "vs-tools", extras = ["locate", "dxf"], marker = "extra == 'dev'", editable = "vendor/visionsuite/packages/vs-tools" },
|
||||||
]
|
]
|
||||||
provides-extras = ["dev"]
|
provides-extras = ["locate", "dxf", "dev"]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "watchfiles"
|
name = "watchfiles"
|
||||||
|
|||||||
Vendored
+1
-1
Submodule vendor/visionsuite updated: f095fcc254...bc0df1667c
Reference in New Issue
Block a user