orchestrator-core 3.1.0rc1__tar.gz → 3.1.1__tar.gz

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.0rc1
+current_version = 3.1.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/.github/workflows/run-codspeed-tests.yml

@@ -11,7 +11,7 @@ jobs:
     name: Run benchmarks
     runs-on: ubuntu-latest
     container:
-      image: python:3.11
+      image: python:3.13
       options: --privileged
     services:
       postgres:

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.1.0rc1
+Version: 3.1.1
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -40,7 +40,7 @@ Requires-Dist: itsdangerous
 Requires-Dist: Jinja2==3.1.5
 Requires-Dist: orjson==3.10.15
 Requires-Dist: psycopg[binary]==3.2.5
-Requires-Dist: pydantic[email]~=2.8.2
+Requires-Dist: pydantic[email]~=2.10.6
 Requires-Dist: pydantic-settings~=2.8.0
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: python-rapidjson>=1.18,<1.21
@@ -51,13 +51,13 @@ Requires-Dist: sentry-sdk[fastapi]~=2.22.0
 Requires-Dist: SQLAlchemy==2.0.38
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog
-Requires-Dist: typer==0.15.1
-Requires-Dist: uvicorn[standard]~=0.32.0
+Requires-Dist: typer==0.15.2
+Requires-Dist: uvicorn[standard]~=0.34.0
 Requires-Dist: nwa-stdlib~=1.9.0
 Requires-Dist: oauth2-lib~=2.4.0
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: strawberry-graphql>=0.246.2
-Requires-Dist: pydantic-forms~=1.3.0
+Requires-Dist: pydantic-forms~=1.4.0
 Requires-Dist: celery~=5.4.0 ; extra == "celery"
 Requires-Dist: toml ; extra == "dev"
 Requires-Dist: bumpversion ; extra == "dev"
@@ -82,7 +82,7 @@ Requires-Dist: dirty-equals ; extra == "test"
 Requires-Dist: jsonref ; extra == "test"
 Requires-Dist: mypy==1.9 ; extra == "test"
 Requires-Dist: pyinstrument ; extra == "test"
-Requires-Dist: pytest==8.3.4 ; extra == "test"
+Requires-Dist: pytest==8.3.5 ; extra == "test"
 Requires-Dist: pytest-asyncio==0.21.2 ; extra == "test"
 Requires-Dist: pytest-codspeed ; extra == "test"
 Requires-Dist: pytest-cov ; extra == "test"

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/orchestrator/__init__.py

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

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "Jinja2==3.1.5",
     "orjson==3.10.15",
     "psycopg[binary]==3.2.5",
-    "pydantic[email]~=2.8.2",
+    "pydantic[email]~=2.10.6",
     "pydantic-settings~=2.8.0",
     "python-dateutil==2.8.2",
     "python-rapidjson>=1.18,<1.21",
@@ -59,13 +59,13 @@ dependencies = [
     "SQLAlchemy==2.0.38",
     "SQLAlchemy-Utils==0.41.2",
     "structlog",
-    "typer==0.15.1",
-    "uvicorn[standard]~=0.32.0",
+    "typer==0.15.2",
+    "uvicorn[standard]~=0.34.0",
     "nwa-stdlib~=1.9.0",
     "oauth2-lib~=2.4.0",
     "tabulate==0.9.0",
     "strawberry-graphql>=0.246.2",
-    "pydantic-forms~=1.3.0",
+    "pydantic-forms~=1.4.0",
 ]
 
 description-file = "README.md"
