feat: Define some pyo3 errors, wrap EdgeKind

src/builder.rs

@@ -3,7 +3,7 @@
 use thiserror::Error;
 
 #[cfg(feature = "pyo3")]
-use pyo3::prelude::*;
+use pyo3::{create_exception, exceptions::PyException, prelude::*};
 
 use crate::hugr::{HugrError, Node, ValidationError, Wire};
 use crate::ops::handle::{BasicBlockID, CfgID, ConditionalID, DfgID, FuncID, TailLoopID};
@@ -78,11 +78,18 @@ pub enum BuildError {
     CircuitError(#[from] circuit::CircuitBuildError),
 }
 
+#[cfg(feature = "pyo3")]
+create_exception!(
+    pyrs,
+    PyBuildError,
+    PyException,
+    "Errors that can occur while building a Hugr"
+);
+
 #[cfg(feature = "pyo3")]
 impl From<BuildError> for PyErr {
     fn from(err: BuildError) -> Self {
-        // We may want to define more specific python-level errors at some point.
-        PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(err.to_string())
+        PyBuildError::new_err(err.to_string())
     }
 }
 

src/hugr.rs

@@ -23,7 +23,7 @@ use portgraph::{Hierarchy, NodeIndex, PortMut, UnmanagedDenseMap};
 use thiserror::Error;
 
 #[cfg(feature = "pyo3")]
-use pyo3::prelude::*;
+use pyo3::{create_exception, exceptions::PyException, prelude::*};
 
 pub use self::views::HugrView;
 use crate::extension::{
@@ -463,11 +463,18 @@ pub enum HugrError {
     InvalidNode(Node),
 }
 
+#[cfg(feature = "pyo3")]
+create_exception!(
+    pyrs,
+    PyHugrError,
+    PyException,
+    "Errors that can occur while manipulating a Hugr"
+);
+
 #[cfg(feature = "pyo3")]
 impl From<HugrError> for PyErr {
     fn from(err: HugrError) -> Self {
-        // We may want to define more specific python-level errors at some point.
-        PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(err.to_string())
+        PyHugrError::new_err(err.to_string())
     }
 }
 

src/hugr/serialize.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use thiserror::Error;
 
 #[cfg(feature = "pyo3")]
-use pyo3::prelude::*;
+use pyo3::{create_exception, exceptions::PyException, prelude::*};
 
 use crate::extension::ExtensionSet;
 use crate::hugr::{Hugr, NodeType};
@@ -89,10 +89,18 @@ pub enum HUGRSerializationError {
     FirstNodeNotRoot(Node),
 }
 
+#[cfg(feature = "pyo3")]
+create_exception!(
+    pyrs,
+    PyHUGRSerializationError,
+    PyException,
+    "Errors that can occur while serializing a Hugr"
+);
+
 #[cfg(feature = "pyo3")]
 impl From<HUGRSerializationError> for PyErr {
     fn from(err: HUGRSerializationError) -> Self {
-        PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(err.to_string())
+        PyHUGRSerializationError::new_err(err.to_string())
     }
 }
 

src/types.rs

@@ -13,6 +13,7 @@ pub use custom::CustomType;
 pub use signature::{FunctionType, Signature, SignatureDescription};
 pub use type_row::TypeRow;
 
+use derive_more::{From, Into};
 use itertools::FoldWhile::{Continue, Done};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -24,8 +25,10 @@ use std::fmt::Debug;
 
 use self::primitive::PrimType;
 
+#[cfg(feature = "pyo3")]
+use pyo3::prelude::*;
+
 /// The kinds of edges in a HUGR, excluding Hierarchy.
-//#[cfg_attr(feature = "pyo3", pyclass)] # TODO: Manually derive pyclass with non-unit variants
 #[derive(Clone, PartialEq, Eq, Debug, serde::Serialize, serde::Deserialize)]
 #[non_exhaustive]
 pub enum EdgeKind {
@@ -46,6 +49,12 @@ impl EdgeKind {
     }
 }
 
+/// Python representation for [`EdgeKind`], the kinds of edges in a HUGR.
+#[cfg_attr(feature = "pyo3", pyclass)]
+#[repr(transparent)]
+#[derive(Clone, PartialEq, Eq, Debug, From, Into)]
+pub struct PyEdgeKind(EdgeKind);
+
 #[derive(
     Copy, Default, Clone, PartialEq, Eq, Hash, Debug, derive_more::Display, Serialize, Deserialize,
 )]
@@ -167,6 +176,7 @@ impl TypeEnum {
 )]
 #[display(fmt = "{}", "_0")]
 #[serde(into = "serialize::SerSimpleType", from = "serialize::SerSimpleType")]
+#[cfg_attr(feature = "pyo3", pyclass)]
 /// A HUGR type - the valid types of [EdgeKind::Value] and [EdgeKind::Static] edges.
 /// Such an edge is valid if the ports on either end agree on the [Type].
 /// Types have an optional [TypeBound] which places limits on the valid

src/types/type_row.rs

@@ -11,9 +11,12 @@ use super::Type;
 use crate::utils::display_list;
 use delegate::delegate;
 
+#[cfg(feature = "pyo3")]
+use pyo3::prelude::*;
+
 /// List of types, used for function signatures.
 #[derive(Clone, PartialEq, Eq, Debug, serde::Serialize, serde::Deserialize)]
-//#[cfg_attr(feature = "pyo3", pyclass)]
+#[cfg_attr(feature = "pyo3", pyclass)]
 #[non_exhaustive]
 #[serde(transparent)]
 pub struct TypeRow {