dspy 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f074914faabe00390399080ef0efecca6ca6dbfeeca38201c127cfbef11528
-  data.tar.gz: 91c07b99351fd1095f5e61e1b8c9560c1c67ee67c97c945437f4a2964172eaca
+  metadata.gz: 2f0a8e9dc70e65ef655829a080bc1a7a44cbcf5927c4903c42881c72c8796060
+  data.tar.gz: 39195cb9177617a61e21aae7ed7cedaed536f6862f5840bef3a09b3ade9966d0
 SHA512:
-  metadata.gz: 303990f2586f73beaf638ed85b1e5266a318f760aae0342af4738652078b0087e7d6826588d80fb4d26b3b9ca026dfc1b3f3e6645e3b24213d0cf94b1fbb450f
-  data.tar.gz: db445cef172a2009d565b659fd4170895045dacbbbd9073b0d20ab8c054e2085ed62cfb8d1dbf6b98e203422cc999a495fb2e84ba3363d31360472b10f1487e9
+  metadata.gz: 8b0f2378f818914e4752f1ba309f79c9abfca9a34d5223f55cebc384023f8b76586f36eef725dc170f197c88669df9ab1b3c742dd2a13d2afd65759753066ec2
+  data.tar.gz: 9039f598229486c785d4b254d0d0e0101b312e2975e4e56dbef52c5b7eb99fa29eba74c661fedfabac39688fa59a20fe64823777f39a87b32f55aa546b4ecfa6

data/README.md

