genai-lite 0.6.1 → 0.7.2

package/dist/shared/adapters/systemMessageUtils.js

@@ -0,0 +1,172 @@
+"use strict";
+// AI Summary: Shared utilities for handling system messages across LLM adapters.
+// Provides functions to collect, combine, and transform system content for models
+// that don't support native system instructions.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_SYSTEM_MESSAGE_FORMAT_OPTIONS = void 0;
+exports.formatSystemContentForPrepend = formatSystemContentForPrepend;
+exports.collectSystemContent = collectSystemContent;
+exports.prependSystemToFirstUserMessage = prependSystemToFirstUserMessage;
+exports.processMessagesForSystemSupport = processMessagesForSystemSupport;
+/**
+ * Default format options for system message fallback
+ */
+exports.DEFAULT_SYSTEM_MESSAGE_FORMAT_OPTIONS = {
+    format: 'xml',
+    tagName: 'system',
+    separator: '\n\n---\n\n',
+};
+/**
+ * Formats system content according to the specified format options.
+ *
+ * @param systemContent - The system content to format
+ * @param userContent - The original user message content
+ * @param options - Format options (defaults to XML with 'system' tag)
+ * @returns The formatted combined content
+ *
+ * @example
+ * ```typescript
+ * // XML format (default)
+ * formatSystemContentForPrepend('Be helpful', 'Hello', { format: 'xml' });
+ * // Returns: '<system>\nBe helpful\n</system>\n\nHello'
+ *
+ * // Separator format (default separator is '\n\n---\n\n')
+ * formatSystemContentForPrepend('Be helpful', 'Hello', { format: 'separator' });
+ * // Returns: 'Be helpful\n\n---\n\nHello'
+ *
+ * // Custom separator (specify full separator including whitespace)
+ * formatSystemContentForPrepend('Be helpful', 'Hello', { format: 'separator', separator: '\n\n===\n\n' });
+ * // Returns: 'Be helpful\n\n===\n\nHello'
+ *
+ * // Plain format
+ * formatSystemContentForPrepend('Be helpful', 'Hello', { format: 'plain' });
+ * // Returns: 'Be helpful\n\nHello'
+ * ```
+ */
+function formatSystemContentForPrepend(systemContent, userContent, options) {
+    const opts = { ...exports.DEFAULT_SYSTEM_MESSAGE_FORMAT_OPTIONS, ...options };
+    switch (opts.format) {
+        case 'xml':
+            return `<${opts.tagName}>\n${systemContent}\n</${opts.tagName}>\n\n${userContent}`;
+        case 'separator':
+            return `${systemContent}${opts.separator}${userContent}`;
+        case 'plain':
+        default:
+            return `${systemContent}\n\n${userContent}`;
+    }
+}
+/**
+ * Collects and combines system content from multiple sources.
+ *
+ * Combines the request-level systemMessage with any inline system messages
+ * from the messages array into a single string.
+ *
+ * @param requestSystemMessage - The request.systemMessage field (if any)
+ * @param inlineSystemMessages - Array of system message contents from the messages array
+ * @param supportsSystemMessage - Whether the model supports native system messages
+ * @returns Object with combined content and whether to use native support
+ *
+ * @example
+ * ```typescript
+ * const { combinedSystemContent, useNativeSystemMessage } = collectSystemContent(
+ *   'You are helpful',
+ *   ['Be concise'],
+ *   false // Model doesn't support system messages
+ * );
+ * // combinedSystemContent = 'You are helpful\n\nBe concise'
+ * // useNativeSystemMessage = false
+ * ```
+ */
+function collectSystemContent(requestSystemMessage, inlineSystemMessages, supportsSystemMessage) {
+    // Combine all system content
+    const allSystemContent = [];
+    if (requestSystemMessage) {
+        allSystemContent.push(requestSystemMessage);
+    }
+    allSystemContent.push(...inlineSystemMessages);
+    const combinedSystemContent = allSystemContent.length > 0 ? allSystemContent.join("\n\n") : undefined;
+    return {
+        combinedSystemContent,
+        useNativeSystemMessage: supportsSystemMessage,
+    };
+}
+/**
+ * Prepends system content to the first user message in an array.
+ *
+ * This is used as a fallback for models that don't support native system
+ * instructions. The system content is formatted according to the options
+ * and prepended to the first user message.
+ *
+ * @param messages - Array of message objects with role and content
+ * @param systemContent - System content to prepend
+ * @param options - Format options (defaults to XML with 'system' tag)
+ * @returns The index of the modified message, or -1 if no user message found
+ *
+ * @example
+ * ```typescript
+ * const messages = [
+ *   { role: 'user', content: 'Hello' },
+ *   { role: 'assistant', content: 'Hi!' }
+ * ];
+ *
+ * // Default (XML format)
+ * prependSystemToFirstUserMessage(messages, 'Be helpful');
+ * // messages[0].content = '<system>\nBe helpful\n</system>\n\nHello'
+ *
+ * // Plain format
+ * prependSystemToFirstUserMessage(messages, 'Be helpful', { format: 'plain' });
+ * // messages[0].content = 'Be helpful\n\nHello'
+ *
+ * // Separator format (default separator is '\n\n---\n\n')
+ * prependSystemToFirstUserMessage(messages, 'Be helpful', { format: 'separator' });
+ * // messages[0].content = 'Be helpful\n\n---\n\nHello'
+ * ```
+ */
+function prependSystemToFirstUserMessage(messages, systemContent, options) {
+    const firstUserIndex = messages.findIndex((m) => m.role === "user");
+    if (firstUserIndex !== -1) {
+        messages[firstUserIndex].content = formatSystemContentForPrepend(systemContent, messages[firstUserIndex].content, options);
+        return firstUserIndex;
+    }
+    return -1;
+}
+/**
+ * Filters system messages from an array and returns non-system messages
+ * along with collected system content.
+ *
+ * This is a convenience function that combines message filtering with
+ * system content collection in a single pass.
+ *
+ * @param messages - Array of messages to process
+ * @param requestSystemMessage - Optional request-level system message
+ * @param supportsSystemMessage - Whether the model supports native system messages
+ * @returns Object with filtered messages and system content handling info
+ *
+ * @example
+ * ```typescript
+ * const messages = [
+ *   { role: 'system', content: 'Be helpful' },
+ *   { role: 'user', content: 'Hello' }
+ * ];
+ * const result = processMessagesForSystemSupport(messages, undefined, false);
+ * // result.nonSystemMessages = [{ role: 'user', content: 'Hello' }]
+ * // result.systemContent.combinedSystemContent = 'Be helpful'
+ * ```
+ */
+function processMessagesForSystemSupport(messages, requestSystemMessage, supportsSystemMessage) {
+    const nonSystemMessages = [];
+    const inlineSystemMessages = [];
+    for (const message of messages) {
+        if (message.role === "system") {
+            inlineSystemMessages.push(message.content);
+        }
+        else {
+            nonSystemMessages.push(message);
+        }
+    }
+    const systemContent = collectSystemContent(requestSystemMessage, inlineSystemMessages, supportsSystemMessage);
+    return {
+        nonSystemMessages,
+        systemContent,
+    };
+}

