@genai-fi/nanogpt 1.2.1 → 1.2.3

package/dist/inference/Beamer.js

@@ -79,8 +79,9 @@ var f = class {
 			text: "",
 			terminated: !1,
 			context: a.context,
-			contextLength: a.contextLength
-		}], s = t.maxBeamLength, c = t.endOnWhiteSpace === !0 ? Math.max(s, t.maxLength ?? s + this.model.config.blockSize) : s, l = Date.now();
+			contextLength: a.contextLength,
+			candidates: 0
+		}], s = t.maxBeamLength, c = t.endOnWhiteSpace === !0 ? Math.max(s, t.maxLength ?? s + this.model.config.blockSize) : s, l = Date.now(), u = 0;
 		for (let e = 0; e < c && this.active; e++) {
 			let e = o.filter((e) => !e.terminated);
 			if (e.length === 0) break;
@@ -88,7 +89,7 @@ var f = class {
 			for (let n = 0; n < e.length; n++) {
 				let o = e[n], c = i[n], l = d(c, t.topK ? Math.min(t.topK, r) : Math.max(1, r));
 				for (let e of l) {
-					let n = this.actualTokeniser.decode([e.token]), r = this.shouldTerminate(t.allowSpecial ?? !1, e.token), i = o.tokens.length + 1 >= Math.max(2, s), c = t.endOnWhiteSpace === !0 && i && /\s/.test(n), l = c && o.tokens.length > 0 && /^\s/.test(n);
+					let n = this.actualTokeniser.decode([e.token]), r = this.shouldTerminate(t.allowSpecial ?? !1, e.token), i = o.tokens.length + 1 > s, c = t.endOnWhiteSpace === !0 && i && /\s/.test(n), l = c && o.tokens.length > 0 && /^\s/.test(n);
 					a.push({
 						parent: o,
 						token: e.token,
@@ -107,26 +108,42 @@ var f = class {
 				let t = e.terminatedByToken || e.terminatedByWhitespace, n = !e.dropLeadingWhitespaceTerminator, i = n ? e.parent.tokens.concat(e.token) : e.parent.tokens.slice(), a = e.terminatedByToken || e.dropLeadingWhitespaceTerminator ? e.parent.text : e.parent.text + e.tokenText, o = n ? this.appendTokenToContext(e.parent.context, e.parent.contextLength, e.token) : {
 					context: e.parent.context.clone(),
 					contextLength: e.parent.contextLength
-				};
-				c.push({
+				}, s = e.parent._output?.slice() ?? [];
+				n && s.push({
+					token: e.token,
+					score: e.score,
+					text: e.tokenText,
+					terminated: t,
+					confidence: null,
+					logits: null,
+					scores: null,
+					hiddenStates: null,
+					attention: null,
+					loss: null,
+					multinomialRand: null
+				}), c.push({
 					tokens: i,
 					score: e.score,
 					text: a,
 					terminated: t,
 					context: o.context,
-					contextLength: o.contextLength
+					contextLength: o.contextLength,
+					_output: s,
+					candidates: u
 				});
 			}
-			if (o.forEach((e) => e.context.dispose()), c.length === 0) break;
+			if (u += a.length - c.length, o.forEach((e) => e.context.dispose()), c.length === 0) break;
 			o = c, n && Date.now() - l >= 40 && (n(o.slice(0, t.beams)), l = Date.now());
 		}
-		this.active = !1;
-		let u = o.slice().sort((e, t) => t.score - e.score), f = [], p = /* @__PURE__ */ new Set();
-		for (let e of u) {
+		this.active = !1, u += o.length;
+		let f = o.slice().sort((e, t) => t.score - e.score), p = [], m = /* @__PURE__ */ new Set();
+		for (let e of f) {
 			let n = e.text.trim();
-			if (p.has(n) || (p.add(n), f.push(e)), f.length >= t.beams) break;
+			if (m.has(n) || (m.add(n), p.push(e)), p.length >= t.beams) break;
 		}
-		return o.forEach((e) => e.context.dispose()), f;
+		return o.forEach((e) => {
+			e.context.dispose(), e.candidates = u;
+		}), p;
 	}
 };
 //#endregion

package/dist/inference/Generator.js

@@ -152,7 +152,10 @@ var y = class extends e {
 			content: "",
 			_timestamp: Date.now()
 		}), n = !0, this.resetCache(!e?.noCache)) : (this.lastToken < 0 || t) && this.resetCache(!e?.noCache);
-		let r = this.lastToken >= 0 && this.cache ? i([this.lastToken], [1, 1], "int32") : await m(this.actualTokeniser, this.model.config.blockSize, t ? n ? this.outputConversation.slice(0, -1) : this.outputConversation : void 0, e), a = e?.maxLength ?? 1e3;
+		let r = this.lastToken >= 0 && this.cache ? i([this.lastToken], [1, 1], "int32") : await m(this.actualTokeniser, this.model.config.blockSize, t ? n ? this.outputConversation.slice(0, -1) : this.outputConversation : void 0, n ? e : {
+			...e,
+			continuation: !0
+		}), a = e?.maxLength ?? 1e3;
 		for (let t = 0; t < a && this.active; t++) {
 			let n = await this._generateToken(r, this.cache ? this.cache : void 0, {
 				...e,

package/dist/inference/types.d.ts

@@ -1,7 +1,6 @@
 import { Conversation } from '../tokeniser/type';
 import { Tensor } from '@tensorflow/tfjs-core';
 export interface IGeneratorOutput {
-    outputTensor: Tensor;
     token: number;
     text: string;
     confidence: number | null;
@@ -14,6 +13,9 @@ export interface IGeneratorOutput {
     multinomialRand: number | null;
     terminated: boolean;
 }
+export interface IGeneratorOutputInternal extends IGeneratorOutput {
+    outputTensor: Tensor;
+}
 export interface GeneratorConversation extends Conversation {
     _completed?: boolean;
     _timestamp?: number;
@@ -59,4 +61,6 @@ export interface IBeam {
     tokens: number[];
     score: number;
     text: string;
+    candidates: number;
+    _output?: IGeneratorOutput[];
 }

package/dist/tokeniser/BaseTokeniser.js

@@ -89,6 +89,9 @@ var t = [
 				case "system":
 					r.push([a[2]]), e = !0;
 					break;
+				case "text":
+					r[r.length - 1][0] !== this.bosToken && r.push([this.bosToken]);
+					break;
 			}
 			switch (r.push(s), t.role) {
 				case "user":
@@ -100,11 +103,14 @@ var t = [
 				case "system":
 					r.push([o[2]]);
 					break;
+				case "text":
+					r.push([this.eosToken]);
+					break;
 			}
 			n && i && e ? (i.push([!1]), i.push(s.map(() => !1)), i.push([!1])) : n && i && (i.push([!1]), i.push(s.map(() => !0)), i.push([!0]));
 		}
 		let s = r.flat();
-		return t ? (s.push(a[1]), n && i && i.push([!1])) : (s.push(this.eosToken), n && i && i.push([!0])), n && i ? {
+		return t ? (s.push(a[1]), n && i && i.push([!1])) : (s[s.length - 1] !== this.eosToken && s.push(this.eosToken), n && i && i.push([!0])), n && i ? {
 			tokens: s,
 			mask: i.flat()
 		} : s;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@genai-fi/nanogpt",
-    "version": "1.2.1",
+    "version": "1.2.3",
     "type": "module",
     "main": "dist/main.js",
     "types": "dist/main.d.ts",