Skip to content

Commit 975508b

Browse files
committed
Miscellaneous fixes
1 parent dc804a0 commit 975508b

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

examples/integrity-verification/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"url": "^0.11.3"
1616
},
1717
"dependencies": {
18-
"@mlc-ai/web-llm": "^0.2.80"
18+
"@mlc-ai/web-llm": "^0.2.82"
1919
}
2020
}

src/cache_util.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ModelNotFoundError, UnsupportedTokenizerFilesError } from "./error";
1010
import { Tokenizer } from "@mlc-ai/web-tokenizers";
1111
import { ModelIntegrity, verifyIntegrity } from "./integrity";
1212

13-
async function verifyTokenizerIfNeeded(
13+
async function maybeVerifyTokenizerIntegrity(
1414
data: ArrayBuffer,
1515
filename: string,
1616
url: string,
@@ -147,7 +147,12 @@ export async function asyncLoadTokenizer(
147147
if (config.tokenizer_files.includes("tokenizer.json")) {
148148
const url = new URL("tokenizer.json", baseUrl).href;
149149
const model = await modelCache.fetchWithCache(url, "arraybuffer");
150-
await verifyTokenizerIfNeeded(model, "tokenizer.json", url, integrity);
150+
await maybeVerifyTokenizerIntegrity(
151+
model,
152+
"tokenizer.json",
153+
url,
154+
integrity,
155+
);
151156
return Tokenizer.fromJSON(model);
152157
} else if (config.tokenizer_files.includes("tokenizer.model")) {
153158
logger(
@@ -159,7 +164,12 @@ export async function asyncLoadTokenizer(
159164
);
160165
const url = new URL("tokenizer.model", baseUrl).href;
161166
const model = await modelCache.fetchWithCache(url, "arraybuffer");
162-
await verifyTokenizerIfNeeded(model, "tokenizer.model", url, integrity);
167+
await maybeVerifyTokenizerIntegrity(
168+
model,
169+
"tokenizer.model",
170+
url,
171+
integrity,
172+
);
163173
return Tokenizer.fromSentencePiece(model);
164174
}
165175
throw new UnsupportedTokenizerFilesError(config.tokenizer_files);

src/error.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,14 +614,14 @@ export class ReloadModelIdNotUniqueError extends Error {
614614

615615
export class IntegrityError extends Error {
616616
constructor(
617-
public readonly url: string,
618-
public readonly expected: string,
619-
public readonly actual: string,
617+
readonly url: string,
618+
readonly expected: string,
619+
readonly actual: string,
620620
) {
621621
super(
622622
`Integrity verification failed for ${url}\n` +
623623
` Expected: ${expected}\n` +
624-
` Got: ${actual}\n` +
624+
` Actual: ${actual}\n` +
625625
`This may indicate file corruption or tampering.`,
626626
);
627627
this.name = "IntegrityError";

0 commit comments

Comments
 (0)