@zvec/zvec-grep 0.1.5 → 0.1.7

package/dist/engine/models/factory.js

@@ -1,66 +1,51 @@
-import { EngineError } from "../errors/index.js";
-import { getEmbeddingModelCatalogEntry, getEmbeddingModelCatalogEntryByRef, } from "./catalog.js";
-import { LlamaCppEmbeddingModel, Qwen3VlEmbeddingModel, QwenTextEmbeddingV4Model, } from "./providers/index.js";
-export function createEmbeddingModel(ref, options) {
-    if (ref.provider === "local") {
-        const entry = getEmbeddingModelCatalogEntryByRef(ref);
-        if (!entry || entry.provider !== "local") {
-            throw new EngineError("Local embedding model is not in the zvec-grep catalog", {
-                code: "ZVEC_GREP.ENGINE.MODELS.LOCAL_MODEL_NOT_IN_CATALOG",
-                context: `provider=${ref.provider} model=${ref.model}`,
-            });
-        }
-        return new LlamaCppEmbeddingModel(entry, options);
-    }
-    if (ref.provider === "qwen" && ref.model === "text-embedding-v4") {
-        return new QwenTextEmbeddingV4Model(options);
-    }
-    if (ref.provider === "qwen" && ref.model === "qwen3-vl-embedding") {
-        return new Qwen3VlEmbeddingModel(options);
-    }
-    throw new EngineError("Embedding model is not implemented", {
-        code: "ZVEC_GREP.ENGINE.MODELS.EMBEDDING_MODEL_NOT_IMPLEMENTED",
-        context: `provider=${ref.provider} model=${ref.model}`,
-    });
-}
-export function createEmbeddingModelFromCatalog(id, options) {
-    const entry = getEmbeddingModelCatalogEntry(id);
-    if (!entry) {
-        throw new EngineError("Embedding model is not in the zvec-grep catalog", {
-            code: "ZVEC_GREP.ENGINE.MODELS.EMBEDDING_CATALOG_MODEL_NOT_FOUND",
-            context: `embedding=${id}`,
-        });
-    }
-    return createEmbeddingModel({
-        provider: entry.provider,
-        model: entry.model,
-    }, options);
-}
-export function createEmbeddingModelFromReference(reference, options) {
+import { EngineError } from "../errors.js";
+import { getEmbeddingModelCatalogEntry, } from "./catalog.js";
+import { LlamaCppEmbeddingModel } from "./backends/llama-cpp.js";
+import { Model2VecEmbeddingModel } from "./backends/model2vec.js";
+import { Qwen37TextEmbeddingModel, Qwen3VlEmbeddingModel, QwenTextEmbeddingV4Model, } from "./backends/qwen.js";
+import { TransformersJsEmbeddingModel } from "./backends/transformers-js.js";
+export function createEmbeddingModel(reference, options = {}) {
     const catalogEntry = getEmbeddingModelCatalogEntry(reference);
-    if (catalogEntry) {
-        return createEmbeddingModel({
-            provider: catalogEntry.provider,
-            model: catalogEntry.model,
-        }, options);
-    }
-    const ref = parseModelReference(reference);
-    if (!ref) {
+    if (!catalogEntry) {
         throw new EngineError("Embedding model is not in the zvec-grep catalog", {
             code: "ZVEC_GREP.ENGINE.MODELS.EMBEDDING_CATALOG_MODEL_NOT_FOUND",
             context: `embedding=${reference}`,
         });
     }
-    return createEmbeddingModel(ref, options);
+    switch (catalogEntry.backend) {
+        case "llama-cpp":
+            return new LlamaCppEmbeddingModel(catalogEntry, options);
+        case "model2vec":
+            return new Model2VecEmbeddingModel(catalogEntry, options);
+        case "transformers-js":
+            return new TransformersJsEmbeddingModel(catalogEntry, options);
+        case "qwen":
+            return createQwenEmbeddingModel(catalogEntry, options);
+        default:
+            return unsupportedCatalogEntry(catalogEntry);
+    }
 }
-function parseModelReference(reference) {
-    const separator = reference.indexOf("/");
-    if (separator <= 0 || separator === reference.length - 1) {
-        return undefined;
+function createQwenEmbeddingModel(entry, options) {
+    switch (entry.kind) {
+        case "multimodal":
+            return new Qwen3VlEmbeddingModel(entry, options);
+        case "text":
+            switch (entry.model) {
+                case "text-embedding-v4":
+                    return new QwenTextEmbeddingV4Model(entry, options);
+                case "qwen3.7-text-embedding":
+                    return new Qwen37TextEmbeddingModel(entry, options);
+                default:
+                    return unsupportedCatalogEntry(entry);
+            }
+        default:
+            return unsupportedCatalogEntry(entry);
     }
-    return {
-        provider: reference.slice(0, separator),
-        model: reference.slice(separator + 1),
-    };
+}
+function unsupportedCatalogEntry(entry) {
+    throw new EngineError("Embedding catalog entry is not implemented", {
+        code: "ZVEC_GREP.ENGINE.MODELS.EMBEDDING_MODEL_NOT_IMPLEMENTED",
+        context: JSON.stringify(entry),
+    });
 }
 //# sourceMappingURL=factory.js.map

package/dist/engine/models/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/engine/models/factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/engine/models/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACL,6BAA6B,GAE9B,MAAM,cAAc,CAAC;AAKtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAE7E,MAAM,UAAU,oBAAoB,CAClC,SAAiB,EACjB,UAAuC,EAAE;IAEzC,MAAM,YAAY,GAAG,6BAA6B,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,WAAW,CAAC,iDAAiD,EAAE;YACvE,IAAI,EAAE,2DAA2D;YACjE,OAAO,EAAE,aAAa,SAAS,EAAE;SAClC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,YAAY,CAAC,OAAO,EAAE,CAAC;QAC7B,KAAK,WAAW;YACd,OAAO,IAAI,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,KAAK,WAAW;YACd,OAAO,IAAI,uBAAuB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC5D,KAAK,iBAAiB;YACpB,OAAO,IAAI,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACjE,KAAK,MAAM;YACT,OAAO,wBAAwB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACzD;YACE,OAAO,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,KAAgC,EAChC,OAAoC;IAEpC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,YAAY;YACf,OAAO,IAAI,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,MAAM;YACT,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,mBAAmB;oBACtB,OAAO,IAAI,wBAAwB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACtD,KAAK,wBAAwB;oBAC3B,OAAO,IAAI,wBAAwB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACtD;oBACE,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAC;YAC1C,CAAC;QACH;YACE,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAY;IAC3C,MAAM,IAAI,WAAW,CAAC,4CAA4C,EAAE;QAClE,IAAI,EAAE,yDAAyD;QAC/D,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC"}

package/dist/engine/models/index.d.ts

@@ -1,6 +1,4 @@
-export { EMBEDDING_MODEL_CATALOG, MODEL_CATALOG, getEmbeddingModelCatalogEntry, getEmbeddingModelCatalogEntryByRef, listEmbeddingModels, } from "./catalog.js";
-export { EmbeddingModel } from "./embeddings.js";
-export { LlamaCppEmbeddingModel, Qwen3VlEmbeddingModel, QwenTextEmbeddingV4Model, setLlamaCppRuntimeForTesting, } from "./providers/index.js";
-export type { RankingCandidate, RankingModel, RankingScore, } from "./ranking.js";
-export { createEmbeddingModel, createEmbeddingModelFromCatalog, createEmbeddingModelFromReference, } from "./factory.js";
-export type { EmbeddingCatalogEntry, LlamaCppEmbeddingCatalogEntry, LlamaGpuMode, LocalEmbeddingFormat, ModelProviderOptions, } from "./types.js";
+export { EmbeddingPurpose, type CreateEmbeddingModelOptions, type EmbeddingModel, type EmbeddingModelProgress, type EmbeddingModelInfo, type EmbeddingOptions, type EmbeddingResult, } from "./embeddings.js";
+export { createEmbeddingModel } from "./factory.js";
+export { getEmbeddingModelCatalogEntry, listEmbeddingModels, } from "./catalog.js";
+export { resolveEmbeddingReference, type ResolveEmbeddingReferenceOptions, } from "./resolution.js";

package/dist/engine/models/index.js

@@ -1,5 +1,5 @@
-export { EMBEDDING_MODEL_CATALOG, MODEL_CATALOG, getEmbeddingModelCatalogEntry, getEmbeddingModelCatalogEntryByRef, listEmbeddingModels, } from "./catalog.js";
-export { EmbeddingModel } from "./embeddings.js";
-export { LlamaCppEmbeddingModel, Qwen3VlEmbeddingModel, QwenTextEmbeddingV4Model, setLlamaCppRuntimeForTesting, } from "./providers/index.js";
-export { createEmbeddingModel, createEmbeddingModelFromCatalog, createEmbeddingModelFromReference, } from "./factory.js";
+export { EmbeddingPurpose, } from "./embeddings.js";
+export { createEmbeddingModel } from "./factory.js";
+export { getEmbeddingModelCatalogEntry, listEmbeddingModels, } from "./catalog.js";
+export { resolveEmbeddingReference, } from "./resolution.js";
 //# sourceMappingURL=index.js.map

package/dist/engine/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/engine/models/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,6BAA6B,EAC7B,kCAAkC,EAClC,mBAAmB,GACpB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EACL,oBAAoB,EACpB,+BAA+B,EAC/B,iCAAiC,GAClC,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/engine/models/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,GAOjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EACL,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,yBAAyB,GAE1B,MAAM,iBAAiB,CAAC"}

package/dist/engine/models/ranking.d.ts

@@ -1,5 +1,4 @@
 import type { Content, ContentKind } from "../types.js";
-import type { ModelRef } from "./types.js";
 export type RankingCandidate = {
     id: string;
     content: Content;
@@ -9,7 +8,12 @@ export type RankingScore = {
     score: number;
 };
 export interface RankingModel {
-    readonly ref: ModelRef;
-    readonly supportedContentKinds: readonly ContentKind[];
+    readonly info: Readonly<{
+        reference: string;
+        provider: string;
+        name: string;
+        inputKinds: readonly ContentKind[];
+    }>;
     rank(query: Content, candidates: readonly RankingCandidate[]): Promise<RankingScore[]>;
+    dispose(): Promise<void>;
 }

package/dist/engine/models/resolution.d.ts

@@ -0,0 +1,8 @@
+export type ResolveEmbeddingReferenceOptions = {
+    explicit?: string;
+    existing?: string;
+    globalDefault?: string;
+    environment?: NodeJS.ProcessEnv;
+    fallback?: string;
+};
+export declare function resolveEmbeddingReference(options: ResolveEmbeddingReferenceOptions): string | undefined;

package/dist/engine/models/resolution.js

@@ -0,0 +1,22 @@
+import { EngineError } from "../errors.js";
+import { getEmbeddingModelCatalogEntry } from "./catalog.js";
+export function resolveEmbeddingReference(options) {
+    if (options.explicit !== undefined)
+        return options.explicit;
+    if (options.existing !== undefined)
+        return options.existing;
+    const environmentReference = nonEmptyEnvironmentValue((options.environment ?? process.env).ZVEC_GREP_EMBEDDING);
+    if (environmentReference !== undefined &&
+        !getEmbeddingModelCatalogEntry(environmentReference)) {
+        throw new EngineError(`Invalid ZVEC_GREP_EMBEDDING: unsupported model ${environmentReference}. Run \`zg help models\` to list supported models.`, {
+            code: "ZVEC_GREP.ENGINE.CONFIG.EMBEDDING_ENVIRONMENT_INVALID",
+            context: "source=ZVEC_GREP_EMBEDDING",
+        });
+    }
+    return environmentReference ?? options.globalDefault ?? options.fallback;
+}
+function nonEmptyEnvironmentValue(value) {
+    const normalized = value?.trim();
+    return normalized ? normalized : undefined;
+}
+//# sourceMappingURL=resolution.js.map

package/dist/engine/models/resolution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../../src/engine/models/resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAU7D,MAAM,UAAU,yBAAyB,CACvC,OAAyC;IAEzC,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC5D,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAE5D,MAAM,oBAAoB,GAAG,wBAAwB,CACnD,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,mBAAmB,CACzD,CAAC;IACF,IACE,oBAAoB,KAAK,SAAS;QAClC,CAAC,6BAA6B,CAAC,oBAAoB,CAAC,EACpD,CAAC;QACD,MAAM,IAAI,WAAW,CACnB,kDAAkD,oBAAoB,oDAAoD,EAC1H;YACE,IAAI,EAAE,uDAAuD;YAC7D,OAAO,EAAE,4BAA4B;SACtC,CACF,CAAC;IACJ,CAAC;IACD,OAAO,oBAAoB,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC;AAC3E,CAAC;AAED,SAAS,wBAAwB,CAC/B,KAAyB;IAEzB,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACjC,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7C,CAAC"}

package/dist/engine/pipeline/indexing/index.d.ts

@@ -1,12 +1,14 @@
-import type { EmbeddingModel } from "../../models/embeddings.js";
-import type { CollectionStorage } from "../../storage/index.js";
-import type { CollectionIndexStatus, CollectionInfo, FileInfo, IndexProgress, IndexResult } from "../../types.js";
+import type { EmbeddingModel } from "../../models/index.js";
+import type { WorkspaceIndexStorage } from "../../storage/index.js";
+import type { WorkspaceIndexStatus, WorkspaceIndexInfo, FileInfo, IndexProgress, IndexResult } from "../../types.js";
 export type IndexContext = {
-    collection: CollectionInfo;
-    storage: CollectionStorage;
+    workspaceIndex: WorkspaceIndexInfo;
+    storage: WorkspaceIndexStorage;
     embeddingModel: EmbeddingModel;
     embeddingConcurrency?: number;
     onProgress?: (progress: IndexProgress) => void;
+    signal?: AbortSignal;
 };
-export declare function indexCollection(ctx: IndexContext): Promise<IndexResult>;
-export declare function getCollectionIndexStatus(collection: CollectionInfo, storedFiles: readonly FileInfo[]): Promise<CollectionIndexStatus>;
+export declare function indexWorkspace(ctx: IndexContext): Promise<IndexResult>;
+export declare function indexWorkspacePaths(ctx: IndexContext, changedPaths: readonly string[]): Promise<IndexResult>;
+export declare function getWorkspaceIndexStatus(workspaceIndex: WorkspaceIndexInfo, storedFiles: readonly FileInfo[]): Promise<WorkspaceIndexStatus>;