@effect/ai-anthropic 0.19.2 → 0.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai-anthropic",
-  "version": "0.19.2",
+  "version": "0.20.0",
   "description": "Effect modules for working with AI apis",
   "license": "MIT",
   "repository": {
@@ -14,10 +14,10 @@
     "@anthropic-ai/tokenizer": "^0.0.4"
   },
   "peerDependencies": {
-    "@effect/ai": "^0.29.1",
-    "@effect/platform": "^0.92.1",
+    "@effect/ai": "^0.30.0",
     "@effect/experimental": "^0.56.0",
-    "effect": "^3.18.2"
+    "@effect/platform": "^0.92.1",
+    "effect": "^3.18.4"
   },
   "publishConfig": {
     "provenance": true

package/src/AnthropicLanguageModel.ts

@@ -326,7 +326,6 @@ export const make = Effect.fnUntraced(function*(options: {
       const context = yield* Effect.context<never>()
       const config = { model: options.model, ...options.config, ...context.unsafeMap.get(Config.key) }
       const { betas: messageBetas, messages, system } = yield* prepareMessages(providerOptions)
-      console.dir({ messages }, { depth: null, colors: true })
       const { betas: toolBetas, toolChoice, tools } = yield* prepareTools(providerOptions, config)
       const responseFormat = providerOptions.responseFormat
       const request: typeof Generated.BetaCreateMessageParams.Encoded = {
@@ -573,11 +572,26 @@ const prepareMessages: (options: LanguageModel.ProviderOptions) => Effect.Effect
 
             // TODO: advanced tool result content parts
             case "tool": {
-              for (const part of message.content) {
+              for (let j = 0; j < message.content.length; j++) {
+                const part = message.content[j]
+                const isLastPart = j === message.content.length - 1
+
+                // Attempt to get the cache control from the part first. If
+                // the part does not have cache control defined and we are
+                // evaluating the last part for this message, also check the
+                // message for cache control.
+                const cacheControl = getCacheControl(part) ?? (
+                  isLastPart ? getCacheControl(message) : undefined
+                )
+
+                const result = part.result._tag === "Right" ? part.result.right : part.result.left
+                const isError = part.result._tag === "Left"
                 content.push({
                   type: "tool_result",
                   tool_use_id: part.id,
-                  content: JSON.stringify(part.result)
+                  content: JSON.stringify(result),
+                  is_error: isError,
+                  cache_control: cacheControl
                 })
               }
 
@@ -675,24 +689,23 @@ const prepareMessages: (options: LanguageModel.ProviderOptions) => Effect.Effect
               }
 
               case "tool-result": {
+                const result = part.result._tag === "Right"
+                  ? part.result.right
+                  : part.result.left
                 if (part.name === "AnthropicCodeExecution") {
-                  if (Predicate.hasProperty(part.result, "right")) {
-                    content.push({
-                      type: "code_execution_tool_result",
-                      tool_use_id: part.id,
-                      content: part.result.right as any,
-                      cache_control: cacheControl
-                    })
-                  }
+                  content.push({
+                    type: "code_execution_tool_result",
+                    tool_use_id: part.id,
+                    content: result as any,
+                    cache_control: cacheControl
+                  })
                 } else if (part.name === "AnthropicWebSearch") {
-                  if (Predicate.hasProperty(part.result, "right")) {
-                    content.push({
-                      type: "web_search_tool_result",
-                      tool_use_id: part.id,
-                      content: part.result.right as any,
-                      cache_control: cacheControl
-                    })
-                  }
+                  content.push({
+                    type: "web_search_tool_result",
+                    tool_use_id: part.id,
+                    content: result as any,
+                    cache_control: cacheControl
+                  })
                 } else {
                   return yield* new AiError.MalformedInput({
                     module: "AnthropicLanguageModel",
@@ -828,31 +841,63 @@ const makeResponse: (
           break
         }
 
-        case "code_execution_tool_result":
-        case "bash_code_execution_tool_result":
-        case "text_editor_code_execution_tool_result": {
+        case "bash_code_execution_tool_result": {
+          const result = part.content.type === "bash_code_execution_result"
+            ? { _tag: "Right", right: part.content } as const
+            : { _tag: "Left", left: part.content } as const
+          parts.push({
+            type: "tool-result",
+            id: part.tool_use_id,
+            name: "AnthropicCodeExecution",
+            result,
+            providerName: "code_execution",
+            providerExecuted: true
+          })
+          break
+        }
+
+        case "code_execution_tool_result": {
+          const result = part.content.type === "code_execution_result"
+            ? { _tag: "Right", right: part.content } as const
+            : { _tag: "Left", left: part.content } as const
           parts.push({
             type: "tool-result",
             id: part.tool_use_id,
             name: "AnthropicCodeExecution",
-            result: part.content,
+            result,
             providerName: "code_execution",
             providerExecuted: true
           })
+          break
+        }
 
+        case "text_editor_code_execution_tool_result": {
+          const result = part.content.type === "text_editor_code_execution_tool_result_error"
+            ? { _tag: "Left", left: part.content } as const
+            : { _tag: "Right", right: part.content } as const
+          parts.push({
+            type: "tool-result",
+            id: part.tool_use_id,
+            name: "AnthropicCodeExecution",
+            result,
+            providerName: "code_execution",
+            providerExecuted: true
+          })
           break
         }
 
         case "web_search_tool_result": {
+          const result = Array.isArray(part.content)
+            ? { _tag: "Right", right: part.content } as const
+            : { _tag: "Left", left: part.content } as const
           parts.push({
             type: "tool-result",
             id: part.tool_use_id,
             name: "AnthropicWebSearch",
-            result: part.content,
+            result,
             providerName: "web_search",
             providerExecuted: true
           })
-
           break
         }
       }
@@ -1088,31 +1133,71 @@ const makeStreamResponse: (
                 break
               }
 
-              case "code_execution_tool_result":
-              case "bash_code_execution_tool_result":
-              case "text_editor_code_execution_tool_result": {
+              case "bash_code_execution_tool_result": {
+                const toolUseId = event.content_block.tool_use_id
+                const content = event.content_block.content
+                const result = content.type === "bash_code_execution_result"
+                  ? { _tag: "Right", right: content } as const
+                  : { _tag: "Left", left: content } as const
+                parts.push({
+                  type: "tool-result",
+                  id: toolUseId,
+                  name: "AnthropicCodeExecution",
+                  result,
+                  providerName: "code_execution",
+                  providerExecuted: true
+                })
+                break
+              }
+
+              case "code_execution_tool_result": {
+                const toolUseId = event.content_block.tool_use_id
+                const content = event.content_block.content
+                const result = content.type === "code_execution_result"
+                  ? { _tag: "Right", right: content } as const
+                  : { _tag: "Left", left: content } as const
                 parts.push({
                   type: "tool-result",
-                  id: event.content_block.tool_use_id,
+                  id: toolUseId,
                   name: "AnthropicCodeExecution",
-                  result: event.content_block.content,
+                  result,
                   providerName: "code_execution",
                   providerExecuted: true
                 })
+                break
+              }
 
+              case "text_editor_code_execution_tool_result": {
+                const toolUseId = event.content_block.tool_use_id
+                const content = event.content_block.content
+                const result = content.type === "text_editor_code_execution_tool_result_error"
+                  ? { _tag: "Left", left: content } as const
+                  : { _tag: "Right", right: content } as const
+                parts.push({
+                  type: "tool-result",
+                  id: toolUseId,
+                  name: "AnthropicCodeExecution",
+                  result,
+                  providerName: "code_execution",
+                  providerExecuted: true
+                })
                 break
               }
 
               case "web_search_tool_result": {
+                const toolUseId = event.content_block.tool_use_id
+                const content = event.content_block.content
+                const result = Array.isArray(content)
+                  ? { _tag: "Right", right: content } as const
+                  : { _tag: "Left", left: content } as const
                 parts.push({
                   type: "tool-result",
-                  id: event.content_block.tool_use_id,
+                  id: toolUseId,
                   name: "AnthropicWebSearch",
-                  result: event.content_block.content,
+                  result,
                   providerName: "web_search",
                   providerExecuted: true
                 })
-
                 break
               }
             }