chore: Merge branch 'main' into multi-model

pywr-cli/Cargo.toml

@@ -2,6 +2,13 @@
 name = "pywr-cli"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.60"
+description = "A generalised water resource allocation model."
+readme = "../README.md"
+repository = "https://github.com/pywr/pywr-next/"
+license = "MIT OR Apache-2.0"
+keywords = ["water", "modelling"]
+categories = ["science", "simulation"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

pywr-core/Cargo.toml

@@ -5,10 +5,9 @@ authors = ["James Tomlinson <[email protected]>"]
 edition = "2021"
 rust-version = "1.60"
 description = "A generalised water resource allocation model."
-readme = "README.md"
+readme = "../README.md"
 repository = "https://github.com/pywr/pywr-next/"
 license = "MIT OR Apache-2.0"
-license-file = "LICENSE"
 keywords = ["water", "modelling"]
 categories = ["science", "simulation"]
 

pywr-python/Cargo.toml

@@ -2,6 +2,14 @@
 name = "pywr-python"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.60"
+description = "A generalised water resource allocation model."
+readme = "../README.md"
+repository = "https://github.com/pywr/pywr-next/"
+license = "MIT OR Apache-2.0"
+keywords = ["water", "modelling", "python"]
+categories = ["science", "simulation"]
+
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

pywr-schema/Cargo.toml

@@ -5,10 +5,9 @@ authors = ["James Tomlinson <[email protected]>"]
 edition = "2021"
 rust-version = "1.60"
 description = "A generalised water resource allocation model."
-readme = "README.md"
+readme = "../README.md"
 repository = "https://github.com/pywr/pywr-next/"
 license = "MIT OR Apache-2.0"
-license-file = "LICENSE"
 keywords = ["water", "modelling"]
 categories = ["science", "simulation"]
 
@@ -18,6 +17,8 @@ categories = ["science", "simulation"]
 svgbobdoc = { version = "0.3.0", features = ["enable"]  }
 polars = { version = "0.33.2", features = ["lazy", "rows", "ndarray"] }
 pyo3-polars = "0.7.0"
+strum = "0.25"
+strum_macros = "0.25"
 
 hdf5 = {  workspace = true }
 csv = {  workspace = true }

pywr-schema/src/error.rs

@@ -69,6 +69,8 @@ pub enum ConversionError {
     UnexpectedAttribute { attrs: Vec<String>, name: String },
     #[error("Can not convert a float constant to an index constant.")]
     FloatToIndex,
-    #[error("Attribute {attr:?} is not allowed on node {name:?}.")]
+    #[error("Attribute {attr:?} on node {name:?} is not allowed .")]
     ExtraNodeAttribute { attr: String, name: String },
+    #[error("Custom node of type {ty:?} on node {name:?} is not supported .")]
+    CustomNodeNotSupported { ty: String, name: String },
 }

pywr-schema/src/nodes/annual_virtual_storage.rs

@@ -16,7 +16,17 @@ pub struct AnnualReset {
     pub use_initial_volume: bool,
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+impl Default for AnnualReset {
+    fn default() -> Self {
+        Self {
+            day: 1,
+            month: time::Month::January,
+            use_initial_volume: false,
+        }
+    }
+}
+
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct AnnualVirtualStorageNode {
     #[serde(flatten)]
     pub meta: NodeMeta,

pywr-schema/src/nodes/core.rs

@@ -13,7 +13,7 @@ use pywr_v1_schema::nodes::{
 use std::collections::HashMap;
 use std::path::Path;
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct InputNode {
     #[serde(flatten)]
     pub meta: NodeMeta,
@@ -112,7 +112,7 @@ impl TryFrom<InputNodeV1> for InputNode {
     }
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct LinkNode {
     #[serde(flatten)]
     pub meta: NodeMeta,
@@ -210,7 +210,7 @@ impl TryFrom<LinkNodeV1> for LinkNode {
     }
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct OutputNode {
     #[serde(flatten)]
     pub meta: NodeMeta,
@@ -309,7 +309,7 @@ impl TryFrom<OutputNodeV1> for OutputNode {
     }
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct StorageNode {
     #[serde(flatten)]
     pub meta: NodeMeta,
@@ -489,7 +489,7 @@ impl TryFrom<ReservoirNodeV1> for StorageNode {
 /// ```
 ///
 )]
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct CatchmentNode {
     #[serde(flatten)]
     pub meta: NodeMeta,
@@ -566,7 +566,7 @@ pub enum Factors {
     Ratio { factors: Vec<DynamicFloatValue> },
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct AggregatedNode {
     #[serde(flatten)]
     pub meta: NodeMeta,
@@ -684,7 +684,7 @@ impl TryFrom<AggregatedNodeV1> for AggregatedNode {
     }
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct AggregatedStorageNode {
     #[serde(flatten)]
     pub meta: NodeMeta,

pywr-schema/src/nodes/delay.rs

@@ -24,7 +24,7 @@ use pywr_v1_schema::nodes::DelayNode as DelayNodeV1;
 /// ```
 ///
 )]
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct DelayNode {
     #[serde(flatten)]
     pub meta: NodeMeta,

pywr-schema/src/nodes/loss_link.rs

@@ -24,7 +24,7 @@ use std::path::Path;
 /// ```
 ///
 )]
-#[derive(serde::Deserialize, serde::Serialize, Clone)]
+#[derive(serde::Deserialize, serde::Serialize, Clone, Default)]
 pub struct LossLinkNode {
     #[serde(flatten)]
     pub meta: NodeMeta,