wf reorg 5

src/wf_core/conditions.py

@@ -4,15 +4,15 @@ from collections.abc import Mapping
 from typing import Any
 
 from .errors import WorkflowExecutionError
-from .models import (
+from .models.conditions import (
     BinaryCondition,
     Condition,
     ExistsCondition,
     LiteralOperand,
     NotCondition,
     PathOperand,
-    VariadicCondition,
 )
+from .models.conditions import VariadicCondition
 from .paths import PathResolutionError, path_exists, resolve_graph_path
 
 

src/wf_core/runtime/engine.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
-from wf_core.models import Workflow
+from wf_core.models.workflow import Workflow
 from wf_core.runtime.ops.flow import finalize_run
 from wf_core.runtime.ops.frames import collapse_completed_frames
 from wf_core.runtime.ops.nodes import AsyncNodeHandler, NodeHandler

src/wf_core/runtime/ops/flow.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from wf_core.models import Workflow
+from wf_core.models.workflow import Workflow
 from wf_core.run_state import (
     ExecutionFrame,
     FrameStatus,

src/wf_core/runtime/ops/foreach.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 from wf_core.conditions import safe_resolve_path
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import ForeachNode, Workflow
+from wf_core.models.steps import ForeachNode
+from wf_core.models.workflow import Workflow
 from wf_core.run_state import ExecutionFrame, FrameStatus, RunState, StepExecutionResult
 from wf_core.runtime.ops.flow import advance_frame, append_step_result_trace
 from wf_core.runtime.ops.frames import frame_context_values

src/wf_core/runtime/ops/handlers.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from wf_core.conditions import eval_condition
-from wf_core.models import ConditionNode, InterruptNode
+from wf_core.models.steps import ConditionNode, InterruptNode
 from wf_core.run_state import FrameStatus, RunState, RunStatus, StepExecutionResult
 from wf_core.runtime.ops.flow import append_trace
 from wf_core.runtime.ops.frames import frame_context_values

src/wf_core/runtime/ops/index.py

@@ -4,7 +4,8 @@ from dataclasses import dataclass
 from typing import Any
 
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import NodeDef, Workflow
+from wf_core.models.schemas import NodeDef
+from wf_core.models.workflow import Workflow
 
 
 @dataclass(slots=True)

src/wf_core/runtime/ops/interrupts.py

@@ -4,7 +4,8 @@ from typing import Any
 
 from wf_core.conditions import safe_resolve_path
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import InterruptNode, Workflow
+from wf_core.models.steps import InterruptNode
+from wf_core.models.workflow import Workflow
 from wf_core.run_state import InterruptRequest, RunState, StepExecutionResult
 from wf_core.runtime.ops.flow import advance_frame, append_step_result_trace
 from wf_core.runtime.ops.index import WorkflowIndex

src/wf_core/runtime/ops/nodes.py

@@ -5,7 +5,10 @@ from typing import Any, cast
 
 from wf_core.conditions import safe_resolve_path
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import NodeDef, NodeResult, NodeUse, Workflow
+from wf_core.models.results import NodeResult
+from wf_core.models.schemas import NodeDef
+from wf_core.models.steps import NodeUse
+from wf_core.models.workflow import Workflow
 from wf_core.run_state import RunState, RuntimeContext, StepExecutionResult
 from wf_core.runtime.ops.frames import frame_context_values
 from wf_core.runtime.ops.schemas import validate_payload_against_schema

src/wf_core/runtime/ops/runs.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from copy import deepcopy
 
-from wf_core.models import Workflow
+from wf_core.models.workflow import Workflow
 from wf_core.run_state import ExecutionFrame, FrameStatus, RunState, RunStatus
 
 

src/wf_core/runtime/ops/state.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 from typing import Any
 
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import NodeUse, Workflow
+from wf_core.models.steps import NodeUse
+from wf_core.models.workflow import Workflow
 from wf_core.paths import (
     PathResolutionError,
     get_nested_value,

src/wf_core/runtime/preparation.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Any
 
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import Workflow
+from wf_core.models.workflow import Workflow
 from wf_core.runtime.ops.frames import collapse_completed_frames
 from wf_core.runtime.ops.index import WorkflowIndex, build_workflow_index
 from wf_core.runtime.ops.interrupts import resume_interrupt

src/wf_core/runtime/step.py

@@ -4,14 +4,14 @@ from collections.abc import Mapping
 from typing import Any
 
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models import (
+from wf_core.models.steps import (
     ConditionNode,
     ForeachNode,
     InterruptNode,
     JoinNode,
     NodeUse,
-    Workflow,
 )
+from wf_core.models.workflow import Workflow
 from wf_core.runtime.ops.flow import advance_frame, append_step_result_trace
 from wf_core.runtime.ops.foreach import step_foreach
 from wf_core.runtime.ops.handlers import (

src/wf_core/validation/core.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
 
-from wf_core.models import (
+from wf_core.models.steps import (
     ConditionNode,
-    Edge,
     ForeachNode,
     InterruptNode,
-    NodeDef,
     NodeUse,
     Step,
-    Workflow,
 )
+from wf_core.models.schemas import NodeDef
+from wf_core.models.workflow import Edge, Workflow
 from wf_core.tokens import END
 from wf_core.validation.issues import ValidationIssueCode, ValidationReport
 from wf_core.validation.outcomes import declared_outcomes_for_step, reachable_node_ids

src/wf_core/validation/outcomes.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from wf_core.models import Edge, InterruptNode, NodeDef, NodeUse, Step
+from wf_core.models.schemas import NodeDef
+from wf_core.models.steps import InterruptNode, NodeUse, Step
+from wf_core.models.workflow import Edge
 from wf_core.tokens import END
 
 

src/wf_core/validation/steps.py

@@ -1,20 +1,17 @@
 from __future__ import annotations
 
-from wf_core.models import (
+from wf_core.models.conditions import (
     BinaryCondition,
     Condition,
-    ConditionNode,
     ExistsCondition,
-    ForeachNode,
-    InterruptNode,
     LiteralOperand,
-    NodeDef,
-    NodeUse,
     NotCondition,
     PathOperand,
     VariadicCondition,
-    Workflow,
 )
+from wf_core.models.schemas import NodeDef
+from wf_core.models.steps import ConditionNode, ForeachNode, InterruptNode, NodeUse
+from wf_core.models.workflow import Workflow
 from wf_core.paths import is_valid_destination_path, is_valid_source_path
 from wf_core.validation.issues import ValidationIssueCode, ValidationReport