dspy 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f074914faabe00390399080ef0efecca6ca6dbfeeca38201c127cfbef11528
-  data.tar.gz: 91c07b99351fd1095f5e61e1b8c9560c1c67ee67c97c945437f4a2964172eaca
+  metadata.gz: 0df0301fbda6076f6d4ecaeb7fa907982b11fe67521d4aa689ca812cb1485a71
+  data.tar.gz: ba7d57fa4fef32861b37ccb428c12f58c4262123bff1069dddb3c53c72e9dd67
 SHA512:
-  metadata.gz: 303990f2586f73beaf638ed85b1e5266a318f760aae0342af4738652078b0087e7d6826588d80fb4d26b3b9ca026dfc1b3f3e6645e3b24213d0cf94b1fbb450f
-  data.tar.gz: db445cef172a2009d565b659fd4170895045dacbbbd9073b0d20ab8c054e2085ed62cfb8d1dbf6b98e203422cc999a495fb2e84ba3363d31360472b10f1487e9
+  metadata.gz: 07a619845a4e65cb03d4b9e53726bb6b306ddb5d5c08a6521785c415d6f4a5e1a21949f5120c2dafc3429114c5b97c0a1f2d19d30528bfcfe311aef97bc28245
+  data.tar.gz: 90a800ee9a612da5fd735b36b3c887df8fc777ccd0ed5b4badf4049352c19bcb64a508e7b722b4eae51b08ddf5386e292ae7bbc893c1b444ee1e3b1305f46f05

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/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.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dspy
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 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