LanguageModel: Pass value as the first argument to event handlers

gohai · gohai · commit c032cf95c1a9 · 2023-08-09T13:29:22.000+08:00
Previously this sometimes only passed the LanguageModel instance. Instead, always pass the best possible "value" as the first, and the instance as an (optional) second.
diff --git a/examples/LanguageModelEvent/index.html b/examples/LanguageModelEvent/index.html
@@ -8,7 +8,7 @@
   <script src="../../dist/ml5.js"></script>
 </head>
 <body>
-  <input placeholder="Prompt" id="prompt"></input> <input type="button" value="Generate" id="generate"></input>
+  <input placeholder="Prompt" id="prompt"></input> <input type="button" value="Generate" id="generate"></input><br><br>
   <script src="sketch.js"></script>
 </body>
 </html>
diff --git a/examples/LanguageModelEvent/sketch.js b/examples/LanguageModelEvent/sketch.js
@@ -35,8 +35,8 @@ function generateText() {
 }
 
 
-function onToken(lm) {
-  console.log('token', lm.tokens[lm.tokens.length-1]);
+function onToken(token, lm) {
+  console.log('token', token);
 }
 
 function onWord(word, lm) {
@@ -57,6 +57,6 @@ function onWord(word, lm) {
   pop();
 }
 
-function onFinsh(lm) {
-  console.log('Generation finished', lm.out);
+function onFinsh(out, lm) {
+  console.log('Generation finished', out);
 }
diff --git a/src/LanguageModel/index.js b/src/LanguageModel/index.js
@@ -109,7 +109,7 @@ class LanguageModel extends EventEmitter {
       }
 
       // on-token event
-      this.emit('token', this);
+      this.emit('token', this.tokens[this.tokens.length-1], this);
 
       // redo word tokenization
       const wordDelimiters = ' .,:;"“?!\n';
@@ -131,7 +131,7 @@ class LanguageModel extends EventEmitter {
         if (this.promiseResolve) {
           this.promiseResolve(this.out);
         }
-        this.emit('finsh', this);
+        this.emit('finsh', this.out, this);
         if (this.callback) {
           this.callback(this.out, this);
         }

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ function generateText() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`
`38`		`-function onToken(lm) {`
`39`		`- console.log('token', lm.tokens[lm.tokens.length-1]);`
	`38`	`+function onToken(token, lm) {`
	`39`	`+ console.log('token', token);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`function onWord(word, lm) {`
`@@ -57,6 +57,6 @@ function onWord(word, lm) {`
`57`	`57`	`pop();`
`58`	`58`	`}`
`59`	`59`
`60`		`-function onFinsh(lm) {`
`61`		`- console.log('Generation finished', lm.out);`
	`60`	`+function onFinsh(out, lm) {`
	`61`	`+ console.log('Generation finished', out);`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class LanguageModel extends EventEmitter {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// on-token event`
`112`		`- this.emit('token', this);`
	`112`	`+ this.emit('token', this.tokens[this.tokens.length-1], this);`
`113`	`113`
`114`	`114`	`// redo word tokenization`
`115`	`115`	`const wordDelimiters = ' .,:;"“?!\n';`
`@@ -131,7 +131,7 @@ class LanguageModel extends EventEmitter {`
`131`	`131`	`if (this.promiseResolve) {`
`132`	`132`	`this.promiseResolve(this.out);`
`133`	`133`	`}`
`134`		`- this.emit('finsh', this);`
	`134`	`+ this.emit('finsh', this.out, this);`
`135`	`135`	`if (this.callback) {`
`136`	`136`	`this.callback(this.out, this);`
`137`	`137`	`}`