orchestrator-core 4.6.3__tar.gz → 4.6.3rc1__tar.gz

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 4.6.3
+Version: 4.6.3rc1
 Summary: This is the orchestrator workflow engine.
 Author-email: SURF <automation-beheer@surf.nl>
-Requires-Python: >=3.11,<3.15
+Requires-Python: >=3.11,<3.14
 Description-Content-Type: text/markdown
 License-Expression: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
@@ -20,7 +20,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
@@ -31,28 +30,28 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 License-File: LICENSE
-Requires-Dist: alembic==1.17.2
+Requires-Dist: alembic==1.16.1
 Requires-Dist: anyio>=3.7.0
 Requires-Dist: apscheduler>=3.11.0
 Requires-Dist: click==8.*
 Requires-Dist: deepmerge==2.0
 Requires-Dist: deprecated>=1.2.18
-Requires-Dist: fastapi~=0.121.1
+Requires-Dist: fastapi~=0.120.4
 Requires-Dist: fastapi-etag==0.4.0
 Requires-Dist: itsdangerous>=2.2.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: more-itertools~=10.8.0
+Requires-Dist: more-itertools~=10.7.0
 Requires-Dist: nwa-stdlib~=1.10.3
 Requires-Dist: oauth2-lib>=2.5.0
-Requires-Dist: orjson==3.11.4
+Requires-Dist: orjson==3.10.18
 Requires-Dist: pgvector>=0.4.1
-Requires-Dist: prometheus-client==0.23.1
+Requires-Dist: prometheus-client==0.22.1
 Requires-Dist: psycopg2-binary==2.9.11
 Requires-Dist: pydantic-forms>=1.4.0
-Requires-Dist: pydantic-settings~=2.12.0
-Requires-Dist: pydantic[email]~=2.12.4
-Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: python-rapidjson>=1.22,<1.23
+Requires-Dist: pydantic-settings~=2.9.1
+Requires-Dist: pydantic[email]~=2.11.7
+Requires-Dist: python-dateutil==2.8.2
+Requires-Dist: python-rapidjson>=1.18,<1.21
 Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.1.1
 Requires-Dist: semver==3.0.4

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "4.6.3"
+__version__ = "4.6.3rc1"
 
 
 from structlog import get_logger

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/helpers.py

@@ -1,17 +1,11 @@
 from collections.abc import Sequence
-from functools import wraps
-from typing import Callable, Coroutine
 
-import structlog
 from sqlalchemy import CompoundSelect, Select, select
 from sqlalchemy.orm.strategy_options import _AbstractLoad
-from starlette.concurrency import run_in_threadpool
 
 from orchestrator.db import db
 from orchestrator.db.database import BaseModel
 
