perfact-api-pd-fastapi 1.5__tar.gz → 1.7__tar.gz

{perfact_api_pd_fastapi-1.5 → perfact_api_pd_fastapi-1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: perfact-api-pd-fastapi
-Version: 1.5
+Version: 1.7
 Summary: PerFact API - SQLAlchemy+FastAPI pd apis package
 Author-email: Viktor Dick <viktor.dick@perfact.de>
 License-Expression: GPL-2.0-or-later

{perfact_api_pd_fastapi-1.5 → perfact_api_pd_fastapi-1.7}/src/perfact/api/pd_fastapi/kpi.py

@@ -16,8 +16,7 @@ from perfact.api.pd.services.oee.prod_records import get_prod_records
 from perfact.api.pd.services.oee.state_spans import get_state_spans
 from perfact.api.pd.services.oee.summary import oee_workcenter_time_computation
 from perfact.api.pd.services.oee.trend import (
-    compute_trend_for_candidates,
-    compute_trend_for_collections,
+    compute_trend,
     get_oee_trend_candidate_days,
 )
 from pydantic import BaseModel, BeforeValidator
@@ -191,28 +190,11 @@ def oee_trend_aggregation(
 ) -> dict:
     """
     Calculate and persist daily OEE values into dgval for eligible pdunit/day pairs.
+    Commits day by day so an execution cut short by a timeout keeps its progress.
     """
 
     candidates = get_oee_trend_candidate_days(session, lookback_months)
-
-    # compute trend for candidate days
-    c, u, s, impacted_days = compute_trend_for_candidates(session, candidates)
-
-    # create or update pdunitgroups and pdplants
-    # if possible for each of the impacted days
-    pdgrp_c, pdgrp_u, pdplt_c, pdplt_u = compute_trend_for_collections(
-        session, impacted_days
-    )
-
-    return {
-        "created": c,
-        "updated": u,
-        "skipped": s,
-        "pdunitgroup_created": pdgrp_c,
-        "pdunitgroup_updated": pdgrp_u,
-        "pdplant_created": pdplt_c,
-        "pdplant_updated": pdplt_u,
-    }
+    return compute_trend(session, candidates)
 
 
 @routes.get("/kpi/downtime", tags=["pd"], summary="PdUnit downtime")

{perfact_api_pd_fastapi-1.5 → perfact_api_pd_fastapi-1.7}/src/perfact/api/pd_fastapi/pdunitlch.py

@@ -1,7 +1,7 @@
 import datetime
 from typing import Optional, Sequence
 
-from fastapi import HTTPException
+from fastapi import HTTPException, Query
 from perfact.api.base.model import PydanticBase
 from perfact.api.main import Auth, DBSession, VisibilityRegistryDep, require_roles
 from perfact.api.main.dbsession import APIRouter
@@ -19,10 +19,13 @@ from sqlalchemy import select
 
 routes = APIRouter()
 
+MAX_SAMPLE_COUNT = 9_000
+
 
 class PdUnitLcGet(PydanticBase):
     name: str
     seqnum: Optional[int]
+    color: Optional[str]
 
 
 class PdUnitLctGet(PydanticBase):
@@ -38,6 +41,7 @@ class PdOrdLcGet(PydanticBase):
     isfinal: bool
     issetup: bool
     isdowntime: bool
+    color: Optional[str]
 
 
 class PdOrdLctGet(PydanticBase):
@@ -58,6 +62,7 @@ class PdUnitLchEntryGet(BaseModel):
     pdunitlct_name: str
     pdunitlc_name: str
     pdord_num: Optional[str]
+    pdordlc_name: Optional[str]
 
 
 @routes.get(
@@ -128,7 +133,7 @@ def pdunitlch_get(
     visibility: VisibilityRegistryDep,
     pdunit_id: Optional[int] = None,
     pdunit_num: Optional[str] = None,
-    duration_s: Optional[int] = None,
+    sample_count: Optional[int] = Query(default=None, ge=1, le=MAX_SAMPLE_COUNT),
     starttime: Optional[datetime.datetime] = None,
     endtime: Optional[datetime.datetime] = None,
 ) -> list[UnitLchHistoryEntry]:
@@ -167,7 +172,7 @@ def pdunitlch_get(
             pdunit_id=unit.id,
             starttime=starttime,
             endtime=endtime,
-            duration_s=duration_s,
+            sample_count=sample_count,
         )
     except ValueError as exc:
         raise HTTPException(status_code=422, detail=str(exc)) from exc

{perfact_api_pd_fastapi-1.5 → perfact_api_pd_fastapi-1.7}/src/perfact_api_pd_fastapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: perfact-api-pd-fastapi
-Version: 1.5
+Version: 1.7
 Summary: PerFact API - SQLAlchemy+FastAPI pd apis package
 Author-email: Viktor Dick <viktor.dick@perfact.de>
 License-Expression: GPL-2.0-or-later

{perfact_api_pd_fastapi-1.5 → perfact_api_pd_fastapi-1.7}/src/perfact_api_pd_fastapi.egg-info/SOURCES.txt

@@ -23,4 +23,5 @@ tests/locustfile.py
 tests/test_init.py
 tests/test_kpi.py
 tests/test_pdunit.py
+tests/test_pdunitlch.py
 tests/test_performance.py

{perfact_api_pd_fastapi-1.5 → perfact_api_pd_fastapi-1.7}/src/perfact_api_pd_fastapi.egg-info/scm_file_list.json

@@ -17,6 +17,7 @@
     "tests/__init__.py",
     "tests/test_pdunit.py",
     "tests/conftest.py",
+    "tests/test_pdunitlch.py",
     "tests/test_performance.py"
   ]
 }

