dspy 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0e7cf901df85567e1553a3d7df8659a71f254fa5671803ea98f0573de0c39a
-  data.tar.gz: b2d5d37cb05678f97143a1463410d92848ba10178bd50d60ee384827e9efe9b1
+  metadata.gz: 8b377060443eeb9c3c5d975e76750d6c519d1b93cf6f20dc6ad20bcda08d1ca4
+  data.tar.gz: 4580845b3fd9991b531c8c2bd809595cbd3328da57a23e58307cdbe52e3822bc
 SHA512:
-  metadata.gz: 0d870f2d338fcdce0540143decd3674e94a9c24e5fad796536772e6c8064af75dcafc36533bf39a0a1eeefac30777de1d6541a3ab57eb2568a007260d7a5d7a3
-  data.tar.gz: 13f92278a81ca870f90b662fa40972e41aa6203d27a8792d3d03c13b97d971d7684a0f661dfb86bf03ef5c58e4a8f2f57c2ac48414ed9b8f8e5f0bce7628f231
+  metadata.gz: 444a5e08364b2e996bf49d230cb9a94a1930e26d2ea796cd0104ea4888b45ade4099cec502b92c08752631adff47b1d9d1897da9209e9faabbb28fb6761935b0
+  data.tar.gz: c1b3a83482c861923304c463d6f0b1c9042fbc31da920526ec18ed0f5148b4408a9023d312eded9263ca2d706e4779b78526e28dc50a17458cbbac9afa56b024

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

@@ -11,29 +11,32 @@ module DSPy
           extend T::Sig
 
           # Models that support structured outputs (JSON + Schema)
-          # Based on official Google documentation (Sept 2025)
+          # Based on official Google documentation: https://ai.google.dev/gemini-api/docs/models/gemini
+          # Last updated: Oct 2025
+          # Note: Gemini 1.5 series deprecated Oct 2025
           STRUCTURED_OUTPUT_MODELS = T.let([
-            # 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.0-flash-lite",
+            # Gemini 2.5 series (current)
             "gemini-2.5-pro",
-            "gemini-2.5-flash", 
-            "gemini-2.5-flash-lite"
+            "gemini-2.5-flash",
+            "gemini-2.5-flash-lite",
+            "gemini-2.5-flash-image"
           ].freeze, T::Array[String])
 
-          # Models that do not support structured outputs (legacy only)
+          # Models that do not support structured outputs or are deprecated
           UNSUPPORTED_MODELS = T.let([
-            # Legacy Gemini 1.0 series only
-            "gemini-pro",                   
+            # Legacy Gemini 1.0 series
+            "gemini-pro",
             "gemini-1.0-pro-002",
-            "gemini-1.0-pro"
+            "gemini-1.0-pro",
+            # Deprecated Gemini 1.5 series (removed Oct 2025)
+            "gemini-1.5-pro",
+            "gemini-1.5-pro-preview-0514",
+            "gemini-1.5-pro-preview-0409",
+            "gemini-1.5-flash",
+            "gemini-1.5-flash-8b"
           ].freeze, T::Array[String])
 
           sig { params(signature_class: T.class_of(DSPy::Signature)).returns(T::Hash[Symbol, T.untyped]) }
@@ -111,7 +114,13 @@ module DSPy
             case property_schema[:type]
             when "string"
               result = { type: "string" }
-              result[:enum] = property_schema[:enum] if property_schema[:enum]
+              # Gemini responseJsonSchema doesn't support const, so convert to single-value enum
+              # See: https://ai.google.dev/api/generate-content#FIELDS.response_json_schema
+              if property_schema[:const]
+                result[:enum] = [property_schema[:const]]
+              elsif property_schema[:enum]
+                result[:enum] = property_schema[:enum]
+              end
               result
             when "integer"
               { type: "integer" }

data/lib/dspy/lm/json_strategy.rb

@@ -102,11 +102,6 @@ module DSPy
           type: "tool",
           name: "json_output"
         }
-
-        # Update last user message
-        if messages.any? && messages.last[:role] == "user"
-          messages.last[:content] += "\n\nPlease use the json_output tool to provide your response."
-        end
       end
 
       # Gemini preparation

data/lib/dspy/lm.rb

@@ -26,6 +26,7 @@ require_relative 'lm/json_strategy'
 # Load message builder and message types
 require_relative 'lm/message'
 require_relative 'lm/message_builder'
+require_relative 'structured_outputs_prompt'
 
 module DSPy
   class LM
@@ -176,26 +177,53 @@ module DSPy
 
     def build_messages(inference_module, input_values)
       messages = []
-      
+
+      # Determine if structured outputs will be used and wrap prompt if so
+      base_prompt = inference_module.prompt
+      prompt = if will_use_structured_outputs?(inference_module.signature_class)
+        StructuredOutputsPrompt.new(**base_prompt.to_h)
+      else
+        base_prompt
+      end
+
       # Add system message
-      system_prompt = inference_module.system_signature
+      system_prompt = prompt.render_system_prompt
       if system_prompt
         messages << Message.new(
           role: Message::Role::System,
           content: system_prompt
         )
       end
