From a5466a79a1ade519e4a61106d68e5de4dd132303 Mon Sep 17 00:00:00 2001
From: Michal Moskal <michal@moskal.me>
Date: Mon, 29 Apr 2024 19:59:31 +0000
Subject: [PATCH 1/3] remove accidental code

---
 controllers/jsctrl/samples/hello.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/controllers/jsctrl/samples/hello.js b/controllers/jsctrl/samples/hello.js
index 0826a84f..e47a346d 100644
--- a/controllers/jsctrl/samples/hello.js
+++ b/controllers/jsctrl/samples/hello.js
@@ -1,13 +1,6 @@
-function fib(n) {
-    if (n <= 1) return n
-    return fib(n - 1) + fib(n - 2)
-}
-
 async function main() {
     await $`Ultimate answer is to the life, universe and everything is `
     await gen({ regex: /\d\d/ })
-    console.log(`fib(10) = ${fib(30)}`)
-    await gen({ regex: / [A-Z].*/ })
 }
 
 start(main)

From e610ab9f053961d585b890a32535924456784207 Mon Sep 17 00:00:00 2001
From: Michal Moskal <michal@moskal.me>
Date: Mon, 29 Apr 2024 19:59:51 +0000
Subject: [PATCH 2/3] update vllm to aici2 branch

---
 py/vllm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/vllm b/py/vllm
index 6fc422b5..0633e02e 160000
--- a/py/vllm
+++ b/py/vllm
@@ -1 +1 @@
-Subproject commit 6fc422b56096bd019bf4fb697fde4cde701bf632
+Subproject commit 0633e02e7c633c4e5c81276b2a41dfe5a33fa699

From 017179c935cd25309271052e9d5983181b85eb1b Mon Sep 17 00:00:00 2001
From: Michal Moskal <michal@moskal.me>
Date: Mon, 29 Apr 2024 20:23:15 +0000
Subject: [PATCH 3/3] Use bytes not strings in substr matcher; fixes #100

---
 controllers/aici_abi/src/substring.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/controllers/aici_abi/src/substring.rs b/controllers/aici_abi/src/substring.rs
index 69308631..55f80eef 100644
--- a/controllers/aici_abi/src/substring.rs
+++ b/controllers/aici_abi/src/substring.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use crate::{
-    bytes::limit_str,
+    bytes::limit_bytes,
     recognizer::{FunctionalRecognizer, StackRecognizer},
     toktree::SpecialToken,
 };
@@ -14,7 +14,7 @@ enum Node {
 
 pub struct SubStrMatcher {
     end_str: String,
-    source: String,
+    source: Vec<u8>,
     nodes: Vec<Node>,
 }
 
@@ -52,7 +52,7 @@ impl SubStrMatcher {
                 serde_json::Value::Object(children_json)
             }
             Node::Leaf { source_offset } => {
-                json!(limit_str(&self.source[*source_offset..], 20))
+                json!(limit_bytes(&self.source[*source_offset..], 20))
             }
         }
     }
@@ -77,7 +77,7 @@ impl SubStrMatcher {
                     "{:indent$}{}: {:?}",
                     "",
                     *source_offset,
-                    limit_str(&self.source[*source_offset..], 20),
+                    limit_bytes(&self.source[*source_offset..], 20),
                 )?;
             }
         }
@@ -86,13 +86,13 @@ impl SubStrMatcher {
 
     pub fn new(source: &str, end_str: &str) -> Self {
         let mut tmp = Self {
-            source: source.to_string() + " ",
+            source: (source.to_string() + " ").as_bytes().to_vec(),
             end_str: end_str.to_string(),
             nodes: vec![Node::Inner { children: vec![] }],
         };
         tmp.add(0);
         for i in 0..tmp.source.len() {
-            if tmp.source.as_bytes()[i] == b' ' {
+            if tmp.source[i] == b' ' {
                 tmp.add(i + 1);
             }
         }
@@ -101,15 +101,15 @@ impl SubStrMatcher {
         tmp
     }
 
-    fn find(&self, s: &str) -> (usize, usize) {
+    fn find(&self, s: &[u8]) -> (usize, usize) {
         let mut node_idx = 0;
-        for (i, b) in s.bytes().enumerate() {
+        for (i, b) in s.iter().enumerate() {
             let node = &self.nodes[node_idx];
             match node {
                 Node::Inner { children } => {
                     let mut found = false;
                     for (c, idx) in children.iter() {
-                        if *c == b {
+                        if *c == *b {
                             node_idx = *idx;
                             found = true;
                             break;
@@ -137,7 +137,7 @@ impl SubStrMatcher {
         let num_nodes = self.nodes.len();
         match &mut self.nodes[node_idx] {
             Node::Inner { children } => {
-                children.push((s1.as_bytes()[0], num_nodes));
+                children.push((s1[0], num_nodes));
                 let n = add_node(
                     &mut self.nodes,
                     Node::Leaf {
@@ -160,8 +160,8 @@ impl SubStrMatcher {
                 }
 
                 for i in 0..s1.len() {
-                    let b1 = s1.as_bytes()[i];
-                    let b2 = s2.as_bytes()[i];
+                    let b1 = s1[i];
+                    let b2 = s2[i];
                     if b1 != b2 {
                         let n1 = add_node(
                             &mut self.nodes,
@@ -196,7 +196,7 @@ impl SubStrMatcher {
     }
 
     fn append_to_src_off(&self, off: usize, byte: u8) -> SubStrState {
-        if off < self.source.len() && self.source.as_bytes()[off] == byte {
+        if off < self.source.len() && self.source[off] == byte {
             SubStrState::SourceOffset(off + 1)
         } else {
             SubStrState::Dead