package/dist/shared/services/AdapterRegistry.d.ts

@@ -1,3 +1,4 @@
+import type { Logger } from "../../logging/types";
 /**
  * Information about a registered adapter
  */
@@ -50,12 +51,14 @@ export declare class AdapterRegistry<TAdapter, TProviderId extends string> {
     private adapters;
     private fallbackAdapter;
     private supportedProviders;
+    private logger;
     /**
      * Creates a new AdapterRegistry
      *
      * @param config - Configuration for the registry
+     * @param logger - Optional logger instance
      */
-    constructor(config: AdapterRegistryConfig<TAdapter, TProviderId>);
+    constructor(config: AdapterRegistryConfig<TAdapter, TProviderId>, logger?: Logger);
     /**
      * Initializes adapters for all supported providers using constructors
      */

package/dist/shared/services/AdapterRegistry.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdapterRegistry = void 0;
+const defaultLogger_1 = require("../../logging/defaultLogger");
 /**
  * Generic registry for managing service adapters across different providers.
  * Handles adapter initialization, registration, and retrieval.
@@ -13,11 +14,13 @@ class AdapterRegistry {
      * Creates a new AdapterRegistry
      *
      * @param config - Configuration for the registry
+     * @param logger - Optional logger instance
      */
-    constructor(config) {
+    constructor(config, logger) {
         this.adapters = new Map();
         this.fallbackAdapter = config.fallbackAdapter;
         this.supportedProviders = config.supportedProviders;
+        this.logger = logger ?? (0, defaultLogger_1.createDefaultLogger)();
         // Register custom adapters first if provided
         if (config.customAdapters) {
             for (const [providerId, adapter] of Object.entries(config.customAdapters)) {
@@ -39,7 +42,7 @@ class AdapterRegistry {
             const providerId = provider.id;
             // Skip if adapter is already registered (from custom adapters)
             if (this.adapters.has(providerId)) {
-                console.log(`AdapterRegistry: Skipping constructor initialization for '${provider.id}' ` +
+                this.logger.debug(`AdapterRegistry: Skipping constructor initialization for '${provider.id}' ` +
                     `(custom adapter already registered)`);
                 continue;
             }
@@ -53,21 +56,21 @@ class AdapterRegistry {
                     successfullyRegisteredProviders.push(provider.id);
                 }
                 catch (error) {
-                    console.error(`AdapterRegistry: Failed to instantiate adapter for provider '${provider.id}'. ` +
+                    this.logger.error(`AdapterRegistry: Failed to instantiate adapter for provider '${provider.id}'. ` +
                         `This provider will use the fallback adapter. Error:`, error);
                 }
             }
             else {
-                console.warn(`AdapterRegistry: No adapter constructor found for supported provider '${provider.id}'. ` +
+                this.logger.warn(`AdapterRegistry: No adapter constructor found for supported provider '${provider.id}'. ` +
                     `This provider will use the fallback adapter.`);
             }
         }
         if (registeredCount > 0) {
-            console.log(`AdapterRegistry: Initialized with ${registeredCount} dynamically registered adapter(s) ` +
+            this.logger.debug(`AdapterRegistry: Initialized with ${registeredCount} dynamically registered adapter(s) ` +
                 `for: ${successfullyRegisteredProviders.join(', ')}.`);
         }
         else {
-            console.log(`AdapterRegistry: No real adapters were dynamically registered. ` +
+            this.logger.debug(`AdapterRegistry: No real adapters were dynamically registered. ` +
                 `All providers will use the fallback adapter.`);
         }
     }
@@ -79,7 +82,7 @@ class AdapterRegistry {
      */
     registerAdapter(providerId, adapter) {
         this.adapters.set(providerId, adapter);
-        console.log(`AdapterRegistry: Registered adapter for provider: ${providerId}`);
+        this.logger.debug(`AdapterRegistry: Registered adapter for provider: ${providerId}`);
     }
     /**
      * Gets the appropriate adapter for a provider
@@ -91,11 +94,11 @@ class AdapterRegistry {
         // Check for registered real adapters first
         const registeredAdapter = this.adapters.get(providerId);
         if (registeredAdapter) {
-            console.log(`AdapterRegistry: Using registered adapter for provider: ${providerId}`);
+            this.logger.debug(`AdapterRegistry: Using registered adapter for provider: ${providerId}`);
             return registeredAdapter;
         }
         // Fall back to fallback adapter for unsupported providers
-        console.log(`AdapterRegistry: No real adapter found for ${providerId}, using fallback adapter`);
+        this.logger.debug(`AdapterRegistry: No real adapter found for ${providerId}, using fallback adapter`);
         return this.fallbackAdapter;
     }
     /**

package/dist/types/image.d.ts

@@ -4,6 +4,7 @@
  * This module contains all types for the ImageService and image generation adapters.
  * Based on the design specification in docs/devlog/2025-10-22-genai-lite-image-api-design.md
  */
+import type { Logger, LogLevel } from '../logging/types';
 /**
  * Image provider ID type - represents a unique identifier for an image generation provider
  */
@@ -387,6 +388,10 @@ export interface ImageServiceOptions {
     adapters?: Record<ImageProviderId, ImageProviderAdapter>;
     /** Override default base URLs per provider */
     baseUrls?: Record<ImageProviderId, string>;
+    /** Log level for filtering messages. Defaults to GENAI_LITE_LOG_LEVEL env var or 'warn'. */
+    logLevel?: LogLevel;
+    /** Custom logger implementation. If provided, logLevel is ignored. */
+    logger?: Logger;
 }
 /**
  * Result from createPrompt utility

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genai-lite",
-  "version": "0.6.1",
+  "version": "0.7.2",
   "description": "A lightweight, portable toolkit for interacting with various Generative AI APIs.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,6 +45,7 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.56.0",
     "@google/genai": "^1.0.1",
+    "@mistralai/mistralai": "^1.11.0",
     "js-tiktoken": "^1.0.20",
     "openai": "^5.8.2"
   },

package/src/config/llm-presets.json

@@ -370,50 +370,6 @@
       }
     }
   },
-  {
-    "id": "google-gemini-2.0-flash-default",
-    "displayName": "Google - Gemini 2.0 Flash",
-    "description": "Default preset for Gemini 2.0 Flash.",
-    "providerId": "gemini",
-    "modelId": "gemini-2.0-flash",
-    "settings": {
-      "temperature": 0.7,
-      "geminiSafetySettings": [
-        { "category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE" },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "threshold": "BLOCK_NONE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "threshold": "BLOCK_NONE"
-        },
-        { "category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE" }
-      ]
-    }
-  },
-  {
-    "id": "google-gemini-2.0-flash-lite-default",
-    "displayName": "Google - Gemini 2.0 Flash Lite",
-    "description": "Default preset for Gemini 2.0 Flash Lite.",
-    "providerId": "gemini",
-    "modelId": "gemini-2.0-flash-lite",
-    "settings": {
-      "temperature": 0.7,
-      "geminiSafetySettings": [
-        { "category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE" },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "threshold": "BLOCK_NONE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "threshold": "BLOCK_NONE"
-        },
-        { "category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE" }
-      ]
-    }
-  },
   {
     "id": "google-gemma-3-27b-default",
     "displayName": "Google - Gemma 3 27B (Free)",
@@ -599,5 +555,45 @@
     "settings": {
       "temperature": 0.7
     }
+  },
+  {
+    "id": "openrouter-gemma-3-27b-free",
+    "displayName": "OpenRouter - Gemma 3 27B (Free)",
+    "description": "Google's Gemma 3 27B via OpenRouter free tier.",
+    "providerId": "openrouter",
+    "modelId": "google/gemma-3-27b-it:free",
+    "settings": {
+      "temperature": 0.7
+    }
+  },
+  {
+    "id": "openrouter-mistral-small-3.1-free",
+    "displayName": "OpenRouter - Mistral Small 3.1 (Free)",
+    "description": "Mistral Small 3.1 24B via OpenRouter free tier.",
+    "providerId": "openrouter",
+    "modelId": "mistralai/mistral-small-3.1-24b-instruct:free",
+    "settings": {
+      "temperature": 0.7
+    }
+  },
+  {
+    "id": "mistral-small-default",
+    "displayName": "Mistral - Small",
+    "description": "Cost-effective Mistral Small model for general tasks.",
+    "providerId": "mistral",
+    "modelId": "mistral-small-latest",
+    "settings": {
+      "temperature": 0.7
+    }
+  },
+  {
+    "id": "mistral-codestral-default",
+    "displayName": "Mistral - Codestral",
+    "description": "Specialized model for code generation with lower temperature.",
+    "providerId": "mistral",
+    "modelId": "codestral-2501",
+    "settings": {
+      "temperature": 0.3
+    }
   }
 ]