Merge remote-tracking branch 'origin/main' into ab/list-ops

hugr-py/src/hugr/__init__.py

@@ -2,20 +2,15 @@
 representation.
 """
 
-from .hugr import Hugr
-from .node_port import Direction, InPort, Node, OutPort, Wire
-from .ops import Op
-from .tys import Kind, Type
+from .hugr.base import Hugr
+from .hugr.node_port import Direction, InPort, Node, OutPort, Wire
 
 __all__ = [
     "Hugr",
     "Node",
     "OutPort",
     "InPort",
     "Direction",
-    "Op",
-    "Kind",
-    "Type",
     "Wire",
 ]
 

hugr-py/src/hugr/_serialization/ops.py

@@ -7,7 +7,9 @@
 
 from pydantic import ConfigDict, Field, RootModel
 
-from hugr.node_port import NodeIdx  # noqa: TCH001 # pydantic needs this alias in scope
+from hugr.hugr.node_port import (
+    NodeIdx,  # noqa: TCH001 # pydantic needs this alias in scope
+)
 from hugr.utils import deser_it
 
 from . import tys as stys

hugr-py/src/hugr/_serialization/serial_hugr.py

@@ -2,7 +2,7 @@
 
 from pydantic import ConfigDict, Field
 
-from hugr.node_port import NodeIdx, PortOffset
+from hugr.hugr.node_port import NodeIdx, PortOffset
 
 from .ops import OpType
 from .ops import classes as ops_classes

hugr-py/src/hugr/build/__init__.py

@@ -0,0 +1,24 @@
+"""Classes for building HUGRs."""
+
+from .base import ParentBuilder
+from .cfg import Block, Cfg
+from .cond_loop import Case, Conditional, If, TailLoop
+from .dfg import DefinitionBuilder, DfBase, Dfg, Function
+from .function import Module
+from .tracked_dfg import TrackedDfg
+
+__all__ = [
+    "ParentBuilder",
+    "Cfg",
+    "Block",
+    "Case",
+    "If",
+    "Conditional",
+    "TailLoop",
+    "Function",
+    "Module",
+    "TrackedDfg",
+    "Dfg",
+    "DefinitionBuilder",
+    "DfBase",
+]

hugr-py/src/hugr/build/base.py

@@ -0,0 +1,31 @@
+"""Base classes for HUGR builders."""
+
+from __future__ import annotations
+
+from typing import (
+    Protocol,
+    cast,
+)
+
+from hugr.hugr.base import Hugr, OpVar
+from hugr.hugr.node_port import (
+    Node,
+    ToNode,
+)
+
+
+class ParentBuilder(ToNode, Protocol[OpVar]):
+    """Abstract interface implemented by builders of nodes that contain child HUGRs."""
+
+    #: The child HUGR.
+    hugr: Hugr[OpVar]
+    # Unique parent node.
+    parent_node: Node
+
+    def to_node(self) -> Node:
+        return self.parent_node
+
+    @property
+    def parent_op(self) -> OpVar:
+        """The parent node's operation."""
+        return cast(OpVar, self.hugr[self.parent_node].op)

hugr-py/src/hugr/cfg.py → hugr-py/src/hugr/build/cfg.py

@@ -9,14 +9,14 @@
 from typing_extensions import Self
 
 from hugr import ops, tys, val
-
-from .dfg import DfBase
-from .exceptions import MismatchedExit, NoSiblingAncestor, NotInSameCfg
-from .hugr import Hugr, ParentBuilder
+from hugr.build.base import ParentBuilder
+from hugr.build.dfg import DfBase
+from hugr.exceptions import MismatchedExit, NoSiblingAncestor, NotInSameCfg
+from hugr.hugr import Hugr
 
 if TYPE_CHECKING:
-    from .node_port import Node, PortOffset, ToNode, Wire
-    from .tys import Type, TypeRow
+    from hugr.hugr.node_port import Node, PortOffset, ToNode, Wire
+    from hugr.tys import Type, TypeRow
 
 
 class Block(DfBase[ops.DataflowBlock]):

hugr-py/src/hugr/cond_loop.py → hugr-py/src/hugr/build/cond_loop.py

@@ -11,14 +11,14 @@
 from typing_extensions import Self
 
 from hugr import ops
+from hugr.build.base import ParentBuilder
+from hugr.build.dfg import DfBase
+from hugr.hugr.base import Hugr
 from hugr.tys import Sum
 
-from .dfg import DfBase
-from .hugr import Hugr, ParentBuilder
-
 if TYPE_CHECKING:
