More utils for ModelOutput.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "web-rwkv"
-version = "0.6.1"
+version = "0.6.2"
 edition = "2021"
 authors = ["Zhenyuan Zhang <[email protected]>"]
 license = "MIT OR Apache-2.0"

examples/chat.rs

@@ -256,7 +256,7 @@ where
     // run initial prompt
     loop {
         let logits = model.run(&mut tokens, &state).await?;
-        if logits.iter().any(|x| matches!(x, ModelOutput::Last(_))) {
+        if logits.iter().any(ModelOutput::is_some) {
             break;
         }
     }
@@ -302,7 +302,7 @@ where
         loop {
             let mut logits = loop {
                 let logits = model.run(&mut tokens, &state).await?;
-                if logits.iter().any(|x| matches!(x, ModelOutput::Last(_))) {
+                if logits.iter().any(ModelOutput::is_some) {
                     break logits;
                 }
             };

examples/inspector.rs

@@ -198,7 +198,7 @@ async fn run(cli: Cli) -> Result<()> {
     // run initial prompt
     let logits = loop {
         let logits = model.run_with_hooks(&mut tokens, &state, &hooks).await?;
-        if logits.iter().any(|x| matches!(x, ModelOutput::Last(_))) {
+        if logits.iter().any(ModelOutput::is_some) {
             break logits;
         }
     };

src/model/mod.rs

@@ -93,6 +93,14 @@ pub enum ModelOutput {
 }
 
 impl ModelOutput {
+    pub fn is_none(&self) -> bool {
+        matches!(self, Self::None)
+    }
+
+    pub fn is_some(&self) -> bool {
+        !self.is_none()
+    }
+
     pub fn concat(self, other: Self) -> Self {
         match (self, other) {
             (Self::None, y) => y,