dspy-anthropic 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b0fc4e9033f850fe60e3bea0f99c90d055069d89736cdde636d4bd0e340d72
-  data.tar.gz: fcd89c5568e9227cc56aff466a0c3ec9f500fc7d288ae8ef48cc20bc31d814a9
+  metadata.gz: 2b563f892087546b395c4c279b09684339170eb112898941d3129ac48f804cbf
+  data.tar.gz: 54f15263e44abd8b6feca18a9569973ee952c6dd9373e4302db9ed66e46811c3
 SHA512:
-  metadata.gz: 699456b578d3f003c41c06bc106d52bcb8405569c48dfa11a5edbdc09e6522cae73f0c2b46453b5f213626ec4c6dcb3b3da8614f9f26f7a1f33f1076356dee8e
-  data.tar.gz: 4e3fb2612ae552b00cff15219e7a0e1b10a6be838586a9e4bc2b747e4737f0cf1197a357a0632c31b235f73620f04eca3595c5aa2d46a99fef48f34d66fa9af7
+  metadata.gz: e78bbfb62abdd747b2dbf0d31da401078eeab71c09a6411d78097769baae4a8d96f1c142617741b203031ba9494e6b99581d5c4a9dbc81e1c40fe8ca221bffa7
+  data.tar.gz: 9369dadfb40f324a0f27cf8cdb912245ec214a0e13c676865b561a8886f4a12b0059c4e3b0b67b75b923df7e4a3604462b48d0b8a7807508e1641e0f044173e5

data/README.md

@@ -137,26 +137,18 @@ result.answer     # => "60 km/h"
 Build agents that use tools to accomplish tasks:
 
 ```ruby
-class SearchTool < DSPy::Tools::Tool
+class SearchTool < DSPy::Tools::Base
   tool_name "search"
-  description "Search for information"
-
-  input do
-    const :query, String
-  end
-
-  output do
-    const :results, T::Array[String]
-  end
+  tool_description "Search for information"
 
+  sig { params(query: String).returns(String) }
   def call(query:)
     # Your search implementation
-    { results: ["Result 1", "Result 2"] }
+    "Result 1, Result 2"
   end
 end
 
-toolset = DSPy::Tools::Toolset.new(tools: [SearchTool.new])
-agent = DSPy::ReAct.new(signature: ResearchTask, tools: toolset, max_iterations: 5)
+agent = DSPy::ReAct.new(ResearchTask, tools: [SearchTool.new], max_iterations: 5)
 result = agent.call(question: "What's the latest on Ruby 3.4?")
 ```
 
@@ -185,8 +177,8 @@ result = agent.call(question: "What's the latest on Ruby 3.4?")
 A [Claude Skill](https://github.com/vicentereig/dspy-rb-skill) is available to help you build DSPy.rb applications:
 
 ```bash
-# Claude Code
-git clone https://github.com/vicentereig/dspy-rb-skill ~/.claude/skills/dspy-rb
+# Claude Code — install from the vicentereig/engineering marketplace
+claude install-skill vicentereig/engineering --skill dspy-rb
 ```
 
 For Claude.ai Pro/Max, download the [skill ZIP](https://github.com/vicentereig/dspy-rb-skill/archive/refs/heads/main.zip) and upload via Settings > Skills.
@@ -201,7 +193,7 @@ The [examples/](examples/) directory has runnable code for common patterns:
 - Prompt optimization
 
 ```bash
-bundle exec ruby examples/first_predictor.rb
+bundle exec ruby examples/basic_search_agent.rb
 ```
 
 ## Optional Gems

data/lib/dspy/anthropic/lm/adapters/anthropic_adapter.rb

@@ -26,17 +26,21 @@ module DSPy
             if contains_images?(normalized_messages)
               DSPy::LM::VisionModels.validate_vision_support!('anthropic', model)
               # Convert messages to Anthropic format with proper image handling
-              normalized_messages = format_multimodal_messages(normalized_messages)
+              normalized_messages = format_multimodal_messages(normalized_messages, 'anthropic')
             end
 
             # Anthropic requires system message to be separate from messages
             system_message, user_messages = extract_system_message(normalized_messages)
 
+            # Extract Beta API parameters if present
+            output_format = extra_params.delete(:output_format)
+            betas = extra_params.delete(:betas)
+
             # Check if this is a tool use request
             has_tools = extra_params.key?(:tools) && !extra_params[:tools].empty?
 
-            # Apply JSON prefilling if needed for better Claude JSON compliance (but not for tool use)
-            unless has_tools || contains_images?(normalized_messages)
+            # Apply JSON prefilling if needed for better Claude JSON compliance (but not for tool use or Beta API)
+            unless has_tools || output_format || contains_images?(normalized_messages)
               user_messages = prepare_messages_for_json(user_messages, system_message)
             end
 
@@ -58,11 +62,21 @@ module DSPy
             begin
               if block_given?
                 content = ""
-                @client.messages.stream(**request_params) do |chunk|
-                  if chunk.respond_to?(:delta) && chunk.delta.respond_to?(:text)
-                    chunk_text = chunk.delta.text
-                    content += chunk_text
-                    block.call(chunk)
+                if output_format
+                  @client.beta.messages.stream(**request_params, output_format: output_format, betas: betas) do |chunk|
+                    if chunk.respond_to?(:delta) && chunk.delta.respond_to?(:text)
+                      chunk_text = chunk.delta.text
+                      content += chunk_text
+                      block.call(chunk)
+                    end
+                  end
+                else
+                  @client.messages.stream(**request_params) do |chunk|
+                    if chunk.respond_to?(:delta) && chunk.delta.respond_to?(:text)
+                      chunk_text = chunk.delta.text
+                      content += chunk_text
+                      block.call(chunk)
+                    end
                   end
                 end
 
@@ -78,7 +92,11 @@ module DSPy
                   metadata: metadata
                 )
               else
-                response = @client.messages.create(**request_params)
+                response = if output_format
+                  @client.beta.messages.create(**request_params, output_format: output_format, betas: betas)
+                else
+                  @client.messages.create(**request_params)
+                end
 
                 if response.respond_to?(:error) && response.error
                   raise DSPy::LM::AdapterError, "Anthropic API error: #{response.error}"
@@ -127,7 +145,7 @@ module DSPy
                   metadata: typed_metadata
                 )
               end
