Impl serde for Voice

Cargo.toml

@@ -8,7 +8,7 @@ rust-version = "1.75.0"
 [features]
 default = ["htsvoice"]
 binary = ["htsvoice", "dep:hound"]
-htsvoice = ["dep:nom","dep:serde"]
+htsvoice = ["dep:nom"]
 
 [[example]]
 name = "is-bonsai"
@@ -22,8 +22,10 @@ byteorder = "1.5.0"
 thiserror = "1.0.56"
 approx = "0.5.1"
 
+serde = { version = "1.0", features = ["derive"] }
+
 nom = { version = "7.1.3", optional = true }
-serde = { version = "1.0", features = ["derive"], optional = true }
 hound = { version = "3.5.1", optional = true }
-jlabel = "0.1.3"
-jlabel-question = { version = "0.1.3", features = ["regex"]}
+
+jlabel = { version = "0.1.4", features = ["serde"] }
+jlabel-question = { version = "0.1.4", features = ["regex", "serde"] }

src/model/mean_vari.rs

@@ -3,7 +3,9 @@ use std::{
     ops::{Add, Mul},
 };
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub struct MeanVari(pub f64, pub f64);
 
 impl MeanVari {

src/model/voice/mod.rs

@@ -1,13 +1,15 @@
 use std::fmt::Display;
 
+use serde::{Deserialize, Serialize};
+
 use self::{model::Model, window::Windows};
 
 pub mod model;
 pub mod question;
 pub mod tree;
 pub mod window;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Voice {
     pub metadata: GlobalModelMetadata,
     pub duration_model: Model,
@@ -25,7 +27,7 @@ impl Display for Voice {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct GlobalModelMetadata {
     pub hts_voice_version: String,
     pub sampling_frequency: usize,
@@ -55,7 +57,7 @@ impl Display for GlobalModelMetadata {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct StreamModels {
     pub metadata: StreamModelMetadata,
 
@@ -101,7 +103,7 @@ impl StreamModels {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct StreamModelMetadata {
     pub vector_length: usize,
     pub num_windows: usize,

src/model/voice/model.rs

@@ -1,12 +1,13 @@
 use std::fmt::Display;
 
 use jlabel::Label;
+use serde::{Deserialize, Serialize};
 
 use crate::model::MeanVari;
 
 use super::tree::Tree;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Model {
     trees: Vec<Tree>,
     pdf: Vec<Vec<ModelParameter>>,
@@ -81,7 +82,7 @@ impl Model {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct ModelParameter {
     pub parameters: Vec<MeanVari>,
     pub msd: Option<f64>,

src/model/voice/question.rs

@@ -1,16 +1,17 @@
 use jlabel_question::{regex::RegexQuestion, AllQuestion, QuestionMatcher};
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Question {
     AllQustion(AllQuestion),
-    Regex(RegexQuestion),
+    Regex(RegexWrap),
 }
 
 impl Question {
     pub fn parse(patterns: &[&str]) -> Result<Self, jlabel_question::ParseError> {
         match AllQuestion::parse(patterns) {
             Ok(question) => Ok(Self::AllQustion(question)),
-            Err(_) => Ok(Self::Regex(RegexQuestion::parse(patterns)?)),
+            Err(_) => Ok(Self::Regex(RegexWrap::parse(patterns)?)),
         }
     }
 
@@ -22,13 +23,48 @@
     }
 }
 
-impl PartialEq for Question {
+#[derive(Debug, Clone)]
+pub struct RegexWrap {
+    orig: Vec<String>,
+    q: RegexQuestion,
+}
+
+impl RegexWrap {
+    pub fn parse(patterns: &[&str]) -> Result<Self, jlabel_question::ParseError> {
+        Ok(Self {
+            orig: patterns.iter().map(|s| s.to_string()).collect(),
+            q: RegexQuestion::parse(patterns)?,
+        })
+    }
+    pub fn test(&self, label: &jlabel::Label) -> bool {
+        self.q.test(label)
+    }
+}
+
+impl PartialEq for RegexWrap {
     fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::AllQustion(a), Self::AllQustion(b)) => a == b,
-            // TODO: :exploding_head:
-            (Self::Regex(_), Self::Regex(_)) => true,
-            _ => false,
-        }
+        self.orig == other.orig
+    }
+}
+
+impl Serialize for RegexWrap {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.orig.serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for RegexWrap {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let orig = Vec::deserialize(deserializer)?;
+        Ok(Self {
+            q: RegexQuestion::parse(&orig).map_err(serde::de::Error::custom)?,
+            orig,
+        })
     }
 }

src/model/voice/tree.rs

@@ -1,8 +1,9 @@
 use jlabel::Label;
+use serde::{Deserialize, Serialize};
 
 use super::question::Question;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Tree {
     pub state: usize,
     pub nodes: Vec<TreeNode>,
@@ -26,7 +27,7 @@ impl Tree {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum TreeNode {
     Node {
         question: Question,

src/model/voice/window.rs

@@ -1,4 +1,6 @@
-#[derive(Debug, Clone, PartialEq)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Windows {
     windows: Vec<Window>,
 }
@@ -19,7 +21,7 @@ impl Windows {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Window {
     coefficients: Vec<f64>,
 }