@output.ai/llm 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@output.ai/llm",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Framework abstraction to interact with LLM models",
   "type": "module",
   "main": "src/index.js",

package/src/load_content.js

@@ -1,12 +1,13 @@
 import { join } from 'path';
 import { readdirSync, readFileSync } from 'node:fs';
 import { resolveInvocationDir } from '@output.ai/core/utils';
+import { FatalError } from '@output.ai/core';
 
 const scanDir = dir => {
   try {
     return readdirSync( dir, { withFileTypes: true } );
   } catch ( error ) {
-    throw new Error( `Error scanning directory "${dir}"`, { cause: error } );
+    throw new FatalError( `Error scanning directory "${dir}"`, { cause: error } );
   }
 };
 
@@ -14,7 +15,7 @@ const loadFile = path => {
   try {
     return readFileSync( path, 'utf-8' );
   } catch ( error ) {
-    throw new Error( `Error reading file "${path}"`, { cause: error } );
+    throw new FatalError( `Error reading file "${path}"`, { cause: error } );
   }
 };
 

package/src/parser.js

@@ -1,10 +1,11 @@
 import matter from 'gray-matter';
+import { FatalError } from '@output.ai/core';
 
 export function parsePrompt( raw ) {
-  const { data, content } = matter( raw );
+  const { data: config, content } = matter( raw );
 
   if ( !content || content.trim() === '' ) {
-    throw new Error( 'Prompt file has no content after frontmatter' );
+    throw new FatalError( 'Prompt file has no content after frontmatter' );
   }
 
   const infoExtractor = /<(system|user|assistant|tool)>([\s\S]*?)<\/\1>/gm;
@@ -16,12 +17,12 @@ export function parsePrompt( raw ) {
     const contentPreview = content.substring( 0, 200 );
     const ellipsis = content.length > 200 ? '...' : '';
 
-    throw new Error(
-      `No valid message blocks found in prompt file. 
-Expected format: <system>...</system>, <user>...</user>, etc. 
+    throw new FatalError(
+      `No valid message blocks found in prompt file.
+Expected format: <system>...</system>, <user>...</user>, etc.
 Content preview: ${contentPreview}${ellipsis}`
     );
   }
 
-  return { data, messages };
+  return { config, messages };
 }

package/src/parser.spec.js

@@ -13,7 +13,7 @@ model: claude-3-5-sonnet-20241022
 
     const result = parsePrompt( raw );
 
-    expect( result.data ).toEqual( {
+    expect( result.config ).toEqual( {
       provider: 'anthropic',
       model: 'claude-3-5-sonnet-20241022'
     } );

package/src/prompt_loader.js

@@ -2,30 +2,15 @@ import { parsePrompt } from './parser.js';
 import { Liquid } from 'liquidjs';
 import { loadContent } from './load_content.js';
 import { validatePrompt } from './prompt_validations.js';
+import { FatalError } from '@output.ai/core';
 
 const liquid = new Liquid();
 
-/**
- * Render a single message with template variables.
- *
- * @param {string} role - The message role
- * @param {string} content - The message content template
- * @param {Record<string, string | number>} values - Variables to interpolate
- * @param {string} promptName - Name of the prompt (for error messages)
- * @param {number} index - Message index (for error messages)
- * @returns {{role: string, content: string}} Rendered message object
- */
-const renderMessage = ( role, content, values, promptName, index ) => {
+const renderPrompt = ( name, content, values ) => {
   try {
-    return {
-      role,
-      content: liquid.parseAndRenderSync( content, values )
-    };
+    return liquid.parseAndRenderSync( content, values );
   } catch ( error ) {
-    throw new Error(
-      `Failed to render template in message ${index + 1} (role: ${role}) of prompt "${promptName}": ${error.message}`,
-      { cause: error }
-    );
+    throw new FatalError( `Failed to render template in prompt "${name}": ${error.message}`, { cause: error } );
   }
 };
 
@@ -36,20 +21,20 @@ const renderMessage = ( role, content, values, promptName, index ) => {
  * @param {Record<string, string | number>} [values] - Variables to interpolate
  * @returns {Prompt} Loaded and rendered prompt object
  */
-export const loadPrompt = ( name, values ) => {
+export const loadPrompt = ( name, values = {} ) => {
   const promptContent = loadContent( `${name}.prompt` );
   if ( !promptContent ) {
-    throw new Error( `Prompt ${name} not found.` );
+    throw new FatalError( `Prompt ${name} not found.` );
   }
 
-  const { data: config, messages } = parsePrompt( promptContent );
+  const renderedContent = renderPrompt( name, promptContent, values );
+
+  const { config, messages } = parsePrompt( renderedContent );
 
   const prompt = {
     name,
     config,
-    messages: messages.map( ( { role, content }, index ) =>
-      renderMessage( role, content, values, name, index )
-    )
+    messages
   };
 
   validatePrompt( prompt );

package/src/prompt_loader.spec.js

@@ -1,21 +1,16 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { loadPrompt } from './prompt_loader.js';
 
-// Mock dependencies
+// Mock dependencies that perform I/O or validation
 vi.mock( './load_content.js', () => ( {
   loadContent: vi.fn()
 } ) );
 
-vi.mock( './parser.js', () => ( {
-  parsePrompt: vi.fn()
-} ) );
-
 vi.mock( './prompt_validations.js', () => ( {
   validatePrompt: vi.fn()
 } ) );
 
 import { loadContent } from './load_content.js';
-import { parsePrompt } from './parser.js';
 import { validatePrompt } from './prompt_validations.js';
 
 describe( 'loadPrompt', () => {
@@ -31,10 +26,6 @@ model: claude-3-5-sonnet-20241022
 <user>Hello {{ name }}!</user>`;
 
     loadContent.mockReturnValue( promptContent );
-    parsePrompt.mockReturnValue( {
-      data: { provider: 'anthropic', model: 'claude-3-5-sonnet-20241022' },
-      messages: [ { role: 'user', content: 'Hello {{ name }}!' } ]
-    } );
 
     const result = loadPrompt( 'test', { name: 'World' } );
 
@@ -54,3 +45,88 @@ model: claude-3-5-sonnet-20241022
   } );
 
 } );
