Merge branch 'main' into feature/add_tool_result_content_type

Author: geclos

.gitignore

@@ -58,3 +58,6 @@ TODO.md
 bin
 
 AGENTS.md
+
+# Vim crap
+*-E

package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptl-ai",
-  "version": "0.7.2",
+  "version": "0.7.6",
   "author": "Latitude Data",
   "license": "MIT",
   "description": "Compiler for PromptL, the prompt language",

src/compiler/base/nodes/for.test.ts

@@ -1,5 +1,3 @@
-import CompileError from '$promptl/error/error'
-import { getExpectedError } from '$promptl/test/helpers'
 import { Message, MessageContent, TextContent } from '$promptl/types'
 import { describe, expect, it } from 'vitest'
 
@@ -71,12 +69,11 @@ describe('each loops', async () => {
     const prompt1 = `{{ for elemenet in ['a', 'b', 'c'] }} {{foo = 5}} {{ endfor }} {{foo}}`
     const prompt2 = `{{foo = 5}} {{ for element in ['a', 'b', 'c'] }} {{foo = 7}} {{ endfor }} {{foo}}`
     const prompt3 = `{{foo = 5}} {{ for element in [1, 2, 3] }} {{foo += element}} {{ endfor }} {{foo}}`
-    const action1 = () => render({ prompt: prompt1, parameters: {} })
-    const error1 = await getExpectedError(action1, CompileError)
+    const result1 = await getCompiledText(prompt1)
     const result2 = await getCompiledText(prompt2)
     const result3 = await getCompiledText(prompt3)
 
-    expect(error1.code).toBe('variable-not-declared')
+    expect(result1).toBe('')
     expect(result2).toBe('7')
     expect(result3).toBe('11')
   })

src/compiler/base/nodes/tags/ref.test.ts

@@ -56,7 +56,8 @@ describe('ref tags', async () => {
       child: 'child message',
     }
 
-    const action = () => render({ prompt: prompts['parent'], adapter: Adapters.default })
+    const action = () =>
+      render({ prompt: prompts['parent'], adapter: Adapters.default })
     const error = await getExpectedError(action, CompileError)
     expect(error.code).toBe('missing-reference-function')
   })
@@ -83,16 +84,19 @@ describe('ref tags', async () => {
       parent: '<prompt path="child" />',
     }
 
-    const action = () =>
-      render({
-        prompt: prompts['parent'],
-        parameters: { foo: 'bar' },
-        referenceFn: buildReferenceFn(prompts),
-        adapter: Adapters.default,
-      })
-
-    const error = await getExpectedError(action, CompileError)
-    expect(error.code).toBe('variable-not-declared')
+    const result = await render({
+      prompt: prompts['parent'],
+      referenceFn: buildReferenceFn(prompts),
+      adapter: Adapters.default,
+    })
+    expect(result.messages.length).toBe(1)
+    const message = result.messages[0]! as SystemMessage
+    expect(message.content).toEqual([
+      {
+        type: 'text',
+        text: 'Child message:',
+      },
+    ])
   })
 
   it('referenced prompts can receive parameters as tag attributes', async () => {
@@ -336,12 +340,12 @@ describe('ref tags', async () => {
           {{ bar }}
           </content-text>
         {{ endfor }}
-      `)
+      `),
     }
 
     const metadata = await scan({
       prompt: prompts['parent'],
-      referenceFn: buildReferenceFn(prompts)
+      referenceFn: buildReferenceFn(prompts),
     })
 
     const result = await render({
@@ -351,18 +355,19 @@ describe('ref tags', async () => {
     })
 
     expect(result.messages.length).toBe(2)
-    const [ firstMessage, secondMessage ] = result.messages as [UserMessage, SystemMessage]
+    const [firstMessage, secondMessage] = result.messages as [
+      UserMessage,
+      SystemMessage,
+    ]
     expect(firstMessage.role).toBe(MessageRole.user)
     expect(firstMessage.content.length).toBe(3)
     expect(firstMessage.content).toEqual([
-      { type: 'text', text: '11'},
-      { type: 'text', text: '12'},
-      { type: 'text', text: '13'},
+      { type: 'text', text: '11' },
+      { type: 'text', text: '12' },
+      { type: 'text', text: '13' },
     ])
     expect(secondMessage.role).toBe(MessageRole.system)
     expect(secondMessage.content.length).toBe(1)
-    expect(secondMessage.content).toEqual([
-      { type: 'text', text: '10' }
-    ])
+    expect(secondMessage.content).toEqual([{ type: 'text', text: '10' }])
   })
 })

src/compiler/base/nodes/tags/ref.ts

@@ -32,7 +32,7 @@ export async function compile(
   }
 
   const { path, ...refParameters } = attributes
