orchestrator-core 4.6.0rc4__tar.gz → 4.6.1__tar.gz

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 4.6.0rc4
+Version: 4.6.1
 Summary: This is the orchestrator workflow engine.
 Author-email: SURF <automation-beheer@surf.nl>
 Requires-Python: >=3.11,<3.14
@@ -41,8 +41,8 @@ Requires-Dist: fastapi-etag==0.4.0
 Requires-Dist: itsdangerous>=2.2.0
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: more-itertools~=10.7.0
-Requires-Dist: nwa-stdlib~=1.9.2
-Requires-Dist: oauth2-lib==2.4.2
+Requires-Dist: nwa-stdlib~=1.10.3
+Requires-Dist: oauth2-lib>=2.5.0
 Requires-Dist: orjson==3.10.18
 Requires-Dist: pgvector>=0.4.1
 Requires-Dist: prometheus-client==0.22.1

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/orchestrator/__init__.py

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

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/orchestrator/graphql/schema.py

@@ -63,7 +63,12 @@ from orchestrator.graphql.schemas.settings import StatusType
 from orchestrator.graphql.schemas.subscription import SubscriptionInterface
 from orchestrator.graphql.schemas.version import VersionType
 from orchestrator.graphql.schemas.workflow import Workflow
-from orchestrator.graphql.types import SCALAR_OVERRIDES, OrchestratorContext, ScalarOverrideType, StrawberryModelType
+from orchestrator.graphql.types import (
+    SCALAR_OVERRIDES,
+    OrchestratorContext,
+    ScalarOverrideType,
+    StrawberryModelType,
+)
 from orchestrator.services.process_broadcast_thread import ProcessDataBroadcastThread
 from orchestrator.settings import app_settings
 

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/orchestrator/graphql/types.py

@@ -17,7 +17,7 @@ from ipaddress import IPv4Address, IPv4Interface, IPv6Address, IPv6Interface
 from typing import Any, NewType, TypeVar
 
 import strawberry
-from graphql import GraphQLError
+from graphql import GraphQLError, GraphQLNamedType
 from strawberry.dataloader import DataLoader
 from strawberry.experimental.pydantic.conversion_types import StrawberryTypeFromPydantic
 from strawberry.scalars import JSON
@@ -122,6 +122,9 @@ IPv6InterfaceType = strawberry.scalar(
     parse_value=lambda v: v,
 )
 
+# TODO: Remove Hack to prevent the error: `Redefinition of reserved type 'Int'`
+if hasattr(GraphQLNamedType, "reserved_types"):
+    GraphQLNamedType.reserved_types.pop("Int", None)
 IntType = strawberry.scalar(
     NewType("Int", int),
     description="An arbitrary precision integer",

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/orchestrator/migrations/helpers.py

@@ -237,7 +237,7 @@ def create_task(conn: sa.engine.Connection, task: dict) -> None:
             "name": "task_name",
             "description": "task description",
         }
-        >>> create_workflow(conn, task)
+        >>> create_task(conn, task)
     """
     if has_table_column(table_name="workflows", column_name="is_task", conn=conn):
         query = """

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/orchestrator/workflow.py

@@ -235,7 +235,10 @@ def make_workflow(
     return wrapping_function
 
 
-def step(name: str) -> Callable[[StepFunc], Step]:
+def step(
+    name: str,
+    retry_auth_callback: Authorizer | None = None,
+) -> Callable[[StepFunc], Step]:
     """Mark a function as a workflow step."""
 
     def decorator(func: StepFunc) -> Step:
@@ -255,12 +258,19 @@ def step(name: str) -> Callable[[StepFunc], Step]:
                     logger.warning("Step failed", exc_info=ex)
                     return Failed(ex)
 
-        return make_step_function(wrapper, name)
+        return make_step_function(
+            wrapper,
+            name,
+            retry_auth_callback=retry_auth_callback,
+        )
 
     return decorator
 
 
-def retrystep(name: str) -> Callable[[StepFunc], Step]:
+def retrystep(
+    name: str,
+    retry_auth_callback: Authorizer | None = None,
+) -> Callable[[StepFunc], Step]:
     """Mark a function as a retryable workflow step.
 
     If this step fails it goes to `Waiting` were it will be retried periodically. If it `Success` it acts as a normal
@@ -283,7 +293,11 @@ def retrystep(name: str) -> Callable[[StepFunc], Step]:
                 except Exception as ex:
                     return Waiting(ex)
 
-        return make_step_function(wrapper, name)
+        return make_step_function(
+            wrapper,
+            name,
+            retry_auth_callback=retry_auth_callback,
+        )
 
     return decorator
 
@@ -349,7 +363,9 @@ def _extend_step_group_steps(name: str, steps: StepList) -> StepList:
     return enter_step >> steps >> exit_step
 
 
-def step_group(name: str, steps: StepList, extract_form: bool = True) -> Step:
+def step_group(
+    name: str, steps: StepList, extract_form: bool = True, retry_auth_callback: Authorizer | None = None
+) -> Step:
     """Add a group of steps to the workflow as a single step.
 
     A step group is a sequence of steps that act as a single step.
@@ -362,6 +378,7 @@ def step_group(name: str, steps: StepList, extract_form: bool = True) -> Step:
         name: The name of the step
         steps: The sub steps in the step group
         extract_form: Whether to attach the first form of the sub steps to the step group
+        retry_auth_callback: Callback to determine if user is authorized to retry this group on failure
     """
 
     steps = _extend_step_group_steps(name, steps)
@@ -392,7 +409,7 @@ def step_group(name: str, steps: StepList, extract_form: bool = True) -> Step:
 
     # Make sure we return a form is a sub step has a form
     form = next((sub_step.form for sub_step in steps if sub_step.form), None) if extract_form else None
-    return make_step_function(func, name, form)
+    return make_step_function(func, name, form, retry_auth_callback=retry_auth_callback)
 
 
 def _create_endpoint_step(key: str = DEFAULT_CALLBACK_ROUTE_KEY) -> StepFunc:

{orchestrator_core-4.6.0rc4 → orchestrator_core-4.6.1}/pyproject.toml

@@ -45,8 +45,8 @@ dependencies = [
     "itsdangerous>=2.2.0",
     "jinja2==3.1.6",
     "more-itertools~=10.7.0",
-    "nwa-stdlib~=1.9.2",
-    "oauth2-lib==2.4.2",
+    "nwa-stdlib~=1.10.3",
+    "oauth2-lib>=2.5.0",
     "orjson==3.10.18",
     "pgvector>=0.4.1",
     "prometheus-client==0.22.1",
@@ -97,6 +97,7 @@ docs = [
     "mkdocs-macros-plugin>=1.3.7",
     "mkdocs-material[imaging]>=9.6.14",
     "mkdocs-open-in-new-tab>=1.0.8",
+    "mkdocs-redirects>=1.2.2",
     "mkdocs-render-swagger-plugin>=0.1.2",
     "mkdocstrings[python]>=0.29.1",
 ]