dspy 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6126089636bd0d5fdaf9cd2bba791157186683a7984174bac980be8e32a483
-  data.tar.gz: 1e78c20f7e1a37cf025158be0f4014ee2abe9ba95b84682361ff9ea544fecd2c
+  metadata.gz: d40d9681a87073c6c4f5531025891bf871bee086434ee131e15a4391cba7b893
+  data.tar.gz: 1a1a4ce935e7cdf4ce9c06617f124ed8858d7074a3f6bec4484d6db24dbfa232
 SHA512:
-  metadata.gz: 7b3dbde7e5040dc1b0562142bdc560f9fc393bbb7cf20bef4d767541be079408dc1c6e196257f07193266713585bdfb21ac77bd08df3c6ab69607354393987c2
-  data.tar.gz: 412cf071635f85bb3fb08f339a1dce23d4a9f00144104fc03fc25cc706d87c86c707221bc8a98f6847a7e157e2fa86de8bee4ee7c44d2bd1b9b0ab41934dd411
+  metadata.gz: 2cdd3ee7e867344b4e45dee7fd0d73dc875ec2c730a2cf75e5f620a19c535f0aac50cc6c88dfb7beb3e075b147e7467ccd4e55a7724f49f3ac111eb080fd88e0
+  data.tar.gz: f5c5ed5dd3b6aa5401c20e31fbbd9638eb1d8c0f3b7fe5adb2e2b69bbb3b051d0ecd277d6e2f3b4d4896fd19f39a89345c9503d97106a3b8e005b1f55a3e5b2b

data/README.md

@@ -1,5 +1,8 @@
 # DSPy.rb
 
