@trymirai/uzu 0.1.39 → 0.1.40

package/README.md

@@ -25,7 +25,7 @@ Add the `uzu` dependency to your project's `package.json`:
 
 ```json
 "dependencies": {
-    "@trymirai/uzu": "0.1.39"
+    "@trymirai/uzu": "0.1.40"
 }
 ```
 
@@ -34,7 +34,7 @@ Set up your project through [Platform](https://platform.trymirai.com) and obtain
 ```ts
 const output = await Engine
     .create('API_KEY')
-    .model('Qwen/Qwen3-0.6B')
+    .chatModel('Qwen/Qwen3-0.6B')
     .reply('Tell me a short, funny story about a robot');
 ```
 
@@ -59,7 +59,7 @@ import Engine, { Message } from '@trymirai/uzu';
 
 async function main() {
     const output = await Engine.create('API_KEY')
-        .model('Qwen/Qwen3-0.6B')
+        .chatModel('Qwen/Qwen3-0.6B')
         .download((update) => {
             console.log('Progress:', update.progress);
         })
@@ -93,7 +93,7 @@ async function main() {
     const prompt = `Text is: "${textToSummarize}". Write only summary itself.`;
 
     const output = await Engine.create('API_KEY')
-        .model('Qwen/Qwen3-0.6B')
+        .chatModel('Qwen/Qwen3-0.6B')
         .download((update) => {
             console.log('Progress:', update.progress);
         })
@@ -142,7 +142,7 @@ async function main() {
         "Answer with one word. Don't add a dot at the end.";
 
     const output = await Engine.create('API_KEY')
-        .model('Qwen/Qwen3-0.6B')
+        .chatModel('Qwen/Qwen3-0.6B')
         .download((update) => {
             console.log('Progress:', update.progress);
         })

package/bridging/chatModel.d.mts

@@ -0,0 +1,15 @@
+import { ChatModel as NapiChatModel } from "../napi/uzu.mjs";
+import { ModelType } from "./modelType.mjs";
+export declare class ChatModel {
+    readonly repoId: string;
+    readonly type: ModelType;
+    readonly name: string;
+    readonly vendor: string;
+    readonly quantization: string | null;
+    readonly outputParserRegex: string | null;
+    get isThinking(): boolean;
+    private constructor();
+    static fromNapiChatModel(napiChatModel: NapiChatModel): ChatModel;
+    toNapi(): NapiChatModel;
+}
+//# sourceMappingURL=chatModel.d.mts.map

package/bridging/chatModel.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatModel.d.mts","sourceRoot":"","sources":["../src/bridging/chatModel.ts"],"names":[],"mappings":"OAAO,EAAE,SAAS,IAAI,aAAa,EAAE;OAC9B,EAAE,SAAS,EAAwD;AAE1E,qBAAa,SAAS;IAClB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1C,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,OAAO;IAgBP,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS;IAWjE,MAAM,IAAI,aAAa;CAW1B"}

package/bridging/chatModel.d.ts

@@ -0,0 +1,15 @@
+import { ChatModel as NapiChatModel } from "../napi/uzu.js";
+import { ModelType } from "./modelType.js";
+export declare class ChatModel {
+    readonly repoId: string;
+    readonly type: ModelType;
+    readonly name: string;
+    readonly vendor: string;
+    readonly quantization: string | null;
+    readonly outputParserRegex: string | null;
+    get isThinking(): boolean;
+    private constructor();
+    static fromNapiChatModel(napiChatModel: NapiChatModel): ChatModel;
+    toNapi(): NapiChatModel;
+}
+//# sourceMappingURL=chatModel.d.ts.map

package/bridging/chatModel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatModel.d.ts","sourceRoot":"","sources":["../src/bridging/chatModel.ts"],"names":[],"mappings":"OAAO,EAAE,SAAS,IAAI,aAAa,EAAE;OAC9B,EAAE,SAAS,EAAwD;AAE1E,qBAAa,SAAS;IAClB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1C,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,OAAO;IAgBP,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS;IAWjE,MAAM,IAAI,aAAa;CAW1B"}

package/bridging/chatModel.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatModel = void 0;
+const modelType_1 = require("./modelType.js");
+class ChatModel {
+    get isThinking() {
+        return this.outputParserRegex !== null;
+    }
+    constructor(repoId, type, name, vendor, quantization, outputParserRegex) {
+        this.repoId = repoId;
+        this.type = type;
+        this.name = name;
+        this.vendor = vendor;
+        this.quantization = quantization;
+        this.outputParserRegex = outputParserRegex;
+    }
+    static fromNapiChatModel(napiChatModel) {
+        return new ChatModel(napiChatModel.repoId, (0, modelType_1.modelTypeFromNapiModelType)(napiChatModel.type), napiChatModel.name, napiChatModel.vendor, napiChatModel.quantization ?? null, napiChatModel.outputParserRegex ?? null);
+    }
+    toNapi() {
+        const napiChatModel = {
+            repoId: this.repoId,
+            type: (0, modelType_1.modelTypeToNapiModelType)(this.type),
+            name: this.name,
+            vendor: this.vendor,
+            ...(this.quantization !== null && { quantization: this.quantization }),
+            ...(this.outputParserRegex !== null && { outputParserRegex: this.outputParserRegex }),
+        };
+        return napiChatModel;
+    }
+}
+exports.ChatModel = ChatModel;
+//# sourceMappingURL=chatModel.js.map

package/bridging/chatModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatModel.js","sourceRoot":"","sources":["../src/bridging/chatModel.ts"],"names":[],"mappings":";;;AACA,8CAA8F;AAE9F,MAAa,SAAS;IAQlB,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,iBAAiB,KAAK,IAAI,CAAC;IAC3C,CAAC;IAED,YACI,MAAc,EACd,IAAe,EACf,IAAY,EACZ,MAAc,EACd,YAA2B,EAC3B,iBAAgC;QAEhC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,aAA4B;QACjD,OAAO,IAAI,SAAS,CAChB,aAAa,CAAC,MAAM,EACpB,IAAA,sCAA0B,EAAC,aAAa,CAAC,IAAI,CAAC,EAC9C,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,YAAY,IAAI,IAAI,EAClC,aAAa,CAAC,iBAAiB,IAAI,IAAI,CAC1C,CAAC;IACN,CAAC;IAED,MAAM;QACF,MAAM,aAAa,GAAkB;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAA,oCAAwB,EAAC,IAAI,CAAC,IAAI,CAAC;YACzC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,CAAC,IAAI,CAAC,YAAY,KAAK,IAAI,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YACtE,GAAG,CAAC,IAAI,CAAC,iBAAiB,KAAK,IAAI,IAAI,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;SACxF,CAAC;QACF,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ;AAlDD,8BAkDC"}

package/bridging/chatModel.mjs

@@ -0,0 +1,29 @@
+import { modelTypeFromNapiModelType, modelTypeToNapiModelType } from "./modelType.mjs";
+export class ChatModel {
+    get isThinking() {
+        return this.outputParserRegex !== null;
+    }
+    constructor(repoId, type, name, vendor, quantization, outputParserRegex) {
+        this.repoId = repoId;
+        this.type = type;
+        this.name = name;
+        this.vendor = vendor;
+        this.quantization = quantization;
+        this.outputParserRegex = outputParserRegex;
+    }
+    static fromNapiChatModel(napiChatModel) {
+        return new ChatModel(napiChatModel.repoId, modelTypeFromNapiModelType(napiChatModel.type), napiChatModel.name, napiChatModel.vendor, napiChatModel.quantization ?? null, napiChatModel.outputParserRegex ?? null);
+    }
+    toNapi() {
+        const napiChatModel = {
+            repoId: this.repoId,
+            type: modelTypeToNapiModelType(this.type),
+            name: this.name,
+            vendor: this.vendor,
+            ...(this.quantization !== null && { quantization: this.quantization }),
+            ...(this.outputParserRegex !== null && { outputParserRegex: this.outputParserRegex }),
+        };
+        return napiChatModel;
+    }
+}
+//# sourceMappingURL=chatModel.mjs.map

package/bridging/chatModel.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatModel.mjs","sourceRoot":"","sources":["../src/bridging/chatModel.ts"],"names":[],"mappings":"OACO,EAAa,0BAA0B,EAAE,wBAAwB,EAAE;AAE1E,MAAM,OAAO,SAAS;IAQlB,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,iBAAiB,KAAK,IAAI,CAAC;IAC3C,CAAC;IAED,YACI,MAAc,EACd,IAAe,EACf,IAAY,EACZ,MAAc,EACd,YAA2B,EAC3B,iBAAgC;QAEhC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,aAA4B;QACjD,OAAO,IAAI,SAAS,CAChB,aAAa,CAAC,MAAM,EACpB,0BAA0B,CAAC,aAAa,CAAC,IAAI,CAAC,EAC9C,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,YAAY,IAAI,IAAI,EAClC,aAAa,CAAC,iBAAiB,IAAI,IAAI,CAC1C,CAAC;IACN,CAAC;IAED,MAAM;QACF,MAAM,aAAa,GAAkB;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC;YACzC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,CAAC,IAAI,CAAC,YAAY,KAAK,IAAI,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YACtE,GAAG,CAAC,IAAI,CAAC,iBAAiB,KAAK,IAAI,IAAI,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;SACxF,CAAC;QACF,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ"}

package/bridging/chatSession.d.mts

@@ -0,0 +1,10 @@
+import { ChatSession as NapiChatSession } from "../napi/uzu.mjs";
+import { Input } from "./input.mjs";
+import { Output } from "./output.mjs";
+import { RunConfig } from "./runConfig.mjs";
+export declare class ChatSession {
+    private readonly napiChatSession;
+    constructor(napiChatSession: NapiChatSession);
+    run(input: Input, config?: RunConfig, progress?: (partialOutput: Output) => boolean): Output;
+}
+//# sourceMappingURL=chatSession.d.mts.map

package/bridging/chatSession.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatSession.d.mts","sourceRoot":"","sources":["../src/bridging/chatSession.ts"],"names":[],"mappings":"OAAO,EAAE,WAAW,IAAI,eAAe,EAAwB;OACxD,EAAE,KAAK,EAAE;OACT,EAAE,MAAM,EAAE;OACV,EAAE,SAAS,EAAE;AAEpB,qBAAa,WAAW;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;gBAEtC,eAAe,EAAE,eAAe;IAI5C,GAAG,CACC,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,SAA+B,EACvC,QAAQ,GAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAoB,GAC1D,MAAM;CAOZ"}

package/bridging/chatSession.d.ts

@@ -0,0 +1,10 @@
+import { ChatSession as NapiChatSession } from "../napi/uzu.js";
+import { Input } from "./input.js";
+import { Output } from "./output.js";
+import { RunConfig } from "./runConfig.js";
+export declare class ChatSession {
+    private readonly napiChatSession;
+    constructor(napiChatSession: NapiChatSession);
+    run(input: Input, config?: RunConfig, progress?: (partialOutput: Output) => boolean): Output;
+}
+//# sourceMappingURL=chatSession.d.ts.map

package/bridging/chatSession.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatSession.d.ts","sourceRoot":"","sources":["../src/bridging/chatSession.ts"],"names":[],"mappings":"OAAO,EAAE,WAAW,IAAI,eAAe,EAAwB;OACxD,EAAE,KAAK,EAAE;OACT,EAAE,MAAM,EAAE;OACV,EAAE,SAAS,EAAE;AAEpB,qBAAa,WAAW;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;gBAEtC,eAAe,EAAE,eAAe;IAI5C,GAAG,CACC,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,SAA+B,EACvC,QAAQ,GAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAoB,GAC1D,MAAM;CAOZ"}

package/bridging/{session.js → chatSession.js}

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Session = void 0;
+exports.ChatSession = void 0;
 const output_1 = require("./output.js");
 const runConfig_1 = require("./runConfig.js");
-class Session {
-    constructor(napiSession) {
-        this.napiSession = napiSession;
+class ChatSession {
+    constructor(napiChatSession) {
+        this.napiChatSession = napiChatSession;
     }
     run(input, config = runConfig_1.RunConfig.default(), progress = () => true) {
         const napiInput = input.toNapi();
         const napiConfig = config.toNapi();
         const napiProgress = (partialOutput) => progress(output_1.Output.fromNapi(partialOutput));
-        const napiOutput = this.napiSession.run(napiInput, napiConfig, napiProgress);
+        const napiOutput = this.napiChatSession.run(napiInput, napiConfig, napiProgress);
         return output_1.Output.fromNapi(napiOutput);
     }
 }
-exports.Session = Session;
-//# sourceMappingURL=session.js.map
+exports.ChatSession = ChatSession;
+//# sourceMappingURL=chatSession.js.map

package/bridging/chatSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatSession.js","sourceRoot":"","sources":["../src/bridging/chatSession.ts"],"names":[],"mappings":";;;AAEA,wCAAkC;AAClC,8CAAwC;AAExC,MAAa,WAAW;IAGpB,YAAY,eAAgC;QACxC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED,GAAG,CACC,KAAY,EACZ,SAAoB,qBAAS,CAAC,OAAO,EAAE,EACvC,WAA+C,GAAG,EAAE,CAAC,IAAI;QAEzD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,CAAC,aAAyB,EAAE,EAAE,CAAC,QAAQ,CAAC,eAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7F,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACjF,OAAO,eAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;CACJ;AAlBD,kCAkBC"}

package/bridging/{session.mjs → chatSession.mjs}

@@ -1,15 +1,15 @@
 import { Output } from "./output.mjs";
 import { RunConfig } from "./runConfig.mjs";
-export class Session {
-    constructor(napiSession) {
-        this.napiSession = napiSession;
+export class ChatSession {
+    constructor(napiChatSession) {
+        this.napiChatSession = napiChatSession;
     }
     run(input, config = RunConfig.default(), progress = () => true) {
         const napiInput = input.toNapi();
         const napiConfig = config.toNapi();
         const napiProgress = (partialOutput) => progress(Output.fromNapi(partialOutput));
-        const napiOutput = this.napiSession.run(napiInput, napiConfig, napiProgress);
+        const napiOutput = this.napiChatSession.run(napiInput, napiConfig, napiProgress);
         return Output.fromNapi(napiOutput);
     }
 }
-//# sourceMappingURL=session.mjs.map
+//# sourceMappingURL=chatSession.mjs.map

package/bridging/chatSession.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatSession.mjs","sourceRoot":"","sources":["../src/bridging/chatSession.ts"],"names":[],"mappings":"OAEO,EAAE,MAAM,EAAE;OACV,EAAE,SAAS,EAAE;AAEpB,MAAM,OAAO,WAAW;IAGpB,YAAY,eAAgC;QACxC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED,GAAG,CACC,KAAY,EACZ,SAAoB,SAAS,CAAC,OAAO,EAAE,EACvC,WAA+C,GAAG,EAAE,CAAC,IAAI;QAEzD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,CAAC,aAAyB,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7F,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACjF,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;CACJ"}

package/bridging/engine.d.mts

@@ -1,21 +1,21 @@
 import { EngineInteractor } from "../interactors/engineInteractor.mjs";
+import { ChatModel } from "./chatModel.mjs";
+import { ChatSession } from "./chatSession.mjs";
 import { Config } from "./config.mjs";
 import { DownloadHandle } from "./downloadHandle.mjs";
-import { Model, ModelKind } from "./model.mjs";
+import { DownloadProgressUpdate } from "./downloadProgressUpdate.mjs";
+import { DownloadState } from "./downloadState.mjs";
 import { ModelType } from "./modelType.mjs";
-import { Session } from "./session.mjs";
 export declare class Engine {
     private readonly napiEngine;
     private constructor();
     static load(apiKey?: string | undefined): Promise<Engine>;
     static create(apiKey?: string | undefined): EngineInteractor;
-    models(types?: ModelType[] | null, kinds?: ModelKind[] | null): Promise<Model[]>;
-    model(repoId: string): Promise<Model>;
-    downloadHandle(model: Model): DownloadHandle;
-    session(model: Model, config?: Config): Session;
-    downloadModel(repoId: string): Promise<void>;
-    pauseModel(repoId: string): Promise<void>;
-    deleteModel(repoId: string): Promise<void>;
-    getState(repoId: string): import("../napi/uzu").ModelDownloadState;
+    getDownloadState(repoId: string): DownloadState;
+    downloadHandle(repoId: string): DownloadHandle;
+    chatModels(types?: ModelType[] | null): Promise<ChatModel[]>;
+    chatModel(repoId: string, types?: ModelType[] | null): Promise<ChatModel>;
+    downloadChatModel(chatModel: ChatModel, progress?: (progressUpdate: DownloadProgressUpdate) => void): Promise<DownloadState>;
+    chatSession(chatModel: ChatModel, config?: Config): ChatSession;
 }
 //# sourceMappingURL=engine.d.mts.map

package/bridging/engine.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.mts","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"OACO,EAAE,gBAAgB,EAAE;OAGpB,EAAE,MAAM,EAAE;OACV,EAAE,cAAc,EAAE;OAElB,EAAE,KAAK,EAAE,SAAS,EAAE;OACpB,EAAE,SAAS,EAAmB;OAC9B,EAAE,OAAO,EAAE;AAElB,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,OAAO;WAIM,IAAI,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB1E,MAAM,CAAC,MAAM,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,gBAAgB;IAOjE,MAAM,CAAC,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,EAAE,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqB5F,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAM3C,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;IAO5C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAyB,GAAG,OAAO;IAS3D,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,QAAQ,CAAC,MAAM,EAAE,MAAM;CAG1B"}
+{"version":3,"file":"engine.d.mts","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"OACO,EAAE,gBAAgB,EAAE;OAGpB,EAAE,SAAS,EAAE;OACb,EAAE,WAAW,EAAE;OACf,EAAE,MAAM,EAAE;OACV,EAAE,cAAc,EAAE;OAClB,EAAE,sBAAsB,EAAE;OAC1B,EAAiB,aAAa,EAAE;OAEhC,EAAE,SAAS,EAA4B;AAE9C,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,OAAO;WAIM,IAAI,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB1E,MAAM,CAAC,MAAM,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,gBAAgB;IAOvE,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAK/C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IAIxC,UAAU,CAAC,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAQlE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IAM/E,iBAAiB,CACnB,SAAS,EAAE,SAAS,EACpB,QAAQ,GAAE,CAAC,cAAc,EAAE,sBAAsB,KAAK,IAAe,GACtE,OAAO,CAAC,aAAa,CAAC;IAyBzB,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,GAAE,MAAyB,GAAG,WAAW;CAKpF"}

package/bridging/engine.d.ts

@@ -1,21 +1,21 @@
 import { EngineInteractor } from "../interactors/engineInteractor.js";
+import { ChatModel } from "./chatModel.js";
+import { ChatSession } from "./chatSession.js";
 import { Config } from "./config.js";
 import { DownloadHandle } from "./downloadHandle.js";
-import { Model, ModelKind } from "./model.js";
+import { DownloadProgressUpdate } from "./downloadProgressUpdate.js";
+import { DownloadState } from "./downloadState.js";
 import { ModelType } from "./modelType.js";
-import { Session } from "./session.js";
 export declare class Engine {
     private readonly napiEngine;
     private constructor();
     static load(apiKey?: string | undefined): Promise<Engine>;
     static create(apiKey?: string | undefined): EngineInteractor;
-    models(types?: ModelType[] | null, kinds?: ModelKind[] | null): Promise<Model[]>;
-    model(repoId: string): Promise<Model>;
-    downloadHandle(model: Model): DownloadHandle;
-    session(model: Model, config?: Config): Session;
-    downloadModel(repoId: string): Promise<void>;
-    pauseModel(repoId: string): Promise<void>;
-    deleteModel(repoId: string): Promise<void>;
-    getState(repoId: string): import("../napi/uzu").ModelDownloadState;
+    getDownloadState(repoId: string): DownloadState;
+    downloadHandle(repoId: string): DownloadHandle;
+    chatModels(types?: ModelType[] | null): Promise<ChatModel[]>;
+    chatModel(repoId: string, types?: ModelType[] | null): Promise<ChatModel>;
+    downloadChatModel(chatModel: ChatModel, progress?: (progressUpdate: DownloadProgressUpdate) => void): Promise<DownloadState>;
+    chatSession(chatModel: ChatModel, config?: Config): ChatSession;
 }
 //# sourceMappingURL=engine.d.ts.map

package/bridging/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"OACO,EAAE,gBAAgB,EAAE;OAGpB,EAAE,MAAM,EAAE;OACV,EAAE,cAAc,EAAE;OAElB,EAAE,KAAK,EAAE,SAAS,EAAE;OACpB,EAAE,SAAS,EAAmB;OAC9B,EAAE,OAAO,EAAE;AAElB,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,OAAO;WAIM,IAAI,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB1E,MAAM,CAAC,MAAM,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,gBAAgB;IAOjE,MAAM,CAAC,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,EAAE,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqB5F,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAM3C,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;IAO5C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAyB,GAAG,OAAO;IAS3D,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,QAAQ,CAAC,MAAM,EAAE,MAAM;CAG1B"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"OACO,EAAE,gBAAgB,EAAE;OAGpB,EAAE,SAAS,EAAE;OACb,EAAE,WAAW,EAAE;OACf,EAAE,MAAM,EAAE;OACV,EAAE,cAAc,EAAE;OAClB,EAAE,sBAAsB,EAAE;OAC1B,EAAiB,aAAa,EAAE;OAEhC,EAAE,SAAS,EAA4B;AAE9C,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,OAAO;WAIM,IAAI,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB1E,MAAM,CAAC,MAAM,CAAC,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,gBAAgB;IAOvE,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAK/C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IAIxC,UAAU,CAAC,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAQlE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,SAAS,EAAE,GAAG,IAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IAM/E,iBAAiB,CACnB,SAAS,EAAE,SAAS,EACpB,QAAQ,GAAE,CAAC,cAAc,EAAE,sBAAsB,KAAK,IAAe,GACtE,OAAO,CAAC,aAAa,CAAC;IAyBzB,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,GAAE,MAAyB,GAAG,WAAW;CAKpF"}

package/bridging/engine.js

@@ -5,12 +5,13 @@ const error_1 = require("../error.js");
 const engineInteractor_1 = require("../interactors/engineInteractor.js");
 const uzu_1 = require("../napi/uzu.js");
 const env_1 = require("../utilities/env.js");
+const chatModel_1 = require("./chatModel.js");
+const chatSession_1 = require("./chatSession.js");
 const config_1 = require("./config.js");
 const downloadHandle_1 = require("./downloadHandle.js");
+const downloadState_1 = require("./downloadState.js");
 const licenseStatus_1 = require("./licenseStatus.js");
-const model_1 = require("./model.js");
 const modelType_1 = require("./modelType.js");
-const session_1 = require("./session.js");
 class Engine {
     constructor(napiEngine) {
         this.napiEngine = napiEngine;
@@ -35,54 +36,51 @@ class Engine {
         })();
         return new engineInteractor_1.EngineInteractor(enginePromise);
     }
-    async models(types = null, kinds = null) {
-        function isTypeAllowed(type) {
-            return types === null || types.includes(type);
-        }
-        function isKindAllowed(kind) {
-            return kinds === null || kinds.includes(kind);
-        }
-        let results = [];
-        if (isTypeAllowed(modelType_1.ModelType.Local) && isKindAllowed(model_1.ModelKind.Text)) {
-            const napiLocalModels = this.napiEngine.getLocalModels();
-            results.push(...napiLocalModels.map(model_1.Model.fromNapiLocalModel));
-        }
-        if (isTypeAllowed(modelType_1.ModelType.Cloud) && isKindAllowed(model_1.ModelKind.Text)) {
-            const napiCloudModels = await this.napiEngine.getCloudModels();
-            results.push(...napiCloudModels.map(model_1.Model.fromNapiCloudModel));
-        }
+    getDownloadState(repoId) {
+        let downloadState = this.napiEngine.getModelDownloadState(repoId);
+        return downloadState_1.DownloadState.fromNapi(downloadState);
+    }
+    downloadHandle(repoId) {
+        return new downloadHandle_1.DownloadHandle(this.napiEngine.createModelDownloadHandle(repoId));
+    }
+    async chatModels(types = null) {
+        let typesToFilter = types ?? [modelType_1.ModelType.Local, modelType_1.ModelType.Cloud];
+        let napiModelTypes = typesToFilter.map(modelType_1.modelTypeToNapiModelType);
+        let napiChatModels = await this.napiEngine.getChatModels(napiModelTypes);
+        let results = napiChatModels.map(chatModel_1.ChatModel.fromNapiChatModel);
         return results;
     }
-    async model(repoId) {
-        const models = await this.models();
-        const model = models.find((model) => model.repoId === repoId);
-        return (0, error_1.unwrapOrThrow)(model, error_1.EngineErrorCode.ModelNotFound);
+    async chatModel(repoId, types = null) {
+        const chatModels = await this.chatModels(types);
+        const chatModel = chatModels.find((model) => model.repoId === repoId);
+        return (0, error_1.unwrapOrThrow)(chatModel, error_1.EngineErrorCode.ModelNotFound);
     }
-    downloadHandle(model) {
-        if (model.type !== modelType_1.ModelType.Local) {
-            throw new error_1.EngineError(error_1.EngineErrorCode.ExpectedLocalModel);
+    async downloadChatModel(chatModel, progress = () => { }) {
+        switch (chatModel.type) {
+            case modelType_1.ModelType.Local:
+                break;
+            case modelType_1.ModelType.Cloud:
+                throw new error_1.EngineError(error_1.EngineErrorCode.UnexpectedModelType);
         }
-        return new downloadHandle_1.DownloadHandle(this.napiEngine.downloadHandle(model.repoId));
-    }
-    session(model, config = config_1.Config.default()) {
-        if (model.kind !== model_1.ModelKind.Text) {
-            throw new error_1.EngineError(error_1.EngineErrorCode.ExpectedTextModel);
+        const downloadHandle = this.downloadHandle(chatModel.repoId);
+        const state = await downloadHandle.state();
+        switch (state.phase) {
+            case downloadState_1.DownloadPhase.Downloaded:
+                break;
+            default:
+                await downloadHandle.download();
+                for await (const progressUpdate of downloadHandle.progressUpdate()) {
+                    progress(progressUpdate);
+                }
+                break;
         }
-        const napiModelType = (0, modelType_1.modelTypeToNapi)(model.type);
-        const napiConfig = config.toNapi();
-        return new session_1.Session(this.napiEngine.createSession(model.repoId, napiModelType, napiConfig));
+        const finalState = await downloadHandle.state();
+        return finalState;
     }
-    async downloadModel(repoId) {
-        await this.napiEngine.downloadModel(repoId);
-    }
-    async pauseModel(repoId) {
-        await this.napiEngine.pauseModel(repoId);
-    }
-    async deleteModel(repoId) {
-        await this.napiEngine.deleteModel(repoId);
-    }
-    getState(repoId) {
-        return this.napiEngine.getState(repoId);
+    chatSession(chatModel, config = config_1.Config.default()) {
+        const napiChatModel = chatModel.toNapi();
+        const napiConfig = config.toNapi();
+        return new chatSession_1.ChatSession(this.napiEngine.createChatSession(napiChatModel, napiConfig));
     }
 }
 exports.Engine = Engine;

package/bridging/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"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"}

package/bridging/engine.mjs

@@ -2,12 +2,13 @@ import { EngineError, EngineErrorCode, unwrapOrThrow } from "../error.mjs";
 import { EngineInteractor } from "../interactors/engineInteractor.mjs";
 import { Engine as NapiEngine } from "../napi/uzu.mjs";
 import { readEnv } from "../utilities/env.mjs";
+import { ChatModel } from "./chatModel.mjs";
+import { ChatSession } from "./chatSession.mjs";
 import { Config } from "./config.mjs";
 import { DownloadHandle } from "./downloadHandle.mjs";
+import { DownloadPhase, DownloadState } from "./downloadState.mjs";
 import { LicenseStatus, licenseStatusFromNapiLicenseStatus } from "./licenseStatus.mjs";
-import { Model, ModelKind } from "./model.mjs";
-import { ModelType, modelTypeToNapi } from "./modelType.mjs";
-import { Session } from "./session.mjs";
+import { ModelType, modelTypeToNapiModelType } from "./modelType.mjs";
 export class Engine {
     constructor(napiEngine) {
         this.napiEngine = napiEngine;
@@ -32,54 +33,51 @@ export class Engine {
         })();
         return new EngineInteractor(enginePromise);
     }
-    async models(types = null, kinds = null) {
-        function isTypeAllowed(type) {
-            return types === null || types.includes(type);
-        }
-        function isKindAllowed(kind) {
-            return kinds === null || kinds.includes(kind);
-        }
-        let results = [];
-        if (isTypeAllowed(ModelType.Local) && isKindAllowed(ModelKind.Text)) {
-            const napiLocalModels = this.napiEngine.getLocalModels();
-            results.push(...napiLocalModels.map(Model.fromNapiLocalModel));
-        }
-        if (isTypeAllowed(ModelType.Cloud) && isKindAllowed(ModelKind.Text)) {
-            const napiCloudModels = await this.napiEngine.getCloudModels();
-            results.push(...napiCloudModels.map(Model.fromNapiCloudModel));
-        }
+    getDownloadState(repoId) {
+        let downloadState = this.napiEngine.getModelDownloadState(repoId);
+        return DownloadState.fromNapi(downloadState);
+    }
+    downloadHandle(repoId) {
+        return new DownloadHandle(this.napiEngine.createModelDownloadHandle(repoId));
+    }
+    async chatModels(types = null) {
+        let typesToFilter = types ?? [ModelType.Local, ModelType.Cloud];
+        let napiModelTypes = typesToFilter.map(modelTypeToNapiModelType);
+        let napiChatModels = await this.napiEngine.getChatModels(napiModelTypes);
+        let results = napiChatModels.map(ChatModel.fromNapiChatModel);
         return results;
     }
-    async model(repoId) {
-        const models = await this.models();
-        const model = models.find((model) => model.repoId === repoId);
-        return unwrapOrThrow(model, EngineErrorCode.ModelNotFound);
+    async chatModel(repoId, types = null) {
+        const chatModels = await this.chatModels(types);
+        const chatModel = chatModels.find((model) => model.repoId === repoId);
+        return unwrapOrThrow(chatModel, EngineErrorCode.ModelNotFound);
     }
-    downloadHandle(model) {
-        if (model.type !== ModelType.Local) {
-            throw new EngineError(EngineErrorCode.ExpectedLocalModel);
+    async downloadChatModel(chatModel, progress = () => { }) {
+        switch (chatModel.type) {
+            case ModelType.Local:
+                break;
+            case ModelType.Cloud:
+                throw new EngineError(EngineErrorCode.UnexpectedModelType);
         }
-        return new DownloadHandle(this.napiEngine.downloadHandle(model.repoId));
-    }
-    session(model, config = Config.default()) {
-        if (model.kind !== ModelKind.Text) {
-            throw new EngineError(EngineErrorCode.ExpectedTextModel);
+        const downloadHandle = this.downloadHandle(chatModel.repoId);
+        const state = await downloadHandle.state();
+        switch (state.phase) {
+            case DownloadPhase.Downloaded:
+                break;
+            default:
+                await downloadHandle.download();
+                for await (const progressUpdate of downloadHandle.progressUpdate()) {
+                    progress(progressUpdate);
+                }
+                break;
         }
-        const napiModelType = modelTypeToNapi(model.type);
-        const napiConfig = config.toNapi();
-        return new Session(this.napiEngine.createSession(model.repoId, napiModelType, napiConfig));
+        const finalState = await downloadHandle.state();
+        return finalState;
     }
-    async downloadModel(repoId) {
-        await this.napiEngine.downloadModel(repoId);
-    }
-    async pauseModel(repoId) {
-        await this.napiEngine.pauseModel(repoId);
-    }
-    async deleteModel(repoId) {
-        await this.napiEngine.deleteModel(repoId);
-    }
-    getState(repoId) {
-        return this.napiEngine.getState(repoId);
+    chatSession(chatModel, config = Config.default()) {
+        const napiChatModel = chatModel.toNapi();
+        const napiConfig = config.toNapi();
+        return new ChatSession(this.napiEngine.createChatSession(napiChatModel, napiConfig));
     }
 }
 //# sourceMappingURL=engine.mjs.map

package/bridging/engine.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"engine.mjs","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.mjs","sourceRoot":"","sources":["../src/bridging/engine.ts"],"names":[],"mappings":"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"}