@effect-uai/anthropic 0.12.0 → 0.13.0

package/dist/usage.test.d.mts

@@ -1 +1 @@
-export { };
+export {}

package/dist/usage.test.mjs

@@ -1,6 +1,6 @@
 import { emptyAccumulator, mergeUsage } from "./codec.mjs";
 import { applyEvent } from "./streamEvents.mjs";
-import { n as describe, r as it, t as globalExpect } from "./test.DNmyFkvJ-CPKukVWS.mjs";
+import { n as describe, r as it, t as globalExpect } from "./test.DNmyFkvJ-N3QqMRwZ.mjs";
 //#region src/usage.test.ts
 const wire = {
 	input_tokens: 94,

package/dist/usage.test.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"usage.test.mjs","names":[],"sources":["../src/usage.test.ts"],"sourcesContent":["import { describe, expect, it } from \"vitest\"\nimport { type WireUsage, emptyAccumulator, mergeUsage } from \"./codec.js\"\nimport { type ProviderEvent, applyEvent } from \"./streamEvents.js\"\n\n// A completed cached turn: input split across post-breakpoint tokens, cache\n// reads, and cache writes, all billed separately.\nconst wire: WireUsage = {\n  input_tokens: 94,\n  output_tokens: 210,\n  cache_read_input_tokens: 31851,\n  cache_creation_input_tokens: 604,\n}\n\ndescribe(\"mergeUsage\", () => {\n  it(\"keeps all three input buckets, not just cache reads\", () => {\n    const usage = mergeUsage(emptyAccumulator, wire).usage\n    expect(usage.input_tokens).toBe(94)\n    expect(usage.input_tokens_details?.cached_tokens).toBe(31851)\n    expect(usage.input_tokens_details?.cache_write_tokens).toBe(604)\n  })\n\n  it(\"totals every input bucket plus output\", () => {\n    const usage = mergeUsage(emptyAccumulator, wire).usage\n    expect(usage.total_tokens).toBe(94 + 31851 + 604 + 210)\n  })\n})\n\ndescribe(\"streamed usage\", () => {\n  // Anthropic sends input + cache on message_start and the final output_tokens\n  // on message_delta. total_tokens must reflect the accumulated buckets, not\n  // the (input + initial output) figure frozen at message_start.\n  it(\"computes a non-stale total across message_start and message_delta\", () => {\n    const start: ProviderEvent = {\n      type: \"message_start\",\n      message: {\n        usage: {\n          input_tokens: 94,\n          output_tokens: 1,\n          cache_read_input_tokens: 31851,\n          cache_creation_input_tokens: 604,\n        },\n      },\n    }\n    const delta: ProviderEvent = {\n      type: \"message_delta\",\n      delta: { stop_reason: \"end_turn\" },\n      usage: { output_tokens: 210 },\n    }\n    const usage = applyEvent(applyEvent(emptyAccumulator, start), delta).usage\n    expect(usage.output_tokens).toBe(210)\n    expect(usage.input_tokens_details?.cache_write_tokens).toBe(604)\n    expect(usage.total_tokens).toBe(94 + 31851 + 604 + 210)\n  })\n})\n"],"mappings":";;;;AAMA,MAAM,OAAkB;CACtB,cAAc;CACd,eAAe;CACf,yBAAyB;CACzB,6BAA6B;CAC9B;AAED,SAAS,oBAAoB;AAC3B,IAAG,6DAA6D;EAC9D,MAAM,QAAQ,WAAW,kBAAkB,KAAK,CAAC;AACjD,eAAO,MAAM,aAAa,CAAC,KAAK,GAAG;AACnC,eAAO,MAAM,sBAAsB,cAAc,CAAC,KAAK,MAAM;AAC7D,eAAO,MAAM,sBAAsB,mBAAmB,CAAC,KAAK,IAAI;GAChE;AAEF,IAAG,+CAA+C;EAChD,MAAM,QAAQ,WAAW,kBAAkB,KAAK,CAAC;AACjD,eAAO,MAAM,aAAa,CAAC,KAAK,MAAuB;GACvD;EACF;AAEF,SAAS,wBAAwB;AAI/B,IAAG,2EAA2E;EAiB5E,MAAM,QAAQ,WAAW,WAAW,kBAAkB;GAfpD,MAAM;GACN,SAAS,EACP,OAAO;IACL,cAAc;IACd,eAAe;IACf,yBAAyB;IACzB,6BAA6B;IAC9B,EACF;GAOwD,CAAC,EAAE;GAJ5D,MAAM;GACN,OAAO,EAAE,aAAa,YAAY;GAClC,OAAO,EAAE,eAAe,KAAK;GAEoC,CAAC,CAAC;AACrE,eAAO,MAAM,cAAc,CAAC,KAAK,IAAI;AACrC,eAAO,MAAM,sBAAsB,mBAAmB,CAAC,KAAK,IAAI;AAChE,eAAO,MAAM,aAAa,CAAC,KAAK,MAAuB;GACvD;EACF"}
+{"version":3,"file":"usage.test.mjs","names":[],"sources":["../src/usage.test.ts"],"sourcesContent":["import { describe, expect, it } from \"vitest\"\nimport { type WireUsage, emptyAccumulator, mergeUsage } from \"./codec.js\"\nimport { type ProviderEvent, applyEvent } from \"./streamEvents.js\"\n\n// A completed cached turn: input split across post-breakpoint tokens, cache\n// reads, and cache writes, all billed separately.\nconst wire: WireUsage = {\n  input_tokens: 94,\n  output_tokens: 210,\n  cache_read_input_tokens: 31851,\n  cache_creation_input_tokens: 604,\n}\n\ndescribe(\"mergeUsage\", () => {\n  it(\"keeps all three input buckets, not just cache reads\", () => {\n    const usage = mergeUsage(emptyAccumulator, wire).usage\n    expect(usage.input_tokens).toBe(94)\n    expect(usage.input_tokens_details?.cached_tokens).toBe(31851)\n    expect(usage.input_tokens_details?.cache_write_tokens).toBe(604)\n  })\n\n  it(\"totals every input bucket plus output\", () => {\n    const usage = mergeUsage(emptyAccumulator, wire).usage\n    expect(usage.total_tokens).toBe(94 + 31851 + 604 + 210)\n  })\n})\n\ndescribe(\"streamed usage\", () => {\n  // Anthropic sends input + cache on message_start and the final output_tokens\n  // on message_delta. total_tokens must reflect the accumulated buckets, not\n  // the (input + initial output) figure frozen at message_start.\n  it(\"computes a non-stale total across message_start and message_delta\", () => {\n    const start: ProviderEvent = {\n      type: \"message_start\",\n      message: {\n        usage: {\n          input_tokens: 94,\n          output_tokens: 1,\n          cache_read_input_tokens: 31851,\n          cache_creation_input_tokens: 604,\n        },\n      },\n    }\n    const delta: ProviderEvent = {\n      type: \"message_delta\",\n      delta: { stop_reason: \"end_turn\" },\n      usage: { output_tokens: 210 },\n    }\n    const usage = applyEvent(applyEvent(emptyAccumulator, start), delta).usage\n    expect(usage.output_tokens).toBe(210)\n    expect(usage.input_tokens_details?.cache_write_tokens).toBe(604)\n    expect(usage.total_tokens).toBe(94 + 31851 + 604 + 210)\n  })\n})\n"],"mappings":";;;;AAMA,MAAM,OAAkB;CACtB,cAAc;CACd,eAAe;CACf,yBAAyB;CACzB,6BAA6B;AAC/B;AAEA,SAAS,oBAAoB;CAC3B,GAAG,6DAA6D;EAC9D,MAAM,QAAQ,WAAW,kBAAkB,IAAI,CAAC,CAAC;EACjD,aAAO,MAAM,YAAY,CAAC,CAAC,KAAK,EAAE;EAClC,aAAO,MAAM,sBAAsB,aAAa,CAAC,CAAC,KAAK,KAAK;EAC5D,aAAO,MAAM,sBAAsB,kBAAkB,CAAC,CAAC,KAAK,GAAG;CACjE,CAAC;CAED,GAAG,+CAA+C;EAChD,MAAM,QAAQ,WAAW,kBAAkB,IAAI,CAAC,CAAC;EACjD,aAAO,MAAM,YAAY,CAAC,CAAC,KAAK,KAAsB;CACxD,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB;CAI/B,GAAG,2EAA2E;EAiB5E,MAAM,QAAQ,WAAW,WAAW,kBAAkB;GAfpD,MAAM;GACN,SAAS,EACP,OAAO;IACL,cAAc;IACd,eAAe;IACf,yBAAyB;IACzB,6BAA6B;GAC/B,EACF;EAOwD,CAAC,GAAG;GAJ5D,MAAM;GACN,OAAO,EAAE,aAAa,WAAW;GACjC,OAAO,EAAE,eAAe,IAAI;EAEoC,CAAC,CAAC,CAAC;EACrE,aAAO,MAAM,aAAa,CAAC,CAAC,KAAK,GAAG;EACpC,aAAO,MAAM,sBAAsB,kBAAkB,CAAC,CAAC,KAAK,GAAG;EAC/D,aAAO,MAAM,YAAY,CAAC,CAAC,KAAK,KAAsB;CACxD,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-uai/anthropic",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Anthropic Messages API provider for @effect-uai/core.",
   "keywords": [
     "ai",
@@ -43,13 +43,13 @@
     "access": "public"
   },
   "devDependencies": {
-    "effect": "4.0.0-beta.94",
-    "typescript": "^6.0.3",
-    "@effect-uai/core": "0.12.0"
+    "effect": "4.0.0-rc.111",
+    "typescript": "^7.0.2",
+    "@effect-uai/core": "0.13.0"
   },
   "peerDependencies": {
     "@effect-uai/core": ">=0.2.0 <1",
-    "effect": ">=4.0.0-beta.94 <5.0.0"
+    "effect": ">=4.0.0-rc.111 <5.0.0"
   },
   "scripts": {
     "build": "tsdown",

package/src/Anthropic.ts

@@ -445,13 +445,10 @@ export const layer = (
   const typed = Layer.effect(Anthropic, make(cfg))
   const generic = Layer.effect(
     LanguageModel,
-    Effect.map(
-      make(cfg),
-      (s): LanguageModelService => ({
-        streamTurn: (request) => s.streamTurn(request as AnthropicRequest),
-        turn: (request) => s.turn(request as AnthropicRequest),
-      }),
-    ),
+    Effect.map(make(cfg), (s): LanguageModelService => ({
+      streamTurn: (request) => s.streamTurn(request as AnthropicRequest),
+      turn: (request) => s.turn(request as AnthropicRequest),
+    })),
   )
   return Layer.merge(typed, generic)
 }

package/src/AnthropicTools.ts

@@ -109,12 +109,10 @@ const renderOne = (
       })
     : decodeConfig(tool.config).pipe(
         Result.map(configToWire),
-        Result.mapError(
-          (): ToolRenderError => ({
-            capability: "providerTool",
-            reason: `unrecognized Anthropic provider tool config on "${tool.name}"`,
-          }),
-        ),
+        Result.mapError((): ToolRenderError => ({
+          capability: "providerTool",
+          reason: `unrecognized Anthropic provider tool config on "${tool.name}"`,
+        })),
       )
 
 /**

package/src/codec.ts

@@ -195,11 +195,9 @@ const itemToAssistantBlocks = (
       function_call: (f) =>
         pipe(
           parseJson(f.arguments),
-          Result.map(
-            (input): ReadonlyArray<RequestAssistantContentBlock> => [
-              { type: "tool_use", id: f.call_id, name: f.name, input },
-            ],
-          ),
+          Result.map((input): ReadonlyArray<RequestAssistantContentBlock> => [
+            { type: "tool_use", id: f.call_id, name: f.name, input },
+          ]),
         ),
       function_call_output: (): Result.Result<
         ReadonlyArray<RequestAssistantContentBlock>,
@@ -373,58 +371,56 @@ export const buildRequestBody = (params: {
 }): Result.Result<RequestBody, JsonParseError> =>
   pipe(
     groupedMessages(params.history),
-    Result.map(
-      (messages): RequestBody => ({
-        model: params.model,
-        messages,
-        max_tokens: params.maxTokens,
-        ...Option.match(systemFromHistory(params.history), {
-          onNone: () => ({}),
-          onSome: (system) => ({ system }),
-        }),
-        ...Option.match(params.temperature, {
-          onNone: () => ({}),
-          onSome: (temperature) => ({ temperature }),
-        }),
-        ...Option.match(params.topP, {
-          onNone: () => ({}),
-          onSome: (top_p) => ({ top_p }),
-        }),
-        ...Option.match(params.topK, {
-          onNone: () => ({}),
-          onSome: (top_k) => ({ top_k }),
-        }),
-        ...Option.match(params.stopSequences, {
-          onNone: () => ({}),
-          onSome: (stop_sequences) => ({ stop_sequences }),
-        }),
-        ...Option.match(params.thinking, {
-          onNone: () => ({}),
-          onSome: (thinking) => ({ thinking }),
-        }),
-        ...Option.match(params.tools, {
-          onNone: () => ({}),
-          onSome: (tools) => ({ tools }),
-        }),
-        ...Option.match(params.toolChoice, {
-          onNone: () => ({}),
-          onSome: (tool_choice) => ({ tool_choice }),
-        }),
-        ...Option.match(params.userId, {
-          onNone: () => ({}),
-          onSome: (user_id) => ({ metadata: { user_id } }),
-        }),
-        ...Option.match(params.outputConfig, {
-          onNone: () => ({}),
-          onSome: (output_config) => ({ output_config }),
-        }),
-        ...Option.match(params.cacheControl, {
-          onNone: () => ({}),
-          onSome: (cache_control) => ({ cache_control }),
-        }),
-        stream: true,
+    Result.map((messages): RequestBody => ({
+      model: params.model,
+      messages,
+      max_tokens: params.maxTokens,
+      ...Option.match(systemFromHistory(params.history), {
+        onNone: () => ({}),
+        onSome: (system) => ({ system }),
       }),
-    ),
+      ...Option.match(params.temperature, {
+        onNone: () => ({}),
+        onSome: (temperature) => ({ temperature }),
+      }),
+      ...Option.match(params.topP, {
+        onNone: () => ({}),
+        onSome: (top_p) => ({ top_p }),
+      }),
+      ...Option.match(params.topK, {
+        onNone: () => ({}),
+        onSome: (top_k) => ({ top_k }),
+      }),
+      ...Option.match(params.stopSequences, {
+        onNone: () => ({}),
+        onSome: (stop_sequences) => ({ stop_sequences }),
+      }),
+      ...Option.match(params.thinking, {
+        onNone: () => ({}),
+        onSome: (thinking) => ({ thinking }),
+      }),
+      ...Option.match(params.tools, {
+        onNone: () => ({}),
+        onSome: (tools) => ({ tools }),
+      }),
+      ...Option.match(params.toolChoice, {
+        onNone: () => ({}),
+        onSome: (tool_choice) => ({ tool_choice }),
+      }),
+      ...Option.match(params.userId, {
+        onNone: () => ({}),
+        onSome: (user_id) => ({ metadata: { user_id } }),
+      }),
+      ...Option.match(params.outputConfig, {
+        onNone: () => ({}),
+        onSome: (output_config) => ({ output_config }),
+      }),
+      ...Option.match(params.cacheControl, {
+        onNone: () => ({}),
+        onSome: (cache_control) => ({ cache_control }),
+      }),
+      stream: true,
+    })),
   )
 
 // ---------------------------------------------------------------------------
@@ -576,52 +572,41 @@ const blocksByIndex = (acc: Accumulator): ReadonlyArray<BlockBuffer> =>
 
 const blockToItems = (block: BlockBuffer): ReadonlyArray<Items.HistoryItem> =>
   Match.value(block.type).pipe(
-    Match.when(
-      "text",
-      (): ReadonlyArray<Items.HistoryItem> =>
-        block.text.length === 0
-          ? []
-          : [
-              {
-                type: "message",
-                role: "assistant",
-                content: [{ type: "output_text", text: block.text }],
-              },
-            ],
-    ),
-    Match.when(
-      "tool_use",
-      (): ReadonlyArray<Items.HistoryItem> => [
-        {
-          type: "function_call",
-          call_id: Option.getOrElse(block.id, () => ""),
-          name: Option.getOrElse(block.name, () => ""),
-          arguments: block.inputJson,
-        },
-      ],
-    ),
-    Match.when(
-      "thinking",
-      (): ReadonlyArray<Items.HistoryItem> => [
-        {
-          type: "reasoning",
-          ...(block.thinking.length > 0 && { summary: block.thinking }),
-          ...(block.signature.length > 0 && { signature: block.signature }),
-        },
-      ],
-    ),
-    Match.when(
-      "redacted_thinking",
-      (): ReadonlyArray<Items.HistoryItem> => [
-        {
-          type: "reasoning",
-          ...Option.match(block.redactedData, {
-            onNone: () => ({}),
-            onSome: (signature) => ({ signature }),
-          }),
-        },
-      ],
+    Match.when("text", (): ReadonlyArray<Items.HistoryItem> =>
+      block.text.length === 0
+        ? []
+        : [
+            {
+              type: "message",
+              role: "assistant",
+              content: [{ type: "output_text", text: block.text }],
+            },
+          ],
     ),
+    Match.when("tool_use", (): ReadonlyArray<Items.HistoryItem> => [
+      {
+        type: "function_call",
+        call_id: Option.getOrElse(block.id, () => ""),
+        name: Option.getOrElse(block.name, () => ""),
+        arguments: block.inputJson,
+      },
+    ]),
+    Match.when("thinking", (): ReadonlyArray<Items.HistoryItem> => [
+      {
+        type: "reasoning",
+        ...(block.thinking.length > 0 && { summary: block.thinking }),
+        ...(block.signature.length > 0 && { signature: block.signature }),
+      },
+    ]),
+    Match.when("redacted_thinking", (): ReadonlyArray<Items.HistoryItem> => [
+      {
+        type: "reasoning",
+        ...Option.match(block.redactedData, {
+          onNone: () => ({}),
+          onSome: (signature) => ({ signature }),
+        }),
+      },
+    ]),
     Match.exhaustive,
   )