-  if (!path) baseNodeError(errors.referenceTagWithoutPrompt, node)
+  if (!path) baseNodeError(errors.referenceTagWithoutPath, node)
   if (typeof path !== 'string') baseNodeError(errors.invalidReferencePath, node)
 
   if (!nodeWithStatus.status.refAst || !nodeWithStatus.status.refFullPath) {

src/compiler/base/nodes/tags/scope.test.ts

@@ -1,13 +1,7 @@
 import { Adapters, Chain, render } from '$promptl/index'
 import { complete } from '$promptl/compiler/test/helpers'
 import { removeCommonIndent } from '$promptl/compiler/utils'
-import CompileError from '$promptl/error/error'
-import { getExpectedError } from '$promptl/test/helpers'
-import {
-  MessageRole,
-  SystemMessage,
-  UserMessage,
-} from '$promptl/types'
+import { MessageRole, SystemMessage, UserMessage } from '$promptl/types'
 import { describe, expect, it, vi } from 'vitest'
 
 describe('scope tags', async () => {
@@ -48,7 +42,7 @@ describe('scope tags', async () => {
     `)
 
     const result = await render({ prompt, adapter: Adapters.default })
-    
+
     expect(result.messages.length).toBe(1)
     const message = result.messages[0]! as SystemMessage
     expect(message.content).toEqual([
@@ -67,18 +61,19 @@ describe('scope tags', async () => {
     const prompt = removeCommonIndent(`
       {{ foo = 'bar' }}
       <scope>
-        {{ foo }}
+        {{ foo == 'bar' }}
       </scope>
     `)
 
-    const action = () => render({
-      prompt,
-      parameters: { foo: 'baz' },
-      adapter: Adapters.default
-    })
-
-    const error = await getExpectedError(action, CompileError)
-    expect(error.code).toBe('variable-not-declared')
+    const result = await render({ prompt, adapter: Adapters.default })
+    expect(result.messages.length).toBe(1)
+    const message = result.messages[0]! as SystemMessage
+    expect(message.content).toEqual([
+      {
+        type: 'text',
+        text: 'false',
+      },
+    ])
   })
 
   it('can inherit parameters from parents if explicitly passed', async () => {
@@ -91,7 +86,7 @@ describe('scope tags', async () => {
     const result = await render({
       prompt,
       parameters: { foo: 'bar' },
-      adapter: Adapters.default
+      adapter: Adapters.default,
     })
 
     expect(result.messages.length).toBe(1)

src/compiler/base/nodes/tags/step.test.ts

@@ -1,12 +1,12 @@
 import CompileError from '$promptl/error/error'
-import { complete, getExpectedError } from "$promptl/compiler/test/helpers";
-import { removeCommonIndent } from "$promptl/compiler/utils";
-import { Chain } from "$promptl/index";
-import { describe, expect, it, vi } from "vitest";
+import { complete } from '$promptl/compiler/test/helpers'
+import { removeCommonIndent } from '$promptl/compiler/utils'
+import { Chain } from '$promptl/index'
+import { describe, expect, it, vi } from 'vitest'
 
-describe("step tags", async () => {
-  it("does not create a variable from response if not specified", async () => {
-    const mock = vi.fn();
+describe('step tags', async () => {
+  it('does not create a variable from response if not specified', async () => {
+    const mock = vi.fn()
     const prompt = removeCommonIndent(`
       <step>
         Ensure truthfulness of the following statement, give a reason and a confidence score.
@@ -15,18 +15,22 @@ describe("step tags", async () => {
       <step>
         Now correct the statement if it is not true.
       </step>
-    `);
+    `)
 
-    const chain = new Chain({ prompt, parameters: { mock }});
-    await complete({ chain, callback: async () => `
+    const chain = new Chain({ prompt, parameters: { mock } })
+    await complete({
+      chain,
+      callback: async () =>
+        `
       The statement is not true because it is fake. My confidence score is 100.
-    `.trim()});
+    `.trim(),
+    })
 
-    expect(mock).not.toHaveBeenCalled();
-  });
+    expect(mock).not.toHaveBeenCalled()
+  })
 
-  it("creates a text variable from response if specified", async () => {
-    const mock = vi.fn();
+  it('creates a text variable from response if specified', async () => {
+    const mock = vi.fn()
     const prompt = removeCommonIndent(`
       <step as="analysis">
         Ensure truthfulness of the following statement, give a reason and a confidence score.
@@ -36,18 +40,24 @@ describe("step tags", async () => {
         {{ mock(analysis) }}
         Now correct the statement if it is not true.
       </step>
-    `);
+    `)
 
-    const chain = new Chain({ prompt, parameters: { mock }});
-    await complete({ chain, callback: async () => `
+    const chain = new Chain({ prompt, parameters: { mock } })
+    await complete({
+      chain,
+      callback: async () =>
+        `
       The statement is not true because it is fake. My confidence score is 100.
-    `.trim()});
+    `.trim(),
+    })
 
-    expect(mock).toHaveBeenCalledWith("The statement is not true because it is fake. My confidence score is 100.");
-  });
+    expect(mock).toHaveBeenCalledWith(
+      'The statement is not true because it is fake. My confidence score is 100.',
+    )
+  })
 
-  it("creates an object variable from response if specified and schema is provided", async () => {
-    const mock = vi.fn();
+  it('creates an object variable from response if specified and schema is provided', async () => {
+    const mock = vi.fn()
     const prompt = removeCommonIndent(`
       <step as="analysis" schema={{{type: "object", properties: {truthful: {type: "boolean"}, reason: {type: "string"}, confidence: {type: "integer"}}, required: ["truthful", "reason", "confidence"]}}}>
         Ensure truthfulness of the following statement, give a reason and a confidence score.
@@ -59,27 +69,33 @@ describe("step tags", async () => {
           Correct the statement taking into account the reason: '{{ analysis.reason }}'.
         {{ endif }}
       </step>
-    `);
+    `)
 
-    const chain = new Chain({ prompt, parameters: { mock }});
-    const { messages } = await complete({ chain, callback: async () => `
+    const chain = new Chain({ prompt, parameters: { mock } })
+    const { messages } = await complete({
+      chain,
+      callback: async () =>
+        `
       {
         "truthful": false,
         "reason": "It is fake",
         "confidence": 100
       }
-    `.trim()});
+    `.trim(),
+    })
 
     expect(mock).toHaveBeenCalledWith({
       truthful: false,
-      reason: "It is fake",
-      confidence: 100
-    });
-    expect(messages[2]!.content).toEqual("Correct the statement taking into account the reason: 'It is fake'.");
-  });
+      reason: 'It is fake',
+      confidence: 100,
+    })
+    expect(messages[2]!.content).toEqual(
+      "Correct the statement taking into account the reason: 'It is fake'.",
+    )
+  })
 
-  it("fails creating an object variable from response if specified and schema is provided but response is invalid", async () => {
-    const mock = vi.fn();
+  it('fails creating an object variable from response if specified and schema is provided but response is invalid', async () => {
+    const mock = vi.fn()
     const prompt = removeCommonIndent(`
       <step as="analysis" schema={{{type: "object", properties: {truthful: {type: "boolean"}, reason: {type: "string"}, confidence: {type: "integer"}}, required: ["truthful", "reason", "confidence"]}}}>
         Ensure truthfulness of the following statement, give a reason and a confidence score.
@@ -91,19 +107,29 @@ describe("step tags", async () => {
           Correct the statement taking into account the reason: '{{ analysis.reason }}'.
         {{ endif }}
       </step>
-    `);
+    `)
 
-    const chain = new Chain({ prompt, parameters: { mock }});
-    const error = await getExpectedError(() => complete({ chain, callback: async () => `
+    const chain = new Chain({ prompt, parameters: { mock } })
+    let error: CompileError
+    try {
+      await complete({
+        chain,
+        callback: async () =>
+          `
       Bad JSON.
-    `.trim()}), CompileError)
-    expect(error.code).toBe('invalid-step-response-format')
+    `.trim(),
+      })
+    } catch (e) {
+      error = e as CompileError
+      expect(e).toBeInstanceOf(CompileError)
+    }
 
-    expect(mock).not.toHaveBeenCalled();
-  });
+    expect(error!.code).toBe('invalid-step-response-format')
+    expect(mock).not.toHaveBeenCalled()
+  })
 
-  it("creates a raw variable from response if specified", async () => {
-    const mock = vi.fn();
+  it('creates a raw variable from response if specified', async () => {
+    const mock = vi.fn()
     const prompt = removeCommonIndent(`
       <step raw="analysis">
         Ensure truthfulness of the following statement, give a reason and a confidence score.
@@ -113,21 +139,25 @@ describe("step tags", async () => {
         {{ mock(analysis) }}
         Now correct the statement if it is not true.
       </step>
-    `);
+    `)
 
-    const chain = new Chain({ prompt, parameters: { mock }});
-    await complete({ chain, callback: async () => `
+    const chain = new Chain({ prompt, parameters: { mock } })
+    await complete({
+      chain,
+      callback: async () =>
+        `
       The statement is not true because it is fake. My confidence score is 100.
-    `.trim()});
+    `.trim(),
+    })
 
     expect(mock).toHaveBeenCalledWith({
-      role: "assistant",
+      role: 'assistant',
       content: [
         {
-          type: "text",
-          text: "The statement is not true because it is fake. My confidence score is 100.",
+          type: 'text',
+          text: 'The statement is not true because it is fake. My confidence score is 100.',
         },
       ],
-    });
-  });
-});
+    })
+  })
+})