smoltalk 0.0.15 → 0.0.17

package/dist/classes/message/AssistantMessage.d.ts

@@ -20,6 +20,7 @@ export declare class AssistantMessage extends BaseMessage implements MessageClas
         rawData?: any;
     });
     get content(): string;
+    set content(value: string);
     get role(): "assistant";
     get name(): string | undefined;
     get audio(): any | null | undefined;

package/dist/classes/message/AssistantMessage.js

@@ -25,6 +25,9 @@ export class AssistantMessage extends BaseMessage {
             ? this._content
             : JSON.stringify(this._content);
     }
+    set content(value) {
+        this._content = value;
+    }
     get role() {
         return this._role;
     }

package/dist/classes/message/DeveloperMessage.d.ts

@@ -13,6 +13,7 @@ export declare class DeveloperMessage extends BaseMessage implements MessageClas
         rawData?: any;
     });
     get content(): string;
+    set content(value: string);
     get role(): "developer";
     get name(): string | undefined;
     get rawData(): any;

package/dist/classes/message/DeveloperMessage.js

@@ -15,6 +15,9 @@ export class DeveloperMessage extends BaseMessage {
             ? this._content
             : JSON.stringify(this._content);
     }
+    set content(value) {
+        this._content = value;
+    }
     get role() {
         return this._role;
     }

package/dist/classes/message/SystemMessage.d.ts

@@ -13,6 +13,7 @@ export declare class SystemMessage extends BaseMessage implements MessageClass {
         rawData?: any;
     });
     get content(): string;
+    set content(value: string);
     get role(): "system";
     get name(): string | undefined;
     get rawData(): any;

package/dist/classes/message/SystemMessage.js

@@ -15,6 +15,9 @@ export class SystemMessage extends BaseMessage {
             ? this._content
             : JSON.stringify(this._content);
     }
+    set content(value) {
+        this._content = value;
+    }
     get role() {
         return this._role;
     }

package/dist/classes/message/ToolMessage.d.ts

@@ -15,6 +15,7 @@ export declare class ToolMessage extends BaseMessage implements MessageClass {
         name: string;
     });
     get content(): string;
+    set content(value: string);
     get role(): "tool";
     get name(): string;
     get tool_call_id(): string;

package/dist/classes/message/ToolMessage.js

@@ -17,6 +17,9 @@ export class ToolMessage extends BaseMessage {
             ? this._content
             : JSON.stringify(this._content);
     }
+    set content(value) {
+        this._content = value;
+    }
     get role() {
         return this._role;
     }

package/dist/classes/message/UserMessage.d.ts

@@ -12,6 +12,7 @@ export declare class UserMessage extends BaseMessage implements MessageClass {
         rawData?: any;
     });
     get content(): string;
+    set content(value: string);
     get role(): "user";
     get name(): string | undefined;
     get rawData(): any;

package/dist/classes/message/UserMessage.js