-logger = structlog.get_logger(__name__)
-
 
 def rows_from_statement(
     stmt: Select | CompoundSelect,
@@ -25,12 +19,3 @@ def rows_from_statement(
     result = db.session.scalars(from_stmt)
     uresult = result.unique() if unique else result
     return uresult.all()
-
-
-def make_async(f: Callable):  # type: ignore
-    @wraps(f)
-    async def wrapper(*args, **kwargs) -> Coroutine:  # type: ignore
-        logger.debug(f"**async, calling fn {f.__name__}")
-        return await run_in_threadpool(f, *args, **kwargs)
-
-    return wrapper

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/process.py

@@ -25,7 +25,7 @@ from orchestrator.db.range import apply_range_to_statement
 from orchestrator.db.sorting import Sort
 from orchestrator.db.sorting.process import process_sort_fields, sort_processes
 from orchestrator.graphql.pagination import Connection
-from orchestrator.graphql.resolvers.helpers import make_async, rows_from_statement
+from orchestrator.graphql.resolvers.helpers import rows_from_statement
 from orchestrator.graphql.schemas.process import ProcessType
 from orchestrator.graphql.types import GraphqlFilter, GraphqlSort, OrchestratorInfo
 from orchestrator.graphql.utils import (
@@ -55,8 +55,7 @@ def _enrich_process(process: ProcessTable, with_details: bool = False) -> Proces
     return ProcessSchema(**process_data)
 
 
-@make_async
-def resolve_process(info: OrchestratorInfo, process_id: UUID) -> ProcessType | None:
+async def resolve_process(info: OrchestratorInfo, process_id: UUID) -> ProcessType | None:
     query_loaders = get_query_loaders_for_gql_fields(ProcessTable, info)
     stmt = select(ProcessTable).options(*query_loaders).where(ProcessTable.process_id == process_id)
     if process := db.session.scalar(stmt):
@@ -65,8 +64,7 @@ def resolve_process(info: OrchestratorInfo, process_id: UUID) -> ProcessType | N
     return None
 
 
-@make_async
-def resolve_processes(
+async def resolve_processes(
     info: OrchestratorInfo,
     filter_by: list[GraphqlFilter] | None = None,
     sort_by: list[GraphqlSort] | None = None,

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/product.py

@@ -9,7 +9,7 @@ from orchestrator.db.range.range import apply_range_to_statement
 from orchestrator.db.sorting import Sort
 from orchestrator.db.sorting.product import product_sort_fields, sort_products
 from orchestrator.graphql.pagination import Connection
-from orchestrator.graphql.resolvers.helpers import make_async, rows_from_statement
+from orchestrator.graphql.resolvers.helpers import rows_from_statement
 from orchestrator.graphql.schemas.product import ProductType
 from orchestrator.graphql.types import GraphqlFilter, GraphqlSort, OrchestratorInfo
 from orchestrator.graphql.utils import create_resolver_error_handler, is_querying_page_data, to_graphql_result_page
@@ -19,8 +19,7 @@ from orchestrator.utils.search_query import create_sqlalchemy_select
 logger = structlog.get_logger(__name__)
 
 
-@make_async
-def resolve_products(
+async def resolve_products(
     info: OrchestratorInfo,
     filter_by: list[GraphqlFilter] | None = None,
     sort_by: list[GraphqlSort] | None = None,

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/product_block.py

@@ -13,7 +13,7 @@ from orchestrator.db.range.range import apply_range_to_statement
 from orchestrator.db.sorting import Sort
 from orchestrator.db.sorting.product_block import product_block_sort_fields, sort_product_blocks
 from orchestrator.graphql.pagination import Connection
-from orchestrator.graphql.resolvers.helpers import make_async, rows_from_statement
+from orchestrator.graphql.resolvers.helpers import rows_from_statement
 from orchestrator.graphql.schemas.product_block import ProductBlock
 from orchestrator.graphql.types import GraphqlFilter, GraphqlSort, OrchestratorInfo
 from orchestrator.graphql.utils import create_resolver_error_handler, is_querying_page_data, to_graphql_result_page
@@ -23,8 +23,7 @@ from orchestrator.utils.search_query import create_sqlalchemy_select
 logger = structlog.get_logger(__name__)
 
 
-@make_async
-def resolve_product_blocks(
+async def resolve_product_blocks(
     info: OrchestratorInfo,
     filter_by: list[GraphqlFilter] | None = None,
     sort_by: list[GraphqlSort] | None = None,

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/resource_type.py

@@ -13,7 +13,7 @@ from orchestrator.db.range import apply_range_to_statement
 from orchestrator.db.sorting import Sort
 from orchestrator.db.sorting.resource_type import resource_type_sort_fields, sort_resource_types
 from orchestrator.graphql.pagination import Connection
-from orchestrator.graphql.resolvers.helpers import make_async, rows_from_statement
+from orchestrator.graphql.resolvers.helpers import rows_from_statement
 from orchestrator.graphql.schemas.resource_type import ResourceType
 from orchestrator.graphql.types import GraphqlFilter, GraphqlSort, OrchestratorInfo
 from orchestrator.graphql.utils import create_resolver_error_handler, is_querying_page_data, to_graphql_result_page
@@ -23,8 +23,7 @@ from orchestrator.utils.search_query import create_sqlalchemy_select
 logger = structlog.get_logger(__name__)
 
 
-@make_async
-def resolve_resource_types(
+async def resolve_resource_types(
     info: OrchestratorInfo,
     filter_by: list[GraphqlFilter] | None = None,
     sort_by: list[GraphqlSort] | None = None,

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/scheduled_tasks.py

@@ -3,7 +3,6 @@ import structlog
 from orchestrator.db.filters import Filter
 from orchestrator.db.sorting import Sort
 from orchestrator.graphql.pagination import Connection
-from orchestrator.graphql.resolvers.helpers import make_async
 from orchestrator.graphql.schemas.scheduled_task import ScheduledTaskGraphql
 from orchestrator.graphql.types import GraphqlFilter, GraphqlSort, OrchestratorInfo
 from orchestrator.graphql.utils import create_resolver_error_handler, to_graphql_result_page
@@ -13,8 +12,7 @@ from orchestrator.schedules.scheduler import get_scheduler_tasks, scheduled_task
 logger = structlog.get_logger(__name__)
 
 
-@make_async
-def resolve_scheduled_tasks(
+async def resolve_scheduled_tasks(
     info: OrchestratorInfo,
     filter_by: list[GraphqlFilter] | None = None,
     sort_by: list[GraphqlSort] | None = None,

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/settings.py

@@ -4,7 +4,6 @@ from redis.asyncio import Redis as AIORedis
 
 from oauth2_lib.strawberry import authenticated_mutation_field
 from orchestrator.api.api_v1.endpoints.settings import generate_engine_status_response
-from orchestrator.graphql.resolvers.helpers import make_async
 from orchestrator.graphql.schemas.errors import Error
 from orchestrator.graphql.schemas.settings import (
     CACHE_FLUSH_OPTIONS,
@@ -28,7 +27,6 @@ logger = structlog.get_logger(__name__)
 
 
 # Queries
-@make_async
 def resolve_settings(info: OrchestratorInfo) -> StatusType:
     selected_fields = get_selected_fields(info)
 

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/subscription.py

@@ -18,7 +18,6 @@ from graphql import GraphQLError
 from pydantic.alias_generators import to_camel as to_lower_camel
 from sqlalchemy import Select, func, select
 from sqlalchemy.orm import contains_eager
-from starlette.concurrency import run_in_threadpool
 from strawberry.experimental.pydantic.conversion_types import StrawberryTypeFromPydantic
 
 from nwastdlib.asyncio import gather_nice
@@ -102,7 +101,7 @@ async def format_subscription(info: OrchestratorInfo, subscription: Subscription
 async def resolve_subscription(info: OrchestratorInfo, id: UUID) -> SubscriptionInterface | None:
     stmt = select(SubscriptionTable).where(SubscriptionTable.subscription_id == id)
 
-    if subscription := await run_in_threadpool(db.session.scalar, stmt):
+    if subscription := db.session.scalar(stmt):
         return await format_subscription(info, subscription)
     return None
 
@@ -142,13 +141,12 @@ async def resolve_subscriptions(
         stmt = filter_by_query_string(stmt, query)
 
     stmt = cast(Select, sort_subscriptions(stmt, pydantic_sort_by, _error_handler))
-    total = await run_in_threadpool(db.session.scalar, select(func.count()).select_from(stmt.subquery()))
+    total = db.session.scalar(select(func.count()).select_from(stmt.subquery()))
     stmt = apply_range_to_statement(stmt, after, after + first + 1)
 
     graphql_subscriptions: list[SubscriptionInterface] = []
     if is_querying_page_data(info):
-        scalars = await run_in_threadpool(db.session.scalars, stmt)
-        subscriptions = scalars.all()
+        subscriptions = db.session.scalars(stmt).all()
         graphql_subscriptions = list(await gather_nice((format_subscription(info, p) for p in subscriptions)))  # type: ignore
     logger.info("Resolve subscriptions", filter_by=filter_by, total=total)
 

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/version.py

@@ -1,7 +1,6 @@
 from structlog import get_logger
 
 from orchestrator import __version__
-from orchestrator.graphql.resolvers.helpers import make_async
 from orchestrator.graphql.schemas.version import VersionType
 from orchestrator.graphql.types import OrchestratorInfo
 from orchestrator.graphql.utils import create_resolver_error_handler
@@ -12,7 +11,6 @@ logger = get_logger(__name__)
 VERSIONS = [f"orchestrator-core: {__version__}"]
 
 
-@make_async
 def resolve_version(info: OrchestratorInfo) -> VersionType | None:
     logger.debug("resolve_version() called")
     _error_handler = create_resolver_error_handler(info)

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/graphql/resolvers/workflow.py

@@ -9,7 +9,7 @@ from orchestrator.db.range.range import apply_range_to_statement
 from orchestrator.db.sorting import Sort
 from orchestrator.db.sorting.workflow import sort_workflows, workflow_sort_fields
 from orchestrator.graphql.pagination import Connection
-from orchestrator.graphql.resolvers.helpers import make_async, rows_from_statement
+from orchestrator.graphql.resolvers.helpers import rows_from_statement
 from orchestrator.graphql.schemas.workflow import Workflow
 from orchestrator.graphql.types import GraphqlFilter, GraphqlSort, OrchestratorInfo
 from orchestrator.graphql.utils import create_resolver_error_handler, is_querying_page_data, to_graphql_result_page
@@ -19,8 +19,7 @@ from orchestrator.utils.search_query import create_sqlalchemy_select
 logger = structlog.get_logger(__name__)
 
 
-@make_async
-def resolve_workflows(
+async def resolve_workflows(
     info: OrchestratorInfo,
     filter_by: list[GraphqlFilter] | None = None,
     sort_by: list[GraphqlSort] | None = None,

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/orchestrator/workflows/translations/en-GB.json

@@ -6,7 +6,6 @@
             "subscription_id": "Subscription",
             "version": "Version",
             "subscription_id_info": "The subscription for this action",
-            "vlan_info": "The vlan id for this service port",
             "product_type": "Product Type"
         }
     },

{orchestrator_core-4.6.3 → orchestrator_core-4.6.3rc1}/pyproject.toml

@@ -7,7 +7,7 @@ license-files = ["LICENSE"]
 authors = [
     { name = "SURF", email = "automation-beheer@surf.nl" }
 ]
-requires-python = ">=3.11,<3.15"
+requires-python = ">=3.11,<3.14"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
@@ -23,7 +23,6 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python",
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
     "Topic :: Internet :: WWW/HTTP",
@@ -35,28 +34,28 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "alembic==1.17.2",
+    "alembic==1.16.1",
     "anyio>=3.7.0",
     "apscheduler>=3.11.0",
     "click==8.*",
     "deepmerge==2.0",
     "deprecated>=1.2.18",
-    "fastapi~=0.121.1",
+    "fastapi~=0.120.4",
     "fastapi-etag==0.4.0",
     "itsdangerous>=2.2.0",
     "jinja2==3.1.6",
-    "more-itertools~=10.8.0",
+    "more-itertools~=10.7.0",
     "nwa-stdlib~=1.10.3",
     "oauth2-lib>=2.5.0",
-    "orjson==3.11.4",
+    "orjson==3.10.18",
     "pgvector>=0.4.1",
-    "prometheus-client==0.23.1",
+    "prometheus-client==0.22.1",
     "psycopg2-binary==2.9.11",
     "pydantic-forms>=1.4.0",
-    "pydantic-settings~=2.12.0",
-    "pydantic[email]~=2.12.4",
-    "python-dateutil==2.9.0.post0",
-    "python-rapidjson>=1.22,<1.23",
+    "pydantic-settings~=2.9.1",
+    "pydantic[email]~=2.11.7",
+    "python-dateutil==2.8.2",
+    "python-rapidjson>=1.18,<1.21",
     "pytz==2025.2",
     "redis==5.1.1",
     "semver==3.0.4",
@@ -116,7 +115,7 @@ dev = [
     "pydocstyle>=6.3.0",
     "pyinstrument>=5.0.2",
     "pytest==8.4.2",
-    "pytest-asyncio==0.26.0",
+    "pytest-asyncio==0.21.2",
     "pytest-celery>=1.2.1",
     "pytest-codspeed>=3.2.0",
     "pytest-cov>=6.2.1",