dspy 0.27.3 → 0.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d697eb8eb574ca5c23914c1911f1d7a03ad7411aa83b19bedf2231cacc544460
-  data.tar.gz: 3086cbaa86d01b0dd09512c9f5893f8a31b8d9988eed6782a967c24e1c12fb01
+  metadata.gz: d8a0e5d292482730715265985f5334aa60853c2146c9dde2dc18ffa9b882ca6d
+  data.tar.gz: 9ae0827c01495b38b9250714254d841948a1191b74e3f7af59360f1b2e4705c1
 SHA512:
-  metadata.gz: eae9e4cba177e6cea359f1ffd55ebaa4203cc5a6594b86ab5fc2b9b9e8c54cf24838a8d18102ab96fc9a8f4b85827c3cb02ef0b75c3d077c6c70301abb52f48d
-  data.tar.gz: ecc26be5f85df66e911a71d5a1fa878cc42c79c7d63e42b2d1440836859814837f4ba782db18584161598867a5aef5ebbfef056a2988b4208767b8e0c1999013
+  metadata.gz: b7912c2a40ea8f036211bf7553cac71746cfbf0b24790cb3a69df0bf513771fbcdf7d317d5e492ea8354b46acca0b17d62bd02a3a2debaf191343ff7934df68c
+  data.tar.gz: cafc3cd07f94829e3aae3277630c2a875b6c2cfb982ca64fa493531b6274fe10079fca447824b42d31d8d1a7a4bb43714e5256d3ce7505e31b01a5d4b10007df

data/lib/dspy/lm/adapter_factory.rb

@@ -9,9 +9,12 @@ module DSPy
         'openai' => 'OpenAIAdapter',
         'anthropic' => 'AnthropicAdapter',
         'ollama' => 'OllamaAdapter',
-        'gemini' => 'GeminiAdapter'
+        'gemini' => 'GeminiAdapter',
+        'openrouter' => 'OpenrouterAdapter'
       }.freeze
 
+      PROVIDERS_WITH_EXTRA_OPTIONS = %w[openai ollama gemini openrouter].freeze
+
       class << self
         # Creates an adapter instance based on model_id
         # @param model_id [String] Full model identifier (e.g., "openai/gpt-4")
@@ -24,8 +27,8 @@ module DSPy
           
           # Pass provider-specific options
           adapter_options = { model: model, api_key: api_key }
-          # OpenAI, Ollama, and Gemini accept additional options
-          adapter_options.merge!(options) if %w[openai ollama gemini].include?(provider)
+          # Some providers accept additional options
+          adapter_options.merge!(options) if PROVIDERS_WITH_EXTRA_OPTIONS.include?(provider)
           
           adapter_class.new(**adapter_options)
         end

data/lib/dspy/lm/adapters/gemini/schema_converter.rb

@@ -11,24 +11,29 @@ module DSPy
           extend T::Sig
 
           # Models that support structured outputs (JSON + Schema)
-          # Based on official Google documentation and gemini-ai gem table
+          # Based on official Google documentation (Sept 2025)
           STRUCTURED_OUTPUT_MODELS = T.let([
-            "gemini-1.5-pro",              # ✅ Full schema support (legacy)
-            "gemini-1.5-pro-preview-0514", # ✅ Full schema support (legacy)
-            "gemini-1.5-pro-preview-0409", # ✅ Full schema support (legacy)
-            "gemini-2.5-flash",            # ✅ Full schema support (2025 current)
-            "gemini-2.5-flash-lite"        # ✅ Full schema support (2025 current)
+            # Gemini 1.5 series
+            "gemini-1.5-pro",
+            "gemini-1.5-pro-preview-0514",
+            "gemini-1.5-pro-preview-0409", 
+            "gemini-1.5-flash",             # ✅ Now supports structured outputs
+            "gemini-1.5-flash-8b",
+            # Gemini 2.0 series
+            "gemini-2.0-flash",
+            "gemini-2.0-flash-001",
+            # Gemini 2.5 series
+            "gemini-2.5-pro",
+            "gemini-2.5-flash", 
+            "gemini-2.5-flash-lite"
           ].freeze, T::Array[String])
 
