Skip to content

Support load tokenizer from subfolder #1235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support load tokenizer from subfolder #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01a57bf
Support load tokenizer from subfolder
hans00 Mar 14, 2025
c75499c
prevent `subfolder` set false
hans00 Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/pipelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3399,7 +3399,7 @@ export async function pipeline(
revision = 'main',
device = null,
dtype = null,
subfolder = 'onnx',
subfolder = null,
use_external_data_format = null,
model_file_name = null,
session_options = {},
Expand Down Expand Up @@ -3466,6 +3466,7 @@ export async function pipeline(
* @private
*/
async function loadItems(mapping, model, pretrainedOptions) {
const { subfolder, ...rest } = pretrainedOptions;

const result = Object.create(null);

Expand All @@ -3474,6 +3475,8 @@ async function loadItems(mapping, model, pretrainedOptions) {
for (const [name, cls] of mapping.entries()) {
if (!cls) continue;

const options = name === 'model' ? { ...rest, subfolder: subfolder ?? 'onnx' } : pretrainedOptions;

/**@type {Promise} */
let promise;
if (Array.isArray(cls)) {
Expand All @@ -3487,7 +3490,7 @@ async function loadItems(mapping, model, pretrainedOptions) {
return;
}
try {
resolve(await c.from_pretrained(model, pretrainedOptions));
resolve(await c.from_pretrained(model, options));
return;
} catch (err) {
if (err.message?.includes('Unsupported model type')) {
Expand All @@ -3506,7 +3509,7 @@ async function loadItems(mapping, model, pretrainedOptions) {
reject(e);
})
} else {
promise = cls.from_pretrained(model, pretrainedOptions);
promise = cls.from_pretrained(model, options);
}

result[name] = promise;
Expand Down
4 changes: 2 additions & 2 deletions src/tokenizers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ import {
async function loadTokenizer(pretrained_model_name_or_path, options) {

const info = await Promise.all([
getModelJSON(pretrained_model_name_or_path, 'tokenizer.json', true, options),
getModelJSON(pretrained_model_name_or_path, 'tokenizer_config.json', true, options),
getModelJSON(pretrained_model_name_or_path, `${options.subfolder || ''}/tokenizer.json`, true, options),
getModelJSON(pretrained_model_name_or_path, `${options.subfolder || ''}/tokenizer_config.json`, true, options),
])

// Override legacy option if `options.legacy` is not null
Expand Down