cleanup

Author: IMax153

packages/ai/ai/src/Prompt.ts

@@ -1327,7 +1327,8 @@ const VALID_RESPONSE_PART_MAP = {
   "tool-params-end": false,
   "tool-call": true,
   "tool-result": true,
-  "finish": false
+  "finish": false,
+  "error": false
 } as const satisfies Record<Response.AnyPart["type"], boolean>
 
 type ValidResponseParts = typeof VALID_RESPONSE_PART_MAP
@@ -1597,24 +1598,12 @@ export type AllowedProviderOptions<
  */
 export const getProviderOptions: {
   <Identifier, ProviderOptions>(
-    /**
-     * Context tag identifying the provider options.
-     */
     tag: Context.Tag<Identifier, ProviderOptions>
   ): <P extends Message | Part>(
-    /**
-     * Message or part to extract options from.
-     */
     part: P
   ) => ExtractProviderOptions<P, ProviderOptions>
   <P extends Message | Part, Identifier, ProviderOptions>(
-    /**
-     * Message or part to extract options from.
-     */
     part: P,
-    /**
-     * Context tag identifying the provider options.
-     */
     tag: Context.Tag<Identifier, ProviderOptions>
   ): ExtractProviderOptions<P, ProviderOptions>
 } = dual<
@@ -1632,6 +1621,7 @@ export const getProviderOptions: {
     Option.flatMapNullable((options) => options[tag.key]),
     Option.flatMapNullable((options) => "role" in part ? options[part.role] : options[part.type])
   ) as any)
+
 /**
  * Sets provider-specific options on a message or part (mutating operation).
  *
@@ -1668,32 +1658,14 @@ export const getProviderOptions: {
  */
 export const unsafeSetProviderOptions: {
   <P extends Message | Part, Identifier, ProviderOptions>(
-    /**
-     * Context tag identifying the provider options.
-     */
     tag: Context.Tag<Identifier, ProviderOptions>,
-    /**
-     * Provider-specific options to set.
-     */
     options: AllowedProviderOptions<P, ProviderOptions>
   ): (
-    /**
-     * Message or part to set options on.
-     */
     part: P
   ) => void
   <P extends Message | Part, Identifier, ProviderOptions>(
-    /**
-     * Message or part to set options on.
-     */
     part: P,
-    /**
-     * Context tag identifying the provider options.
-     */
     tag: Context.Tag<Identifier, ProviderOptions>,
-    /**
-     * Provider-specific options to set.
-     */
     options: AllowedProviderOptions<P, ProviderOptions>
   ): void
 } = dual<

packages/ai/ai/src/Response.ts

@@ -31,7 +31,7 @@ import type * as Context from "effect/Context"
 import type * as DateTime from "effect/DateTime"
 import * as Effect from "effect/Effect"
 import { constFalse, dual } from "effect/Function"
-import type * as Option from "effect/Option"
+import * as Option from "effect/Option"
 import * as Predicate from "effect/Predicate"
 import * as Schema from "effect/Schema"
 import type * as Tool from "./Tool.js"
@@ -1958,10 +1958,11 @@ export const ErrorPart: Schema.Schema<ErrorPart, ErrorPartEncoded> = Schema.Stru
  * @since 1.0.0
  * @category Provider Metadata
  */
-export type ExtractProviderMetadata<Part extends AnyPart, ProviderMetadata> = ProviderMetadata extends
-  Record<string, any> ? Part["type"] extends keyof ProviderMetadata ? ProviderMetadata[Part["type"]]
-  : never
-  : never
+export type ExtractProviderMetadata<Part extends AnyPart, ProviderMetadata, Type extends Part["type"] = Part["type"]> =
+  ProviderMetadata extends Record<string, any> ?
+    Type extends keyof ProviderMetadata ? Option.Option<ProviderMetadata[Type]>
+    : never
+    : never
 
 /**
  * Extracts provider-specific metadata from a response part.
@@ -2000,40 +2001,29 @@ export type ExtractProviderMetadata<Part extends AnyPart, ProviderMetadata> = Pr
  */
 export const getProviderMetadata: {
   <Identifier, ProviderMetadata>(
-    /**
-     * Context tag identifying the provider metadata.
-     */
     tag: Context.Tag<Identifier, ProviderMetadata>
   ): <Part extends AnyPart>(
-    /**
-     * Response part to extract metadata from.
-     */
     part: Part
-  ) => ExtractProviderMetadata<Part, ProviderMetadata> | undefined
+  ) => ExtractProviderMetadata<Part, ProviderMetadata>
   <Part extends AnyPart, Identifier, ProviderMetadata>(
-    /**
-     * Response part to extract metadata from.
-     */
     part: Part,
-    /**
-     * Context tag identifying the provider metadata.
-     */
     tag: Context.Tag<Identifier, ProviderMetadata>
-  ): ExtractProviderMetadata<Part, ProviderMetadata> | undefined
+  ): ExtractProviderMetadata<Part, ProviderMetadata>
 } = dual<
   <Identifier, ProviderMetadata>(
     tag: Context.Tag<Identifier, ProviderMetadata>
   ) => <Part extends AnyPart>(
     part: Part
-  ) => ExtractProviderMetadata<Part, ProviderMetadata> | undefined,
+  ) => ExtractProviderMetadata<Part, ProviderMetadata>,
   <Part extends AnyPart, Identifier, ProviderMetadata>(
     part: Part,
     tag: Context.Tag<Identifier, ProviderMetadata>
-  ) => ExtractProviderMetadata<Part, ProviderMetadata> | undefined
->(2, (part, tag) => {
-  const metadata = part.metadata?.[tag.key]
-  return metadata?.[part.type] as any
-})
+  ) => ExtractProviderMetadata<Part, ProviderMetadata>
+>(2, (part, tag) =>
+  Option.fromNullable(part.metadata).pipe(
+    Option.flatMapNullable((metadata) => metadata[tag.key]),
+    Option.flatMapNullable((metadata) => metadata[part.type])
+  ) as any)
 
 /**
  * Sets provider-specific metadata on a response part (mutating operation).
@@ -2071,32 +2061,14 @@ export const getProviderMetadata: {
  */
 export const unsafeSetProviderMetadata: {
   <Part extends AnyPart, Identifier, ProviderMetadata>(
-    /**
-     * Context tag identifying the provider metadata.
-     */
     tag: Context.Tag<Identifier, ProviderMetadata>,
-    /**
-     * Provider-specific metadata to set.
-     */
     metadata: ExtractProviderMetadata<Part, ProviderMetadata>
   ): (
-    /**
-     * Response part to set metadata on.
-     */
     part: Part
   ) => void
   <Part extends AnyPart, Identifier, ProviderMetadata>(
-    /**
-     * Response part to set metadata on.
-     */
     part: Part,
-    /**
-     * Context tag identifying the provider metadata.
-     */
     tag: Context.Tag<Identifier, ProviderMetadata>,
-    /**
-     * Provider-specific metadata to set.
-     */
     metadata: ExtractProviderMetadata<Part, ProviderMetadata>
   ): void
 } = dual<