Skip to content

Return buffer instead of file_path if cache unavailable for model loading #1280

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

Merged
merged 5 commits into from
Apr 16, 2025
Merged

Return buffer instead of file_path if cache unavailable for model loading #1280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb3ea0b
Return buffer if cache unavailable for model file loading
PrafulB Apr 11, 2025
9aee688
Minor cleanup
xenova Apr 14, 2025
7d93652
Add back check
xenova Apr 14, 2025
4785285
Actually, original approach was better
xenova Apr 14, 2025
32bd34a
Support custom cache returning response or path
xenova Apr 14, 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
6 changes: 3 additions & 3 deletions src/models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ import { RawImage } from './utils/image.js';
import { dynamic_time_warping, max, medianFilter } from './utils/maths.js';
import { EosTokenCriteria, MaxLengthCriteria, StoppingCriteriaList } from './generation/stopping_criteria.js';
import { LogitsSampler } from './generation/logits_sampler.js';
import { apis } from './env.js';
import { apis, env } from './env.js';

import { WhisperGenerationConfig } from './models/whisper/generation_whisper.js';
import { whisper_language_to_code } from './models/whisper/common_whisper.js';
Expand Down Expand Up @@ -248,7 +248,7 @@ async function getSession(pretrained_model_name_or_path, fileName, options) {
);
}

const bufferOrPathPromise = getModelFile(pretrained_model_name_or_path, modelFileName, true, options, apis.IS_NODE_ENV);
const bufferOrPathPromise = getModelFile(pretrained_model_name_or_path, modelFileName, true, options, (apis.IS_NODE_ENV && (env.useFSCache || env.useCustomCache)));

// handle onnx external data files
const use_external_data_format = options.use_external_data_format ?? custom_config.use_external_data_format;
Expand Down Expand Up @@ -276,7 +276,7 @@ async function getSession(pretrained_model_name_or_path, fileName, options) {
const path = `${baseName}_data${i === 0 ? '' : '_' + i}`;
const fullPath = `${options.subfolder ?? ''}/${path}`;
externalDataPromises.push(new Promise(async (resolve, reject) => {
const data = await getModelFile(pretrained_model_name_or_path, fullPath, true, options, apis.IS_NODE_ENV);
const data = await getModelFile(pretrained_model_name_or_path, fullPath, true, options, (apis.IS_NODE_ENV && (env.useFSCache || env.useCustomCache)));
resolve(data instanceof Uint8Array ? { path, data } : path);
}));
}
Expand Down
4 changes: 2 additions & 2 deletions src/utils/hub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ export async function getModelFile(path_or_repo_id, filename, fatal = true, opti
});

if (result) {
if (return_path) {
if (!apis.IS_NODE_ENV && return_path) {
throw new Error("Cannot return path in a browser environment.")
}
return result;
Expand All @@ -647,7 +647,7 @@ export async function getModelFile(path_or_repo_id, filename, fatal = true, opti
return response.filePath;
}

const path = await cache.match(cacheKey);
const path = await cache?.match(cacheKey);
if (path instanceof FileResponse) {
return path.filePath;
}
Expand Down