@effect/ai 0.32.1 → 0.33.1

package/src/Prompt.ts

@@ -1333,6 +1333,7 @@ export interface PromptEncoded {
 export class PromptFromSelf extends Schema.declare(
   (u) => isPrompt(u),
   {
+    typeConstructor: { _tag: "effect/ai/Prompt" },
     identifier: "PromptFromSelf",
     description: "a Prompt instance",
     arbitrary: (): Arbitrary.LazyArbitrary<Prompt> => (fc) =>
@@ -1510,38 +1511,6 @@ export const make = (input: RawInput): Prompt => {
  */
 export const fromMessages = (messages: ReadonlyArray<Message>): Prompt => makePrompt(messages)
 
-const VALID_RESPONSE_PART_MAP = {
-  "response-metadata": false,
-  "text": true,
-  "text-start": false,
-  "text-delta": true,
-  "text-end": false,
-  "reasoning": true,
-  "reasoning-start": false,
-  "reasoning-delta": true,
-  "reasoning-end": false,
-  "file": false,
-  "source": false,
-  "tool-params-start": false,
-  "tool-params-delta": false,
-  "tool-params-end": false,
-  "tool-call": true,
-  "tool-result": true,
-  "finish": false,
-  "error": false
-} as const satisfies Record<Response.AnyPart["type"], boolean>
-
-type ValidResponseParts = typeof VALID_RESPONSE_PART_MAP
-
-type ValidResponsePart = {
-  [Type in keyof ValidResponseParts]: ValidResponseParts[Type] extends true ? Extract<Response.AnyPart, { type: Type }>
-    : never
-}[keyof typeof VALID_RESPONSE_PART_MAP]
-
-const isValidPart = (part: Response.AnyPart): part is ValidResponsePart => {
-  return VALID_RESPONSE_PART_MAP[part.type]
-}
-
 /**
  * Creates a Prompt from the response parts of a previous interaction with a
  * large language model.
@@ -1589,93 +1558,96 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
   const assistantParts: Array<AssistantMessagePart> = []
   const toolParts: Array<ToolMessagePart> = []
 
-  const textDeltas: Array<string> = []
-  function flushTextDeltas() {
-    if (textDeltas.length > 0) {
-      const text = textDeltas.join("")
-      if (text.length > 0) {
-        assistantParts.push(makePart("text", { text }))
-      }
-      textDeltas.length = 0
-    }
-  }
+  const activeTextDeltas = new Map<string, { text: string }>()
+  const activeReasoningDeltas = new Map<string, { text: string }>()
 
-  const reasoningDeltas: Array<string> = []
-  function flushReasoningDeltas() {
-    if (reasoningDeltas.length > 0) {
-      const text = reasoningDeltas.join("")
-      if (text.length > 0) {
-        assistantParts.push(makePart("reasoning", { text }))
+  for (const part of parts) {
+    switch (part.type) {
+      // Text Parts
+      case "text": {
+        assistantParts.push(makePart("text", { text: part.text }))
+        break
       }
-      reasoningDeltas.length = 0
-    }
-  }
 
-  function flushDeltas() {
-    flushTextDeltas()
-    flushReasoningDeltas()
-  }
-
-  for (const part of parts) {
-    if (isValidPart(part)) {
-      switch (part.type) {
-        case "text": {
-          flushDeltas()
-          assistantParts.push(makePart("text", { text: part.text }))
-          break
-        }
-        case "text-delta": {
-          flushReasoningDeltas()
-          textDeltas.push(part.delta)
-          break
-        }
-        case "reasoning": {
-          flushDeltas()
-          assistantParts.push(makePart("reasoning", { text: part.text }))
-          break
+      // Text Parts (streaming)
+      case "text-start": {
+        activeTextDeltas.set(part.id, { text: "" })
+        break
+      }
+      case "text-delta": {
+        if (activeTextDeltas.has(part.id)) {
+          activeTextDeltas.get(part.id)!.text += part.delta
         }
-        case "reasoning-delta": {
-          flushTextDeltas()
-          reasoningDeltas.push(part.delta)
-          break
+        break
+      }
+      case "text-end": {
+        if (activeTextDeltas.has(part.id)) {
+          assistantParts.push(makePart("text", activeTextDeltas.get(part.id)!))
         }
-        case "tool-call": {
-          flushDeltas()
-          assistantParts.push(makePart("tool-call", {
-            id: part.id,
-            name: part.providerName ?? part.name,
-            params: part.params,
-            providerExecuted: part.providerExecuted ?? false
-          }))
-          break
+        break
+      }
+
+      // Reasoning Parts
+      case "reasoning": {
+        assistantParts.push(makePart("reasoning", { text: part.text }))
+        break
+      }
+
+      // Reasoning Parts (streaming)
+      case "reasoning-start": {
+        activeReasoningDeltas.set(part.id, { text: "" })
+        break
+      }
+      case "reasoning-delta": {
+        if (activeReasoningDeltas.has(part.id)) {
+          activeReasoningDeltas.get(part.id)!.text += part.delta
         }
-        case "tool-result": {
-          flushDeltas()
-          toolParts.push(makePart("tool-result", {
-            id: part.id,
-            name: part.providerName ?? part.name,
-            isFailure: part.isFailure,
-            result: part.encodedResult
-          }))
-          break
+        break
+      }
+      case "reasoning-end": {
+        if (activeReasoningDeltas.has(part.id)) {
+          assistantParts.push(makePart("reasoning", activeReasoningDeltas.get(part.id)!))
         }
+        break
+      }
+
+      // Tool Call Parts
+      case "tool-call": {
+        assistantParts.push(makePart("tool-call", {
+          id: part.id,
+          name: part.providerName ?? part.name,
+          params: part.params,
+          providerExecuted: part.providerExecuted ?? false
+        }))
+        break
+      }
+
+      // Tool Result Parts
+      case "tool-result": {
+        toolParts.push(makePart("tool-result", {
+          id: part.id,
+          name: part.providerName ?? part.name,
+          isFailure: part.isFailure,
+          result: part.encodedResult
+        }))
       }
     }
   }
 
-  flushDeltas()
-
   if (assistantParts.length === 0 && toolParts.length === 0) {
     return empty
   }
 
   const messages: Array<Message> = []
+
   if (assistantParts.length > 0) {
     messages.push(makeMessage("assistant", { content: assistantParts }))
   }
+
   if (toolParts.length > 0) {
     messages.push(makeMessage("tool", { content: toolParts }))
   }
+
   return makePrompt(messages)
 }
 
@@ -1904,6 +1876,7 @@ export const setSystem: {
  *   prompt,
  *   "You are a helpful assistant. "
  * )
+ * // result content: "You are a helpful assistant. You are an expert in programming."
  * ```
  *
  * @since 1.0.0
@@ -1934,6 +1907,7 @@ export const prependSystem: {
    *   prompt,
    *   "You are a helpful assistant. "
    * )
+   * // result content: "You are a helpful assistant. You are an expert in programming."
    * ```
    *
    * @since 1.0.0
@@ -1964,6 +1938,7 @@ export const prependSystem: {
    *   prompt,
    *   "You are a helpful assistant. "
    * )
+   * // result content: "You are a helpful assistant. You are an expert in programming."
    * ```
    *
    * @since 1.0.0
@@ -1971,18 +1946,19 @@ export const prependSystem: {
    */
   (self: Prompt, content: string): Prompt
 } = dual(2, (self: Prompt, content: string): Prompt => {
-  const messages: Array<Message> = []
+  let system: SystemMessage | undefined = undefined
   for (const message of self.content) {
     if (message.role === "system") {
-      const system = makeMessage("system", {
+      system = makeMessage("system", {
         content: content + message.content
       })
-      messages.push(system)
-    } else {
-      messages.push(message)
+      break
     }
   }
-  return makePrompt(messages)
+  if (Predicate.isUndefined(system)) {
+    system = makeMessage("system", { content })
+  }
+  return makePrompt([system, ...self.content])
 })
 
 /**
@@ -1998,7 +1974,7 @@ export const prependSystem: {
  *
  * const systemPrompt = Prompt.make([{
  *   role: "system",
- *   content: "You are a helpful assistant."
+ *   content: "You are an expert in programming."
  * }])
  *
  * const userPrompt = Prompt.make("Hello, world!")
@@ -2007,8 +1983,9 @@ export const prependSystem: {
  *
  * const replaced = Prompt.appendSystem(
  *   prompt,
- *   " You are an expert in programming."
+ *   " You are a helpful assistant."
  * )
+ * // result content: "You are an expert in programming. You are a helpful assistant."
  * ```
  *
  * @since 1.0.0
@@ -2028,7 +2005,7 @@ export const appendSystem: {
    *
    * const systemPrompt = Prompt.make([{
    *   role: "system",
-   *   content: "You are a helpful assistant."
+   *   content: "You are an expert in programming."
    * }])
    *
    * const userPrompt = Prompt.make("Hello, world!")
@@ -2037,8 +2014,9 @@ export const appendSystem: {
    *
    * const replaced = Prompt.appendSystem(
    *   prompt,
-   *   " You are an expert in programming."
+   *   " You are a helpful assistant."
    * )
+   * // result content: "You are an expert in programming. You are a helpful assistant."
    * ```
    *
    * @since 1.0.0
@@ -2058,7 +2036,7 @@ export const appendSystem: {
    *
    * const systemPrompt = Prompt.make([{
    *   role: "system",
-   *   content: "You are a helpful assistant."
+   *   content: "You are an expert in programming."
    * }])
    *
    * const userPrompt = Prompt.make("Hello, world!")
@@ -2067,8 +2045,9 @@ export const appendSystem: {
    *
    * const replaced = Prompt.appendSystem(
    *   prompt,
-   *   " You are an expert in programming."
+   *   " You are a helpful assistant."
    * )
+   * // result content: "You are an expert in programming. You are a helpful assistant."
    * ```
    *
    * @since 1.0.0
@@ -2076,16 +2055,17 @@ export const appendSystem: {
    */
   (self: Prompt, content: string): Prompt
 } = dual(2, (self: Prompt, content: string): Prompt => {
-  const messages: Array<Message> = []
+  let system: SystemMessage | undefined = undefined
   for (const message of self.content) {
     if (message.role === "system") {
-      const system = makeMessage("system", {
+      system = makeMessage("system", {
         content: message.content + content
       })
-      messages.push(system)
-    } else {
-      messages.push(message)
+      break
     }
   }
-  return makePrompt(messages)
+  if (Predicate.isUndefined(system)) {
+    system = makeMessage("system", { content })
+  }
+  return makePrompt([system, ...self.content])
 })