-            rescue => e
+            rescue StandardError => e
               # Check for specific image-related errors in the message
               error_msg = e.message.to_s
 
@@ -267,33 +285,6 @@ module DSPy
 
             [system_message, user_messages]
           end
-
-          def format_multimodal_messages(messages)
-            messages.map do |msg|
-              if msg[:content].is_a?(Array)
-                # Convert multimodal content to Anthropic format
-                formatted_content = msg[:content].map do |item|
-                  case item[:type]
-                  when 'text'
-                    { type: 'text', text: item[:text] }
-                  when 'image'
-                    # Validate image compatibility before formatting
-                    item[:image].validate_for_provider!('anthropic')
-                    item[:image].to_anthropic_format
-                  else
-                    item
-                  end
-                end
-
-                {
-                  role: msg[:role],
-                  content: formatted_content
-                }
-              else
-                msg
-              end
-            end
-          end
         end
       end
     end

data/lib/dspy/anthropic/lm/schema_converter.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+
+module DSPy
+  module Anthropic
+    module LM
+      # Converts DSPy signatures to Anthropic Beta API structured output format
+      module SchemaConverter
+        extend T::Sig
+
+        sig { params(signature_class: T.class_of(DSPy::Signature)).returns(T::Hash[Symbol, T.untyped]) }
+        def self.to_beta_format(signature_class)
+          schema = signature_class.output_json_schema.except(:$schema)
+          add_additional_properties_false(schema)
+        end
+
+        sig { params(schema: T.untyped).returns(T.untyped) }
+        def self.add_additional_properties_false(schema)
+          return schema unless schema.is_a?(Hash)
+
+          result = schema.dup
+
+          # Add additionalProperties: false to any object type
+          result[:additionalProperties] = false if result[:type] == "object"
+
+          # Process nested properties
+          if result[:properties].is_a?(Hash)
+            result[:properties] = result[:properties].transform_values do |v|
+              add_additional_properties_false(v)
+            end
+          end
+
+          # Process array items
+          if result[:items].is_a?(Hash)
+            result[:items] = add_additional_properties_false(result[:items])
+          elsif result[:items].is_a?(Array)
+            result[:items] = result[:items].map { |item| add_additional_properties_false(item) }
+          end
+
+          # Process oneOf, anyOf, allOf arrays
+          [:oneOf, :anyOf, :allOf].each do |key|
+            if result[key].is_a?(Array)
+              result[key] = result[key].map { |item| add_additional_properties_false(item) }
+            end
+          end
+
+          # Process definitions
+          [:definitions, :$defs].each do |key|
+            if result[key].is_a?(Hash)
+              result[key] = result[key].transform_values { |v| add_additional_properties_false(v) }
+            end
+          end
+
+          result
+        end
+      end
+    end
+  end
+end

data/lib/dspy/anthropic/version.rb

@@ -2,6 +2,6 @@
 
 module DSPy
   module Anthropic
-    VERSION = '1.0.2'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dspy-anthropic
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Vicente Reig Rincón de Arellano
@@ -51,6 +51,7 @@ files:
 - lib/dspy/anthropic/errors.rb
 - lib/dspy/anthropic/guardrails.rb
 - lib/dspy/anthropic/lm/adapters/anthropic_adapter.rb
+- lib/dspy/anthropic/lm/schema_converter.rb
 - lib/dspy/anthropic/version.rb
 homepage: https://github.com/vicentereig/dspy.rb
 licenses: