Persist material efficiency snapshots
This commit is contained in:
@@ -92,7 +92,7 @@ class MaterialEfficiencyService:
|
||||
enlyze_production_order=order, article_number=status.article_number,
|
||||
article_description=status.article_description,
|
||||
nominal_width_m=extract_nominal_width_m(status.article_description),
|
||||
erp_feedback_timestamp=status.feedback_timestamp,
|
||||
erp_feedback_timestamp=cutoff,
|
||||
material_snapshot_timestamp=material.timestamp,
|
||||
good_quantity_m2=quantity, material_consumption_kg=consumption,
|
||||
material_consumption_kg_per_m2=kg_per_m2,
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
"""Independent foreground ERP feedback polling; PostgreSQL owns deduplication."""
|
||||
|
||||
import sys
|
||||
import time
|
||||
from collections.abc import Callable
|
||||
from typing import TextIO
|
||||
|
||||
import psycopg
|
||||
|
||||
from production_analytics.calculations.config import finite_number
|
||||
from production_analytics.erp import ErpReadError
|
||||
from production_analytics.service.material_efficiency import MaterialEfficiencyService
|
||||
from production_analytics.service.postgres_material_efficiency import MaterialEfficiencyWriter
|
||||
|
||||
|
||||
class MaterialEfficiencyRunner:
|
||||
def __init__(
|
||||
self,
|
||||
service: MaterialEfficiencyService,
|
||||
writer: MaterialEfficiencyWriter,
|
||||
*,
|
||||
poll_interval_seconds: float = 60,
|
||||
sleep: Callable[[float], None] = time.sleep,
|
||||
stderr: TextIO | None = None,
|
||||
stdout: TextIO | None = None,
|
||||
) -> None:
|
||||
self.service = service
|
||||
self.writer = writer
|
||||
self.interval = finite_number(poll_interval_seconds, "poll interval", positive=True)
|
||||
self.sleep = sleep
|
||||
self.stderr = stderr if stderr is not None else sys.stderr
|
||||
self.stdout = stdout if stdout is not None else sys.stdout
|
||||
|
||||
def run(self) -> None:
|
||||
try:
|
||||
while True:
|
||||
try:
|
||||
snapshot = self.service.evaluate_current()
|
||||
if snapshot is not None and self.writer.write(snapshot):
|
||||
print(
|
||||
f"{snapshot.erp_feedback_timestamp.isoformat()} "
|
||||
f"workplace={snapshot.workplace!r} "
|
||||
f"production_order={snapshot.enlyze_production_order!r} "
|
||||
f"good_m2={snapshot.good_quantity_m2:.3f} "
|
||||
f"material_kg={snapshot.material_consumption_kg:.3f} "
|
||||
f"g_per_m2={snapshot.material_consumption_g_per_m2:.3f}",
|
||||
file=self.stdout,
|
||||
flush=True,
|
||||
)
|
||||
except (ErpReadError, psycopg.OperationalError, psycopg.InterfaceError) as exc:
|
||||
# Never include driver messages, SQL, credentials or response bodies.
|
||||
print(
|
||||
f"Material efficiency cycle failed: {type(exc).__name__}",
|
||||
file=self.stderr,
|
||||
flush=True,
|
||||
)
|
||||
# Fixed delay even after unavailable evaluations or transient failures.
|
||||
self.sleep(self.interval)
|
||||
except KeyboardInterrupt:
|
||||
return
|
||||
@@ -0,0 +1,82 @@
|
||||
"""Small strict YAML configuration and composition for KPI persistence."""
|
||||
|
||||
import os
|
||||
from pathlib import Path
|
||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||
|
||||
import yaml
|
||||
|
||||
from production_analytics.calculations.config import (
|
||||
CalculationConfigError,
|
||||
_UniqueLoader,
|
||||
finite_number,
|
||||
)
|
||||
from production_analytics.context import build_enlyze_production_order
|
||||
from production_analytics.enlyze.exploration import ConfigurationError, load_secret_file
|
||||
from production_analytics.erp import ErpSettings, ErpWorkplaceStatusGateway
|
||||
from production_analytics.service.material_efficiency import MaterialEfficiencyService
|
||||
from production_analytics.service.material_efficiency_runner import MaterialEfficiencyRunner
|
||||
from production_analytics.service.postgres_material import (
|
||||
PostgresMaterialSnapshotRepository,
|
||||
PostgresSettings,
|
||||
)
|
||||
from production_analytics.service.postgres_material_efficiency import (
|
||||
PostgresMaterialEfficiencyWriter,
|
||||
)
|
||||
|
||||
|
||||
def build_material_efficiency_runner(
|
||||
config: Path,
|
||||
*,
|
||||
secrets_file: Path = Path("secrets/enlyze.env"),
|
||||
erp_secrets_file: Path = Path("secrets/erp.env"),
|
||||
) -> MaterialEfficiencyRunner:
|
||||
try:
|
||||
document = yaml.load(config.read_text(encoding="utf-8"), Loader=_UniqueLoader)
|
||||
except (OSError, UnicodeError, yaml.YAMLError):
|
||||
raise CalculationConfigError("Cannot read material efficiency YAML configuration") from None
|
||||
required = {
|
||||
"workplace",
|
||||
"machine_id",
|
||||
"calculation_id",
|
||||
"production_order_format",
|
||||
"erp_timezone",
|
||||
}
|
||||
if (
|
||||
not isinstance(document, dict)
|
||||
or not required <= document.keys()
|
||||
or document.keys() - required - {"poll_interval_seconds"}
|
||||
):
|
||||
raise CalculationConfigError("Invalid material efficiency configuration fields")
|
||||
for name in required:
|
||||
value = document[name]
|
||||
if not isinstance(value, str) or not value.strip() or "\x00" in value:
|
||||
raise CalculationConfigError(f"{name} must be a non-empty string without NUL bytes")
|
||||
try:
|
||||
timezone = ZoneInfo(document["erp_timezone"])
|
||||
build_enlyze_production_order("0", document["production_order_format"])
|
||||
except (ValueError, ZoneInfoNotFoundError):
|
||||
raise CalculationConfigError("Invalid ERP timezone or production order format") from None
|
||||
interval = finite_number(
|
||||
document.get("poll_interval_seconds", 60), "poll interval", positive=True
|
||||
)
|
||||
environment = dict(os.environ)
|
||||
try:
|
||||
environment.update(load_secret_file(secrets_file))
|
||||
except Exception:
|
||||
raise ConfigurationError("PostgreSQL settings file could not be loaded") from None
|
||||
postgres = PostgresSettings.from_environment(environment)
|
||||
erp = ErpSettings.from_secret_file(erp_secrets_file)
|
||||
return MaterialEfficiencyRunner(
|
||||
MaterialEfficiencyService(
|
||||
ErpWorkplaceStatusGateway(erp),
|
||||
PostgresMaterialSnapshotRepository(postgres),
|
||||
workplace=document["workplace"],
|
||||
machine_id=document["machine_id"],
|
||||
calculation_id=document["calculation_id"],
|
||||
format_template=document["production_order_format"],
|
||||
erp_timezone=timezone,
|
||||
),
|
||||
PostgresMaterialEfficiencyWriter(postgres),
|
||||
poll_interval_seconds=interval,
|
||||
)
|
||||
@@ -0,0 +1,71 @@
|
||||
"""Immutable PostgreSQL history of feedback-aligned KPI points."""
|
||||
|
||||
from typing import Protocol
|
||||
|
||||
import psycopg
|
||||
|
||||
from production_analytics.calculations.config import finite_number
|
||||
from production_analytics.service.material_efficiency import MaterialEfficiencySnapshot
|
||||
from production_analytics.service.postgres_material import PostgresSettings
|
||||
|
||||
|
||||
class MaterialEfficiencyWriter(Protocol):
|
||||
def write(self, snapshot: MaterialEfficiencySnapshot) -> bool: ...
|
||||
|
||||
|
||||
class PostgresMaterialEfficiencyWriter:
|
||||
def __init__(self, settings: PostgresSettings) -> None:
|
||||
self.settings = settings
|
||||
|
||||
def write(self, snapshot: MaterialEfficiencySnapshot) -> bool:
|
||||
for name in ("erp_feedback_timestamp", "material_snapshot_timestamp"):
|
||||
if getattr(snapshot, name).utcoffset() is None:
|
||||
raise ValueError(f"{name} must be timezone-aware")
|
||||
for name in (
|
||||
"good_quantity_m2",
|
||||
"material_consumption_kg",
|
||||
"material_consumption_kg_per_m2",
|
||||
"material_consumption_g_per_m2",
|
||||
):
|
||||
finite_number(getattr(snapshot, name), name)
|
||||
if snapshot.nominal_width_m is not None:
|
||||
finite_number(snapshot.nominal_width_m, "nominal_width_m")
|
||||
# Context exit commits/rolls back and closes; later cycles reconnect after outages.
|
||||
with psycopg.connect(
|
||||
host=self.settings.host,
|
||||
port=self.settings.port,
|
||||
dbname=self.settings.dbname,
|
||||
user=self.settings.user,
|
||||
password=self.settings.password,
|
||||
connect_timeout=10,
|
||||
options="-c statement_timeout=10000",
|
||||
) as connection:
|
||||
row = connection.execute(
|
||||
"""INSERT INTO material_efficiency_snapshots (
|
||||
erp_feedback_timestamp, material_snapshot_timestamp, calculation_id,
|
||||
machine_id, workplace, erp_production_order, enlyze_production_order,
|
||||
article_number, article_description, nominal_width_m, good_quantity_m2,
|
||||
material_consumption_kg, material_consumption_kg_per_m2,
|
||||
material_consumption_g_per_m2
|
||||
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
ON CONFLICT (calculation_id, machine_id, enlyze_production_order,
|
||||
erp_feedback_timestamp) DO NOTHING
|
||||
RETURNING 1""",
|
||||
(
|
||||
snapshot.erp_feedback_timestamp,
|
||||
snapshot.material_snapshot_timestamp,
|
||||
snapshot.calculation_id,
|
||||
snapshot.machine_id,
|
||||
snapshot.workplace,
|
||||
snapshot.erp_production_order,
|
||||
snapshot.enlyze_production_order,
|
||||
snapshot.article_number,
|
||||
snapshot.article_description,
|
||||
snapshot.nominal_width_m,
|
||||
snapshot.good_quantity_m2,
|
||||
snapshot.material_consumption_kg,
|
||||
snapshot.material_consumption_kg_per_m2,
|
||||
snapshot.material_consumption_g_per_m2,
|
||||
),
|
||||
).fetchone()
|
||||
return row is not None
|
||||
Reference in New Issue
Block a user