@effect/ai 0.30.0 → 0.31.1

package/dist/esm/Toolkit.js

@@ -40,7 +40,6 @@
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import { CommitPrototype } from "effect/Effectable";
-import * as Either from "effect/Either";
 import { identity } from "effect/Function";
 import { BaseProto as InspectableProto } from "effect/Inspectable";
 import * as Layer from "effect/Layer";
@@ -89,8 +88,9 @@ const Proto = {
         if (Predicate.isUndefined(schemas)) {
           const handler = context.unsafeMap.get(tool.id);
           const decodeParameters = Schema.decodeUnknown(tool.parametersSchema);
-          const validateResult = Schema.validate(tool.resultSchema);
-          const encodeResult = Schema.encodeUnknown(tool.resultSchema);
+          const resultSchema = Schema.Union(tool.successSchema, tool.failureSchema);
+          const validateResult = Schema.validate(resultSchema);
+          const encodeResult = Schema.encodeUnknown(resultSchema);
           schemas = {
             context: handler.context,
             handler: handler.handler,
@@ -125,10 +125,21 @@ const Proto = {
           description: `Failed to decode tool call parameters for tool '${name}' from:\n'${JSON.stringify(params, undefined, 2)}'`,
           cause
         }));
-        const result = yield* schemas.handler(decodedParams).pipe(Effect.matchEffect({
-          onFailure: error => tool.failureMode === "error" ? Effect.fail(error) : Effect.succeed(Either.left(error)),
-          onSuccess: value => Effect.succeed(Either.right(value))
-        }), Effect.flatMap(either => schemas.validateResult(either)), Effect.mapInputContext(input => Context.merge(schemas.context, input)), Effect.mapError(cause => ParseResult.isParseError(cause) ? new AiError.MalformedInput({
+        const {
+          isFailure,
+          result
+        } = yield* schemas.handler(decodedParams).pipe(Effect.map(result => ({
+          result,
+          isFailure: false
+        })), Effect.catchAll(error =>
+        // If the tool handler failed, check the tool's failure mode to
+        // determine how the result should be returned to the end user
+        tool.failureMode === "error" ? Effect.fail(error) : Effect.succeed({
+          result: error,
+          isFailure: true
+        })), Effect.tap(({
+          result
+        }) => schemas.validateResult(result)), Effect.mapInputContext(input => Context.merge(schemas.context, input)), Effect.mapError(cause => ParseResult.isParseError(cause) ? new AiError.MalformedInput({
           module: "Toolkit",
           method: `${name}.handle`,
           description: `Failed to validate tool call result for tool '${name}'`,
@@ -141,13 +152,14 @@ const Proto = {
           cause
         }));
         return {
+          isFailure,
           result,
           encodedResult
         };
       });
       return {
         tools,
-        handle: handle
+        handle
       };
     });
   },

package/dist/esm/Toolkit.js.map

@@ -1 +1 @@
-{"version":3,"file":"Toolkit.js","names":["Context","Effect","CommitPrototype","Either","identity","BaseProto","InspectableProto","Layer","ParseResult","pipeArguments","Predicate","Schema","AiError","Tool","TypeId","Proto","of","toContext","build","gen","context","handlers","isEffect","contextMap","Map","name","handler","Object","entries","tool","tools","set","id","unsafeMake","toLayer","scopedContext","commit","schemasCache","WeakMap","getSchemas","schemas","get","isUndefined","unsafeMap","decodeParameters","decodeUnknown","parametersSchema","validateResult","validate","resultSchema","encodeResult","encodeUnknown","handle","fn","captureStackTrace","params","annotateCurrentSpan","parameters","toolNames","keys","join","MalformedOutput","module","method","description","decodedParams","mapError","cause","JSON","stringify","undefined","result","pipe","matchEffect","onFailure","error","failureMode","fail","succeed","left","onSuccess","value","right","flatMap","either","mapInputContext","input","merge","isParseError","MalformedInput","encodedResult","toJSON","_id","Array","from","values","map","arguments","makeProto","assign","resolveInput","output","isSchema","fromTaggedRequest","empty","make","toolkits","toolkit"],"sources":["../../src/Toolkit.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Toolkit.js","names":["Context","Effect","CommitPrototype","identity","BaseProto","InspectableProto","Layer","ParseResult","pipeArguments","Predicate","Schema","AiError","Tool","TypeId","Proto","of","toContext","build","gen","context","handlers","isEffect","contextMap","Map","name","handler","Object","entries","tool","tools","set","id","unsafeMake","toLayer","scopedContext","commit","schemasCache","WeakMap","getSchemas","schemas","get","isUndefined","unsafeMap","decodeParameters","decodeUnknown","parametersSchema","resultSchema","Union","successSchema","failureSchema","validateResult","validate","encodeResult","encodeUnknown","handle","fn","captureStackTrace","params","annotateCurrentSpan","parameters","toolNames","keys","join","MalformedOutput","module","method","description","decodedParams","mapError","cause","JSON","stringify","undefined","isFailure","result","pipe","map","catchAll","error","failureMode","fail","succeed","tap","mapInputContext","input","merge","isParseError","MalformedInput","encodedResult","toJSON","_id","Array","from","values","arguments","makeProto","assign","resolveInput","output","value","isSchema","fromTaggedRequest","empty","make","toolkits","toolkit"],"sources":["../../src/Toolkit.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai",
-  "version": "0.30.0",
+  "version": "0.31.1",
   "description": "Effect modules for working with AI apis",
   "license": "MIT",
   "repository": {
@@ -15,9 +15,9 @@
   },
   "peerDependencies": {
     "@effect/experimental": "^0.56.0",
-    "@effect/platform": "^0.92.1",
     "@effect/rpc": "^0.71.0",
-    "effect": "^3.18.4"
+    "effect": "^3.18.4",
+    "@effect/platform": "^0.92.1"
   },
   "publishConfig": {
     "provenance": true

package/src/LanguageModel.ts

@@ -51,10 +51,12 @@
 import * as Chunk from "effect/Chunk"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import * as Mailbox from "effect/Mailbox"
 import * as Option from "effect/Option"
 import * as ParseResult from "effect/ParseResult"
 import * as Predicate from "effect/Predicate"
 import * as Schema from "effect/Schema"
+import type * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
 import type { Span } from "effect/Tracer"
 import type { Concurrency, Mutable, NoExcessProperties } from "effect/Types"
@@ -797,7 +799,9 @@ export const make: (params: ConstructorParams) => Effect.Effect<Service> = Effec
     >(options: Options & GenerateTextOptions<Tools>, providerOptions: Mutable<ProviderOptions>) => Effect.Effect<
       Stream.Stream<Response.StreamPart<Tools>, AiError.AiError | ParseResult.ParseError, IdGenerator>,
       Options extends { readonly toolkit: Effect.Effect<Toolkit.WithHandler<Tools>, infer _E, infer _R> } ? _E : never,
-      Options extends { readonly toolkit: Effect.Effect<Toolkit.WithHandler<Tools>, infer _E, infer _R> } ? _R : never
+      | (Options extends { readonly toolkit: Effect.Effect<Toolkit.WithHandler<Tools>, infer _E, infer _R> } ? _R
+        : never)
+      | Scope.Scope
     > = Effect.fnUntraced(
       function*<
         Tools extends Record<string, Tool.Any>,
@@ -842,16 +846,21 @@ export const make: (params: ConstructorParams) => Effect.Effect<Service> = Effec
           ) as Stream.Stream<Response.StreamPart<Tools>, AiError.AiError | ParseResult.ParseError, IdGenerator>
         }
 
-        const ResponseSchema = Schema.Chunk(Response.StreamPart(toolkit))
+        const mailbox = yield* Mailbox.make<Response.StreamPart<Tools>, AiError.AiError | ParseResult.ParseError>()
+        const ResponseSchema = Schema.Array(Response.StreamPart(toolkit))
         const decode = Schema.decode(ResponseSchema)
-        return params.streamText(providerOptions).pipe(
-          Stream.mapChunksEffect(Effect.fnUntraced(function*(chunk) {
+        yield* params.streamText(providerOptions).pipe(
+          Stream.runForEachChunk(Effect.fnUntraced(function*(chunk) {
             const rawContent = Chunk.toArray(chunk)
-            const toolResults = yield* resolveToolCalls(rawContent, toolkit, options.concurrency)
             const content = yield* decode(rawContent)
-            return Chunk.unsafeFromArray([...content, ...toolResults])
-          }))
-        ) as Stream.Stream<Response.StreamPart<Tools>, AiError.AiError | ParseResult.ParseError, IdGenerator>
+            yield* mailbox.offerAll(content)
+            const toolResults = yield* resolveToolCalls(rawContent, toolkit, options.concurrency)
+            yield* mailbox.offerAll(toolResults as any)
+          })),
+          Mailbox.into(mailbox),
+          Effect.forkScoped
+        )
+        return Mailbox.toStream(mailbox)
       }
     )
 
@@ -1010,12 +1019,13 @@ const resolveToolCalls = <Tools extends Record<string, Tool.Any>>(
 
   return Effect.forEach(toolCalls, (toolCall) => {
     return toolkit.handle(toolCall.name, toolCall.params as any).pipe(
-      Effect.map(({ encodedResult, result }) =>
+      Effect.map(({ encodedResult, isFailure, result }) =>
         Response.makePart("tool-result", {
           id: toolCall.id,
           name: toolCall.name,
           result,
           encodedResult,
+          isFailure,
           providerExecuted: false,
           ...(toolCall.providerName !== undefined
             ? { providerName: toolCall.providerName }

package/src/Prompt.ts

@@ -606,13 +606,11 @@ export const toolCallPart = (params: PartConstructorParams<ToolCallPart>): ToolC
  * const toolResultPart: Prompt.ToolResultPart = Prompt.makePart("tool-result", {
  *   id: "call_123",
  *   name: "get_weather",
+ *   isFailure: false,
  *   result: {
- *     _tag: "Right",
- *     right: {
- *       temperature: 22,
- *       condition: "sunny",
- *       humidity: 65
- *     }
+ *     temperature: 22,
+ *     condition: "sunny",
+ *     humidity: 65
  *   }
  * })
  * ```
@@ -629,10 +627,14 @@ export interface ToolResultPart extends BasePart<"tool-result", ToolResultPartOp
    * Name of the tool that was executed.
    */
   readonly name: string
+  /**
+   * Whether or not the result of executing the tool call handler was an error.
+   */
+  readonly isFailure: boolean
   /**
    * The result returned by the tool execution.
    */
-  readonly result: Schema.EitherEncoded<unknown, unknown>
+  readonly result: unknown
 }
 
 /**
@@ -650,10 +652,14 @@ export interface ToolResultPartEncoded extends BasePartEncoded<"tool-result", To
    * Name of the tool that was executed.
    */
   readonly name: string
+  /**
+   * Whether or not the result of executing the tool call handler was an error.
+   */
+  readonly isFailure: boolean
   /**
    * The result returned by the tool execution.
    */
-  readonly result: Schema.EitherEncoded<unknown, unknown>
+  readonly result: unknown
 }
 
 /**
@@ -675,10 +681,8 @@ export const ToolResultPart: Schema.Schema<ToolResultPart, ToolResultPartEncoded
   type: Schema.Literal("tool-result"),
   id: Schema.String,
   name: Schema.String,
-  result: Schema.encodedSchema(Schema.Either({
-    left: Schema.Unknown,
-    right: Schema.Unknown
-  })),
+  isFailure: Schema.Boolean,
+  result: Schema.Unknown,
   options: Schema.optionalWith(ProviderOptions, { default: constEmptyObject })
 }).pipe(
   Schema.attachPropertySignature(PartTypeId, PartTypeId),
@@ -1028,9 +1032,10 @@ export const userMessage = (params: MessageConstructorParams<UserMessage>): User
  *     Prompt.makePart("tool-result", {
  *       id: "call_123",
  *       name: "get_weather",
+ *       isFailure: false,
  *       result: {
- *         _tag: "Right",
- *         right: { temperature: 72, condition: "sunny" }
+ *         temperature: 72,
+ *         condition: "sunny"
  *       }
  *     }),
  *     Prompt.makePart("text", {
@@ -1138,15 +1143,13 @@ export const assistantMessage = (params: MessageConstructorParams<AssistantMessa
  *     Prompt.makePart("tool-result", {
  *       id: "call_123",
  *       name: "search_web",
+ *       isFailure: false,
  *       result: {
- *         _tag: "Right",
- *         right: {
- *           query: "TypeScript best practices",
- *           results: [
- *             { title: "TypeScript Handbook", url: "https://..." },
- *             { title: "Effective TypeScript", url: "https://..." }
- *           ]
- *         }
+ *         query: "TypeScript best practices",
+ *         results: [
+ *           { title: "TypeScript Handbook", url: "https://..." },
+ *           { title: "Effective TypeScript", url: "https://..." }
+ *         ]
  *       }
  *     })
  *   ]
@@ -1564,8 +1567,9 @@ const isValidPart = (part: Response.AnyPart): part is ValidResponsePart => {
  *   Response.makePart("tool-result", {
  *     id: "call_1",
  *     name: "get_time",
- *     result: Either.right("10:30 AM"),
- *     encodedResult: { _tag: "Right", right: "10:30 AM" },
+ *     isFailure: false,
+ *     result: "10:30 AM",
+ *     encodedResult: "10:30 AM",
  *     providerExecuted: false
  *   })
  * ]
@@ -1650,6 +1654,7 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
           toolParts.push(makePart("tool-result", {
             id: part.id,
             name: part.providerName ?? part.name,
+            isFailure: part.isFailure,
             result: part.encodedResult
           }))
           break

package/src/Response.ts

@@ -28,7 +28,6 @@
  */
 import type * as DateTime from "effect/DateTime"
 import * as Effect from "effect/Effect"
-import type * as Either from "effect/Either"
 import { constFalse } from "effect/Function"
 import type * as Option from "effect/Option"
 import * as ParseResult from "effect/ParseResult"
@@ -1506,6 +1505,75 @@ export const toolCallPart = <const Name extends string, Params>(
 // Tool Call Result Part
 // =============================================================================
 
+/**
+ * The base fields of a tool result part.
+ *
+ * @since 1.0.0
+ * @category Models
+ */
+export interface BaseToolResult<Name extends string> extends BasePart<"tool-result", ToolResultPartMetadata> {
+  /**
+   * Unique identifier matching the original tool call.
+   */
+  readonly id: string
+  /**
+   * Name of the tool being called, which corresponds to the name of the tool
+   * in the `Toolkit` included with the request.
+   */
+  readonly name: Name
+  /**
+   * The encoded result for serialization purposes.
+   */
+  readonly encodedResult: unknown
+  /**
+   * Optional provider-specific name for the tool, which can be useful when the
+   * name of the tool in the `Toolkit` and the name of the tool used by the
+   * model are different.
+   *
+   * This is usually happens only with provider-defined tools which require a
+   * user-space handler.
+   */
+  readonly providerName?: string | undefined
+  /**
+   * Whether the tool was executed by the provider (true) or framework (false).
+   */
+  readonly providerExecuted: boolean
+}
+
+/**
+ * Represents a successful tool call result.
+ *
+ * @since 1.0.0
+ * @category Models
+ */
+export interface ToolResultSuccess<Name extends string, Success> extends BaseToolResult<Name> {
+  /**
+   * The decoded success returned by the tool execution.
+   */
+  readonly result: Success
+  /**
+   * Whether or not the result of executing the tool call handler was an error.
+   */
+  readonly isFailure: false
+}
+
+/**
+ * Represents a failed tool call result.
+ *
+ * @since 1.0.0
+ * @category Models
+ */
+export interface ToolResultFailure<Name extends string, Failure> extends BaseToolResult<Name> {
+  /**
+   * The decoded failure returned by the tool execution.
+   */
+  readonly result: Failure
+  /**
+   * Whether or not the result of executing the tool call handler was an error.
+   */
+  readonly isFailure: true
+}
+
 /**
  * Response part representing the result of a tool call.
  *
@@ -1527,18 +1595,16 @@ export const toolCallPart = <const Name extends string, Params>(
  * > = Response.toolResultPart({
  *   id: "call_123",
  *   name: "get_weather",
- *   result: Either.right({
+ *   isFailure: false,
+ *   result: {
  *     temperature: 22,
  *     condition: "sunny",
  *     humidity: 65
- *   }),
+ *   },
  *   encodedResult: {
- *     _tag: "Right",
- *     right: {
- *       temperature: 22,
- *       condition: "sunny",
- *       humidity: 65
- *     }
+ *     temperature: 22,
+ *     condition: "sunny",
+ *     humidity: 65
  *   },
  *   providerExecuted: false
  * })
@@ -1547,40 +1613,9 @@ export const toolCallPart = <const Name extends string, Params>(
  * @since 1.0.0
  * @category Models
  */
-export interface ToolResultPart<Name extends string, Success, Failure>
-  extends BasePart<"tool-result", ToolResultPartMetadata>
-{
-  /**
-   * Unique identifier matching the original tool call.
-   */
-  readonly id: string
-  /**
-   * Name of the tool being called, which corresponds to the name of the tool
-   * in the `Toolkit` included with the request.
-   */
-  readonly name: Name
-  /**
-   * The decoded result returned by the tool execution.
-   */
-  readonly result: Either.Either<Success, Failure>
-  /**
-   * The encoded result for serialization purposes.
-   */
-  readonly encodedResult: Schema.EitherEncoded<unknown, unknown>
-  /**
-   * Optional provider-specific name for the tool, which can be useful when the
-   * name of the tool in the `Toolkit` and the name of the tool used by the
-   * model are different.
-   *
-   * This is usually happens only with provider-defined tools which require a
-   * user-space handler.
-   */
-  readonly providerName?: string | undefined
-  /**
-   * Whether the tool was executed by the provider (true) or framework (false).
-   */
-  readonly providerExecuted: boolean
-}
+export type ToolResultPart<Name extends string, Success, Failure> =
+  | ToolResultSuccess<Name, Success>
+  | ToolResultFailure<Name, Failure>
 
 /**
  * Encoded representation of tool result parts for serialization.
@@ -1601,7 +1636,11 @@ export interface ToolResultPartEncoded extends BasePartEncoded<"tool-result", To
   /**
    * The result returned by the tool execution.
    */
-  readonly result: Schema.EitherEncoded<unknown, unknown>
+  readonly result: unknown
+  /**
+   * Whether or not the result of executing the tool call handler was an error.
+   */
+  readonly isFailure: boolean
   /**
    * Optional provider-specific name for the tool, which can be useful when the
    * name of the tool in the `Toolkit` and the name of the tool used by the
@@ -1644,15 +1683,13 @@ export const ToolResultPart = <
   ToolResultPart<Name, Schema.Schema.Type<Success>, Schema.Schema.Type<Failure>>,
   ToolResultPartEncoded
 > => {
-  const ResultSchema = Schema.Either({
-    left: failure,
-    right: success
-  })
   const Base = Schema.Struct({
     id: Schema.String,
     type: Schema.Literal("tool-result"),
-    providerName: Schema.optional(Schema.String)
+    providerName: Schema.optional(Schema.String),
+    isFailure: Schema.Boolean
   })
+  const ResultSchema = Schema.Union(success, failure)
   const Encoded = Schema.Struct({
     ...Base.fields,
     name: Schema.String,
@@ -1692,11 +1729,9 @@ export const ToolResultPart = <
       encode: Effect.fnUntraced(function*(decoded) {
         const encoded = yield* encodeResult(decoded.result)
         return {
-          id: decoded.id,
-          type: decoded.type,
-          name: decoded.name,
+          ...decoded,
           result: encoded,
-          ...(decoded.metadata ? { metadata: decoded.metadata } : {}),
+          ...(decoded.metadata ?? {}),
           ...(decoded.providerName ? { providerName: decoded.providerName } : {}),
           ...(decoded.providerExecuted ? { providerExecuted: true } : {})
         }
@@ -1711,9 +1746,21 @@ export const ToolResultPart = <
  * @since 1.0.0
  * @category Constructors
  */
-export const toolResultPart = <const Name extends string, Success, Failure>(
-  params: ConstructorParams<ToolResultPart<Name, Success, Failure>>
-): ToolResultPart<Name, Success, Failure> => makePart("tool-result", params)
+export const toolResultPart = <
+  const Params extends ConstructorParams<ToolResultPart<string, any, any>>
+>(
+  params: Params
+): Params extends {
+  readonly name: infer Name extends string
+  readonly isFailure: false
+  readonly result: infer Success
+} ? ToolResultPart<Name, Success, never>
+  : Params extends {
+    readonly name: infer Name extends string
+    readonly isFailure: true
+    readonly result: infer Failure
+  } ? ToolResultPart<Name, never, Failure>
+  : never => makePart("tool-result", params) as any
 
 // =============================================================================
 // File Part