@effect/ai 0.28.2 → 0.28.4

package/src/Prompt.ts

@@ -51,6 +51,7 @@
  *
  * @since 1.0.0
  */
+import * as Arbitrary from "effect/Arbitrary"
 import * as Arr from "effect/Array"
 import { constFalse, dual } from "effect/Function"
 import * as ParseResult from "effect/ParseResult"
@@ -225,10 +226,10 @@ export const makePart = <const Type extends Part["type"]>(
   }
 ): Extract<Part, { type: Type }> =>
   (({
-   ...params,
-   [PartTypeId]: PartTypeId,
-   type,
-   options: params.options ?? {}
+    ...params,
+    [PartTypeId]: PartTypeId,
+    type,
+    options: params.options ?? {}
   }) as any)
 
 // =============================================================================
@@ -724,10 +725,10 @@ export const makeMessage = <const Role extends Message["role"]>(
   }
 ): Extract<Message, { role: Role }> =>
   (({
-   ...params,
-   [MessageTypeId]: MessageTypeId,
-   role,
-   options: params.options ?? {}
+    ...params,
+    [MessageTypeId]: MessageTypeId,
+    role,
+    options: params.options ?? {}
   }) as any)
 
 /**
@@ -1214,7 +1215,11 @@ export class PromptFromSelf extends Schema.declare(
   (u) => isPrompt(u),
   {
     identifier: "PromptFromSelf",
-    description: "a Prompt instance"
+    description: "a Prompt instance",
+    arbitrary: (): Arbitrary.LazyArbitrary<Prompt> => (fc) =>
+      fc.array(
+        Arbitrary.makeLazy(Message)(fc)
+      ).map(makePrompt)
   }
 ) {}
 
@@ -1467,14 +1472,15 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
     return empty
   }
 
-  const content: Array<AssistantMessagePart> = []
+  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) {
-        content.push(makePart("text", { text }))
+        assistantParts.push(makePart("text", { text }))
       }
       textDeltas.length = 0
     }
@@ -1485,7 +1491,7 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
     if (reasoningDeltas.length > 0) {
       const text = reasoningDeltas.join("")
       if (text.length > 0) {
-        content.push(makePart("reasoning", { text }))
+        assistantParts.push(makePart("reasoning", { text }))
       }
       reasoningDeltas.length = 0
     }
@@ -1501,7 +1507,7 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
       switch (part.type) {
         case "text": {
           flushDeltas()
-          content.push(makePart("text", { text: part.text }))
+          assistantParts.push(makePart("text", { text: part.text }))
           break
         }
         case "text-delta": {
@@ -1511,7 +1517,7 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
         }
         case "reasoning": {
           flushDeltas()
-          content.push(makePart("reasoning", { text: part.text }))
+          assistantParts.push(makePart("reasoning", { text: part.text }))
           break
         }
         case "reasoning-delta": {
@@ -1521,7 +1527,7 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
         }
         case "tool-call": {
           flushDeltas()
-          content.push(makePart("tool-call", {
+          assistantParts.push(makePart("tool-call", {
             id: part.id,
             name: part.providerName ?? part.name,
             params: part.params,
@@ -1531,7 +1537,7 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
         }
         case "tool-result": {
           flushDeltas()
-          content.push(makePart("tool-result", {
+          toolParts.push(makePart("tool-result", {
             id: part.id,
             name: part.providerName ?? part.name,
             result: part.encodedResult
@@ -1544,9 +1550,18 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
 
   flushDeltas()
 
-  const message = makeMessage("assistant", { content })
+  if (assistantParts.length === 0 && toolParts.length === 0) {
+    return empty
+  }
 
-  return makePrompt([message])
+  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)
 }
 
 // =============================================================================
@@ -1600,7 +1615,7 @@ export const merge: {
    * @since 1.0.0
    * @category Combinators
    */
-  (other: RawInput): (self: Prompt) => Prompt
+  (input: RawInput): (self: Prompt) => Prompt
   // =============================================================================
   // Merging Prompts
   // =============================================================================
@@ -1626,12 +1641,17 @@ export const merge: {
    * @since 1.0.0
    * @category Combinators
    */
-  (self: Prompt, other: RawInput): Prompt
-} = dual(2, (self: Prompt, other: RawInput): Prompt =>
-  fromMessages([
-    ...self.content,
-    ...make(other).content
-  ]))
+  (self: Prompt, input: RawInput): Prompt
+} = dual(2, (self: Prompt, input: RawInput): Prompt => {
+  const other = make(input)
+  if (self.content.length === 0) {
+    return other
+  }
+  if (other.content.length === 0) {
+    return self
+  }
+  return fromMessages([...self.content, ...other.content])
+})
 
 // =============================================================================
 // Manipulating Prompts

package/src/Response.ts

@@ -200,10 +200,7 @@ export type AllPartsEncoded =
  */
 export const AllParts = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
   toolkit: T
-): Schema.Schema<
-  AllParts<Toolkit.Tools<T>>,
-  AllParts<Toolkit.Tools<T>>
-> => {
+): Schema.Schema<AllParts<Toolkit.Tools<T>>, AllPartsEncoded> => {
   const toolCalls: Array<Schema.Schema<ToolCallPart<string, any>, ToolCallPartEncoded>> = []
   const toolCallResults: Array<Schema.Schema<ToolResultPart<string, any>, ToolResultPartEncoded>> = []
   for (const tool of Object.values(toolkit.tools as Record<string, Tool.Any>)) {
@@ -542,7 +539,7 @@ export const makePart = <const Type extends AnyPart["type"]>(
    ...params,
    [PartTypeId]: PartTypeId,
    type,
-   metadata: params.metadata
+   metadata: params.metadata ?? {}
   }) as any)
 
 // =============================================================================

package/src/index.ts

@@ -54,7 +54,7 @@
  *       url: "https://api.openai.com/v1/completions",
  *       urlParams: [],
  *       hash: Option.none(),
- *       headers: { "Authorization": "Bearer ***" }
+ *       headers: { "Content-Type": "application/json" }
  *     }
  *   })
  * })