-          # Models that support JSON mode but NOT schema
-          JSON_ONLY_MODELS = T.let([
-            "gemini-pro",                   # 🟡 JSON only, no schema
-            "gemini-1.5-flash",             # 🟡 JSON only, no schema (legacy)
-            "gemini-1.5-flash-preview-0514", # 🟡 JSON only, no schema (legacy)
-            "gemini-1.0-pro-002",           # 🟡 JSON only, no schema
-            "gemini-1.0-pro",               # 🟡 JSON only, no schema
-            "gemini-2.0-flash-001",         # 🟡 JSON only, no schema (2025)
-            "gemini-2.0-flash-lite-001"     # 🟡 JSON only, no schema (2025)
+          # Models that do not support structured outputs (legacy only)
+          UNSUPPORTED_MODELS = T.let([
+            # Legacy Gemini 1.0 series only
+            "gemini-pro",                   
+            "gemini-1.0-pro-002",
+            "gemini-1.0-pro"
           ].freeze, T::Array[String])
 
           sig { params(signature_class: T.class_of(DSPy::Signature)).returns(T::Hash[Symbol, T.untyped]) }

data/lib/dspy/lm/adapters/gemini_adapter.rb

@@ -14,11 +14,16 @@ module DSPy
         @structured_outputs_enabled = structured_outputs
         
         # Disable streaming for VCR tests since SSE responses don't record properly
+        # But keep streaming enabled for SSEVCR tests (SSE-specific cassettes)
         @use_streaming = true
         begin
-          @use_streaming = false if defined?(VCR) && VCR.current_cassette
+          vcr_active = defined?(VCR) && VCR.current_cassette
+          ssevcr_active = defined?(SSEVCR) && SSEVCR.turned_on?
+          
+          # Only disable streaming if regular VCR is active but SSEVCR is not
+          @use_streaming = false if vcr_active && !ssevcr_active
         rescue
-          # If VCR is not available or any error occurs, use streaming
+          # If VCR/SSEVCR is not available or any error occurs, use streaming
           @use_streaming = true
         end
 

data/lib/dspy/lm/adapters/openai_adapter.rb

@@ -29,10 +29,9 @@ module DSPy
           normalized_messages = handle_o1_messages(normalized_messages)
         end
 
-        request_params = {
-          model: model,
+        request_params = default_request_params.merge(
           messages: normalized_messages
-        }
+        )
 
         # Add temperature based on model capabilities  
         unless o1_model?(model)
@@ -123,6 +122,15 @@ module DSPy
         end
       end
 
+      protected
+
+      # Allow subclasses to override request params (add headers, etc)
+      def default_request_params
+        {
+          model: model
+        }
+      end
+
       private
 
       def supports_structured_outputs?

data/lib/dspy/lm/adapters/openrouter_adapter.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'openai'
+
+module DSPy
+  class LM
+    class OpenrouterAdapter < OpenAIAdapter
+      BASE_URL = 'https://openrouter.ai/api/v1'
+
+      def initialize(model:, api_key: nil, structured_outputs: true, http_referrer: nil, x_title: nil)
+        # Don't call parent's initialize, do it manually to control client creation
+        @model = model
+        @api_key = api_key
+        @structured_outputs_enabled = structured_outputs
+
+        @http_referrer = http_referrer
+        @x_title = x_title
+
+        validate_configuration!
+
+        # Create client with custom base URL
+        @client = OpenAI::Client.new(
+          api_key: @api_key,
+          base_url: BASE_URL
+        )
+      end
+
+      def chat(messages:, signature: nil, response_format: nil, &block)
+        # For OpenRouter, we need to be more lenient with structured outputs
+        # as the model behind it may not fully support OpenAI's response_format spec
+        begin
+          super
+        rescue => e
+          # If structured output fails, retry with enhanced prompting
+          if @structured_outputs_enabled && signature && e.message.include?('response_format')
+            DSPy.logger.debug("OpenRouter structured output failed, falling back to enhanced prompting")
+            @structured_outputs_enabled = false
+            retry
+          else
+            raise
+          end
+        end
+      end
+
+      protected
+
+      # Add any OpenRouter-specific headers to all requests
+      def default_request_params
+        headers = {
+          'X-Title' => @x_title,
+          'HTTP-Referer' => @http_referrer
+        }.compact
+
+        upstream_params = super
+        upstream_params.merge!(request_options: { extra_headers: headers }) if headers.any?
+        upstream_params
+      end
+
+      private
+
+      def supports_structured_outputs?
+        # Different models behind OpenRouter may have different capabilities
+        # For now, we rely on whatever was passed to the constructor
+        @structured_outputs_enabled
+      end
+    end
+  end
+end

data/lib/dspy/lm.rb

@@ -17,6 +17,7 @@ require_relative 'lm/adapters/openai_adapter'
 require_relative 'lm/adapters/anthropic_adapter'
 require_relative 'lm/adapters/ollama_adapter'
 require_relative 'lm/adapters/gemini_adapter'
+require_relative 'lm/adapters/openrouter_adapter'
 
 # Load strategy system
 require_relative 'lm/strategy_selector'

data/lib/dspy/observability/async_span_processor.rb

@@ -107,6 +107,7 @@ module DSPy
 
       def start_export_task
         return if @export_interval <= 0 # Disable timer for testing
+        return if ENV['DSPY_DISABLE_OBSERVABILITY'] == 'true' # Skip in tests
 
         # Start timer-based export task in background
         Thread.new do
@@ -129,6 +130,7 @@ module DSPy
 
       def trigger_export_if_batch_full
         return if @queue.size < @export_batch_size
+        return if ENV['DSPY_DISABLE_OBSERVABILITY'] == 'true' # Skip in tests
 
         # Trigger immediate export in background
         Thread.new do

data/lib/dspy/observability.rb

@@ -11,6 +11,12 @@ module DSPy
       def configure!
         @enabled = false
         
+        # Check for explicit disable flag first
+        if ENV['DSPY_DISABLE_OBSERVABILITY'] == 'true'
+          DSPy.log('observability.disabled', reason: 'Explicitly disabled via DSPY_DISABLE_OBSERVABILITY')
+          return
+        end
+        
         # Check for required Langfuse environment variables
         public_key = ENV['LANGFUSE_PUBLIC_KEY']
         secret_key = ENV['LANGFUSE_SECRET_KEY']
@@ -130,6 +136,17 @@ module DSPy
 
       def reset!
         @enabled = false
+        
+        # Shutdown OpenTelemetry if it's configured
+        if defined?(OpenTelemetry) && OpenTelemetry.tracer_provider
+          begin
+            OpenTelemetry.tracer_provider.shutdown(timeout: 1.0)
+          rescue => e
+            # Ignore shutdown errors in tests - log them but don't fail
+            DSPy.log('observability.shutdown_error', error: e.message) if respond_to?(:log)
+          end
+        end
+        
         @tracer = nil
         @endpoint = nil
       end

data/lib/dspy/re_act.rb

@@ -369,13 +369,22 @@ module DSPy
     sig { params(input_kwargs: T::Hash[Symbol, T.untyped], reasoning_result: T::Hash[Symbol, T.untyped]).returns(T.untyped) }
     def create_enhanced_result(input_kwargs, reasoning_result)
       output_field_name = @original_signature_class.output_struct_class.props.keys.first
+      final_answer = reasoning_result[:final_answer]
 
       output_data = input_kwargs.merge({
         history: reasoning_result[:history].map(&:to_h),
         iterations: reasoning_result[:iterations],
         tools_used: reasoning_result[:tools_used]
       })
-      output_data[output_field_name] = reasoning_result[:final_answer]
+
+      # Check if final_answer is a String but the expected type is NOT String
+      # This happens when max iterations is reached or the LLM generates an error message
+      output_field_type = @original_signature_class.output_struct_class.props[output_field_name][:type_object]
+      if final_answer.is_a?(String) && !string_compatible_type?(output_field_type)
+        output_data[output_field_name] = default_value_for_type(output_field_type)
+      else
+        output_data[output_field_name] = final_answer
+      end
 
       @enhanced_output_struct.new(**output_data)
     end
@@ -502,6 +511,56 @@ module DSPy
       "No answer reached within #{@max_iterations} iterations"
     end
 
+    # Checks if a type is String or compatible with String (e.g., T.any(String, ...) or T.nilable(String))
+    sig { params(type_object: T.untyped).returns(T::Boolean) }
+    def string_compatible_type?(type_object)
+      case type_object
+      when T::Types::Simple
+        type_object.raw_type == String
+      when T::Types::Union
+        # Check if any of the union types is String
+        type_object.types.any? { |t| t.is_a?(T::Types::Simple) && t.raw_type == String }
+      else
+        false
+      end
+    end
+
+    # Returns an appropriate default value for a given Sorbet type
+    # This is used when max iterations is reached without a successful completion
+    sig { params(type_object: T.untyped).returns(T.untyped) }
+    def default_value_for_type(type_object)
+      # Handle TypedArray (T::Array[...])
+      if type_object.is_a?(T::Types::TypedArray)
+        return []
+      end
+
+      # Handle TypedHash (T::Hash[...])
+      if type_object.is_a?(T::Types::TypedHash)
+        return {}
+      end
+
+      # Handle simple types
+      case type_object
+      when T::Types::Simple
+        raw_type = type_object.raw_type
+        case raw_type.to_s
+        when 'String' then ''
+        when 'Integer' then 0
+        when 'Float' then 0.0
+        when 'TrueClass', 'FalseClass' then false
+        else
+          # For T::Struct types, return nil as fallback
+          nil
+        end
+      when T::Types::Union
+        # For unions, return nil (assuming it's nilable) or first non-nil default
+        nil
+      else
+        # Default fallback for unknown types
+        nil
+      end
+    end
+
     # Tool execution method
     sig { params(action: String, action_input: T.untyped).returns(String) }
     def execute_action(action, action_input)

data/lib/dspy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DSPy
-  VERSION = "0.27.3"
+  VERSION = "0.27.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dspy
 version: !ruby/object:Gem::Version
-  version: 0.27.3
+  version: 0.27.5
 platform: ruby
 authors:
 - Vicente Reig Rincón de Arellano
 bindir: bin
 cert_chain: []
-date: 2025-09-20 00:00:00.000000000 Z
+date: 2025-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -212,6 +212,7 @@ files:
 - lib/dspy/lm/adapters/ollama_adapter.rb
 - lib/dspy/lm/adapters/openai/schema_converter.rb
 - lib/dspy/lm/adapters/openai_adapter.rb
+- lib/dspy/lm/adapters/openrouter_adapter.rb
 - lib/dspy/lm/errors.rb
 - lib/dspy/lm/message.rb
 - lib/dspy/lm/message_builder.rb