@effect/ai-openrouter 4.0.0-beta.6 → 4.0.0-beta.62

package/src/OpenRouterLanguageModel.ts

@@ -3,16 +3,17 @@
  */
 /** @effect-diagnostics preferSchemaOverJson:skip-file */
 import * as Arr from "effect/Array"
+import * as Context from "effect/Context"
 import * as DateTime from "effect/DateTime"
 import * as Effect from "effect/Effect"
 import * as Encoding from "effect/Encoding"
 import { dual } from "effect/Function"
 import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
 import * as Predicate from "effect/Predicate"
 import * as Redactable from "effect/Redactable"
 import type * as Schema from "effect/Schema"
 import * as SchemaAST from "effect/SchemaAST"
-import * as ServiceMap from "effect/ServiceMap"
 import * as Stream from "effect/Stream"
 import type { Span } from "effect/Tracer"
 import type { DeepMutable, Mutable, Simplify } from "effect/Types"
@@ -42,7 +43,7 @@ import { type ChatStreamingResponseChunkData, OpenRouterClient } from "./OpenRou
  * @since 1.0.0
  * @category services
  */
-export class Config extends ServiceMap.Service<
+export class Config extends Context.Service<
   Config,
   Simplify<
     & Partial<
@@ -233,7 +234,7 @@ export const model = (
   model: string,
   config?: Omit<typeof Config.Service, "model">
 ): AiModel.Model<"openai", LanguageModel.LanguageModel, OpenRouterClient> =>
