orchestrator-core 4.3.0rc1__tar.gz → 4.3.0rc3__tar.gz

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 4.3.0rc1
+Version: 4.3.0rc3
 Summary: This is the orchestrator workflow engine.
 Author-email: SURF <automation-beheer@surf.nl>
 Requires-Python: >=3.11,<3.14

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "4.3.0rc1"
+__version__ = "4.3.0rc3"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/graphql/loaders/subscriptions.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Literal
 from uuid import UUID
 
@@ -8,7 +9,11 @@ from strawberry.dataloader import DataLoader
 from orchestrator.db import (
     SubscriptionTable,
 )
-from orchestrator.services.subscription_relations import get_depends_on_subscriptions, get_in_use_by_subscriptions
+from orchestrator.services.subscription_relations import (
+    get_depends_on_subscriptions,
+    get_in_use_by_subscriptions,
+    get_last_validation_datetimes,
+)
 from orchestrator.types import SubscriptionLifecycle
 
 logger = structlog.get_logger(__name__)
@@ -38,4 +43,10 @@ async def depends_on_subs_loader(keys: list[tuple[UUID, tuple[str, ...]]]) -> li
     return await get_depends_on_subscriptions(subscription_ids, filter_statuses)
 
 
+async def last_validation_datetime_loader(keys: list[UUID]) -> list[datetime | None]:
+    """GraphQL dataloader to efficiently get the last validation datetime for multiple subscription_ids."""
+    return await get_last_validation_datetimes(keys)
+
+
 SubsLoaderType = DataLoader[tuple[UUID, tuple[str, ...]], list[SubscriptionTable]]
+LastValidationLoaderType = DataLoader[UUID, datetime | None]

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/graphql/schemas/subscription.py

@@ -175,6 +175,10 @@ class SubscriptionInterface:
         ]
         return await resolve_subscriptions(info, filter_by_with_related_subscriptions, sort_by, first, after)
 
+    @strawberry.field(description="Returns the date and time of the last validation workflow run for a subscription")  # type: ignore
+    async def last_validated_at(self, info: OrchestratorInfo) -> datetime | None:
+        return await info.context.core_last_validation_datetime_loader.load(self.subscription_id)
+
     @strawberry.field(description="Returns customer of a subscription")  # type: ignore
     def customer(self) -> CustomerType:
         return CustomerType(

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/graphql/types.py

@@ -30,7 +30,13 @@ from oauth2_lib.fastapi import AuthManager
 from oauth2_lib.strawberry import OauthContext
 from orchestrator.db.filters import Filter
 from orchestrator.db.sorting import Sort, SortOrder
-from orchestrator.graphql.loaders.subscriptions import SubsLoaderType, depends_on_subs_loader, in_use_by_subs_loader
+from orchestrator.graphql.loaders.subscriptions import (
+    LastValidationLoaderType,
+    SubsLoaderType,
+    depends_on_subs_loader,
+    in_use_by_subs_loader,
+    last_validation_datetime_loader,
+)
 from orchestrator.services.process_broadcast_thread import ProcessDataBroadcastThread
 
 StrawberryPydanticModel = TypeVar("StrawberryPydanticModel", bound=StrawberryTypeFromPydantic)
@@ -60,6 +66,9 @@ class OrchestratorContext(OauthContext):
         self.graphql_models = graphql_models or {}
         self.core_in_use_by_subs_loader: SubsLoaderType = DataLoader(load_fn=in_use_by_subs_loader)
         self.core_depends_on_subs_loader: SubsLoaderType = DataLoader(load_fn=depends_on_subs_loader)
+        self.core_last_validation_datetime_loader: LastValidationLoaderType = DataLoader(
+            load_fn=last_validation_datetime_loader
+        )
         super().__init__(auth_manager)
 
 

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/services/input_state.py

@@ -41,7 +41,7 @@ def retrieve_input_state(process_id: UUID, input_type: InputType, raise_exceptio
         select(InputStateTable)
         .filter(InputStateTable.process_id == process_id)
         .filter(InputStateTable.input_type == input_type)
-        .order_by(InputStateTable.input_time.asc())
+        .order_by(InputStateTable.input_time.desc())
     ).first()
 
     if res:

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/services/subscription_relations.py

@@ -1,15 +1,18 @@
+from datetime import datetime
 from itertools import chain
 from typing import Any, Awaitable, Callable, NamedTuple
 from uuid import UUID
 
 import structlog
 from more_itertools import flatten, unique_everseen
-from sqlalchemy import Row, select
+from sqlalchemy import Row, func, select
 from sqlalchemy import Text as SaText
 from sqlalchemy import cast as sa_cast
 from sqlalchemy.orm import aliased
 
 from orchestrator.db import (
+    ProcessSubscriptionTable,
+    ProcessTable,
     ResourceTypeTable,
     SubscriptionInstanceTable,
     SubscriptionInstanceValueTable,
@@ -267,3 +270,20 @@ async def get_recursive_relations(
             relation_fetcher=relation_fetcher,
         )
     return list(unique_everseen(relations + nested_relations, key=lambda s: s.subscription_id))
+
+
+async def get_last_validation_datetimes(subscription_ids: list[UUID]) -> list[datetime | None]:
+    stmt = (
+        select(ProcessSubscriptionTable.subscription_id, func.max(ProcessTable.last_modified_at))
+        .join(ProcessSubscriptionTable)
+        .group_by(ProcessSubscriptionTable.subscription_id)
+        .where(
+            (ProcessSubscriptionTable.workflow_target == "VALIDATE")
+            & ProcessSubscriptionTable.subscription_id.in_(subscription_ids)
+        )
+    )
+    results = db.session.execute(stmt).all()
+    last_validation_indexed_by_sub_id = {
+        str(subscription_id): last_validation for subscription_id, last_validation in results
+    }
+    return [last_validation_indexed_by_sub_id.get(str(subscription_id), None) for subscription_id in subscription_ids]

{orchestrator_core-4.3.0rc1 → orchestrator_core-4.3.0rc3}/orchestrator/services/tasks.py

@@ -72,7 +72,7 @@ def initialise_celery(celery: Celery) -> None:  # noqa: C901
             process = _get_process(process_id)
             pstat = load_process(process)
             ensure_correct_process_status(process_id, ProcessStatus.CREATED)
-            thread_start_process(pstat, user)
+            thread_start_process(pstat, user=user, broadcast_func=process_broadcast_fn)
 
         except Exception as exc:
             local_logger.error("Worker failed to execute workflow", process_id=process_id, details=str(exc))