LanguageModel: Make callback/event return the instance rather than the value

Author: gohai

examples/LanguageModel/sketch.js

@@ -42,9 +42,9 @@ function generateText() {
   lm.generate(prompt, options, gotText);
 }
 
-function gotText(text, lm) {
-  console.log('Model returned "' + text + '"');
+function gotText(result) {
+  console.log('Model returned "' + result.text + '"');
   // lm.words contains the output broken up in words
-  words = lm.words;
+  words = result.words;
   curWord = 0;
 }

examples/LanguageModelEvents/sketch.js

@@ -36,12 +36,12 @@ function generateText() {
 }
 
 
-function onToken(token, lm) {
-  //console.log('Token', token);
+function onToken(lm) {
+  console.log('Token', lm.tokens.slice(-1));
 }
 
-function onWord(word, lm) {
-  //console.log('Word "' + word + '"');
+function onWord(lm) {
+  console.log('Word "' + lm.words.slice(-1) + '"');
   push();
   translate(width/2, height/2);
   rotate(radians(angle));
@@ -55,10 +55,10 @@ function onWord(word, lm) {
   fill(255);
   textAlign(CENTER);
   textSize(10);
-  text(word, 0, 0);
+  text(lm.words.slice(-1), 0, 0);
   pop();
 }
 
-function onFinsh(text, lm) {
-  console.log('Generation finished');
+function onFinsh(lm) {
+  console.log('Model returned "' + lm.text + '"');
 }

src/LanguageModel/index.js

@@ -115,20 +115,20 @@ class LanguageModel extends EventEmitter {
       }
 
       // on-token event
-      this.emit('token', this.tokens[this.tokens.length-1], this);
+      this.emit('token', this);
 
       // redo word tokenization
       const wordDelimiters = ' .,:;"“?!\n';
       const re = new RegExp('(?=[' + wordDelimiters + '])|(?<=[' + wordDelimiters + '])', 'g');
-      const prevNumWords = this.words.length;
-      this.words = this.text.split(re);
+      const newWords = this.text.split(re);
       // ignore the last word if we can't be certain it's complete
       if (!wordDelimiters.includes(this.text.slice(-1)) && !this.finished) {
-        this.words.pop();
+        newWords.pop();
       }
-      // on-word event
-      for (let i=prevNumWords; i < this.words.length; i++) {
-        this.emit('word', this.words[i], this);
+      // on-word events
+      for (let i=this.words.length; i < newWords.length; i++) {
+        this.words[i] = newWords[i];
+        this.emit('word', this);
       }
 
       // on-finished promise/event/callback
@@ -137,9 +137,9 @@ class LanguageModel extends EventEmitter {
         if (this.promiseResolve) {
           this.promiseResolve(this.text);
         }
-        this.emit('finish', this.text, this);
+        this.emit('finish', this);
         if (this.callback) {
-          this.callback(this.text, this);
+          this.callback(this);
         }
       }
     }, 'viifi');