@@ -40,6 +40,7 @@ The result? LLM applications that actually scale and don't break when you sneeze
 - LLM provider support using official Ruby clients:
   - [OpenAI Ruby](https://github.com/openai/openai-ruby)
   - [Anthropic Ruby SDK](https://github.com/anthropics/anthropic-sdk-ruby)
+  - [Ollama](https://ollama.com/) via OpenAI compatibility layer
 - Runtime type checking with [Sorbet](https://sorbet.org/)
 - Type-safe tool definitions for ReAct agents
 - Comprehensive instrumentation and observability

data/lib/dspy/code_act.rb

@@ -9,6 +9,7 @@ require 'stringio'
 require_relative 'instrumentation'
 require_relative 'mixins/struct_builder'
 require_relative 'mixins/instrumentation_helpers'
+require_relative 'type_serializer'
 
 module DSPy
   # Define a simple struct for CodeAct history entries with proper type annotations
@@ -37,7 +38,7 @@ module DSPy
 
     input do
       const :task, String,
-        description: "The task description requiring Ruby code solution"
+        description: "JSON representation of all input fields for the task"
       const :context, String,
         description: "Available variables and previous results from code execution history"
       const :history, T::Array[CodeActHistoryEntry],
@@ -67,7 +68,7 @@ module DSPy
 
     input do
       const :task, String,
-        description: "The original task"
+        description: "JSON representation of all input fields for the task"
       const :history, T::Array[CodeActHistoryEntry],
         description: "Previous thoughts, code executions, and their results"
       const :execution_result, T.nilable(String),
@@ -148,9 +149,9 @@ module DSPy
       result = instrument_prediction('dspy.codeact', @original_signature_class, kwargs, {
         max_iterations: @max_iterations
       }) do
-        # Validate input and extract task
+        # Validate input and serialize all fields as task context
         input_struct = @original_signature_class.input_struct_class.new(**kwargs)
-        task = T.cast(input_struct.serialize.values.first, String)
+        task = DSPy::TypeSerializer.serialize(input_struct).to_json
 
         # Execute CodeAct reasoning loop
         reasoning_result = execute_codeact_reasoning_loop(task)

data/lib/dspy/lm/adapter_factory.rb

@@ -7,7 +7,8 @@ module DSPy
       # Maps provider prefixes to adapter classes
       ADAPTER_MAP = {
         'openai' => 'OpenAIAdapter',
-        'anthropic' => 'AnthropicAdapter'
+        'anthropic' => 'AnthropicAdapter',
+        'ollama' => 'OllamaAdapter'
       }.freeze
 
       class << self
@@ -22,7 +23,8 @@ module DSPy
           
           # Pass provider-specific options
           adapter_options = { model: model, api_key: api_key }
-          adapter_options.merge!(options) if provider == 'openai' # Only OpenAI accepts structured_outputs for now
+          # Both OpenAI and Ollama accept additional options
+          adapter_options.merge!(options) if %w[openai ollama].include?(provider)
           
           adapter_class.new(**adapter_options)
         end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'openai'
+
+module DSPy
+  class LM
+    class OllamaAdapter < OpenAIAdapter
+      DEFAULT_BASE_URL = 'http://localhost:11434/v1'
+      
+      def initialize(model:, api_key: nil, base_url: nil, structured_outputs: true)
+        # Ollama doesn't require API key for local instances
+        # But may need it for remote/protected instances
+        api_key ||= 'ollama' # OpenAI client requires non-empty key
+        base_url ||= DEFAULT_BASE_URL
+        
+        # Store base_url before calling super
+        @base_url = base_url
+        
+        # Don't call parent's initialize, do it manually to control client creation
+        @model = model
+        @api_key = api_key
+        @structured_outputs_enabled = structured_outputs
+        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 Ollama, we need to be more lenient with structured outputs
+        # as 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("Ollama structured output failed, falling back to enhanced prompting")
+            @structured_outputs_enabled = false
+            retry
+          else
+            raise
+          end
+        end
+      end
+      
+      private
+      
+      def validate_configuration!
+        super
+        # Additional Ollama-specific validation could go here
+      end
+      
+      def validate_api_key!(api_key, provider)
+        # For Ollama, API key is optional for local instances
+        # Only validate if it looks like a remote URL
+        if @base_url && !@base_url.include?('localhost') && !@base_url.include?('127.0.0.1')
+          super
+        end
+      end
+      
+      
+      # Ollama may have different model support for structured outputs
+      def supports_structured_outputs?
+        # For now, assume all Ollama models support basic JSON mode
+        # but may not support full OpenAI structured output spec
+        true
+      end
+    end
+  end
+end

data/lib/dspy/lm/strategies/openai_structured_output_strategy.rb

@@ -11,10 +11,15 @@ module DSPy
 
         sig { override.returns(T::Boolean) }
         def available?
-          # Check if adapter is OpenAI and supports structured outputs
-          return false unless adapter.is_a?(DSPy::LM::OpenAIAdapter)
+          # Check if adapter is OpenAI or Ollama and supports structured outputs
+          return false unless adapter.is_a?(DSPy::LM::OpenAIAdapter) || adapter.is_a?(DSPy::LM::OllamaAdapter)
           return false unless adapter.instance_variable_get(:@structured_outputs_enabled)
           
+          # For Ollama, we assume it supports basic structured outputs
+          if adapter.is_a?(DSPy::LM::OllamaAdapter)
+            return true
+          end
+          
           DSPy::LM::Adapters::OpenAI::SchemaConverter.supports_structured_outputs?(adapter.model)
         end
 

data/lib/dspy/lm.rb

@@ -13,6 +13,7 @@ require_relative 'instrumentation/token_tracker'
 # Load adapters
 require_relative 'lm/adapters/openai_adapter'
 require_relative 'lm/adapters/anthropic_adapter'
+require_relative 'lm/adapters/ollama_adapter'
 
 # Load strategy system
 require_relative 'lm/strategy_selector'

data/lib/dspy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dspy
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Vicente Reig Rincón de Arellano
@@ -172,6 +172,7 @@ files:
 - lib/dspy/lm/adapter.rb
 - lib/dspy/lm/adapter_factory.rb
 - lib/dspy/lm/adapters/anthropic_adapter.rb
+- 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/cache_manager.rb