-    from .node_port import Node, ToNode, Wire
-    from .tys import TypeRow
+    from hugr.hugr.node_port import Node, ToNode, Wire
+    from hugr.tys import TypeRow
 
 
 class Case(DfBase[ops.Case]):

hugr-py/src/hugr/dfg.py → hugr-py/src/hugr/build/dfg.py

@@ -14,17 +14,18 @@
 from typing_extensions import Self
 
 from hugr import ops, tys, val
-
-from .exceptions import NoSiblingAncestor
-from .hugr import Hugr, ParentBuilder
+from hugr.build.base import ParentBuilder
+from hugr.exceptions import NoSiblingAncestor
+from hugr.hugr import Hugr
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Sequence
 
+    from hugr.hugr.node_port import Node, OutPort, PortOffset, ToNode, Wire
+    from hugr.tys import Type, TypeParam, TypeRow
+
     from .cfg import Cfg
     from .cond_loop import Conditional, If, TailLoop
-    from .node_port import Node, OutPort, PortOffset, ToNode, Wire
-    from .tys import Type, TypeParam, TypeRow
 
 OpVar = TypeVar("OpVar", bound=ops.Op)
 

hugr-py/src/hugr/function.py → hugr-py/src/hugr/build/function.py

@@ -5,13 +5,13 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from . import ops
-from .dfg import DefinitionBuilder, Function
-from .hugr import Hugr
+from hugr import ops
+from hugr.build.dfg import DefinitionBuilder, Function
+from hugr.hugr import Hugr
 
 if TYPE_CHECKING:
-    from .node_port import Node
-    from .tys import PolyFuncType, TypeBound, TypeRow
+    from hugr.hugr.node_port import Node
+    from hugr.tys import PolyFuncType, TypeBound, TypeRow
 
 __all__ = ["Function", "Module"]
 

hugr-py/src/hugr/tracked_dfg.py → hugr-py/src/hugr/build/tracked_dfg.py

@@ -4,8 +4,8 @@
 from typing import Any
 
 from hugr import tys
-from hugr.dfg import Dfg
-from hugr.node_port import Node, Wire
+from hugr.build.dfg import Dfg
+from hugr.hugr.node_port import Node, Wire
 from hugr.ops import Command, ComWire
 
 

hugr-py/src/hugr/conftest.py

@@ -2,7 +2,10 @@
 
 import pytest
 
-from hugr import dfg, hugr, node_port, ops, tys, val
+from hugr import ops, tys, val
+from hugr.build import dfg
+from hugr.hugr import base as hugr
+from hugr.hugr import node_port
 
 
 @pytest.fixture(autouse=True)

hugr-py/src/hugr/exceptions.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass
 
-from .node_port import NodeIdx
+from .hugr.node_port import NodeIdx
 
 
 @dataclass

hugr-py/src/hugr/hugr/__init__.py

@@ -0,0 +1,20 @@
+"""The main HUGR structure."""
+
+from .base import Hugr, NodeData
+from .node_port import (
+    Direction,
+    InPort,
+    Node,
+    OutPort,
+    Wire,
+)
+
+__all__ = [
+    "Hugr",
+    "NodeData",
+    "Direction",
+    "InPort",
+    "Wire",
+    "OutPort",
+    "Node",
+]

hugr-py/src/hugr/hugr.py → hugr-py/src/hugr/hugr/base.py

@@ -9,15 +9,20 @@
     TYPE_CHECKING,
     Any,
     Generic,
-    Protocol,
     TypeVar,
     cast,
     overload,
 )
 
 from hugr._serialization.ops import OpType as SerialOp
 from hugr._serialization.serial_hugr import SerialHugr