+[![Gem Version](https://img.shields.io/gem/v/dspy)](https://rubygems.org/gems/dspy)
+[![Total Downloads](https://img.shields.io/gem/dt/dspy)](https://rubygems.org/gems/dspy)
+
 **Build reliable LLM applications in Ruby using composable, type-safe modules.**
 
 DSPy.rb brings structured LLM programming to Ruby developers. Instead of wrestling with prompt strings and parsing responses, you define typed signatures and compose them into pipelines that just work.

data/lib/dspy/lm/message_builder.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module DSPy
+  class LM
+    class MessageBuilder
+      attr_reader :messages
+
+      def initialize
+        @messages = []
+      end
+
+      def system(content)
+        @messages << { role: 'system', content: content.to_s }
+        self
+      end
+
+      def user(content)
+        @messages << { role: 'user', content: content.to_s }
+        self
+      end
+
+      def assistant(content)
+        @messages << { role: 'assistant', content: content.to_s }
+        self
+      end
+    end
+  end
+end

data/lib/dspy/lm.rb

@@ -18,6 +18,9 @@ require_relative 'lm/adapters/anthropic_adapter'
 require_relative 'lm/strategy_selector'
 require_relative 'lm/retry_handler'
 
+# Load message builder
+require_relative 'lm/message_builder'
+
 module DSPy
   class LM
     attr_reader :model_id, :api_key, :model, :provider, :adapter
@@ -39,41 +42,13 @@ module DSPy
       # Build messages from inference module
       messages = build_messages(inference_module, input_values)
       
-      # Calculate input size for monitoring
-      input_text = messages.map { |m| m[:content] }.join(' ')
-      input_size = input_text.length
-      
-      # Use smart consolidation: emit LM events only when not in nested context
-      response = nil
-      token_usage = {}
+      # Execute with instrumentation
+      response = instrument_lm_request(messages, signature_class.name) do
+        chat_with_strategy(messages, signature_class, &block)
+      end
       
+      # Instrument response parsing
       if should_emit_lm_events?
-        # Emit all LM events when not in nested context
-        response = Instrumentation.instrument('dspy.lm.request', {
-          gen_ai_operation_name: 'chat',
-          gen_ai_system: provider,
-          gen_ai_request_model: model,
-          signature_class: signature_class.name,
-          provider: provider,
-          adapter_class: adapter.class.name,
-          input_size: input_size
-        }) do
-          chat_with_strategy(messages, signature_class, &block)
-        end
-        
-        # Extract actual token usage from response (more accurate than estimation)
-        token_usage = Instrumentation::TokenTracker.extract_token_usage(response, provider)
-        
-        # Emit token usage event if available
-        if token_usage.any?
-          Instrumentation.emit('dspy.lm.tokens', token_usage.merge({
-            gen_ai_system: provider,
-            gen_ai_request_model: model,
-            signature_class: signature_class.name
-          }))
-        end
-        
-        # Instrument response parsing
         parsed_result = Instrumentation.instrument('dspy.lm.response.parsed', {
           signature_class: signature_class.name,
           provider: provider,
@@ -82,15 +57,33 @@ module DSPy
           parse_response(response, input_values, signature_class)
         end
       else
-        # Consolidated mode: execute without nested instrumentation
-        response = chat_with_strategy(messages, signature_class, &block)
-        token_usage = Instrumentation::TokenTracker.extract_token_usage(response, provider)
         parsed_result = parse_response(response, input_values, signature_class)
       end
       
       parsed_result
     end
 
+    def raw_chat(messages = nil, &block)
+      # Support both array format and builder DSL
+      if block_given? && messages.nil?
+        # DSL mode - block is for building messages
+        builder = MessageBuilder.new
+        yield builder
+        messages = builder.messages
+        streaming_block = nil
+      else
+        # Array mode - block is for streaming
+        messages ||= []
+        streaming_block = block
+      end
+      
+      # Validate messages format
+      validate_messages!(messages)
+      
+      # Execute with instrumentation
+      execute_raw_chat(messages, &streaming_block)
+    end
+
     private
 
     def chat_with_strategy(messages, signature_class, &block)
@@ -208,5 +201,77 @@ module DSPy
         raise "Failed to parse LLM response as JSON: #{e.message}. Original content length: #{response.content&.length || 0} chars"
       end
     end
+
+    # Common instrumentation method for LM requests
+    def instrument_lm_request(messages, signature_class_name, &execution_block)
+      input_text = messages.map { |m| m[:content] }.join(' ')
+      input_size = input_text.length
+      
+      response = nil
+      
+      if should_emit_lm_events?
+        # Emit dspy.lm.request event
+        response = Instrumentation.instrument('dspy.lm.request', {
+          gen_ai_operation_name: 'chat',
+          gen_ai_system: provider,
+          gen_ai_request_model: model,
+          signature_class: signature_class_name,
+          provider: provider,
+          adapter_class: adapter.class.name,
+          input_size: input_size
+        }, &execution_block)
+        
+        # Extract and emit token usage
+        emit_token_usage(response, signature_class_name)
+      else
+        # Consolidated mode: execute without instrumentation
+        response = execution_block.call
+      end
+      
+      response
+    end
+
+    # Common method to emit token usage events
+    def emit_token_usage(response, signature_class_name)
+      token_usage = Instrumentation::TokenTracker.extract_token_usage(response, provider)
+      
+      if token_usage.any?
+        Instrumentation.emit('dspy.lm.tokens', token_usage.merge({
+          gen_ai_system: provider,
+          gen_ai_request_model: model,
+          signature_class: signature_class_name
+        }))
+      end
+      
+      token_usage
+    end
+
+    def validate_messages!(messages)
+      unless messages.is_a?(Array)
+        raise ArgumentError, "messages must be an array"
+      end
+      
+      valid_roles = %w[system user assistant]
+      
+      messages.each do |message|
+        unless message.is_a?(Hash) && message.key?(:role) && message.key?(:content)
+          raise ArgumentError, "Each message must have :role and :content"
+        end
+        
+        unless valid_roles.include?(message[:role])
+          raise ArgumentError, "Invalid role: #{message[:role]}. Must be one of: #{valid_roles.join(', ')}"
+        end
+      end
+    end
+
+    def execute_raw_chat(messages, &streaming_block)
+      response = instrument_lm_request(messages, 'RawPrompt') do
+        # Direct adapter call, no strategies or JSON parsing
+        adapter.chat(messages: messages, signature: nil, &streaming_block)
+      end
+      
+      # Return raw response content, not parsed JSON
+      response.content
+    end
   end
 end

data/lib/dspy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dspy
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Vicente Reig Rincón de Arellano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -177,6 +177,7 @@ files:
 - lib/dspy/lm/adapters/openai_adapter.rb
 - lib/dspy/lm/cache_manager.rb
 - lib/dspy/lm/errors.rb
+- lib/dspy/lm/message_builder.rb
 - lib/dspy/lm/response.rb
 - lib/dspy/lm/retry_handler.rb
 - lib/dspy/lm/strategies/anthropic_extraction_strategy.rb