Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 787575807d |
@@ -14,7 +14,6 @@ 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,7 +14,6 @@ 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
|
||||||
|
|||||||
@@ -9,8 +9,7 @@ from src.backend.database import get_db
|
|||||||
from src.backend.config import settings
|
from src.backend.config import settings
|
||||||
from src.backend.models.orm.api_key import ApiKey
|
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.services.auth_service import hash_api_key, utcnow
|
||||||
from src.backend.utils.tempo import utcnow
|
|
||||||
|
|
||||||
_RENEW_INTERVAL = timedelta(minutes=5)
|
_RENEW_INTERVAL = timedelta(minutes=5)
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
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
|
||||||
@@ -234,8 +232,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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
@@ -292,8 +290,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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
@@ -374,7 +372,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,
|
||||||
iso_utc(m.measured_at),
|
m.measured_at.isoformat(),
|
||||||
m.synced_to_csv,
|
m.synced_to_csv,
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -384,6 +382,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_{to_local(utcnow()).strftime('%Y%m%d_%H%M%S')}.csv"
|
"Content-Disposition": f"attachment; filename=measurements_{datetime.now().strftime('%Y%m%d_%H%M%S')}.csv"
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -20,8 +20,7 @@ from src.backend.models.api.production import (
|
|||||||
)
|
)
|
||||||
from src.backend.models.orm.production import ProductionRun
|
from src.backend.models.orm.production import ProductionRun
|
||||||
from src.backend.models.orm.user import User
|
from src.backend.models.orm.user import User
|
||||||
from src.backend.models.api.monitor import MonitorRun
|
from src.backend.services import auth_service, production_service
|
||||||
from src.backend.services import auth_service, monitor_service, production_service
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/production-runs", tags=["production"])
|
router = APIRouter(prefix="/api/production-runs", tags=["production"])
|
||||||
|
|
||||||
@@ -82,27 +81,6 @@ async def get_current_production_run(
|
|||||||
return await _as_response(db, run) if run is not None else None
|
return await _as_response(db, run) if run is not None else None
|
||||||
|
|
||||||
|
|
||||||
async def _require_high_authority(user: User = Depends(get_current_user)) -> User:
|
|
||||||
"""Monitor of all stations (#57): admin or Supervisor (capoturno) only."""
|
|
||||||
if user.is_admin or user.has_role("Supervisor"):
|
|
||||||
return user
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_403_FORBIDDEN, detail="Supervisor role required",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/open", response_model=list[MonitorRun])
|
|
||||||
async def list_open_production_runs(
|
|
||||||
user: User = Depends(_require_high_authority),
|
|
||||||
db: AsyncSession = Depends(get_db),
|
|
||||||
):
|
|
||||||
"""Every open run with timer, last event and recent measurements (#57).
|
|
||||||
|
|
||||||
Declared before /{run_id} so "open" is not parsed as a run id.
|
|
||||||
"""
|
|
||||||
return await monitor_service.list_open_runs(db)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{run_id}", response_model=ProductionRunWithEventsResponse)
|
@router.get("/{run_id}", response_model=ProductionRunWithEventsResponse)
|
||||||
async def get_production_run(
|
async def get_production_run(
|
||||||
run_id: int,
|
run_id: int,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Reports router — PDF report generation endpoints for Metrologist."""
|
"""Reports router — PDF report generation endpoints for Metrologist."""
|
||||||
from src.backend.models.api.tipi import UtcNaiveInput
|
from datetime import datetime
|
||||||
|
|
||||||
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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ NOT protected by API Key auth (standalone access).
|
|||||||
import hmac
|
import hmac
|
||||||
import random
|
import random
|
||||||
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
|
||||||
@@ -556,7 +555,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 = utcnow()
|
base_date = datetime.now()
|
||||||
|
|
||||||
all_subtasks = subtasks_1 + subtasks_2
|
all_subtasks = subtasks_1 + subtasks_2
|
||||||
measurements_created = 0
|
measurements_created = 0
|
||||||
@@ -604,8 +603,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": iso_utc(u.created_at) or None,
|
"created_at": u.created_at.isoformat() if u.created_at else None,
|
||||||
"last_login": iso_utc(u.last_login) or None,
|
"last_login": u.last_login.isoformat() if u.last_login else None,
|
||||||
}
|
}
|
||||||
for u in users
|
for u in users
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
"""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
|
||||||
@@ -101,8 +100,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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
@@ -123,8 +122,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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
@@ -146,8 +145,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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
@@ -173,8 +172,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: UtcNaiveInput = Query(None),
|
date_from: datetime | None = Query(None),
|
||||||
date_to: UtcNaiveInput = Query(None),
|
date_to: datetime | None = 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),
|
||||||
|
|||||||
@@ -28,9 +28,6 @@ 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
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for Measurement operations."""
|
"""Pydantic schemas for Measurement operations."""
|
||||||
from src.backend.models.api.tipi import UtcDateTime, UtcNaiveInput
|
from datetime import datetime
|
||||||
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[UtcDateTime] = None
|
authorised_at: Optional[datetime] = None
|
||||||
measured_at: UtcDateTime
|
measured_at: datetime
|
||||||
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: UtcDateTime
|
measured_at: datetime
|
||||||
|
|
||||||
|
|
||||||
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: UtcNaiveInput = None
|
date_from: Optional[datetime] = None
|
||||||
date_to: UtcNaiveInput = None
|
date_to: Optional[datetime] = 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,49 +0,0 @@
|
|||||||
"""API models for the live station monitor (#57)."""
|
|
||||||
from datetime import datetime
|
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
from pydantic import BaseModel
|
|
||||||
|
|
||||||
|
|
||||||
class MonitorSubtask(BaseModel):
|
|
||||||
"""Mean of the recent measurements of one quote, against its tolerance."""
|
|
||||||
|
|
||||||
subtask_id: int
|
|
||||||
description: str
|
|
||||||
unit: str
|
|
||||||
count: int
|
|
||||||
mean: float
|
|
||||||
ltl: Optional[float] = None
|
|
||||||
utl: Optional[float] = None
|
|
||||||
# True when ltl <= mean <= utl (a missing limit does not constrain).
|
|
||||||
in_tolerance: bool
|
|
||||||
|
|
||||||
|
|
||||||
class MonitorEvent(BaseModel):
|
|
||||||
event_type: str
|
|
||||||
created_at: datetime
|
|
||||||
note: Optional[str] = None
|
|
||||||
|
|
||||||
|
|
||||||
class MonitorRun(BaseModel):
|
|
||||||
id: int
|
|
||||||
station_code: str
|
|
||||||
station_name: str
|
|
||||||
recipe_code: str
|
|
||||||
recipe_name: str
|
|
||||||
version_number: int
|
|
||||||
operator: str
|
|
||||||
status: str
|
|
||||||
started_at: datetime
|
|
||||||
duration_seconds: int
|
|
||||||
cycle_count: int
|
|
||||||
seconds_to_next_measurement: Optional[int] = None
|
|
||||||
overdue: bool
|
|
||||||
last_event: Optional[MonitorEvent] = None
|
|
||||||
# Counts over the last MONITOR_WINDOW measurements of the run.
|
|
||||||
measured: int
|
|
||||||
pass_count: int
|
|
||||||
warning_count: int
|
|
||||||
fail_count: int
|
|
||||||
subtasks: list[MonitorSubtask]
|
|
||||||
server_time: datetime
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for production runs and their events."""
|
"""Pydantic schemas for production runs and their events."""
|
||||||
from src.backend.models.api.tipi import UtcDateTime
|
from datetime import datetime
|
||||||
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: UtcDateTime
|
created_at: datetime
|
||||||
|
|
||||||
|
|
||||||
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[UtcDateTime]
|
next_measurement_at: Optional[datetime]
|
||||||
cycle_count: int
|
cycle_count: int
|
||||||
started_at: UtcDateTime
|
started_at: datetime
|
||||||
paused_at: Optional[UtcDateTime]
|
paused_at: Optional[datetime]
|
||||||
closed_at: Optional[UtcDateTime]
|
closed_at: Optional[datetime]
|
||||||
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[UtcDateTime] = None
|
server_time: Optional[datetime] = 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 src.backend.models.api.tipi import UtcDateTime
|
from datetime import datetime
|
||||||
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: UtcDateTime
|
created_at: datetime
|
||||||
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: UtcDateTime
|
created_at: datetime
|
||||||
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 src.backend.models.api.tipi import UtcDateTime
|
from datetime import datetime
|
||||||
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: UtcDateTime
|
created_at: datetime
|
||||||
|
|
||||||
|
|
||||||
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: UtcDateTime
|
assigned_at: datetime
|
||||||
|
|
||||||
|
|
||||||
class RecipeSummary(BaseModel):
|
class RecipeSummary(BaseModel):
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"""Pydantic schemas for SPC statistics responses."""
|
"""Pydantic schemas for SPC statistics responses."""
|
||||||
from src.backend.models.api.tipi import UtcDateTime, UtcNaiveInput
|
from datetime import datetime
|
||||||
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: UtcNaiveInput = None
|
date_from: Optional[datetime] = None
|
||||||
date_to: UtcNaiveInput = None
|
date_to: Optional[datetime] = 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[UtcDateTime]
|
timestamps: list[datetime]
|
||||||
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[UtcDateTime]
|
dates: list[datetime]
|
||||||
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]
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
"""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 src.backend.models.api.tipi import UtcDateTime
|
from datetime import datetime
|
||||||
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: UtcDateTime
|
created_at: datetime
|
||||||
last_login: Optional[UtcDateTime] = None
|
last_login: Optional[datetime] = 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 src.backend.models.api.tipi import UtcDateTime
|
from datetime import datetime
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict
|
from pydantic import BaseModel, ConfigDict
|
||||||
|
|
||||||
@@ -28,4 +28,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: UtcDateTime
|
acquired_at: datetime
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
"""Authentication service - password hashing, API key management."""
|
"""Authentication service - password hashing, API key management."""
|
||||||
import hashlib
|
import hashlib
|
||||||
import secrets
|
import secrets
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta, timezone
|
||||||
from src.backend.utils.tempo import utcnow
|
|
||||||
|
|
||||||
import bcrypt
|
import bcrypt
|
||||||
from fastapi import HTTPException, status
|
from fastapi import HTTPException, status
|
||||||
@@ -79,6 +78,11 @@ async def authorise_supervisor(db: AsyncSession, username: str, password: str) -
|
|||||||
return supervisor
|
return supervisor
|
||||||
|
|
||||||
|
|
||||||
|
def utcnow() -> datetime:
|
||||||
|
"""Naive UTC now (the whole DB moves to naive UTC, #42)."""
|
||||||
|
return datetime.now(timezone.utc).replace(tzinfo=None)
|
||||||
|
|
||||||
|
|
||||||
def hash_api_key(key: str) -> str:
|
def hash_api_key(key: str) -> str:
|
||||||
"""SHA-256 hex digest of an API key; this is all the DB ever stores."""
|
"""SHA-256 hex digest of an API key; this is all the DB ever stores."""
|
||||||
return hashlib.sha256(key.encode("utf-8")).hexdigest()
|
return hashlib.sha256(key.encode("utf-8")).hexdigest()
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
"""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
|
||||||
|
|
||||||
@@ -344,7 +343,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 = utcnow()
|
measurement.authorised_at = datetime.now()
|
||||||
await db.flush()
|
await db.flush()
|
||||||
await db.refresh(measurement)
|
await db.refresh(measurement)
|
||||||
return measurement
|
return measurement
|
||||||
|
|||||||
@@ -1,133 +0,0 @@
|
|||||||
"""Live monitor of the open production runs (#57).
|
|
||||||
|
|
||||||
One query per table, whatever the number of runs: measurements and last events are
|
|
||||||
ranked per run with a window function and cut in the database, not in a loop.
|
|
||||||
"""
|
|
||||||
from collections import defaultdict
|
|
||||||
|
|
||||||
from sqlalchemy import func, select
|
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
|
||||||
|
|
||||||
from src.backend.models.api.monitor import MonitorEvent, MonitorRun, MonitorSubtask
|
|
||||||
from src.backend.models.orm.measurement import Measurement
|
|
||||||
from src.backend.models.orm.production import ProductionEvent, ProductionRun
|
|
||||||
from src.backend.models.orm.task import RecipeSubtask
|
|
||||||
from src.backend.models.orm.user import User
|
|
||||||
from src.backend.services import production_service
|
|
||||||
|
|
||||||
# Recent measurements per run that feed counts and means (#57: last N).
|
|
||||||
MONITOR_WINDOW = 20
|
|
||||||
|
|
||||||
|
|
||||||
def _in_tolerance(mean: float, ltl, utl) -> bool:
|
|
||||||
# A missing limit does not constrain.
|
|
||||||
if ltl is not None and mean < float(ltl):
|
|
||||||
return False
|
|
||||||
if utl is not None and mean > float(utl):
|
|
||||||
return False
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
async def list_open_runs(db: AsyncSession) -> list[MonitorRun]:
|
|
||||||
runs = (await db.execute(
|
|
||||||
select(ProductionRun)
|
|
||||||
.where(ProductionRun.status.in_(("running", "paused")))
|
|
||||||
.order_by(ProductionRun.started_at)
|
|
||||||
)).scalars().all()
|
|
||||||
if not runs:
|
|
||||||
return []
|
|
||||||
run_ids = [r.id for r in runs]
|
|
||||||
|
|
||||||
# Operators: one query.
|
|
||||||
users = {
|
|
||||||
u.id: u for u in (await db.execute(
|
|
||||||
select(User).where(User.id.in_({r.operator_id for r in runs}))
|
|
||||||
)).scalars().all()
|
|
||||||
}
|
|
||||||
|
|
||||||
# Last event per run: rank desc inside the run, keep rank 1.
|
|
||||||
ev_rank = func.row_number().over(
|
|
||||||
partition_by=ProductionEvent.run_id,
|
|
||||||
order_by=(ProductionEvent.created_at.desc(), ProductionEvent.id.desc()),
|
|
||||||
).label("rn")
|
|
||||||
ev_sub = select(
|
|
||||||
ProductionEvent.run_id.label("run_id"),
|
|
||||||
ProductionEvent.event_type.label("event_type"),
|
|
||||||
ProductionEvent.created_at.label("created_at"),
|
|
||||||
ProductionEvent.note.label("note"),
|
|
||||||
ev_rank,
|
|
||||||
).where(ProductionEvent.run_id.in_(run_ids)).subquery()
|
|
||||||
ev_rows = (await db.execute(
|
|
||||||
select(ev_sub.c.run_id, ev_sub.c.event_type, ev_sub.c.created_at, ev_sub.c.note)
|
|
||||||
.where(ev_sub.c.rn == 1)
|
|
||||||
)).all()
|
|
||||||
last_event = {r.run_id: r for r in ev_rows}
|
|
||||||
|
|
||||||
# Last N measurements per run, joined to their subtask for the limits.
|
|
||||||
m_rank = func.row_number().over(
|
|
||||||
partition_by=Measurement.production_run_id,
|
|
||||||
order_by=(Measurement.measured_at.desc(), Measurement.id.desc()),
|
|
||||||
).label("rn")
|
|
||||||
m_sub = select(
|
|
||||||
Measurement.production_run_id.label("run_id"),
|
|
||||||
Measurement.subtask_id.label("subtask_id"),
|
|
||||||
Measurement.value.label("value"),
|
|
||||||
Measurement.pass_fail.label("pass_fail"),
|
|
||||||
m_rank,
|
|
||||||
).where(Measurement.production_run_id.in_(run_ids)).subquery()
|
|
||||||
m_rows = (await db.execute(
|
|
||||||
select(
|
|
||||||
m_sub.c.run_id, m_sub.c.subtask_id, m_sub.c.value, m_sub.c.pass_fail,
|
|
||||||
RecipeSubtask.description, RecipeSubtask.unit,
|
|
||||||
RecipeSubtask.ltl, RecipeSubtask.utl,
|
|
||||||
)
|
|
||||||
.join(RecipeSubtask, RecipeSubtask.id == m_sub.c.subtask_id)
|
|
||||||
.where(m_sub.c.rn <= MONITOR_WINDOW)
|
|
||||||
)).all()
|
|
||||||
by_run = defaultdict(list)
|
|
||||||
for row in m_rows:
|
|
||||||
by_run[row.run_id].append(row)
|
|
||||||
|
|
||||||
result = []
|
|
||||||
for run in runs:
|
|
||||||
rows = by_run.get(run.id, [])
|
|
||||||
per_sub: dict[int, list] = defaultdict(list)
|
|
||||||
for row in rows:
|
|
||||||
per_sub[row.subtask_id].append(row)
|
|
||||||
subtasks = []
|
|
||||||
for sid, group in sorted(per_sub.items()):
|
|
||||||
mean = sum(float(g.value) for g in group) / len(group)
|
|
||||||
first = group[0]
|
|
||||||
subtasks.append(MonitorSubtask(
|
|
||||||
subtask_id=sid, description=first.description, unit=first.unit,
|
|
||||||
count=len(group), mean=round(mean, 6),
|
|
||||||
ltl=float(first.ltl) if first.ltl is not None else None,
|
|
||||||
utl=float(first.utl) if first.utl is not None else None,
|
|
||||||
in_tolerance=_in_tolerance(mean, first.ltl, first.utl),
|
|
||||||
))
|
|
||||||
timer = production_service.describe(run)
|
|
||||||
ev = last_event.get(run.id)
|
|
||||||
operator = users.get(run.operator_id)
|
|
||||||
result.append(MonitorRun(
|
|
||||||
id=run.id,
|
|
||||||
station_code=run.station.code, station_name=run.station.name,
|
|
||||||
recipe_code=run.recipe.code, recipe_name=run.recipe.name,
|
|
||||||
version_number=run.version.version_number,
|
|
||||||
operator=(operator.display_name or operator.username) if operator else "",
|
|
||||||
status=run.status,
|
|
||||||
started_at=run.started_at,
|
|
||||||
duration_seconds=max(0, int((timer["server_time"] - run.started_at).total_seconds())),
|
|
||||||
cycle_count=run.cycle_count,
|
|
||||||
seconds_to_next_measurement=timer["seconds_to_next_measurement"],
|
|
||||||
overdue=timer["overdue"],
|
|
||||||
last_event=MonitorEvent(
|
|
||||||
event_type=ev.event_type, created_at=ev.created_at, note=ev.note,
|
|
||||||
) if ev else None,
|
|
||||||
measured=len(rows),
|
|
||||||
pass_count=sum(1 for g in rows if g.pass_fail == "pass"),
|
|
||||||
warning_count=sum(1 for g in rows if g.pass_fail == "warning"),
|
|
||||||
fail_count=sum(1 for g in rows if g.pass_fail == "fail"),
|
|
||||||
subtasks=subtasks,
|
|
||||||
server_time=timer["server_time"],
|
|
||||||
))
|
|
||||||
return result
|
|
||||||
@@ -14,7 +14,6 @@ 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
|
||||||
@@ -170,9 +169,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,
|
||||||
iso_utc(measurement.measured_at),
|
measurement.measured_at.isoformat() if measurement.measured_at else "",
|
||||||
measurement.supervisor_id or "",
|
measurement.supervisor_id or "",
|
||||||
iso_utc(measurement.authorised_at),
|
measurement.authorised_at.isoformat() if measurement.authorised_at else "",
|
||||||
])
|
])
|
||||||
|
|
||||||
return output.getvalue()
|
return output.getvalue()
|
||||||
@@ -192,7 +191,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 = to_local(run.closed_at or utcnow()).strftime("%Y%m%d_%H%M%S")
|
stamp = (run.closed_at or datetime.now()).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,7 +14,6 @@ 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
|
||||||
@@ -35,10 +34,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 UTC, matching what the database writes for ``func.now()`` defaults,
|
Naive local time, 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 utcnow()
|
return datetime.now()
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
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
|
||||||
@@ -33,11 +32,6 @@ _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,
|
||||||
@@ -329,9 +323,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: {_giorno_locale(date_from)}")
|
filters_desc.append(f"From: {date_from.strftime('%Y-%m-%d')}")
|
||||||
if date_to:
|
if date_to:
|
||||||
filters_desc.append(f"To: {_giorno_locale(date_to)}")
|
filters_desc.append(f"To: {date_to.strftime('%Y-%m-%d')}")
|
||||||
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:
|
||||||
@@ -348,7 +342,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=to_local(utcnow()),
|
generated_at=datetime.now(),
|
||||||
n_measurements=len(measurements),
|
n_measurements=len(measurements),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -401,7 +395,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": to_local(m.measured_at).strftime("%Y-%m-%d %H:%M"),
|
"measured_at": 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 "—",
|
||||||
@@ -420,9 +414,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: {_giorno_locale(date_from)}")
|
filters_desc.append(f"From: {date_from.strftime('%Y-%m-%d')}")
|
||||||
if date_to:
|
if date_to:
|
||||||
filters_desc.append(f"To: {_giorno_locale(date_to)}")
|
filters_desc.append(f"To: {date_to.strftime('%Y-%m-%d')}")
|
||||||
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:
|
||||||
@@ -436,7 +430,7 @@ async def generate_measurement_report(
|
|||||||
rows=rows,
|
rows=rows,
|
||||||
summary=summary,
|
summary=summary,
|
||||||
filters_desc=filters_desc,
|
filters_desc=filters_desc,
|
||||||
generated_at=to_local(utcnow()),
|
generated_at=datetime.now(),
|
||||||
n_measurements=len(measurements),
|
n_measurements=len(measurements),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
"""GET /api/production-runs/open - live monitor of the open runs (#57)."""
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
|
|
||||||
from sqlalchemy import select
|
|
||||||
|
|
||||||
from src.backend.models.orm.measurement import Measurement
|
|
||||||
from src.backend.models.orm.production import ProductionEvent, ProductionRun
|
|
||||||
from src.backend.models.orm.station import Station
|
|
||||||
from src.backend.models.orm.task import RecipeSubtask, RecipeTask
|
|
||||||
from src.backend.tests.conftest import _create_user, auth_headers, create_test_recipe
|
|
||||||
|
|
||||||
|
|
||||||
async def _run(db, user, code, status="running", overdue=False, open_=True):
|
|
||||||
"""A station plus a run on a fresh recipe (limits ltl 9.5 / utl 10.5)."""
|
|
||||||
station = Station(code=f"ST-{code}", name=f"Linea {code}", active=True, created_by=user.id)
|
|
||||||
db.add(station)
|
|
||||||
recipe = await create_test_recipe(db, user_id=user.id, code=f"REC-{code}")
|
|
||||||
await db.flush()
|
|
||||||
version = recipe.versions[0]
|
|
||||||
now = datetime.utcnow()
|
|
||||||
run = ProductionRun(
|
|
||||||
station_id=station.id, recipe_id=recipe.id, version_id=version.id,
|
|
||||||
operator_id=user.id, status=status if open_ else "closed",
|
|
||||||
started_at=now - timedelta(hours=1),
|
|
||||||
measurement_interval_minutes=30,
|
|
||||||
next_measurement_at=now + (timedelta(minutes=-5) if overdue else timedelta(minutes=20)),
|
|
||||||
cycle_count=3,
|
|
||||||
active_station_id=station.id if open_ else None,
|
|
||||||
)
|
|
||||||
db.add(run)
|
|
||||||
await db.flush()
|
|
||||||
db.add(ProductionEvent(run_id=run.id, event_type="start", user_id=user.id))
|
|
||||||
sub = (await db.execute(
|
|
||||||
select(RecipeSubtask).join(RecipeTask, RecipeTask.id == RecipeSubtask.task_id)
|
|
||||||
.where(RecipeTask.version_id == version.id)
|
|
||||||
)).scalars().first()
|
|
||||||
return run, sub, version
|
|
||||||
|
|
||||||
|
|
||||||
def _m(run, sub, version, user, value, pf, minutes=0):
|
|
||||||
return Measurement(
|
|
||||||
subtask_id=sub.id, version_id=version.id, measured_by=user.id, value=value,
|
|
||||||
pass_fail=pf, production_run_id=run.id,
|
|
||||||
measured_at=datetime.utcnow() - timedelta(minutes=minutes),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def test_open_requires_high_authority(client, db_session, measurement_tec_user):
|
|
||||||
resp = await client.get("/api/production-runs/open", headers=auth_headers(measurement_tec_user))
|
|
||||||
assert resp.status_code == 403
|
|
||||||
|
|
||||||
|
|
||||||
async def test_open_lists_only_open_runs_with_means(client, db_session, admin_user):
|
|
||||||
sup = await _create_user(db_session, "capo", roles=["Supervisor"])
|
|
||||||
r1, s1, v1 = await _run(db_session, admin_user, "A", overdue=True)
|
|
||||||
r2, s2, v2 = await _run(db_session, admin_user, "B", status="paused")
|
|
||||||
await _run(db_session, admin_user, "C", open_=False)
|
|
||||||
# Run A: mean 10.0 (inside), run B: mean 10.8 (outside, one fail).
|
|
||||||
for i, (val, pf) in enumerate([(9.9, "pass"), (10.1, "pass")]):
|
|
||||||
db_session.add(_m(r1, s1, v1, admin_user, val, pf, i))
|
|
||||||
for i, (val, pf) in enumerate([(10.6, "fail"), (11.0, "fail"), (10.8, "warning")]):
|
|
||||||
db_session.add(_m(r2, s2, v2, admin_user, val, pf, i))
|
|
||||||
await db_session.commit()
|
|
||||||
|
|
||||||
resp = await client.get("/api/production-runs/open", headers=auth_headers(sup))
|
|
||||||
assert resp.status_code == 200
|
|
||||||
body = {r["station_code"]: r for r in resp.json()}
|
|
||||||
assert set(body) == {"ST-A", "ST-B"} # closed run C is absent
|
|
||||||
a, b = body["ST-A"], body["ST-B"]
|
|
||||||
assert a["overdue"] is True and a["seconds_to_next_measurement"] < 0
|
|
||||||
assert b["overdue"] is False and b["status"] == "paused"
|
|
||||||
assert a["duration_seconds"] >= 3600 and a["cycle_count"] == 3
|
|
||||||
assert a["last_event"]["event_type"] == "start"
|
|
||||||
assert a["pass_count"] == 2 and a["fail_count"] == 0
|
|
||||||
assert a["subtasks"][0]["mean"] == 10.0 and a["subtasks"][0]["in_tolerance"] is True
|
|
||||||
assert b["fail_count"] == 2 and b["warning_count"] == 1
|
|
||||||
assert round(b["subtasks"][0]["mean"], 3) == 10.8
|
|
||||||
assert b["subtasks"][0]["in_tolerance"] is False
|
|
||||||
|
|
||||||
|
|
||||||
async def test_open_empty_for_admin(client, admin_user):
|
|
||||||
resp = await client.get("/api/production-runs/open", headers=auth_headers(admin_user))
|
|
||||||
assert resp.status_code == 200 and resp.json() == []
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
"""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"
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
"""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))
|
|
||||||
@@ -74,14 +74,12 @@ def create_app() -> Flask:
|
|||||||
from blueprints.maker import maker_bp
|
from blueprints.maker import maker_bp
|
||||||
from blueprints.statistics import statistics_bp
|
from blueprints.statistics import statistics_bp
|
||||||
from blueprints.admin import admin_bp
|
from blueprints.admin import admin_bp
|
||||||
from blueprints.monitor import monitor_bp # #57 live station monitor
|
|
||||||
|
|
||||||
app.register_blueprint(auth_bp)
|
app.register_blueprint(auth_bp)
|
||||||
app.register_blueprint(measure_bp, url_prefix="/measure")
|
app.register_blueprint(measure_bp, url_prefix="/measure")
|
||||||
app.register_blueprint(maker_bp, url_prefix="/maker")
|
app.register_blueprint(maker_bp, url_prefix="/maker")
|
||||||
app.register_blueprint(statistics_bp, url_prefix="/statistics")
|
app.register_blueprint(statistics_bp, url_prefix="/statistics")
|
||||||
app.register_blueprint(admin_bp, url_prefix="/admin")
|
app.register_blueprint(admin_bp, url_prefix="/admin")
|
||||||
app.register_blueprint(monitor_bp, url_prefix="/monitor") # #57
|
|
||||||
|
|
||||||
@app.before_request
|
@app.before_request
|
||||||
def _check_secret_key():
|
def _check_secret_key():
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
"""Live monitor of the open production runs (#57).
|
|
||||||
|
|
||||||
Page at /monitor for admin and Supervisor (capoturno); the page polls a JSON proxy
|
|
||||||
of GET /api/production-runs/open every 10 seconds.
|
|
||||||
"""
|
|
||||||
from functools import wraps
|
|
||||||
|
|
||||||
from flask import Blueprint, abort, jsonify, render_template, session
|
|
||||||
|
|
||||||
from blueprints.auth import login_required
|
|
||||||
from services.api_client import api_client
|
|
||||||
|
|
||||||
monitor_bp = Blueprint("monitor", __name__)
|
|
||||||
|
|
||||||
|
|
||||||
def monitor_required(f):
|
|
||||||
"""Admin or Supervisor only: the same people the backend lets read /open."""
|
|
||||||
@wraps(f)
|
|
||||||
def decorated(*args, **kwargs):
|
|
||||||
user = session.get("user", {})
|
|
||||||
if not (user.get("is_admin") or "Supervisor" in user.get("roles", [])):
|
|
||||||
abort(403)
|
|
||||||
return f(*args, **kwargs)
|
|
||||||
return decorated
|
|
||||||
|
|
||||||
|
|
||||||
@monitor_bp.route("", strict_slashes=False)
|
|
||||||
@login_required
|
|
||||||
@monitor_required
|
|
||||||
def index():
|
|
||||||
return render_template("monitor/index.html")
|
|
||||||
|
|
||||||
|
|
||||||
@monitor_bp.route("/api/runs")
|
|
||||||
@login_required
|
|
||||||
@monitor_required
|
|
||||||
def api_runs():
|
|
||||||
"""JSON proxy polled by the page."""
|
|
||||||
resp = api_client.get("/api/production-runs/open")
|
|
||||||
if isinstance(resp, dict) and resp.get("error"):
|
|
||||||
body = {"error": True, "detail": resp.get("detail", "")}
|
|
||||||
if resp.get("session_expired"):
|
|
||||||
body["session_expired"] = True
|
|
||||||
return jsonify(body), resp.get("status_code", 500)
|
|
||||||
return jsonify(resp)
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block title %}{{ _("Monitor stazioni") }} — TieMeasureFlow{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="tmf-page" x-data="stationMonitor()" x-init="init()">
|
|
||||||
<div class="mb-6 flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 class="text-2xl font-bold text-[var(--text-primary)]">{{ _("Monitor stazioni") }}</h1>
|
|
||||||
<p class="text-sm text-steel mt-1">{{ _("Produzioni aperte, aggiornate ogni 10 secondi") }}</p>
|
|
||||||
</div>
|
|
||||||
<div class="text-xs text-steel" x-text="updatedLabel"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div x-show="error" class="mb-4 p-3 rounded-lg bg-red-50 text-red-700 text-sm" x-text="error"></div>
|
|
||||||
|
|
||||||
<div x-show="loaded && runs.length === 0 && !error"
|
|
||||||
class="p-8 text-center text-steel bg-[var(--bg-secondary)] rounded-xl border border-[var(--border-color)]">
|
|
||||||
{{ _("Nessuna stazione in produzione") }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
|
|
||||||
<template x-for="r in runs" :key="r.id">
|
|
||||||
<div class="bg-[var(--bg-secondary)] rounded-xl border border-[var(--border-color)] border-l-8 shadow-sm p-4"
|
|
||||||
:class="borderClass(r)">
|
|
||||||
<div class="flex items-start justify-between gap-2">
|
|
||||||
<div>
|
|
||||||
<div class="text-lg font-bold text-[var(--text-primary)]" x-text="r.station_code + ' — ' + r.station_name"></div>
|
|
||||||
<div class="text-sm text-steel" x-text="r.recipe_code + ' ' + r.recipe_name + ' (v' + r.version_number + ')'"></div>
|
|
||||||
</div>
|
|
||||||
<span class="text-xs font-semibold px-2 py-1 rounded"
|
|
||||||
:class="r.overdue ? 'bg-red-600 text-white animate-pulse' : 'bg-gray-200 text-gray-700'"
|
|
||||||
x-text="statusLabel(r)"></span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<dl class="mt-3 grid grid-cols-2 gap-x-3 gap-y-1 text-sm">
|
|
||||||
<dt class="text-steel">{{ _("Operatore") }}</dt><dd x-text="r.operator"></dd>
|
|
||||||
<dt class="text-steel">{{ _("Avviata alle") }}</dt><dd x-text="startedAt(r)"></dd>
|
|
||||||
<dt class="text-steel">{{ _("Durata") }}</dt><dd x-text="fmt(r.duration_seconds)"></dd>
|
|
||||||
<dt class="text-steel">{{ _("Cicli") }}</dt><dd x-text="r.cycle_count"></dd>
|
|
||||||
<dt class="text-steel">{{ _("Prossima misura") }}</dt>
|
|
||||||
<dd :class="r.overdue ? 'text-red-600 font-bold' : ''" x-text="timerLabel(r)"></dd>
|
|
||||||
<dt class="text-steel">{{ _("Ultimo evento") }}</dt>
|
|
||||||
<dd x-text="r.last_event ? r.last_event.event_type : '-'"></dd>
|
|
||||||
</dl>
|
|
||||||
|
|
||||||
<div class="mt-3 flex gap-2 text-xs font-semibold">
|
|
||||||
<span class="px-2 py-1 rounded bg-green-100 text-green-800" x-text="'OK ' + r.pass_count"></span>
|
|
||||||
<span class="px-2 py-1 rounded bg-yellow-100 text-yellow-800" x-text="'{{ _("Avviso") }} ' + r.warning_count"></span>
|
|
||||||
<span class="px-2 py-1 rounded bg-red-100 text-red-800" x-text="'NOK ' + r.fail_count"></span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul class="mt-3 space-y-1 text-sm">
|
|
||||||
<template x-for="s in r.subtasks" :key="s.subtask_id">
|
|
||||||
<li class="flex justify-between gap-2">
|
|
||||||
<span class="truncate" x-text="s.description"></span>
|
|
||||||
<span class="font-mono whitespace-nowrap"
|
|
||||||
:class="s.in_tolerance ? 'text-green-700' : 'text-red-700 font-bold'"
|
|
||||||
x-text="s.mean.toFixed(3) + ' ' + s.unit"></span>
|
|
||||||
</li>
|
|
||||||
</template>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
function stationMonitor() {
|
|
||||||
return {
|
|
||||||
runs: [], loaded: false, error: '', updatedLabel: '',
|
|
||||||
init() { this.load(); setInterval(() => this.load(), 10000); },
|
|
||||||
async load() {
|
|
||||||
try {
|
|
||||||
const resp = await fetch('/monitor/api/runs');
|
|
||||||
const data = await resp.json();
|
|
||||||
if (!resp.ok || data.error) { this.error = data.detail || {{ _("Errore di caricamento")|tojson }}; return; }
|
|
||||||
this.runs = data; this.error = ''; this.loaded = true;
|
|
||||||
this.updatedLabel = new Date().toLocaleTimeString();
|
|
||||||
} catch (e) { this.error = {{ _("Errore di rete")|tojson }}; }
|
|
||||||
},
|
|
||||||
// Green in tolerance, yellow with warnings, red with fails or a mean out of tolerance.
|
|
||||||
borderClass(r) {
|
|
||||||
if (r.fail_count > 0 || r.subtasks.some(s => !s.in_tolerance)) return 'border-l-red-600';
|
|
||||||
if (r.warning_count > 0) return 'border-l-yellow-500';
|
|
||||||
return 'border-l-green-600';
|
|
||||||
},
|
|
||||||
statusLabel(r) {
|
|
||||||
if (r.overdue) return {{ _("IN RITARDO")|tojson }};
|
|
||||||
return r.status === 'paused' ? {{ _("In pausa")|tojson }} : {{ _("In corso")|tojson }};
|
|
||||||
},
|
|
||||||
startedAt(r) { return new Date(r.started_at + 'Z').toLocaleTimeString(); },
|
|
||||||
timerLabel(r) {
|
|
||||||
if (r.seconds_to_next_measurement === null) return '-';
|
|
||||||
const s = r.seconds_to_next_measurement;
|
|
||||||
return (s < 0 ? '-' : '') + this.fmt(Math.abs(s));
|
|
||||||
},
|
|
||||||
fmt(sec) {
|
|
||||||
const h = Math.floor(sec / 3600), m = Math.floor((sec % 3600) / 60), s = sec % 60;
|
|
||||||
return (h ? h + 'h ' : '') + m + 'm ' + String(s).padStart(2, '0') + 's';
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
"""Live station monitor page and JSON proxy (#57)."""
|
|
||||||
from unittest.mock import patch
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_api():
|
|
||||||
with patch("blueprints.monitor.api_client") as m:
|
|
||||||
yield m
|
|
||||||
|
|
||||||
|
|
||||||
def _login(client, roles, is_admin=False):
|
|
||||||
with client.session_transaction() as sess:
|
|
||||||
sess["api_key"] = "k"
|
|
||||||
sess["user"] = {"id": 2, "username": "u", "display_name": "U", "roles": roles,
|
|
||||||
"is_admin": is_admin, "language_pref": "en", "theme_pref": "light",
|
|
||||||
"active": True}
|
|
||||||
sess["language"] = "en"
|
|
||||||
|
|
||||||
|
|
||||||
def test_page_ok_for_supervisor(client, mock_api):
|
|
||||||
_login(client, ["Supervisor"])
|
|
||||||
resp = client.get("/monitor")
|
|
||||||
assert resp.status_code == 200 and b"stationMonitor" in resp.data
|
|
||||||
|
|
||||||
|
|
||||||
def test_page_forbidden_for_operator(client, mock_api):
|
|
||||||
_login(client, ["MeasurementTec"])
|
|
||||||
assert client.get("/monitor").status_code == 403
|
|
||||||
assert client.get("/monitor/api/runs").status_code == 403
|
|
||||||
|
|
||||||
|
|
||||||
def test_proxy_returns_backend_json(client, mock_api):
|
|
||||||
_login(client, ["Supervisor"])
|
|
||||||
mock_api.get.return_value = [{"id": 1, "station_code": "ST-1"}]
|
|
||||||
resp = client.get("/monitor/api/runs")
|
|
||||||
assert resp.status_code == 200 and resp.get_json()[0]["station_code"] == "ST-1"
|
|
||||||
mock_api.get.assert_called_once_with("/api/production-runs/open")
|
|
||||||
|
|
||||||
|
|
||||||
def test_proxy_passes_backend_error(client, mock_api):
|
|
||||||
_login(client, [], is_admin=True)
|
|
||||||
mock_api.get.return_value = {"error": True, "status_code": 403, "detail": "no"}
|
|
||||||
resp = client.get("/monitor/api/runs")
|
|
||||||
assert resp.status_code == 403 and resp.get_json()["error"] is True
|
|
||||||
Reference in New Issue
Block a user