-from hugr.node_port import (
+from hugr.exceptions import ParentBeforeChild
+from hugr.ops import Call, Const, Custom, DataflowOp, Module, Op
+from hugr.tys import Kind, Type, ValueKind
+from hugr.utils import BiMap
+from hugr.val import Value
+
+from .node_port import (
     Direction,
     InPort,
     Node,
@@ -27,12 +32,6 @@
     ToNode,
     _SubPort,
 )
-from hugr.ops import Call, Const, Custom, DataflowOp, Module, Op
-from hugr.tys import Kind, Type, ValueKind
-from hugr.utils import BiMap
-from hugr.val import Value
-
-from .exceptions import ParentBeforeChild
 
 if TYPE_CHECKING:
     import graphviz as gv  # type: ignore[import-untyped]
@@ -69,23 +68,6 @@ def _to_serial(self, node: Node) -> SerialOp:
 OpVarCov = TypeVar("OpVarCov", bound=Op, covariant=True)
 
 
-class ParentBuilder(ToNode, Protocol[OpVar]):
-    """Abstract interface implemented by builders of nodes that contain child HUGRs."""
-
-    #: The child HUGR.
-    hugr: Hugr[OpVar]
-    # Unique parent node.
-    parent_node: Node
-
-    def to_node(self) -> Node:
-        return self.parent_node
-
-    @property
-    def parent_op(self) -> OpVar:
-        """The parent node's operation."""
-        return cast(OpVar, self.hugr[self.parent_node].op)
-
-
 @dataclass()
 class Hugr(Mapping[Node, NodeData], Generic[OpVarCov]):
     """The core HUGR datastructure.
@@ -669,9 +651,10 @@ def get_meta(idx: int) -> dict[str, Any]:
                 parent = None
 
             serial_node.root.parent = -1
-            hugr._nodes.append(
-                NodeData(serial_node.root.deserialize(), parent, metadata=node_meta)
+            n = hugr._add_node(
+                serial_node.root.deserialize(), parent, metadata=node_meta
             )
+            assert n.idx == idx, "Nodes should be added contiguously"
 
         for (src_node, src_offset), (dst_node, dst_offset) in serial.edges:
             if src_offset is None or dst_offset is None:

hugr-py/src/hugr/ops.py

@@ -10,7 +10,7 @@
 
 import hugr._serialization.ops as sops
 from hugr import tys, val
-from hugr.node_port import Direction, InPort, Node, OutPort, PortOffset, Wire
+from hugr.hugr.node_port import Direction, InPort, Node, OutPort, PortOffset, Wire
 from hugr.utils import ser_it
 
 if TYPE_CHECKING:

hugr-py/tests/serialization/test_basic.py

@@ -1,4 +1,6 @@
+from hugr import Hugr, tys
 from hugr._serialization.serial_hugr import SerialHugr, serialization_version
+from hugr.build.function import Module
 
 
 def test_empty():
@@ -10,3 +12,15 @@ def test_empty():
         "metadata": None,
         "encoder": None,
     }
+
+
+def test_children():
+    mod = Module()
+    mod.declare_function("foo", tys.PolyFuncType([], tys.FunctionType.empty()))
+
+    h = mod.hugr
+    assert len(h.children(h.root)) == 1
+
+    h2 = Hugr.load_json(h.to_json())
+
+    assert len(h2.children(h2.root)) == 1

hugr-py/tests/test_cfg.py

@@ -1,6 +1,5 @@
 from hugr import ops, tys, val
-from hugr.cfg import Cfg
-from hugr.dfg import Dfg
+from hugr.build import Cfg, Dfg
 from hugr.std.int import INT_T, DivMod, IntVal
 
 from .conftest import validate

hugr-py/tests/test_cond_loop.py

@@ -1,8 +1,8 @@
 import pytest
 
 from hugr import ops, tys, val
-from hugr.cond_loop import Conditional, ConditionalError, TailLoop
-from hugr.dfg import Dfg
+from hugr.build.cond_loop import Conditional, ConditionalError, TailLoop
+from hugr.build.dfg import Dfg
 from hugr.ext import Package
 from hugr.std.int import INT_T, IntVal
 

hugr-py/tests/test_custom.py

@@ -3,9 +3,8 @@
 import pytest
 
 from hugr import ext, ops, tys
-from hugr.dfg import Dfg
-from hugr.hugr import Hugr
-from hugr.node_port import Node
+from hugr.build.dfg import Dfg
+from hugr.hugr import Hugr, Node
 from hugr.ops import AsExtOp, Custom, ExtOp
 from hugr.std.float import EXTENSION as FLOAT_EXT
 from hugr.std.float import FLOAT_T

hugr-py/tests/test_hugr_build.py

@@ -5,10 +5,10 @@
 import hugr.ops as ops
 import hugr.tys as tys
 import hugr.val as val
-from hugr.dfg import Dfg, _ancestral_sibling
-from hugr.function import Module
+from hugr.build.dfg import Dfg, _ancestral_sibling
+from hugr.build.function import Module
 from hugr.hugr import Hugr
-from hugr.node_port import Node, _SubPort
+from hugr.hugr.node_port import Node, _SubPort
 from hugr.ops import NoConcreteFunc
 from hugr.std.int import INT_T, DivMod, IntVal
 from hugr.std.logic import Not

hugr-py/tests/test_nodes.py

@@ -1,6 +1,6 @@
 import pytest
 
-from hugr.node_port import Node, OutPort
+from hugr.hugr import Node, OutPort
 
 
 def test_index():