Skip to content

fix: embed and pull commands now respect models config and env vars #571

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
beorn wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −15
Open

fix: embed and pull commands now respect models config and env vars #571

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 25 additions & 15 deletions src/cli/qmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,23 +112,36 @@ enableProductionMode();
let store: ReturnType<typeof createStore> | null = null;
let storeDbPathOverride: string | undefined;
let currentIndexName = "index";
/** Resolved model URIs: YAML config > env var > built-in default */
const models = {
embed: DEFAULT_EMBED_MODEL_URI,
generate: DEFAULT_GENERATE_MODEL_URI,
rerank: DEFAULT_RERANK_MODEL_URI,
};

function getStore(): ReturnType<typeof createStore> {
if (!store) {
store = createStore(storeDbPathOverride);
// Sync YAML config into SQLite store_collections so store.ts reads from DB
// Resolve model URIs from config/env before anything else
try {
const config = loadConfig();
models.embed = config.models?.embed || process.env.QMD_EMBED_MODEL || DEFAULT_EMBED_MODEL_URI;
models.generate = config.models?.generate || process.env.QMD_GENERATE_MODEL || DEFAULT_GENERATE_MODEL_URI;
models.rerank = config.models?.rerank || process.env.QMD_RERANK_MODEL || DEFAULT_RERANK_MODEL_URI;
// Sync YAML config into SQLite store_collections
syncConfigToDb(store.db, config);
if (config.models) {
setDefaultLlamaCpp(new LlamaCpp({
embedModel: config.models.embed,
generateModel: config.models.generate,
rerankModel: config.models.rerank,
embedModel: models.embed,
generateModel: models.generate,
rerankModel: models.rerank,
}));
}
} catch {
// Config may not exist yet — that's fine, DB works without it
// Config may not exist yet — resolve from env/defaults
models.embed = process.env.QMD_EMBED_MODEL || DEFAULT_EMBED_MODEL_URI;
models.generate = process.env.QMD_GENERATE_MODEL || DEFAULT_GENERATE_MODEL_URI;
models.rerank = process.env.QMD_RERANK_MODEL || DEFAULT_RERANK_MODEL_URI;
}
}
return store;
Expand Down Expand Up @@ -462,9 +475,9 @@ async function showStatus(): Promise<void> {
return match ? `https://huggingface.co/${match[1]}` : uri;
};
console.log(`\n${c.bold}Models${c.reset}`);
console.log(` Embedding: ${hfLink(DEFAULT_EMBED_MODEL_URI)}`);
console.log(` Reranking: ${hfLink(DEFAULT_RERANK_MODEL_URI)}`);
console.log(` Generation: ${hfLink(DEFAULT_GENERATE_MODEL_URI)}`);
console.log(` Embedding: ${hfLink(models.embed)}`);
console.log(` Reranking: ${hfLink(models.rerank)}`);
console.log(` Generation: ${hfLink(models.generate)}`);
}

// Device / GPU info
Expand Down Expand Up @@ -3104,10 +3117,11 @@ if (isMain) {

case "embed":
try {
getStore(); // ensure models are resolved from config before reading
const maxDocsPerBatch = parseEmbedBatchOption("maxDocsPerBatch", cli.values["max-docs-per-batch"]);
const maxBatchMb = parseEmbedBatchOption("maxBatchBytes", cli.values["max-batch-mb"]);
const embedChunkStrategy = parseChunkStrategy(cli.values["chunk-strategy"]);
await vectorIndex(DEFAULT_EMBED_MODEL_URI, !!cli.values.force, {
await vectorIndex(models.embed, !!cli.values.force, {
maxDocsPerBatch,
maxBatchBytes: maxBatchMb === undefined ? undefined : maxBatchMb * 1024 * 1024,
chunkStrategy: embedChunkStrategy,
Expand All @@ -3119,14 +3133,10 @@ if (isMain) {
break;

case "pull": {
getStore(); // ensure models are resolved from config
const refresh = cli.values.refresh === undefined ? false : Boolean(cli.values.refresh);
const models = [
DEFAULT_EMBED_MODEL_URI,
DEFAULT_GENERATE_MODEL_URI,
DEFAULT_RERANK_MODEL_URI,
];
console.log(`${c.bold}Pulling models${c.reset}`);
const results = await pullModels(models, {
const results = await pullModels(Object.values(models), {
refresh,
cacheDir: DEFAULT_MODEL_CACHE_DIR,
});
Expand Down