@@ -89,7 +89,7 @@ test = [
     "jsonref",
     "mypy==1.9",
     "pyinstrument",
-    "pytest==8.3.4",
+    "pytest==8.3.5",
     "pytest-asyncio==0.21.2",
     "pytest-codspeed",
     "pytest-cov",

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/test/unit_tests/api/test_subscriptions.py

@@ -734,17 +734,23 @@ def test_subscriptions_search_uuids2(
     assert not failed, f"Could not find '{subscription_id}' by all keywords; {succeeded=} {failed=}"
 
 
-def test_subscription_detail_with_domain_model(test_client, generic_subscription_1):
+def test_subscription_detail_with_domain_model(test_client, generic_subscription_1, benchmark):
     # test with a subscription that has domain model and without
-    response = test_client.get(URL("api/subscriptions/domain-model") / generic_subscription_1)
+    @benchmark
+    def response():
+        return test_client.get(URL("api/subscriptions/domain-model") / generic_subscription_1)
+
     assert response.status_code == HTTPStatus.OK
     # Check hierarchy
     assert response.json()["pb_1"]["rt_1"] == "Value1"
 
 
-def test_subscription_detail_with_domain_model_does_not_exist(test_client, generic_subscription_1):
+def test_subscription_detail_with_domain_model_does_not_exist(test_client, generic_subscription_1, benchmark):
     # test with a subscription that has domain model and without
-    response = test_client.get(URL("api/subscriptions/domain-model") / uuid4())
+    @benchmark
+    def response():
+        return test_client.get(URL("api/subscriptions/domain-model") / uuid4())
+
     assert response.status_code == HTTPStatus.NOT_FOUND
 
 
@@ -774,7 +780,7 @@ def test_subscription_detail_with_domain_model_if_none_match(test_client, generi
 @pytest.mark.skipif(
     not getenv("AIOCACHE_DISABLE", "0") == "0", reason="AIOCACHE must be enabled for this test to do anything"
 )
-def test_subscription_detail_with_domain_model_cache(test_client, generic_subscription_1):
+def test_subscription_detail_with_domain_model_cache(test_client, generic_subscription_1, benchmark):
     # test with a subscription that has domain model and without
     subscription = SubscriptionModel.from_subscription(generic_subscription_1)
     extended_model = build_extended_domain_model(subscription)
@@ -784,7 +790,9 @@ def test_subscription_detail_with_domain_model_cache(test_client, generic_subscr
 
     to_redis(extended_model)
 
-    response = test_client.get(URL("api/subscriptions/domain-model") / generic_subscription_1)
+    @benchmark
+    def response():
+        return test_client.get(URL("api/subscriptions/domain-model") / generic_subscription_1)
 
     cache = create_redis_client(app_settings.CACHE_URI)
     result = cache.get(f"orchestrator:domain:{generic_subscription_1}")

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/test/unit_tests/conftest.py

@@ -134,6 +134,21 @@ logger = structlog.getLogger(__name__)
 
 CUSTOMER_ID: str = "2f47f65a-0911-e511-80d0-005056956c1a"
 
+CLI_OPT_MONITOR_SQLALCHEMY = "--monitor-sqlalchemy"
+
+
+def pytest_addoption(parser):
+    """Define custom pytest commandline options."""
+    parser.addoption(
+        CLI_OPT_MONITOR_SQLALCHEMY,
+        action="store_true",
+        default=False,
+        help=(
+            "When set, activate query monitoring for tests instrumented with monitor_sqlalchemy. "
+            "Note that this has a certain overhead on execution time."
+        ),
+    )
+
 
 def run_migrations(db_uri: str) -> None:
     """Configure the alembic context and run the migrations.
@@ -746,10 +761,12 @@ def refresh_subscriptions_search_view():
 
 
 @pytest.fixture
-def monitor_sqlalchemy():
+def monitor_sqlalchemy(pytestconfig, request, capsys):
     """Can be used to inspect the number of sqlalchemy queries made by part of the code.
 
-    Usage: include as fixture, wrap code to measure in context manager, run pytest with option `-s` for stdout
+    Usage: include this fixture, it returns a context manager. Wrap this around the code you want to inspect.
+    The inspection is disabled unless you explicitly enable it.
+    To enable it pass the cli option --monitor-sqlalchemy (see CLI_OPT_MONITOR_SQLALCHEMY).
 
     Example:
         def mytest(monitor_sqlalchemy):
@@ -762,20 +779,27 @@ def monitor_sqlalchemy():
     """
     from orchestrator.db.listeners import disable_listeners, monitor_sqlalchemy_queries
 
-    monitor_sqlalchemy_queries()
-
     @contextlib.contextmanager
-    def context():
+    def monitor_queries():
+        monitor_sqlalchemy_queries()
         before = db.session.connection().info.copy()
 
         yield
 
         after = db.session.connection().info.copy()
+        disable_listeners()
 
         estimated_queries = after["queries_completed"] - before.get("queries_completed", 0)
         estimated_query_time = after["query_time_spent"] - before.get("query_time_spent", 0.0)
-        print(f"{estimated_queries:3d} sqlalchemy queries in {estimated_query_time:.2f}s")
 
-    yield context
+        with capsys.disabled():
+            print(f"\n{request.node.nodeid} performed {estimated_queries} queries in {estimated_query_time:.2f}s\n")
 
-    disable_listeners()
+    @contextlib.contextmanager
+    def noop():
+        yield
+
+    if pytestconfig.getoption(CLI_OPT_MONITOR_SQLALCHEMY):
+        yield monitor_queries
+    else:
+        yield noop

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/test/unit_tests/domain/test_base_performance.py

@@ -1,8 +1,9 @@
 from uuid import UUID, uuid4
 
 import pytest
+from sqlalchemy import func, select
 
-from orchestrator.db import db
+from orchestrator.db import SubscriptionTable, db
 from orchestrator.domain import SubscriptionModel
 from orchestrator.types import SubscriptionLifecycle
 from test.unit_tests.fixtures.products.product_blocks.product_block_one import DummyEnum
@@ -79,7 +80,9 @@ def subscription_with_100_horizontal_blocks(create_horizontal_subscription):
 
 
 @pytest.mark.benchmark
-def test_subscription_model_horizontal_references(subscription_with_100_horizontal_blocks, test_product_type_one):
+def test_subscription_model_horizontal_references(
+    subscription_with_100_horizontal_blocks, test_product_type_one, monitor_sqlalchemy
+):
     # Note: fixtures only execute once per benchmark and are excluded from the measurement
 
     # given
@@ -90,8 +93,8 @@ def test_subscription_model_horizontal_references(subscription_with_100_horizont
 
     # when
 
-    # Include the `monitor_sqlalchemy` fixture and use it as a context manager to see the number of real queries
-    subscription = ProductTypeOneForTest.from_subscription(subscription_id)
+    with monitor_sqlalchemy():  # Context does nothing unless you set CLI_OPT_MONITOR_SQLALCHEMY
+        subscription = ProductTypeOneForTest.from_subscription(subscription_id)
 
     # then
     assert len(subscription.block.sub_block_list) == 100
@@ -103,7 +106,9 @@ def subscription_with_10_vertical_blocks(create_vertical_subscription):
 
 
 @pytest.mark.benchmark
-def test_subscription_model_vertical_references(subscription_with_10_vertical_blocks, test_product_type_one_nested):
+def test_subscription_model_vertical_references(
+    subscription_with_10_vertical_blocks, test_product_type_one_nested, monitor_sqlalchemy
+):
     # Note: fixtures only execute once per benchmark and are excluded from the measurement
 
     # given
@@ -114,8 +119,8 @@ def test_subscription_model_vertical_references(subscription_with_10_vertical_bl
 
     # when
 
-    # Include the `monitor_sqlalchemy` fixture and use it as a context manager to see the number of real queries
-    subscription = ProductTypeOneNestedForTest.from_subscription(subscription_id)
+    with monitor_sqlalchemy():  # Context does nothing unless you set CLI_OPT_MONITOR_SQLALCHEMY
+        subscription = ProductTypeOneNestedForTest.from_subscription(subscription_id)
 
     # then
     assert subscription.block is not None
@@ -123,3 +128,33 @@ def test_subscription_model_vertical_references(subscription_with_10_vertical_bl
     assert subscription.block.sub_block.sub_block is not None
     assert subscription.block.sub_block.sub_block.sub_block is not None
     # no need to check all x levels
+
+
+@pytest.mark.benchmark
+def test_subscription_model_vertical_references_save(create_vertical_subscription, monitor_sqlalchemy):
+    # when
+    with monitor_sqlalchemy():
+        subscription_id = create_vertical_subscription(size=5)
+
+    # then
+
+    # Checks that the subscription was created, without too much overhead
+    query_check_created = (
+        select(func.count()).select_from(SubscriptionTable).where(SubscriptionTable.subscription_id == subscription_id)
+    )
+    assert db.session.scalar(query_check_created) == 1
+
+
+@pytest.mark.benchmark
+def test_subscription_model_horizontal_references_save(create_horizontal_subscription, monitor_sqlalchemy):
+    # when
+    with monitor_sqlalchemy():
+        subscription_id = create_horizontal_subscription(size=10)
+
+    # then
+
+    # Checks that the subscription was created, without too much overhead
+    query_check_created = (
+        select(func.count()).select_from(SubscriptionTable).where(SubscriptionTable.subscription_id == subscription_id)
+    )
+    assert db.session.scalar(query_check_created) == 1

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/test/unit_tests/forms/test_display_subscription.py

@@ -59,11 +59,7 @@ def test_display_only_schema():
                 "type": "string",
             },
             "summary": {
-                "allOf": [
-                    {
-                        "$ref": "#/$defs/MigrationSummaryValue",
-                    },
-                ],
+                "$ref": "#/$defs/MigrationSummaryValue",
                 "format": "summary",
                 "default": None,
                 "type": "string",

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/test/unit_tests/graphql/test_subscription.py

@@ -60,19 +60,27 @@ def build_complex_query(subscription_id):
     ).encode("utf-8")
 
 
-def test_single_simple_subscription(fastapi_app_graphql, test_client, product_sub_list_union_subscription_1):
+def test_single_simple_subscription(fastapi_app_graphql, test_client, product_sub_list_union_subscription_1, benchmark):
     test_query = build_simple_query(subscription_id=product_sub_list_union_subscription_1)
-    response = test_client.post("/api/graphql", content=test_query, headers={"Content-Type": "application/json"})
+
+    @benchmark
+    def response():
+        return test_client.post("/api/graphql", content=test_query, headers={"Content-Type": "application/json"})
+
     assert response.status_code == HTTPStatus.OK
     assert response.json() == {"data": {"subscription": {"insync": True, "status": "ACTIVE"}}}
 
 
 def test_single_complex_subscription(
-    fastapi_app_graphql, test_client, product_sub_list_union_subscription_1, test_product_type_sub_list_union
+    fastapi_app_graphql, test_client, product_sub_list_union_subscription_1, test_product_type_sub_list_union, benchmark
 ):
     _, _, ProductSubListUnion = test_product_type_sub_list_union
     test_query = build_complex_query(subscription_id=product_sub_list_union_subscription_1)
-    response = test_client.post("/api/graphql", content=test_query, headers={"Content-Type": "application/json"})
+
+    @benchmark
+    def response():
+        return test_client.post("/api/graphql", content=test_query, headers={"Content-Type": "application/json"})
+
     assert response.status_code == HTTPStatus.OK
     assert response.json() == {
         "data": {
@@ -86,8 +94,12 @@ def test_single_complex_subscription(
     }
 
 
-def test_subscription_does_not_exist(fastapi_app_graphql, test_client):
+def test_subscription_does_not_exist(fastapi_app_graphql, test_client, benchmark):
     test_query = build_simple_query(uuid4())
-    response = test_client.post("/api/graphql", content=test_query, headers={"Content-Type": "application/json"})
+
+    @benchmark
+    def response():
+        return test_client.post("/api/graphql", content=test_query, headers={"Content-Type": "application/json"})
+
     assert response.status_code == HTTPStatus.OK
     assert response.json() == {"data": {"subscription": None}}

{orchestrator_core-3.1.0rc1 → orchestrator_core-3.1.1}/test/unit_tests/graphql/test_subscriptions.py

@@ -413,12 +413,15 @@ def get_subscriptions_with_metadata_and_schema_query(
     ).encode("utf-8")
 
 
-def test_subscriptions_single_page(test_client, product_type_1_subscriptions_factory):
+def test_subscriptions_single_page(test_client, product_type_1_subscriptions_factory, benchmark):
     # when
 
     product_type_1_subscriptions_factory(4)
     data = get_subscriptions_query()
-    response = test_client.post("/api/graphql", content=data, headers={"Content-Type": "application/json"})
+
+    @benchmark
+    def response():
+        return test_client.post("/api/graphql", content=data, headers={"Content-Type": "application/json"})
 
     # then
 
@@ -1076,6 +1079,7 @@ def test_single_subscription_with_depends_on_subscriptions(
     sub_one_subscription_1,
     sub_two_subscription_1,
     product_sub_list_union_subscription_1,
+    benchmark,
 ):
     # when
 
@@ -1085,7 +1089,10 @@ def test_single_subscription_with_depends_on_subscriptions(
 
     subscription_id = str(product_sub_list_union_subscription_1)
     data = get_subscriptions_query_with_relations(query_string=subscription_id)
-    response = test_client.post("/api/graphql", content=data, headers={"Content-Type": "application/json"})
+
+    @benchmark
+    def response():
+        return test_client.post("/api/graphql", content=data, headers={"Content-Type": "application/json"})
 
     expected_depends_on_ids = {
         str(subscription.subscription_id) for subscription in [sub_one_subscription_1, sub_two_subscription_1]
@@ -1183,6 +1190,7 @@ def test_single_subscription_schema(
     sub_one_subscription_1,
     sub_two_subscription_1,
     product_sub_list_union_subscription_1,
+    benchmark,
 ):
     # when
 
@@ -1191,7 +1199,11 @@ def test_single_subscription_schema(
     data = get_subscriptions_product_block_json_schema_query(
         filter_by=[{"field": "subscriptionId", "value": subscription_id}]
     )
-    response = test_client.post("/api/graphql", content=data, headers={"Content-Type": "application/json"})
+
+    @benchmark
+    def response():
+        return test_client.post("/api/graphql", content=data, headers={"Content-Type": "application/json"})
+
     # then
 
     assert HTTPStatus.OK == response.status_code
@@ -1323,7 +1335,7 @@ def test_single_subscription_schema(
             "customer_id": {"title": "Customer Id", "type": "string"},
             "subscription_id": {"format": "uuid", "title": "Subscription Id", "type": "string"},
             "description": {"default": "Initial subscription", "title": "Description", "type": "string"},
-            "status": {"allOf": [{"$ref": "#/$defs/SubscriptionLifecycle"}], "default": "initial"},
+            "status": {"$ref": "#/$defs/SubscriptionLifecycle", "default": "initial"},
             "insync": {"default": False, "title": "Insync", "type": "boolean"},
             "start_date": {
                 "anyOf": [{"format": "date-time", "type": "string"}, {"type": "null"}],