-  AiModel.make("openai", layer({ model, config }))
+  AiModel.make("openai", model, layer({ model, config }))
 
 /**
  * Creates an OpenRouter language model service.
@@ -249,7 +250,7 @@ export const make = Effect.fnUntraced(function*({ model, config: providerConfig
   const codecTransformer = getCodecTransformer(model)
 
   const makeConfig = Effect.gen(function*() {
-    const services = yield* Effect.services<never>()
+    const services = yield* Effect.context<never>()
     return { model, ...providerConfig, ...services.mapUnsafe.get(Config.key) }
   })
 
@@ -273,6 +274,7 @@ export const make = Effect.fnUntraced(function*({ model, config: providerConfig
   )
 
   return yield* LanguageModel.make({
+    codecTransformer: toCodecOpenAI,
     generateText: Effect.fnUntraced(
       function*(options) {
         const config = yield* makeConfig
@@ -300,10 +302,7 @@ export const make = Effect.fnUntraced(function*({ model, config: providerConfig
           })
         )
     )
-  }).pipe(Effect.provideService(
-    LanguageModel.CurrentCodecTransformer,
-    codecTransformer
-  ))
+  })
 })
 
 /**
@@ -588,7 +587,7 @@ const buildHttpRequestDetails = (
   method: request.method,
   url: request.url,
   urlParams: Array.from(request.urlParams),
-  hash: request.hash,
+  hash: Option.getOrUndefined(request.hash),
   headers: Redactable.redact(request.headers) as Record<string, string>
 })
 
@@ -885,283 +884,275 @@ const makeStreamResponse = Effect.fnUntraced(
         }
 
         const choice = event.choices[0]
-        if (Predicate.isUndefined(choice)) {
-          return yield* AiError.make({
-            module: "OpenRouterLanguageModel",
-            method: "makeStreamResponse",
-            reason: new AiError.InvalidOutputError({
-              description: "Received response with empty choices"
-            })
-          })
-        }
-
-        if (Predicate.isNotNull(choice.finish_reason)) {
-          finishReason = resolveFinishReason(choice.finish_reason)
-        }
+        if (Predicate.isNotUndefined(choice)) {
+          if (Predicate.isNotNullish(choice.finish_reason)) {
+            finishReason = resolveFinishReason(choice.finish_reason)
+          }
 
-        const delta = choice.delta
-        if (Predicate.isNullish(delta)) {
-          return parts
-        }
+          const delta = choice.delta
+          if (Predicate.isNullish(delta)) {
+            return parts
+          }
 
-        const emitReasoning = Effect.fnUntraced(
-          function*(delta: string, metadata?: Response.ReasoningDeltaPart["metadata"] | undefined) {
-            if (!reasoningStarted) {
-              activeReasoningId = openRouterResponseId ?? (yield* idGenerator.generateId())
+          const emitReasoning = Effect.fnUntraced(
+            function*(delta: string, metadata?: Response.ReasoningDeltaPart["metadata"] | undefined) {
+              if (!reasoningStarted) {
+                activeReasoningId = openRouterResponseId ?? (yield* idGenerator.generateId())
+                parts.push({
+                  type: "reasoning-start",
+                  id: activeReasoningId,
+                  metadata
+                })
+                reasoningStarted = true
+              }
               parts.push({
-                type: "reasoning-start",
-                id: activeReasoningId,
+                type: "reasoning-delta",
+                id: activeReasoningId!,
+                delta,
                 metadata
               })
-              reasoningStarted = true
             }
-            parts.push({
-              type: "reasoning-delta",
-              id: activeReasoningId!,
-              delta,
-              metadata
-            })
-          }
-        )
+          )
 
-        const reasoningDetails = delta.reasoning_details
-        if (Predicate.isNotUndefined(reasoningDetails) && reasoningDetails.length > 0) {
-          // Accumulate reasoning_details to preserve for multi-turn conversations
-          // Merge consecutive reasoning.text items into a single entry
-          for (const detail of reasoningDetails) {
-            if (detail.type === "reasoning.text") {
-              const lastDetail = accumulatedReasoningDetails[accumulatedReasoningDetails.length - 1]
-              if (Predicate.isNotUndefined(lastDetail) && lastDetail.type === "reasoning.text") {
-                // Merge with the previous text detail
-                lastDetail.text = (lastDetail.text ?? "") + (detail.text ?? "")
-                lastDetail.signature = lastDetail.signature ?? detail.signature ?? null
-                lastDetail.format = lastDetail.format ?? detail.format ?? null
+          const reasoningDetails = delta.reasoning_details
+          if (Predicate.isNotUndefined(reasoningDetails) && reasoningDetails.length > 0) {
+            // Accumulate reasoning_details to preserve for multi-turn conversations
+            // Merge consecutive reasoning.text items into a single entry
+            for (const detail of reasoningDetails) {
+              if (detail.type === "reasoning.text") {
+                const lastDetail = accumulatedReasoningDetails[accumulatedReasoningDetails.length - 1]
+                if (Predicate.isNotUndefined(lastDetail) && lastDetail.type === "reasoning.text") {
+                  // Merge with the previous text detail
+                  lastDetail.text = (lastDetail.text ?? "") + (detail.text ?? "")
+                  lastDetail.signature = lastDetail.signature ?? detail.signature ?? null
+                  lastDetail.format = lastDetail.format ?? detail.format ?? null
+                } else {
+                  // Start a new text detail
+                  accumulatedReasoningDetails.push({ ...detail })
+                }
               } else {
-                // Start a new text detail
-                accumulatedReasoningDetails.push({ ...detail })
+                // Non-text details (encrypted, summary) are pushed as-is
+                accumulatedReasoningDetails.push(detail)
               }
-            } else {
-              // Non-text details (encrypted, summary) are pushed as-is
-              accumulatedReasoningDetails.push(detail)
             }
-          }
 
-          // Emit reasoning_details in providerMetadata for each delta chunk
-          // so users can accumulate them on their end before sending back
-          const metadata: Response.ReasoningDeltaPart["metadata"] = {
-            openrouter: {
-              reasoningDetails
+            // Emit reasoning_details in providerMetadata for each delta chunk
+            // so users can accumulate them on their end before sending back
+            const metadata: Response.ReasoningDeltaPart["metadata"] = {
+              openrouter: {
+                reasoningDetails
+              }
             }
-          }
-          for (const detail of reasoningDetails) {
-            switch (detail.type) {
-              case "reasoning.text": {
-                if (Predicate.isNotNullish(detail.text)) {
-                  yield* emitReasoning(detail.text, metadata)
+            for (const detail of reasoningDetails) {
+              switch (detail.type) {
+                case "reasoning.text": {
+                  if (Predicate.isNotNullish(detail.text)) {
+                    yield* emitReasoning(detail.text, metadata)
+                  }
+                  break
                 }
-                break
-              }
 
-              case "reasoning.summary": {
-                if (Predicate.isNotNullish(detail.summary)) {
-                  yield* emitReasoning(detail.summary, metadata)
+                case "reasoning.summary": {
+                  if (Predicate.isNotNullish(detail.summary)) {
+                    yield* emitReasoning(detail.summary, metadata)
+                  }
+                  break
                 }
-                break
-              }
 
-              case "reasoning.encrypted": {
-                if (Predicate.isNotNullish(detail.data)) {
-                  yield* emitReasoning("[REDACTED]", metadata)
+                case "reasoning.encrypted": {
+                  if (Predicate.isNotNullish(detail.data)) {
+                    yield* emitReasoning("[REDACTED]", metadata)
+                  }
+                  break
                 }
-                break
               }
             }
+          } else if (Predicate.isNotNullish(delta.reasoning)) {
+            yield* emitReasoning(delta.reasoning)
           }
-        } else if (Predicate.isNotNullish(delta.reasoning)) {
-          yield* emitReasoning(delta.reasoning)
-        }
 
-        const content = delta.content
-        if (Predicate.isNotNullish(content)) {
-          // If reasoning was previously active and now we're starting text content,
-          // we should end the reasoning first to maintain proper order
-          if (reasoningStarted && !textStarted) {
-            parts.push({
-              type: "reasoning-end",
-              id: activeReasoningId!,
-              // Include accumulated reasoning_details so the we can update the
-              // reasoning part's provider metadata with the correct signature.
-              // The signature typically arrives in the last reasoning delta,
-              // but reasoning-start only carries the first delta's metadata.
-              metadata: accumulatedReasoningDetails.length > 0
-                ? { openRouter: { reasoningDetails: accumulatedReasoningDetails } }
-                : undefined
-            })
-            reasoningStarted = false
-          }
+          const content = delta.content
+          if (Predicate.isNotNullish(content)) {
+            // If reasoning was previously active and now we're starting text content,
+            // we should end the reasoning first to maintain proper order
+            if (reasoningStarted && !textStarted) {
+              parts.push({
+                type: "reasoning-end",
+                id: activeReasoningId!,
+                // Include accumulated reasoning_details so the we can update the
+                // reasoning part's provider metadata with the correct signature.
+                // The signature typically arrives in the last reasoning delta,
+                // but reasoning-start only carries the first delta's metadata.
+                metadata: accumulatedReasoningDetails.length > 0
+                  ? { openRouter: { reasoningDetails: accumulatedReasoningDetails } }
+                  : undefined
+              })
+              reasoningStarted = false
+            }
+
+            if (!textStarted) {
+              activeTextId = openRouterResponseId ?? (yield* idGenerator.generateId())
+              parts.push({
+                type: "text-start",
+                id: activeTextId
+              })
+              textStarted = true
+            }
 
-          if (!textStarted) {
-            activeTextId = openRouterResponseId ?? (yield* idGenerator.generateId())
             parts.push({
-              type: "text-start",
-              id: activeTextId
+              type: "text-delta",
+              id: activeTextId!,
+              delta: content
             })
-            textStarted = true
           }
 
-          parts.push({
-            type: "text-delta",
-            id: activeTextId!,
-            delta: content
-          })
-        }
-
-        const annotations = delta.annotations
-        if (Predicate.isNotNullish(annotations)) {
-          for (const annotation of annotations) {
-            if (annotation.type === "url_citation") {
-              parts.push({
-                type: "source",
-                sourceType: "url",
-                id: annotation.url_citation.url,
-                url: annotation.url_citation.url,
-                title: annotation.url_citation.title ?? "",
-                metadata: {
-                  openrouter: {
-                    ...(Predicate.isNotUndefined(annotation.url_citation.content)
-                      ? { content: annotation.url_citation.content }
-                      : undefined),
-                    ...(Predicate.isNotUndefined(annotation.url_citation.start_index)
-                      ? { startIndex: annotation.url_citation.start_index }
-                      : undefined),
-                    ...(Predicate.isNotUndefined(annotation.url_citation.end_index)
-                      ? { startIndex: annotation.url_citation.end_index }
-                      : undefined)
+          const annotations = delta.annotations
+          if (Predicate.isNotNullish(annotations)) {
+            for (const annotation of annotations) {
+              if (annotation.type === "url_citation") {
+                parts.push({
+                  type: "source",
+                  sourceType: "url",
+                  id: annotation.url_citation.url,
+                  url: annotation.url_citation.url,
+                  title: annotation.url_citation.title ?? "",
+                  metadata: {
+                    openrouter: {
+                      ...(Predicate.isNotUndefined(annotation.url_citation.content)
+                        ? { content: annotation.url_citation.content }
+                        : undefined),
+                      ...(Predicate.isNotUndefined(annotation.url_citation.start_index)
+                        ? { startIndex: annotation.url_citation.start_index }
+                        : undefined),
+                      ...(Predicate.isNotUndefined(annotation.url_citation.end_index)
+                        ? { startIndex: annotation.url_citation.end_index }
+                        : undefined)
+                    }
                   }
-                }
-              })
-            } else if (annotation.type === "file") {
-              accumulatedFileAnnotations.push(annotation)
+                })
+              } else if (annotation.type === "file") {
+                accumulatedFileAnnotations.push(annotation)
+              }
             }
           }
-        }
 
-        const toolCalls = delta.tool_calls
-        if (Predicate.isNotNullish(toolCalls)) {
-          for (const toolCall of toolCalls) {
-            const index = toolCall.index ?? toolCalls.length - 1
-            let activeToolCall = activeToolCalls[index]
-
-            // Tool call start - OpenRouter returns all information except the
-            // tool call parameters in the first chunk
-            if (Predicate.isUndefined(activeToolCall)) {
-              if (toolCall.type !== "function") {
-                return yield* AiError.make({
-                  module: "OpenRouterLanguageModel",
-                  method: "makeStreamResponse",
-                  reason: new AiError.InvalidOutputError({
-                    description: "Received tool call delta that was not of type: 'function'"
+          const toolCalls = delta.tool_calls
+          if (Predicate.isNotNullish(toolCalls)) {
+            for (const toolCall of toolCalls) {
+              const index = toolCall.index ?? toolCalls.length - 1
+              let activeToolCall = activeToolCalls[index]
+
+              // Tool call start - OpenRouter returns all information except the
+              // tool call parameters in the first chunk
+              if (Predicate.isUndefined(activeToolCall)) {
+                if (toolCall.type !== "function") {
+                  return yield* AiError.make({
+                    module: "OpenRouterLanguageModel",
+                    method: "makeStreamResponse",
+                    reason: new AiError.InvalidOutputError({
+                      description: "Received tool call delta that was not of type: 'function'"
+                    })
                   })
-                })
-              }
+                }
 
-              if (Predicate.isUndefined(toolCall.id)) {
-                return yield* AiError.make({
-                  module: "OpenRouterLanguageModel",
-                  method: "makeStreamResponse",
-                  reason: new AiError.InvalidOutputError({
-                    description: "Received tool call delta without a tool call identifier"
+                if (Predicate.isNullish(toolCall.id)) {
+                  return yield* AiError.make({
+                    module: "OpenRouterLanguageModel",
+                    method: "makeStreamResponse",
+                    reason: new AiError.InvalidOutputError({
+                      description: "Received tool call delta without a tool call identifier"
+                    })
                   })
-                })
-              }
+                }
 
-              if (Predicate.isUndefined(toolCall.function?.name)) {
-                return yield* AiError.make({
-                  module: "OpenRouterLanguageModel",
-                  method: "makeStreamResponse",
-                  reason: new AiError.InvalidOutputError({
-                    description: "Received tool call delta without a tool call name"
+                if (Predicate.isNullish(toolCall.function?.name)) {
+                  return yield* AiError.make({
+                    module: "OpenRouterLanguageModel",
+                    method: "makeStreamResponse",
+                    reason: new AiError.InvalidOutputError({
+                      description: "Received tool call delta without a tool call name"
+                    })
                   })
-                })
-              }
+                }
 
-              activeToolCall = {
-                id: toolCall.id,
-                type: "function",
-                name: toolCall.function.name,
-                params: toolCall.function.arguments ?? ""
-              }
+                activeToolCall = {
+                  id: toolCall.id,
+                  type: "function",
+                  name: toolCall.function.name,
+                  params: toolCall.function.arguments ?? ""
+                }
 
-              activeToolCalls[index] = activeToolCall
+                activeToolCalls[index] = activeToolCall
 
-              parts.push({
-                type: "tool-params-start",
-                id: activeToolCall.id,
-                name: activeToolCall.name
-              })
+                parts.push({
+                  type: "tool-params-start",
+                  id: activeToolCall.id,
+                  name: activeToolCall.name
+                })
 
-              // Emit a tool call delta part if parameters were also sent
-              if (activeToolCall.params.length > 0) {
+                // Emit a tool call delta part if parameters were also sent
+                if (activeToolCall.params.length > 0) {
+                  parts.push({
+                    type: "tool-params-delta",
+                    id: activeToolCall.id,
+                    delta: activeToolCall.params
+                  })
+                }
+              } else {
+                // If an active tool call was found, update and emit the delta for
+                // the tool call's parameters
+                activeToolCall.params += toolCall.function?.arguments ?? ""
                 parts.push({
                   type: "tool-params-delta",
                   id: activeToolCall.id,
                   delta: activeToolCall.params
                 })
               }
-            } else {
-              // If an active tool call was found, update and emit the delta for
-              // the tool call's parameters
-              activeToolCall.params += toolCall.function?.arguments ?? ""
-              parts.push({
-                type: "tool-params-delta",
-                id: activeToolCall.id,
-                delta: activeToolCall.params
-              })
-            }
 
-            // Check if the tool call is complete
-            // @effect-diagnostics-next-line tryCatchInEffectGen:off
-            try {
-              const params = Tool.unsafeSecureJsonParse(activeToolCall.params)
+              // Check if the tool call is complete
+              // @effect-diagnostics-next-line tryCatchInEffectGen:off
+              try {
+                const params = Tool.unsafeSecureJsonParse(activeToolCall.params)
 
-              parts.push({
-                type: "tool-params-end",
-                id: activeToolCall.id
-              })
+                parts.push({
+                  type: "tool-params-end",
+                  id: activeToolCall.id
+                })
 
-              parts.push({
-                type: "tool-call",
-                id: activeToolCall.id,
-                name: activeToolCall.name,
-                params,
-                // Only attach reasoning_details to the first tool call to avoid
-                // duplicating thinking blocks for parallel tool calls (Claude)
-                metadata: reasoningDetailsAttachedToToolCall ? undefined : {
-                  openrouter: { reasoningDetails: accumulatedReasoningDetails }
-                }
-              })
+                parts.push({
+                  type: "tool-call",
+                  id: activeToolCall.id,
+                  name: activeToolCall.name,
+                  params,
+                  // Only attach reasoning_details to the first tool call to avoid
+                  // duplicating thinking blocks for parallel tool calls (Claude)
+                  metadata: reasoningDetailsAttachedToToolCall ? undefined : {
+                    openrouter: { reasoningDetails: accumulatedReasoningDetails }
+                  }
+                })
 
-              reasoningDetailsAttachedToToolCall = true
+                reasoningDetailsAttachedToToolCall = true
 
-              // Increment the total tool calls emitted by the stream and
-              // remove the active tool call
-              totalToolCalls += 1
-              delete activeToolCalls[toolCall.index]
-            } catch {
-              // Tool call incomplete, continue parsing
-              continue
+                // Increment the total tool calls emitted by the stream and
+                // remove the active tool call
+                totalToolCalls += 1
+                delete activeToolCalls[toolCall.index]
+              } catch {
+                // Tool call incomplete, continue parsing
+                continue
+              }
             }
           }
-        }
 
-        const images = delta.images
-        if (Predicate.isNotNullish(images)) {
-          for (const image of images) {
-            parts.push({
-              type: "file",
-              mediaType: getMediaType(image.image_url.url, "image/jpeg"),
-              data: getBase64FromDataUrl(image.image_url.url)
-            })
+          const images = delta.images
+          if (Predicate.isNotNullish(images)) {
+            for (const image of images) {
+              parts.push({
+                type: "file",
+                mediaType: getMediaType(image.image_url.url, "image/jpeg"),
+                data: getBase64FromDataUrl(image.image_url.url)
+              })
+            }
           }
         }
 

package/src/internal/errors.ts

@@ -192,12 +192,14 @@ export const parseRateLimitHeaders = (headers: Record<string, string>) => {
   let retryAfter: Duration.Duration | undefined
   if (Predicate.isNotUndefined(retryAfterRaw)) {
     const parsed = Number.parse(retryAfterRaw)
-    if (Predicate.isNotUndefined(parsed)) {
-      retryAfter = Duration.seconds(parsed)
+    if (Option.isSome(parsed)) {
+      retryAfter = Duration.seconds(parsed.value)
     }
   }
   const remainingRaw = headers["x-ratelimit-remaining-requests"]
-  const remaining = Predicate.isNotUndefined(remainingRaw) ? Number.parse(remainingRaw) ?? null : null
+  const remaining = Predicate.isNotUndefined(remainingRaw)
+    ? Option.getOrNull(Number.parse(remainingRaw))
+    : null
   return {
     retryAfter,
     limit: headers["x-ratelimit-limit-requests"] ?? null,
@@ -218,7 +220,7 @@ export const buildHttpRequestDetails = (
   method: request.method,
   url: request.url,
   urlParams: Array.from(request.urlParams),
-  hash: request.hash,
+  hash: Option.getOrUndefined(request.hash),
   headers: Redactable.redact(request.headers) as Record<string, string>
 })