perfact-api-pd 1.2__tar.gz → 1.4__tar.gz

{perfact_api_pd-1.2 → perfact_api_pd-1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: perfact-api-pd
-Version: 1.2
+Version: 1.4
 Summary: PerFact API - pd domain models and services
 Author-email: Viktor Dick <viktor.dick@perfact.de>
 License-Expression: GPL-2.0-or-later

{perfact_api_pd-1.2 → perfact_api_pd-1.4}/src/perfact/api/pd/services/oee/trend.py

@@ -11,11 +11,20 @@ from perfact.api.pd.services.oee.prod_metrics import (
 )
 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 sqlalchemy import Date, func, literal_column, select, union_all
+from sqlalchemy import Date, func, select, union_all
 from sqlalchemy.engine.row import Row
 from sqlalchemy.orm import InstrumentedAttribute, Session
 
 
+def get_local_timezone():
+    """
+    Function to get local system timezone
+    In the future, to be replaced with a specific field in the database
+    Currently returning local timezone, or UTC as fallback
+    """
+    return datetime.now().astimezone().tzinfo or timezone.utc
+
+
 def get_dgkpi_id_by_plugin_name(session: Session, plugin: str) -> int:
     """
     Getter for the dgkpi id by requested plugin name
@@ -41,14 +50,31 @@ def parse_stored_modtime(value: object) -> datetime | None:
         return None
 
 
+def compute_window_start(value: date, lookback_months: int) -> date:
+    year = value.year
+    month = value.month - lookback_months
+    while month <= 0:
+        month += 12
+        year -= 1
+
+    if month == 12:
+        next_month_start = date(year + 1, 1, 1)
+    else:
+        next_month_start = date(year, month + 1, 1)
+
+    last_day_of_month = (next_month_start - timedelta(days=1)).day
+    day = min(value.day, last_day_of_month)
+    return date(year, month, day)
+
+
 def get_oee_trend_candidate_days(session: Session, lookback_months: int = 6):
     """
     Distinct past (pdunit_id, day) candidates for OEE.
     Query involving entries from PdOrdPrd and PdOrdLch
     lookback_months is capped into [0, 6] and measured back from yesterday.
     """
-    window_end = func.current_date() - 1
-    window_start = window_end - (lookback_months * literal_column("interval '1 month'"))
+    window_end = datetime.now(get_local_timezone()).date()
+    window_start = compute_window_start(window_end, lookback_months)
 
     pdordprd_start = (
         select(
@@ -116,6 +142,7 @@ def _upsert_latest_dgval(
     identstring: str,
     reftime: datetime,
     value: float | None,
+    current_session_time: datetime | None = None,
     existing: DgVal | None = None,
 ) -> DgVal:
     """
@@ -129,6 +156,9 @@ def _upsert_latest_dgval(
         ).scalar_one_or_none()
     if existing is not None:
         existing.reftime = reftime
+        if current_session_time:
+            # specifically modify modtime if requested
+            existing.modtime = current_session_time
         existing.value = value
         stats.updated += 1
         return existing
@@ -172,6 +202,18 @@ def compute_trend_for_candidates(
     skipped = 0
     impacted_days: dict[str, set[int]] = defaultdict(set)
 
+    local_tz = get_local_timezone()
+    tz_name = datetime.now(local_tz).tzname()
+    current_transaction_time = session.scalar(
+        select(func.timezone(tz_name, func.now()))
+    )
+    if not current_transaction_time:
+        raise ValueError(
+            "Could not communicate with db to get \
+                         current transaction time"
+        )
+    current_transaction_day = current_transaction_time.date().isoformat()
+
     for pdunit_id_c, day_value in candidates:
         pdunit_id = int(pdunit_id_c) if pdunit_id_c is not None else None
         if pdunit_id is None or not isinstance(day_value, date):
@@ -183,7 +225,7 @@ def compute_trend_for_candidates(
             skipped += 1
             continue
 
-        day_start = datetime.combine(day_value, time.min, tzinfo=timezone.utc)
+        day_start = datetime.combine(day_value, time.min, tzinfo=local_tz)
         day_stop = day_start + timedelta(days=1)
         day_mid = day_start + timedelta(hours=12)
         identstring = day_value.isoformat()
@@ -200,18 +242,50 @@ def compute_trend_for_candidates(
                 identstring,
             )
         ).scalar_one_or_none()
-        existing_data = existing_oee.data if existing_oee else None
-        stored_max_modtime = (
-            parse_stored_modtime((existing_data or {}).get("max_pdordprd_modtime"))
-            if isinstance(existing_data, dict)
-            else None
-        )
-        needs_refresh = existing_oee is None or (
-            max_pdordprd_modtime is not None
-            and (
+
+        if existing_oee:
+            # check if dgval entry needs update
+            # first check if the stored modtime is older than the candidate modtime
+            # get the stored modtime from the dgval.data field
+            stored_max_modtime = (
+                parse_stored_modtime(
+                    (existing_oee.data or {}).get("max_pdordprd_modtime")
+                )
+                if isinstance(existing_oee.data, dict)
+                else None
+            )
+            # check if the new_max_pdordprd candidate modtime
+            # is higher than the stored one
+            is_new_max_modtime = max_pdordprd_modtime is not None and (
                 stored_max_modtime is None or stored_max_modtime < max_pdordprd_modtime
             )
-        )
+
+            # check if the existing entry has the same day as the current day
+            is_current_day = existing_oee.identstring == current_transaction_day
+
+            # next, check if the next day in transaction time
+            # is syncronized with the data
+            # get the start of the next day based on the identstring
+            current_identstring_day = date.fromisoformat(existing_oee.identstring)
+            next_day_start = datetime.combine(
+                current_identstring_day + timedelta(days=1),
+                time.min,
+                tzinfo=local_tz,
+            )
+            # check if the day has already started, but the data is not syncronized yet
+            # by checking the identstring against the current_transaction_day
+            # and the modtime against the next_day_start
+            is_day_later = (
+                existing_oee.identstring < current_transaction_day
+                and existing_oee.modtime < next_day_start
+            )
+            # compute the necessity of updating the existing dgval entry
+            # based on criteria
+            needs_refresh = is_new_max_modtime or is_current_day or is_day_later
+        else:
+            # needs creation
+            needs_refresh = True
+
         if not needs_refresh:
             skipped += 1
             continue
@@ -246,6 +320,7 @@ def compute_trend_for_candidates(
             identstring=identstring,
             reftime=day_mid,
             value=oee,
+            current_session_time=current_transaction_time,
             existing=existing_oee,
         ).data = oee_data
 
@@ -358,11 +433,12 @@ def compute_trend_for_collections(session: Session, impacted_days: dict[str, set
     pdunitgroup_updated = 0
     pdplant_created = 0
     pdplant_updated = 0
+    local_tz = get_local_timezone()
 
     # compute for pdunitgroup and pdplant
     for identstring, changed_pdunits in impacted_days.items():
         day_value = date.fromisoformat(identstring)
-        day_mid = datetime.combine(day_value, time(hour=12), tzinfo=timezone.utc)
+        day_mid = datetime.combine(day_value, time(hour=12), tzinfo=local_tz)
 
         memberships = session.execute(
             select(PdUnit.id, PdUnit.pdunitgroup_id, PdUnit.pdplant_id).where(

{perfact_api_pd-1.2 → perfact_api_pd-1.4}/src/perfact_api_pd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: perfact-api-pd
-Version: 1.2
+Version: 1.4
 Summary: PerFact API - pd domain models and services
 Author-email: Viktor Dick <viktor.dick@perfact.de>
 License-Expression: GPL-2.0-or-later

perfact_api_pd-1.4/src/perfact_api_pd.egg-info/scm_version.json

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

{perfact_api_pd-1.2 → perfact_api_pd-1.4}/tests/test_s_oee_trend.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterator
-from datetime import date, datetime, timedelta, timezone
+from datetime import date, datetime, timedelta
 from typing import Any, cast
 
 import psycopg
@@ -16,6 +16,8 @@ from sqlalchemy.orm import Session
 postgresql_proc = factories.postgresql_proc()
 postgresql = factories.postgresql("postgresql_proc")
 
+local_timezone = trend.get_local_timezone()
+
 
 @pytest.fixture
 def db_session(postgresql: psycopg.Connection[Any]) -> Iterator[Session]:
@@ -152,7 +154,7 @@ def test_get_dgkpi_id_by_plugin_name_returns_int(db_session: Session) -> None:
             "INSERT INTO dgkpi (dgkpi_id, dgkpi_plugin, dgkpi_lastcheck) \
             VALUES (42, 'OEE', :now)"
         ),
-        {"now": datetime.now(timezone.utc)},
+        {"now": datetime.now(local_timezone)},
     )
     db_session.commit()
 
@@ -172,8 +174,9 @@ def test_get_dgkpi_id_by_plugin_name_raises_when_missing(db_session: Session) ->
         (123, None),
         ("not-a-date", None),
         (
-            "2025-01-01T12:30:00+00:00",
-            datetime(2025, 1, 1, 12, 30, tzinfo=timezone.utc),
+            # "2025-01-01T12:30:00+00:00",
+            f"{datetime(2025, 1, 1, 12, 30, tzinfo=local_timezone).isoformat()}",
+            datetime(2025, 1, 1, 12, 30, tzinfo=local_timezone),
         ),
     ],
 )
@@ -181,10 +184,51 @@ def test_parse_stored_modtime(value: object, expected: datetime | None) -> None:
     assert trend.parse_stored_modtime(value) == expected
 
 
+@pytest.mark.parametrize(
+    ("value", "lookback_months", "expected"),
+    [
+        (date(2025, 1, 15), 1, date(2024, 12, 15)),
+        (date(2025, 1, 15), 13, date(2023, 12, 15)),
+        (date(2025, 6, 15), 0, date(2025, 6, 15)),
+        (date(2025, 5, 31), 1, date(2025, 4, 30)),
+        (date(2025, 3, 31), 1, date(2025, 2, 28)),
+        (date(2024, 3, 31), 1, date(2024, 2, 29)),
+        (date(2025, 12, 1), 1, date(2025, 11, 1)),
+    ],
+)
+def test_compute_window_start(
+    value: date, lookback_months: int, expected: date
+) -> None:
+    assert trend.compute_window_start(value, lookback_months) == expected
+
+
+def test_compute_trend_for_candidates_raises_when_current_transaction_time_missing(
+    db_session: Session,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    db_session.add_all(
+        [
+            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(local_timezone)),
+        ]
+    )
+    db_session.commit()
+
+    monkeypatch.setattr(db_session, "scalar", lambda *_args, **_kwargs: None)
+
+    with pytest.raises(
+        ValueError,
+        match="Could not communicate with db to get .*current transaction time",
+    ):
+        trend.compute_trend_for_candidates(db_session, [])
+
+
 def test_get_oee_trend_candidate_days_returns_rows_from_query(
     db_session: Session,
 ) -> None:
-    now = datetime.now(timezone.utc)
+    now = datetime.now(local_timezone)
     db_session.execute(text("INSERT INTO pdunit (pdunit_id) VALUES (1), (2)"))
     db_session.execute(
         text(
@@ -217,16 +261,16 @@ def test_compute_trend_for_candidates_creates_new_dgval(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     day = date(2025, 1, 15)
-    day_start = datetime(2025, 1, 15, 0, 0, tzinfo=timezone.utc)
+    day_start = datetime(2025, 1, 15, 0, 0, tzinfo=local_timezone)
     day_stop = day_start + timedelta(days=1)
-    max_mod = datetime(2025, 1, 15, 9, 0, tzinfo=timezone.utc)
+    max_mod = datetime(2025, 1, 15, 9, 0, tzinfo=local_timezone)
 
     db_session.add_all(
         [
-            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(timezone.utc)),
+            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(local_timezone)),
         ]
     )
     db_session.execute(
@@ -295,7 +339,7 @@ def test_compute_trend_for_candidates_creates_new_dgval(
     assert oee_row.value is None
     assert (
         datetime.fromisoformat(oee_row.data["max_pdordprd_modtime"]).astimezone(
-            timezone.utc
+            local_timezone
         )
         == max_mod
     )
@@ -324,16 +368,16 @@ def test_compute_trend_for_candidates_updates_existing_dgval(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     day = date(2025, 1, 16)
-    day_start = datetime(2025, 1, 16, 0, 0, tzinfo=timezone.utc)
+    day_start = datetime(2025, 1, 16, 0, 0, tzinfo=local_timezone)
     day_stop = day_start + timedelta(days=1)
-    new_max_mod = datetime(2025, 1, 16, 10, 0, tzinfo=timezone.utc)
+    new_max_mod = datetime(2025, 1, 16, 10, 0, tzinfo=local_timezone)
 
     db_session.add_all(
         [
-            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(timezone.utc)),
+            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(local_timezone)),
         ]
     )
     db_session.execute(
@@ -357,6 +401,8 @@ def test_compute_trend_for_candidates_updates_existing_dgval(
         ),
         {"mod": new_max_mod, "start": day_start, "stop": day_stop},
     )
+
+    max_prd_modtime = datetime(2025, 1, 16, 9, 30, tzinfo=local_timezone).isoformat()
     db_session.add(
         DgVal(
             dgkpi_id=20,
@@ -365,7 +411,7 @@ def test_compute_trend_for_candidates_updates_existing_dgval(
             identstring="2025-01-16",
             reftime=day_start,
             value=0.1,
-            data={"max_pdordprd_modtime": "2025-01-16T09:30:00+00:00"},
+            data={"max_pdordprd_modtime": f"{max_prd_modtime}"},
         )
     )
     db_session.commit()
@@ -408,14 +454,14 @@ def test_compute_trend_for_candidates_skips_invalid_and_not_needing_refresh(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     day = date(2025, 1, 17)
-    day_start = datetime(2025, 1, 17, 0, 0, tzinfo=timezone.utc)
+    day_start = datetime(2025, 1, 17, 0, 0, tzinfo=local_timezone)
 
     db_session.add_all(
         [
-            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(timezone.utc)),
+            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(local_timezone)),
         ]
     )
     db_session.execute(
@@ -428,7 +474,7 @@ def test_compute_trend_for_candidates_skips_invalid_and_not_needing_refresh(
             VALUES (4, :mod, FALSE, tstzrange(:start, :stop, '[)'), 4)"
         ),
         {
-            "mod": datetime(2025, 1, 17, 10, 0, tzinfo=timezone.utc),
+            "mod": datetime(2025, 1, 17, 10, 0, tzinfo=local_timezone),
             "start": day_start,
             "stop": day_start + timedelta(days=1),
         },
@@ -478,7 +524,7 @@ def test_compute_trend_for_collection_returns_zero_when_no_impacted_ids(
     assert trend.compute_trend_for_collection(
         db_session,
         identstring="2025-01-20",
-        day_mid=datetime(2025, 1, 20, 12, tzinfo=timezone.utc),
+        day_mid=datetime(2025, 1, 20, 12, tzinfo=local_timezone),
         collection_reftable="pdunitgroup",
         pdunit_collection_fk="pdunitgroup_id",
         impacted_collection_ids=set(),
@@ -487,14 +533,14 @@ def test_compute_trend_for_collection_returns_zero_when_no_impacted_ids(
 
 def test_compute_trend_for_collection_creates_and_updates(db_session: Session) -> None:
     identstring = "2025-01-20"
-    day_mid = datetime(2025, 1, 20, 12, tzinfo=timezone.utc)
+    day_mid = datetime(2025, 1, 20, 12, tzinfo=local_timezone)
 
     db_session.add_all(
         [
-            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(timezone.utc)),
-            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(timezone.utc)),
+            DgKpi(id=20, plugin="OEE", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=21, plugin="OEE.A", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=22, plugin="OEE.P", lastcheck=datetime.now(local_timezone)),
+            DgKpi(id=23, plugin="OEE.Q", lastcheck=datetime.now(local_timezone)),
         ]
     )
     db_session.execute(

perfact_api_pd-1.2/src/perfact_api_pd.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.2",
-  "distance": 0,
-  "node": "g23f9e71ace0327b4a1e5f9488a191b8ffe17585a",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-06-26"
-}