Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e640c4a36e | |||
| a829bf3eb0 | |||
| 7ac291b8ac | |||
| 486e1288bf |
@@ -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
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ 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, utcnow
|
from src.backend.services.auth_service import hash_api_key
|
||||||
|
from src.backend.utils.tempo import utcnow
|
||||||
|
|
||||||
_RENEW_INTERVAL = timedelta(minutes=5)
|
_RENEW_INTERVAL = timedelta(minutes=5)
|
||||||
|
|
||||||
|
|||||||
@@ -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),
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ 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
|
||||||
@@ -555,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
|
||||||
@@ -603,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
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -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),
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
@@ -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: datetime
|
acquired_at: UtcDateTime
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
"""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, timezone
|
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
|
||||||
@@ -78,11 +79,6 @@ 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,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()
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -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),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -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"
|
||||||
@@ -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):
|
||||||
|
|||||||
@@ -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,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 '-' }}
|
||||||
|
|||||||
@@ -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,
|
||||||
):
|
):
|
||||||
|
|||||||
Reference in New Issue
Block a user