@@ -13,6 +13,9 @@ export class UserMessage extends BaseMessage {
     get content() {
         return this._content;
     }
+    set content(value) {
+        this._content = value;
+    }
     get role() {
         return this._role;
     }

package/dist/clients/baseClient.d.ts

@@ -1,13 +1,23 @@
-import { PromptConfig, PromptResult, Result, SmolClient, SmolConfig } from "../types.js";
+import { PromptConfig, PromptResult, Result, SmolClient, SmolConfig, StreamChunk } from "../types.js";
 export declare class BaseClient implements SmolClient {
     protected config: SmolConfig;
     constructor(config: SmolConfig);
-    text(promptConfig: PromptConfig): Promise<Result<PromptResult>>;
+    text(promptConfig: Omit<PromptConfig, "stream">): Promise<Result<PromptResult>>;
+    text(promptConfig: Omit<PromptConfig, "stream"> & {
+        stream: false;
+    }): Promise<Result<PromptResult>>;
+    text(promptConfig: Omit<PromptConfig, "stream"> & {
+        stream: true;
+    }): AsyncGenerator<StreamChunk>;
+    text(promptConfig: PromptConfig): Promise<Result<PromptResult>> | AsyncGenerator<StreamChunk>;
+    textSync(promptConfig: PromptConfig): Promise<Result<PromptResult>>;
     checkForToolLoops(promptConfig: PromptConfig): {
         continue: boolean;
         newPromptConfig: PromptConfig;
     };
     textWithRetry(promptConfig: PromptConfig, retries: number): Promise<Result<PromptResult>>;
-    _text(promptConfig: PromptConfig): Promise<Result<PromptResult>>;
-    prompt(text: string, promptConfig?: PromptConfig): Promise<Result<PromptResult>>;
+    _textSync(promptConfig: PromptConfig): Promise<Result<PromptResult>>;
+    prompt(text: string, promptConfig?: PromptConfig): Promise<Result<PromptResult>> | AsyncGenerator<StreamChunk>;
+    textStream(config: PromptConfig): AsyncGenerator<StreamChunk>;
+    _textStream(config: PromptConfig): AsyncGenerator<StreamChunk>;
 }

package/dist/clients/baseClient.js

@@ -6,7 +6,15 @@ export class BaseClient {
     constructor(config) {
         this.config = config || {};
     }
-    async text(promptConfig) {
+    text(promptConfig) {
+        if (promptConfig.stream) {
+            return this.textStream(promptConfig);
+        }
+        else {
+            return this.textSync(promptConfig);
+        }
+    }
+    async textSync(promptConfig) {
         const { continue: shouldContinue, newPromptConfig } = this.checkForToolLoops(promptConfig);
         if (!shouldContinue) {
             return { success: true, value: { output: null, toolCalls: [] } };
@@ -52,7 +60,7 @@ export class BaseClient {
         return { continue: true, newPromptConfig: promptConfig };
     }
     async textWithRetry(promptConfig, retries) {
-        const result = await this._text(promptConfig);
+        const result = await this._textSync(promptConfig);
         if (result.success) {
             const { output } = result.value;
             if (output !== null &&
@@ -72,10 +80,10 @@ export class BaseClient {
         }
         return result;
     }
-    async _text(promptConfig) {
+    async _textSync(promptConfig) {
         throw new Error("Method not implemented.");
     }
-    async prompt(text, promptConfig) {
+    prompt(text, promptConfig) {
         const msg = userMessage(text);
         const newPromptConfig = {
             ...promptConfig,
@@ -83,6 +91,31 @@ export class BaseClient {
                 ? [...promptConfig.messages, msg]
                 : [msg],
         };
-        return await this.text(newPromptConfig);
+        return this.text(newPromptConfig);
+    }
+    async *textStream(config) {
+        const { continue: shouldContinue, newPromptConfig } = this.checkForToolLoops(config);
+        if (!shouldContinue) {
+            yield { type: "done", result: { output: null, toolCalls: [] } };
+            return;
+        }
+        yield* this._textStream(newPromptConfig);
+    }
+    // default implementation of text stream just calls the non-streaming version and yields the result
+    // clients that support streaming can override this to provide a streaming implementation
+    async *_textStream(config) {
+        const result = await this._textSync(config);
+        if (result.success) {
+            if (result.value.output) {
+                yield { type: "text", text: result.value.output };
+            }
+            for (const tc of result.value.toolCalls) {
+                yield { type: "tool_call", toolCall: tc };
+            }
+            yield { type: "done", result: result.value };
+        }
+        else {
+            yield { type: "error", error: result.error };
+        }
     }
 }

package/dist/clients/google.d.ts

@@ -9,5 +9,5 @@ export declare class SmolGoogle extends BaseClient implements SmolClient {
     constructor(config: SmolGoogleConfig);
     getClient(): GoogleGenAI;
     getModel(): string;
-    _text(config: PromptConfig): Promise<Result<PromptResult>>;
+    _textSync(config: PromptConfig): Promise<Result<PromptResult>>;
 }

package/dist/clients/google.js

@@ -23,7 +23,7 @@ export class SmolGoogle extends BaseClient {
     getModel() {
         return this.model;
     }
-    async _text(config) {
+    async _textSync(config) {
         const messages = config.messages.map((msg) => msg.toGoogleMessage());
         const tools = (config.tools || []).map((tool) => {
             return zodToGoogleTool(tool.name, tool.schema, {
@@ -42,10 +42,9 @@ export class SmolGoogle extends BaseClient {
             contents: messages,
             model: this.model,
             config: genConfig,
+            stream: config.stream || false,
+            ...(config.rawAttributes || {}),
         };
-        if (config.rawAttributes) {
-            Object.assign(request, config.rawAttributes);
-        }
         this.logger.debug("Sending request to Google Gemini:", JSON.stringify(request, null, 2));
         // Send the prompt as the latest message
         const result = await this.client.models.generateContent(request);

package/dist/clients/ollama.d.ts

@@ -10,5 +10,5 @@ export declare class SmolOllama extends BaseClient implements SmolClient {
     constructor(config: SmolOllamaConfig);
     getClient(): Ollama;
     getModel(): string;
-    text(config: PromptConfig): Promise<Result<PromptResult>>;
+    _textSync(config: PromptConfig): Promise<Result<PromptResult>>;
 }

package/dist/clients/ollama.js

@@ -30,7 +30,7 @@ export class SmolOllama extends BaseClient {
     getModel() {
         return this.model;
     }
-    async text(config) {
+    async _textSync(config) {
         const messages = config.messages.map((msg) => msg.toOpenAIMessage());
         const tools = (config.tools || []).map((tool) => {
             return zodToGoogleTool(tool.name, tool.schema, {

package/dist/clients/openai.d.ts

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { BaseClientConfig, PromptConfig, PromptResult, Result, SmolClient } from "../types.js";
+import { BaseClientConfig, PromptConfig, PromptResult, Result, SmolClient, StreamChunk } from "../types.js";
 import { BaseClient } from "./baseClient.js";
 export type SmolOpenAiConfig = BaseClientConfig;
 export declare class SmolOpenAi extends BaseClient implements SmolClient {
@@ -9,5 +9,7 @@ export declare class SmolOpenAi extends BaseClient implements SmolClient {
     constructor(config: SmolOpenAiConfig);
     getClient(): OpenAI;
     getModel(): string;
-    _text(config: PromptConfig): Promise<Result<PromptResult>>;
+    private buildRequest;
+    _textSync(config: PromptConfig): Promise<Result<PromptResult>>;
+    _textStream(config: PromptConfig): AsyncGenerator<StreamChunk>;
 }

package/dist/clients/openai.js

@@ -24,7 +24,7 @@ export class SmolOpenAi extends BaseClient {
     getModel() {
         return this.model;
     }
-    async _text(config) {
+    buildRequest(config) {
         const messages = config.messages.map((msg) => msg.toOpenAIMessage());
         const request = {
             model: this.model,
@@ -34,6 +34,7 @@ export class SmolOpenAi extends BaseClient {
                     description: tool.description,
                 });
             }),
+            ...(config.rawAttributes || {}),
         };
         if (config.responseFormat) {
             request.response_format = {
@@ -44,8 +45,15 @@ export class SmolOpenAi extends BaseClient {
                 },
             };
         }
+        return request;
+    }
+    async _textSync(config) {
+        const request = this.buildRequest(config);
         this.logger.debug("Sending request to OpenAI:", JSON.stringify(request, null, 2));
-        const completion = await this.client.chat.completions.create(request);
+        const completion = await this.client.chat.completions.create({
+            ...request,
+            stream: false,
+        });
         this.logger.debug("Response from OpenAI:", JSON.stringify(completion, null, 2));
         const message = completion.choices[0].message;
         const output = message.content;
@@ -63,4 +71,52 @@ export class SmolOpenAi extends BaseClient {
         }
         return success({ output, toolCalls });
     }
+    async *_textStream(config) {
+        const request = this.buildRequest(config);
+        this.logger.debug("Sending streaming request to OpenAI:", JSON.stringify(request, null, 2));
+        const completion = await this.client.chat.completions.create({
+            ...request,
+            stream: true,
+        });
+        let content = "";
+        const toolCallsMap = new Map();
+        for await (const chunk of completion) {
+            const delta = chunk.choices[0]?.delta;
+            if (!delta)
+                continue;
+            if (delta.content) {
+                content += delta.content;
+                yield { type: "text", text: delta.content };
+            }
+            if (delta.tool_calls) {
+                for (const tc of delta.tool_calls) {
+                    const index = tc.index;
+                    if (!toolCallsMap.has(index)) {
+                        toolCallsMap.set(index, {
+                            id: tc.id || "",
+                            name: tc.function?.name || "",
+                            arguments: tc.function?.arguments || "",
+                        });
+                    }
+                    else {
+                        const existing = toolCallsMap.get(index);
+                        if (tc.id)
+                            existing.id = tc.id;
+                        if (tc.function?.name)
+                            existing.name = tc.function.name;
+                        if (tc.function?.arguments)
+                            existing.arguments += tc.function.arguments;
+                    }
+                }
+            }
+        }
+        this.logger.debug("Streaming response completed from OpenAI");
+        const toolCalls = [];
+        for (const tc of toolCallsMap.values()) {
+            const toolCall = new ToolCall(tc.id, tc.name, tc.arguments);
+            toolCalls.push(toolCall);
+            yield { type: "tool_call", toolCall };
+        }
+        yield { type: "done", result: { output: content || null, toolCalls } };
+    }
 }

package/dist/types.d.ts

@@ -18,6 +18,7 @@ export type PromptConfig = {
     numSuggestions?: number;
     parallelToolCalls?: boolean;
     responseFormat?: ZodType;
+    stream?: boolean;
     responseFormatOptions?: Partial<{
         name: string;
         strict: boolean;
@@ -46,10 +47,26 @@ export type PromptResult = {
     output: string | null;
     toolCalls: ToolCall[];
 };
+export type StreamChunk = {
+    type: "text";
+    text: string;
+} | {
+    type: "tool_call";
+    toolCall: ToolCall;
+} | {
+    type: "done";
+    result: PromptResult;
+} | {
+    type: "error";
+    error: string;
+};
 export interface SmolClient {
-    text(config: PromptConfig): Promise<Result<PromptResult>>;
-    prompt(text: string, config?: PromptConfig): Promise<Result<PromptResult>>;
-    _text(config: PromptConfig): Promise<Result<PromptResult>>;
+    text(promptConfig: PromptConfig): Promise<Result<PromptResult>> | AsyncGenerator<StreamChunk>;
+    textSync(config: PromptConfig): Promise<Result<PromptResult>>;
+    _textSync(config: PromptConfig): Promise<Result<PromptResult>>;
+    textStream(config: PromptConfig): AsyncGenerator<StreamChunk>;
+    _textStream(config: PromptConfig): AsyncGenerator<StreamChunk>;
+    prompt(text: string, config?: PromptConfig): Promise<Result<PromptResult>> | AsyncGenerator<StreamChunk>;
 }
 export type TextPart = {
     type: "text";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoltalk",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "A common interface for LLM APIs",
   "homepage": "https://github.com/egonSchiele/smoltalk",
   "scripts": {
@@ -9,7 +9,8 @@
     "coverage": "vitest --coverage",
     "build": "rm -rf dist && tsc",
     "start": "cd dist && node index.js",
-    "doc": "typedoc --disableSources --out docs lib && prettier docs/ --write"
+    "doc": "typedoc --disableSources --out docs lib && prettier docs/ --write",
+    "typecheck": "tsc --noEmit"
   },
   "files": [
     "./dist"