perfact_api_pd_fastapi-1.7/src/perfact_api_pd_fastapi.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7",
+  "distance": 0,
+  "node": "g4aa2bc0baa5e5d3232ee124539082fc3c08f47a1",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-09"
+}

perfact_api_pd_fastapi-1.7/tests/test_pdunitlch.py

@@ -0,0 +1,76 @@
+import datetime
+from types import SimpleNamespace
+
+from perfact.api.main.dbsession import APIRouter
+from perfact.api.pd.services.pdunitlch import UnitLchHistoryEntry
+from perfact.api.pd_fastapi import pdunitlch
+
+MODTIME = datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc)
+
+
+def test_pdunitlcget_exposes_color() -> None:
+    row = SimpleNamespace(
+        id=1, author=None, modtime=MODTIME, name="Production", seqnum=1, color="#0f0"
+    )
+
+    serialized = pdunitlch.PdUnitLcGet.model_validate(row)
+
+    assert serialized.color == "#0f0"
+
+
+def test_pdordlcget_exposes_color() -> None:
+    row = SimpleNamespace(
+        id=1,
+        author=None,
+        modtime=MODTIME,
+        name="Running",
+        isactive=True,
+        isexecution=False,
+        isfinal=False,
+        issetup=False,
+        isdowntime=False,
+        color="#f00",
+    )
+
+    serialized = pdunitlch.PdOrdLcGet.model_validate(row)
+
+    assert serialized.color == "#f00"
+
+
+def test_pdunitlchentryget_exposes_pdordlc_name() -> None:
+    entry = UnitLchHistoryEntry(
+        createtime=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc),
+        pdunitlct_name="start",
+        pdunitlc_name="running",
+        pdord_num="ORD-1",
+        pdordlc_name="active",
+    )
+
+    serialized = pdunitlch.PdUnitLchEntryGet.model_validate(entry)
+
+    assert serialized.pdordlc_name == "active"
+
+
+def test_pdunitlchentryget_pdordlc_name_none_when_no_active_operation() -> None:
+    entry = UnitLchHistoryEntry(
+        createtime=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc),
+        pdunitlct_name="start",
+        pdunitlc_name="running",
+        pdord_num=None,
+        pdordlc_name=None,
+    )
+
+    serialized = pdunitlch.PdUnitLchEntryGet.model_validate(entry)
+
+    assert serialized.pdordlc_name is None
+
+
+def test_mount_includes_pdunitlch_route() -> None:
+    from .helpers import collect_paths
+
+    app_router = APIRouter()
+
+    pdunitlch.mount(app_router)
+
+    paths = collect_paths(app_router)
+    assert "/pdunitlch" in paths

perfact_api_pd_fastapi-1.5/src/perfact_api_pd_fastapi.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.5",
-  "distance": 0,
-  "node": "ge0c4d91c83ebe49c587a5f576ac6030a84fefce4",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-03"
-}