@threaded/ai 1.0.6 → 1.0.8

package/dist/index.d.cts

@@ -138,6 +138,7 @@ interface ProviderConfig {
     model: string;
     instructions?: string;
     schema?: JsonSchema;
+    apiKey?: string;
 }
 interface ParsedModel {
     provider: string;
@@ -162,6 +163,21 @@ interface Thread {
 interface RetryOptions {
     times?: number;
 }
+interface ImageConfig {
+    n?: number;
+    size?: string;
+    quality?: "standard" | "hd" | "low" | "medium" | "high" | "auto";
+    style?: "vivid" | "natural";
+    responseFormat?: "url" | "b64_json";
+    aspectRatio?: string;
+    outputFormat?: "png" | "jpeg" | "webp";
+    outputCompression?: number;
+    background?: "transparent" | "opaque" | "auto";
+}
+interface ImageResult {
+    data: string;
+    revisedPrompt?: string;
+}
 
 declare const createMCPTools: (client: Client) => Promise<ToolConfig[]>;
 
@@ -185,6 +201,8 @@ declare const embed: (model: string, text: string, config?: {
     dimensions?: number;
 }) => Promise<number[]>;
 
+declare const generateImage: (model: string, prompt: string, config?: ImageConfig) => Promise<ImageResult>;
+
 /**
  * @example
  * // in-memory (default)
@@ -252,10 +270,11 @@ declare const tap: (fn: (ctx: ConversationContext) => Promise<void> | void) => S
 
 declare const when: (condition: (ctx: ConversationContext) => boolean, action: StepFunction) => StepFunction;
 
-declare const model: ({ model, schema, system, }?: {
+declare const model: ({ model, schema, system, apiKey, }?: {
     model?: string;
     schema?: JsonSchema | StandardSchema;
     system?: string | ((ctx: ConversationContext) => string);
+    apiKey?: string;
 }) => ComposedFunction;
 
 /**
@@ -293,4 +312,4 @@ declare const rateLimited: (config: RateLimitConfig) => <T extends (...args: any
 
 declare const compose: (...steps: StepFunction[]) => ComposedFunction;
 
-export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, convertStandardSchemaToSchemaProperties, createMCPTools, embed, everyNMessages, everyNTokens, generateApprovalToken, getKey, getOrCreateThread, isStandardSchema, maxCalls, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, parseModelName, rateLimited, removeApprovalListener, requestApproval, resolveApproval, retry, scope, setKeys, tap, toolConfigToToolDefinition, toolNotUsedInNTurns, toolWasCalled, when };
+export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, type ImageConfig, type ImageResult, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, convertStandardSchemaToSchemaProperties, createMCPTools, embed, everyNMessages, everyNTokens, generateApprovalToken, generateImage, getKey, getOrCreateThread, isStandardSchema, maxCalls, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, parseModelName, rateLimited, removeApprovalListener, requestApproval, resolveApproval, retry, scope, setKeys, tap, toolConfigToToolDefinition, toolNotUsedInNTurns, toolWasCalled, when };

package/dist/index.d.ts

@@ -138,6 +138,7 @@ interface ProviderConfig {
     model: string;
     instructions?: string;
     schema?: JsonSchema;
+    apiKey?: string;
 }
 interface ParsedModel {
     provider: string;
@@ -162,6 +163,21 @@ interface Thread {
 interface RetryOptions {
     times?: number;
 }
+interface ImageConfig {
+    n?: number;
+    size?: string;
+    quality?: "standard" | "hd" | "low" | "medium" | "high" | "auto";
+    style?: "vivid" | "natural";
+    responseFormat?: "url" | "b64_json";
+    aspectRatio?: string;
+    outputFormat?: "png" | "jpeg" | "webp";
+    outputCompression?: number;
+    background?: "transparent" | "opaque" | "auto";
+}
+interface ImageResult {
+    data: string;
+    revisedPrompt?: string;
+}
 
 declare const createMCPTools: (client: Client) => Promise<ToolConfig[]>;
 
@@ -185,6 +201,8 @@ declare const embed: (model: string, text: string, config?: {
     dimensions?: number;
 }) => Promise<number[]>;
 
+declare const generateImage: (model: string, prompt: string, config?: ImageConfig) => Promise<ImageResult>;
+
 /**
  * @example
  * // in-memory (default)
@@ -252,10 +270,11 @@ declare const tap: (fn: (ctx: ConversationContext) => Promise<void> | void) => S
 
 declare const when: (condition: (ctx: ConversationContext) => boolean, action: StepFunction) => StepFunction;
 
-declare const model: ({ model, schema, system, }?: {
+declare const model: ({ model, schema, system, apiKey, }?: {
     model?: string;
     schema?: JsonSchema | StandardSchema;
     system?: string | ((ctx: ConversationContext) => string);
+    apiKey?: string;
 }) => ComposedFunction;
 
 /**
@@ -293,4 +312,4 @@ declare const rateLimited: (config: RateLimitConfig) => <T extends (...args: any
 
 declare const compose: (...steps: StepFunction[]) => ComposedFunction;
 
-export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, convertStandardSchemaToSchemaProperties, createMCPTools, embed, everyNMessages, everyNTokens, generateApprovalToken, getKey, getOrCreateThread, isStandardSchema, maxCalls, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, parseModelName, rateLimited, removeApprovalListener, requestApproval, resolveApproval, retry, scope, setKeys, tap, toolConfigToToolDefinition, toolNotUsedInNTurns, toolWasCalled, when };
+export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, type ImageConfig, type ImageResult, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, convertStandardSchemaToSchemaProperties, createMCPTools, embed, everyNMessages, everyNTokens, generateApprovalToken, generateImage, getKey, getOrCreateThread, isStandardSchema, maxCalls, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, parseModelName, rateLimited, removeApprovalListener, requestApproval, resolveApproval, retry, scope, setKeys, tap, toolConfigToToolDefinition, toolNotUsedInNTurns, toolWasCalled, when };

package/dist/index.js

@@ -190,6 +190,122 @@ var embed = async (model2, text, config) => {
   }
 };
 
+// src/image.ts
+var providerKeyEnvVars = {
+  openai: "OPENAI_API_KEY",
+  xai: "XAI_API_KEY",
+  google: "GEMINI_API_KEY"
+};
+var getApiKey = (provider) => {
+  try {
+    return getKey(provider);
+  } catch {
+    const envVar = providerKeyEnvVars[provider];
+    const key = envVar ? process.env[envVar] || "" : "";
+    if (!key) throw new Error(`No API key found for provider: ${provider}`);
+    return key;
+  }
+};
+var generateOpenAICompatible = async (endpoint, modelName, prompt, apiKey, config) => {
+  const isGptImage = modelName.startsWith("gpt-image");
+  const body = {
+    model: modelName,
+    prompt
+  };
+  if (!isGptImage) {
+    body.response_format = config?.responseFormat || "b64_json";
+  }
+  if (config?.n) body.n = config.n;
+  if (config?.size) body.size = config.size;
+  if (config?.quality) body.quality = config.quality;
+  if (config?.style && !isGptImage) body.style = config.style;
+  if (isGptImage) {
+    if (config?.outputFormat) body.output_format = config.outputFormat;
+    if (config?.outputCompression != null) body.output_compression = config.outputCompression;
+    if (config?.background) body.background = config.background;
+  }
+  const response = await fetch(endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiKey}`
+    },
+    body: JSON.stringify(body)
+  });
+  if (!response.ok) {
+    const error = await response.text();
+    throw new Error(`API error: ${error}`);
+  }
+  const data = await response.json();
+  const image = data.data[0];
+  return {
+    data: image.b64_json || image.url,
+    revisedPrompt: image.revised_prompt
+  };
+};
+var generateGoogle = async (modelName, prompt, apiKey, config) => {
+  const endpoint = `https://generativelanguage.googleapis.com/v1beta/models/${modelName}:generateContent`;
+  const body = {
+    contents: [{ parts: [{ text: prompt }] }],
+    generationConfig: {
+      responseModalities: ["TEXT", "IMAGE"]
+    }
+  };
+  if (config?.aspectRatio) {
+    body.generationConfig.aspectRatio = config.aspectRatio;
+  }
+  const response = await fetch(endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "x-goog-api-key": apiKey
+    },
+    body: JSON.stringify(body)
+  });
+  if (!response.ok) {
+    const error = await response.text();
+    throw new Error(`Google API error: ${error}`);
+  }
+  const data = await response.json();
+  const parts = data.candidates?.[0]?.content?.parts || [];
+  const imagePart = parts.find((p) => p.inlineData);
+  const textPart = parts.find((p) => p.text);
+  if (!imagePart?.inlineData?.data) {
+    throw new Error("No image data in response");
+  }
+  return {
+    data: imagePart.inlineData.data,
+    revisedPrompt: textPart?.text
+  };
+};
+var generateImage = async (model2, prompt, config) => {
+  const { provider, model: modelName } = parseModelName(model2);
+  const providerLower = provider.toLowerCase();
+  const apiKey = getApiKey(providerLower);
+  switch (providerLower) {
+    case "openai":
+      return generateOpenAICompatible(
+        "https://api.openai.com/v1/images/generations",
+        modelName,
+        prompt,
+        apiKey,
+        config
+      );
+    case "xai":
+      return generateOpenAICompatible(
+        "https://api.x.ai/v1/images/generations",
+        modelName,
+        prompt,
+        apiKey,
+        config
+      );
+    case "google":
+      return generateGoogle(modelName, prompt, apiKey, config);
+    default:
+      throw new Error(`Unsupported image generation provider: ${provider}`);
+  }
+};
+
 // src/providers/openai.ts
 var appendToolCalls = (toolCalls, tcchunklist) => {
   for (const tcchunk of tcchunklist) {
@@ -208,8 +324,8 @@ var appendToolCalls = (toolCalls, tcchunklist) => {
   return toolCalls;
 };
 var callOpenAI = async (config, ctx) => {
-  const { model: model2, instructions, schema } = config;
-  const apiKey = getKey("openai") || process.env.OPENAI_API_KEY;
+  const { model: model2, instructions, schema, apiKey: configApiKey } = config;
+  const apiKey = configApiKey || getKey("openai") || process.env.OPENAI_API_KEY;
   if (!apiKey) {
     throw new Error("OpenAI API key not found");
   }
@@ -375,8 +491,8 @@ var convertToAnthropicFormat = (messages) => {
   return result;
 };
 var callAnthropic = async (config, ctx) => {
-  const { model: model2, instructions, schema } = config;
-  const apiKey = getKey("anthropic") || process.env.ANTHROPIC_API_KEY;
+  const { model: model2, instructions, schema, apiKey: configApiKey } = config;
+  const apiKey = configApiKey || getKey("anthropic") || process.env.ANTHROPIC_API_KEY;
   if (!apiKey) {
     throw new Error("Anthropic API key not found");
   }
@@ -525,8 +641,8 @@ var handleAnthropicStream = async (response, ctx) => {
 
 // src/providers/google.ts
 var callGoogle = async (config, ctx) => {
-  const { model: model2, instructions } = config;
-  const apiKey = getKey("google") || process.env.GOOGLE_AI_API_KEY;
+  const { model: model2, instructions, apiKey: configApiKey } = config;
+  const apiKey = configApiKey || getKey("google") || process.env.GOOGLE_AI_API_KEY;
   if (!apiKey) {
     throw new Error("Google API key not found");
   }
@@ -731,7 +847,8 @@ var removeApprovalListener = (event, listener) => {
 var model = ({
   model: model2 = "openai/gpt-4o-mini",
   schema,
-  system
+  system,
+  apiKey
 } = {}) => {
   return async (ctxOrMessage) => {
     const ctx = typeof ctxOrMessage === "string" ? (
@@ -768,7 +885,7 @@ var model = ({
         break;
       }
       currentCtx = await callProvider(
-        { model: model2, instructions, schema: normalizedSchema },
+        { model: model2, instructions, schema: normalizedSchema, apiKey },
         currentCtx
       );
       if (currentCtx.lastResponse?.tool_calls && currentCtx.tools?.length) {
@@ -1295,6 +1412,7 @@ export {
   everyNMessages,
   everyNTokens,
   generateApprovalToken,
+  generateImage,
   getKey,
   getOrCreateThread,
   isStandardSchema,