-      
+
       # Add user message
-      user_prompt = inference_module.user_signature(input_values)
+      user_prompt = prompt.render_user_prompt(input_values)
       messages << Message.new(
         role: Message::Role::User,
         content: user_prompt
       )
-      
+
       messages
     end
 
+    def will_use_structured_outputs?(signature_class)
+      return false unless signature_class
+
+      adapter_class_name = adapter.class.name
+
+      if adapter_class_name.include?('OpenAIAdapter') || adapter_class_name.include?('OllamaAdapter')
+        adapter.instance_variable_get(:@structured_outputs_enabled) &&
+          DSPy::LM::Adapters::OpenAI::SchemaConverter.supports_structured_outputs?(adapter.model)
+      elsif adapter_class_name.include?('GeminiAdapter')
+        adapter.instance_variable_get(:@structured_outputs_enabled) &&
+          DSPy::LM::Adapters::Gemini::SchemaConverter.supports_structured_outputs?(adapter.model)
+      elsif adapter_class_name.include?('AnthropicAdapter')
+        structured_outputs_enabled = adapter.instance_variable_get(:@structured_outputs_enabled)
+        structured_outputs_enabled.nil? ? true : structured_outputs_enabled
+      else
+        false
+      end
+    end
+
     def parse_response(response, input_values, signature_class)
       # Try to parse the response as JSON
       content = response.content

data/lib/dspy/mixins/type_coercion.rb

@@ -208,26 +208,26 @@ module DSPy
       sig { params(value: T.untyped, union_type: T.untyped).returns(T.untyped) }
       def coerce_union_value(value, union_type)
         return value unless value.is_a?(Hash)
-        
+
         # Check for _type discriminator field
         type_name = value[:_type] || value["_type"]
         return value unless type_name
-        
+
         # Find matching struct type in the union
         union_type.types.each do |type|
           next if type == T::Utils.coerce(NilClass)
-          
+
           if type.is_a?(T::Types::Simple) && type.raw_type < T::Struct
             struct_name = type.raw_type.name.split('::').last
             if struct_name == type_name
               # Convert string keys to symbols and remove _type
               symbolized_hash = value.transform_keys(&:to_sym)
               symbolized_hash.delete(:_type)
-              
+
               # Coerce struct field values based on their types
               struct_class = type.raw_type
               struct_props = struct_class.props
-              
+
               # ONLY include fields that exist in the struct
               coerced_hash = {}
               struct_props.each_key do |key|
@@ -236,13 +236,13 @@ module DSPy
                   coerced_hash[key] = coerce_value_to_type(symbolized_hash[key], prop_type)
                 end
               end
-              
+
               # Create the struct instance with coerced values
               return struct_class.new(**coerced_hash)
             end
           end
         end
-        
+
         # If no matching type found, return original value
         value
       rescue ArgumentError => e

data/lib/dspy/structured_outputs_prompt.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'sorbet-runtime'
+require_relative 'prompt'
+
+module DSPy
+  # Optimized prompt for structured outputs that omits redundant schema information
+  # since the schema is already enforced by API parameters (response_format, generation_config, tools)
+  class StructuredOutputsPrompt < Prompt
+    extend T::Sig
+
+    # Render minimal system prompt without output schema or JSON formatting instructions
+    sig { returns(String) }
+    def render_system_prompt
+      sections = []
+
+      sections << "Your input schema fields are:"
+      sections << "```json"
+      sections << JSON.pretty_generate(@input_schema)
+      sections << "```"
+
+      # Add few-shot examples if present
+      if @few_shot_examples.any?
+        sections << ""
+        sections << "Here are some examples:"
+        sections << ""
+        @few_shot_examples.each_with_index do |example, index|
+          sections << "### Example #{index + 1}"
+          sections << example.to_prompt_section
+          sections << ""
+        end
+      end
+
+      sections << ""
+      sections << "Your objective is: #{@instruction}"
+
+      sections.join("\n")
+    end
+
+    # Render minimal user prompt without JSON formatting instructions
+    sig { params(input_values: T::Hash[Symbol, T.untyped]).returns(String) }
+    def render_user_prompt(input_values)
+      sections = []
+
+      sections << "## Input Values"
+      sections << "```json"
+      sections << JSON.pretty_generate(serialize_for_json(input_values))
+      sections << "```"
+
+      sections.join("\n")
+    end
+  end
+end

data/lib/dspy/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dspy
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Vicente Reig Rincón de Arellano
 bindir: bin
 cert_chain: []
-date: 2025-10-02 00:00:00.000000000 Z
+date: 2025-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -247,6 +247,7 @@ files:
 - lib/dspy/signature.rb
 - lib/dspy/storage/program_storage.rb
 - lib/dspy/storage/storage_manager.rb
+- lib/dspy/structured_outputs_prompt.rb
 - lib/dspy/teleprompt/data_handler.rb
 - lib/dspy/teleprompt/gepa.rb
 - lib/dspy/teleprompt/mipro_v2.rb