react-native-nobodywho 1.0.1 → 2.0.0

package/src/message.ts

@@ -1,75 +1,89 @@
 import {
   Message as InternalMessage,
   Message_Tags,
-  Role,
   type Asset,
   type ToolCall,
 } from "../generated/ts/nobodywho";
 
 /**
- * A chat message. The `role` field combined with the presence of
- * `toolCalls` or `name` determines the message type:
+ * A chat message. The variant determines the message type:
  *
- * - **User/Assistant/System message:** `{ role, content, assets? }`
- * - **Tool call request:** `{ role: Role.Assistant, content, toolCalls }`
- * - **Tool response:** `{ role: Role.Tool, name, content }`
+ * - **User message:** `{ role: "user", content, assets? }`
+ * - **Assistant message:** `{ role: "assistant", content }`
+ * - **Assistant tool call:** `{ role: "assistant", content, toolCalls }`
+ * - **System message:** `{ role: "system", content }`
+ * - **Tool response:** `{ role: "tool", name, content }`
  *
  * @example
  * ```typescript
  * const history = await chat.getChatHistory();
  * for (const msg of history) {
- *   if ("toolCalls" in msg) {
- *     console.log("Tool calls:", msg.toolCalls);
- *   } else if ("name" in msg) {
+ *   if (msg.role === "tool") {
  *     console.log("Tool response:", msg.name, msg.content);
+ *   } else if (msg.role === "assistant" && "toolCalls" in msg) {
+ *     console.log("Tool calls:", msg.toolCalls);
  *   } else {
  *     console.log(msg.role, msg.content);
  *   }
  * }
  * ```
  */
-export type ChatMessage =
-  | { role: Role.User | Role.Assistant | Role.System; content: string; assets?: Asset[] }
-  | { role: Role.Assistant; content: string; toolCalls: ToolCall[] }
-  | { role: Role.Tool; name: string; content: string };
+export type Message =
+  | { role: "user"; content: string; assets?: Asset[] }
+  | { role: "assistant"; content: string }
+  | { role: "assistant"; content: string; toolCalls: ToolCall[] }
+  | { role: "system"; content: string }
+  | { role: "tool"; name: string; content: string };
 
-/** @internal Convert internal Message to ChatMessage */
-export function fromInternal(msg: InternalMessage): ChatMessage {
-  if (msg.tag === Message_Tags.Message) {
-    const { role, content, assets } = msg.inner;
+/** @internal Convert internal Message to Message */
+export function fromInternal(msg: InternalMessage): Message {
+  if (msg.tag === Message_Tags.User) {
+    const { content, assets } = msg.inner;
     return {
-      role: role as Role.User | Role.Assistant | Role.System,
+      role: "user",
       content,
       ...(assets.length > 0 ? { assets } : {}),
     };
-  } else if (msg.tag === Message_Tags.ToolCalls) {
-    const { role, content, toolCalls } = msg.inner;
-    return { role: role as Role.Assistant, content, toolCalls };
+  } else if (msg.tag === Message_Tags.Assistant) {
+    const { content, toolCalls } = msg.inner;
+    if (toolCalls != null && toolCalls.length > 0) {
+      return { role: "assistant", content, toolCalls };
+    }
+    return { role: "assistant", content };
+  } else if (msg.tag === Message_Tags.System) {
+    const { content } = msg.inner;
+    return { role: "system", content };
   } else {
-    const { role, name, content } = msg.inner;
-    return { role: role as Role.Tool, name, content };
+    const { name, content } = msg.inner;
+    return { role: "tool", name, content };
   }
 }
 
-/** @internal Convert ChatMessage to internal Message */
-export function toInternal(msg: ChatMessage): InternalMessage {
-  if ("toolCalls" in msg) {
-    return new InternalMessage.ToolCalls({
-      role: msg.role,
+/** @internal Convert Message to internal Message */
+export function toInternal(msg: Message): InternalMessage {
+  if (msg.role === "user") {
+    return new InternalMessage.User({
+      content: msg.content,
+      assets: msg.assets ?? [],
+    });
+  } else if (msg.role === "assistant" && "toolCalls" in msg) {
+    return new InternalMessage.Assistant({
       content: msg.content,
       toolCalls: msg.toolCalls,
     });
-  } else if ("name" in msg) {
-    return new InternalMessage.ToolResp({
-      role: msg.role,
-      name: msg.name,
+  } else if (msg.role === "assistant") {
+    return new InternalMessage.Assistant({
+      content: msg.content,
+      toolCalls: null,
+    });
+  } else if (msg.role === "system") {
+    return new InternalMessage.System({
       content: msg.content,
     });
   } else {
-    return new InternalMessage.Message({
-      role: msg.role,
+    return new InternalMessage.Tool({
+      name: msg.name,
       content: msg.content,
-      assets: msg.assets ?? [],
     });
   }
 }

package/src/model.ts

@@ -39,16 +39,23 @@ export class Model {
    * @param opts.modelPath - Path to the GGUF model file, or a `hf://owner/repo/file.gguf` / `https://` URL to download and cache automatically
    * @param opts.useGpu - Use GPU acceleration if available (default: true)
    * @param opts.projectionModelPath - Path to a multimodal projector file for vision models
+   * @param opts.onDownloadProgress - Invoked with `(downloaded, total)` byte counts while a remote model is being downloaded. Throttled to ~10 Hz with a guaranteed final emit on completion. Not invoked for cached/local files.
    */
   static async load(opts: {
     modelPath: string;
     useGpu?: boolean;
     projectionModelPath?: string;
+    onDownloadProgress?: (downloaded: number, total: number) => void;
   }): Promise<Model> {
+    const cb = opts.onDownloadProgress;
+    const progressCallback = cb
+      ? { onDownloadProgress: (d: bigint, t: bigint) => cb(Number(d), Number(t)) }
+      : undefined;
     const inner = await loadModel(
       opts.modelPath,
       opts.useGpu ?? true,
       opts.projectionModelPath,
+      progressCallback,
     );
     return new Model(inner);
   }

package/src/wrapper.ts

@@ -3,8 +3,8 @@
  *
  * This is the public entry point. It re-exports the public API:
  * - Wrapper classes: Model, Chat, Encoder, CrossEncoder, Tool, TokenStream, Prompt
- * - Direct re-exports: SamplerBuilder, SamplerConfig, Role
- * - Types: ChatMessage, Asset, ToolCall
+ * - Direct re-exports: SamplerBuilder, SamplerConfig
+ * - Types: Message, Asset, ToolCall
  * - Utilities: SamplerPresets, cosineSimilarity
  *
  * This file is NOT generated — it is safe to edit.
@@ -20,13 +20,12 @@ export { Tool } from "./tool";
 export { TokenStream } from "./streaming";
 
 // Message types
-export type { ChatMessage } from "./message";
+export type { Message } from "./message";
 
 // Re-export types that don't need wrapping.
 export {
   SamplerBuilder,
   SamplerConfig,
-  Role,
   cosineSimilarity,
 } from "./index";