+
+describe( 'loadPrompt - template hydration in headers (integration tests)', () => {
+  beforeEach( () => {
+    vi.clearAllMocks();
+  } );
+
+  it( 'should hydrate template variables in YAML headers', () => {
+    const promptContent = `---
+provider: {{ provider_name }}
+model: {{ model_id }}
+temperature: 0.7
+---
+
+<user>Hello</user>`;
+
+    loadContent.mockReturnValue( promptContent );
+
+    const result = loadPrompt( 'test', {
+      provider_name: 'anthropic',
+      model_id: 'claude-sonnet-4'
+    } );
+
+    expect( result.config.provider ).toBe( 'anthropic' );
+    expect( result.config.model ).toBe( 'claude-sonnet-4' );
+    expect( result.config.temperature ).toBe( 0.7 );
+  } );
+
+  it( 'should hydrate template variables in both headers and messages', () => {
+    const promptContent = `---
+provider: {{ provider }}
+model: {{ model }}
+---
+
+<user>Tell me about {{ topic }}</user>`;
+
+    loadContent.mockReturnValue( promptContent );
+
+    const result = loadPrompt( 'test', {
+      provider: 'openai',
+      model: 'gpt-4',
+      topic: 'testing'
+    } );
+
+    expect( result.config.provider ).toBe( 'openai' );
+    expect( result.config.model ).toBe( 'gpt-4' );
+    expect( result.messages[0].content ).toBe( 'Tell me about testing' );
+  } );
+
+  it( 'should render undefined template variables as null', () => {
+    const promptContent = `---
+provider: {{ undefined_var }}
+model: claude-3-5-sonnet-20241022
+---
+
+<user>Hello</user>`;
+
+    loadContent.mockReturnValue( promptContent );
+
+    const result = loadPrompt( 'test', {} );
+
+    // Liquid renders undefined variables as empty, which becomes null in YAML
+    expect( result.config.provider ).toBe( null );
+    expect( result.config.model ).toBe( 'claude-3-5-sonnet-20241022' );
+  } );
+
+  it( 'should handle complex template expressions in headers', () => {
+    const promptContent = `---
+provider: anthropic
+model: {{ base_model }}-{{ version }}
+temperature: 0.7
+---
+
+<user>Hello</user>`;
+
+    loadContent.mockReturnValue( promptContent );
+
+    const result = loadPrompt( 'test', {
+      base_model: 'claude-sonnet',
+      version: '4'
+    } );
+
+    expect( result.config.model ).toBe( 'claude-sonnet-4' );
+  } );
+
+} );