open_router_enhanced 1.2.5 → 2.0.1

data/lib/open_router/http.rb

@@ -78,30 +78,30 @@ module OpenRouter
 
     def conn(multipart: false)
       Faraday.new do |f|
-        f.options[:timeout] = OpenRouter.configuration.request_timeout
+        f.options[:timeout] = configuration.request_timeout
         f.request(:multipart) if multipart
         # NOTE: Removed MiddlewareErrors reference - was undefined and @log_errors was never set
         f.response :raise_error
         f.response :json if OpenRouter::HAS_JSON_MW
 
-        OpenRouter.configuration.faraday_config&.call(f)
+        configuration.faraday_config&.call(f)
       end
     end
 
     def uri(path:)
-      base = OpenRouter.configuration.uri_base.sub(%r{/\z}, "")
-      ver = OpenRouter.configuration.api_version.to_s.sub(%r{^/}, "").sub(%r{/\z}, "")
+      base = configuration.uri_base.sub(%r{/\z}, "")
+      ver = configuration.api_version.to_s.sub(%r{^/}, "").sub(%r{/\z}, "")
       p = path.to_s.sub(%r{^/}, "")
-      "#{base}/#{ver}/#{p}"
+      [base, ver, p].reject(&:empty?).join("/")
     end
 
     def headers
       {
-        "Authorization" => "Bearer #{OpenRouter.configuration.access_token}",
+        "Authorization" => "Bearer #{configuration.access_token}",
         "Content-Type" => "application/json",
         "X-Title" => "OpenRouter Ruby Client",
         "HTTP-Referer" => "https://github.com/OlympiaAI/open_router"
-      }.merge(OpenRouter.configuration.extra_headers)
+      }.merge(configuration.extra_headers)
     end
 
     def multipart_parameters(parameters)

data/lib/open_router/json_healer.rb

@@ -22,6 +22,11 @@ module OpenRouter
 
     # Enhanced heal method that supports different healing contexts
     def heal(raw_text, schema, context: :generic)
+      # Guard against re-entrant healing triggered by on_healing callbacks
+      raise StructuredOutputError, "Recursive healing detected — cannot heal from within a healing callback" if (Thread.current[:openrouter_heal_depth] || 0).positive?
+
+      Thread.current[:openrouter_heal_depth] = 1
+
       candidate_json = extract_json_candidate(raw_text)
       raise StructuredOutputError, "No JSON-like content found in the response." if candidate_json.nil?
 
@@ -53,6 +58,8 @@ module OpenRouter
         # Escalate to LLM-based healing with proper context
         candidate_json = fix_with_healer_model(candidate_json, schema, e.message, e.class, original_content, context)
       end
+    ensure
+      Thread.current[:openrouter_heal_depth] = 0
     end
 
     private

data/lib/open_router/model_registry.rb

@@ -15,6 +15,8 @@ module OpenRouter
     CACHE_METADATA_FILE = File.join(CACHE_DIR, "cache_metadata.json")
     MAX_CACHE_SIZE_MB = 50 # Maximum cache size in megabytes
 
+    REGISTRY_MUTEX = Mutex.new
+
     class << self
       # Fetch models from OpenRouter API using Faraday for consistent SSL handling
       def fetch_models_from_api
@@ -83,9 +85,11 @@ module OpenRouter
 
       # Clear local cache (both files and memory)
       def clear_cache!
-        FileUtils.rm_rf(CACHE_DIR) if Dir.exist?(CACHE_DIR)
-        @processed_models = nil
-        @all_models = nil
+        REGISTRY_MUTEX.synchronize do
+          FileUtils.rm_rf(CACHE_DIR) if Dir.exist?(CACHE_DIR)
+          @processed_models = nil
+          @all_models = nil
+        end
       end
 
       # Refresh models data from API
@@ -246,7 +250,11 @@ module OpenRouter
 
       # Get all registered models (fetch from API if needed)
       def all_models
-        @all_models ||= fetch_and_cache_models
+        return @all_models if @all_models # fast path without lock
+
+        REGISTRY_MUTEX.synchronize do
+          @all_models ||= fetch_and_cache_models
+        end
       end
 
       # Calculate estimated cost for a request
@@ -355,9 +363,9 @@ module OpenRouter
         total_size = Dir.glob(File.join(CACHE_DIR, "**/*"))
                         .select { |f| File.file?(f) }
                         .sum do |f|
-                          File.size(f)
-                        rescue StandardError
-                          0
+          File.size(f)
+        rescue StandardError
+          0
         end
         total_size / (1024.0 * 1024.0)
       end

data/lib/open_router/streaming_client.rb

@@ -33,24 +33,34 @@ module OpenRouter
     # Enhanced streaming completion with better event handling and response reconstruction
     #
     # @param messages [Array<Hash>] Array of message hashes
-    # @param model [String|Array] Model identifier or array of models for fallback
+    # @param options [CompletionOptions, Hash, nil] Options object or hash with configuration
     # @param accumulate_response [Boolean] Whether to accumulate and return complete response
-    # @param extras [Hash] Additional parameters for the completion request
+    # @param kwargs [Hash] Additional options (merged with options parameter)
     # @param block [Proc] Optional block to call for each chunk (in addition to registered callbacks)
     # @return [Response, nil] Complete response if accumulate_response is true, nil otherwise
-    def stream_complete(messages, model: "openrouter/auto", accumulate_response: true, **extras, &block)
+    #
+    # @example Simple usage (unchanged)
+    #   client.stream_complete(messages, model: "gpt-4")
+    #
+    # @example With CompletionOptions
+    #   opts = CompletionOptions.new(model: "gpt-4", temperature: 0.7)
+    #   client.stream_complete(messages, opts)
+    #
+    # @example Options with overrides
+    #   client.stream_complete(messages, base_opts, temperature: 0.9)
+    def stream_complete(messages, options = nil, accumulate_response: true, **kwargs, &block)
+      opts = normalize_options(options, kwargs)
       response_accumulator = ResponseAccumulator.new if accumulate_response
 
       # Set up streaming handler (pass optional per-call block)
       stream_handler = build_stream_handler(response_accumulator, &block)
 
       # Trigger start callback
-      trigger_streaming_callbacks(:on_start, { model: model, messages: messages })
+      trigger_streaming_callbacks(:on_start, { model: opts.model, messages: messages })
 
       begin
-        # Execute the streaming request
-        # Note: extras must be passed as a hash, not splatted, to match complete()'s signature
-        complete(messages, model: model, stream: stream_handler, extras: extras)
+        # Execute the streaming request using parent's complete method
+        complete(messages, opts, stream: stream_handler)
 
         # Return accumulated response if requested
         if accumulate_response && response_accumulator
@@ -70,22 +80,26 @@ module OpenRouter
     # Stream with a simple block interface
     #
     # @param messages [Array<Hash>] Array of message hashes
-    # @param model [String|Array] Model identifier
+    # @param options [CompletionOptions, Hash, nil] Options object or hash with configuration
+    # @param kwargs [Hash] Additional options (merged with options parameter)
     # @param block [Proc] Block to call for each content chunk
-    # @param extras [Hash] Additional parameters
     #
-    # @example
+    # @example Simple usage (unchanged)
     #   client.stream(messages, model: "openai/gpt-4o-mini") do |chunk|
     #     print chunk
     #   end
-    def stream(messages, model: "openrouter/auto", **extras, &block)
+    #
+    # @example With CompletionOptions
+    #   opts = CompletionOptions.new(model: "gpt-4", temperature: 0.7)
+    #   client.stream(messages, opts) { |chunk| print chunk }
+    def stream(messages, options = nil, **kwargs, &block)
       raise ArgumentError, "Block required for streaming" unless block_given?
 
       stream_complete(
         messages,
-        model: model,
+        options,
         accumulate_response: false,
-        **extras
+        **kwargs
       ) do |chunk|
         content = extract_content_from_chunk(chunk)
         block.call(content) if content

data/lib/open_router/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenRouter
-  VERSION = "1.2.5"
+  VERSION = "2.0.1"
 end

data/lib/open_router.rb

@@ -17,6 +17,7 @@ module OpenRouter
 end
 
 require_relative "open_router/http"
+require_relative "open_router/completion_options"
 require_relative "open_router/tool"
 require_relative "open_router/tool_call_base"
 require_relative "open_router/tool_call"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_router_enhanced
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 2.0.1
 platform: ruby
 authors:
 - Eric Stiens
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-27 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,6 +149,7 @@ files:
 - examples/tool_loop_example.rb
 - lib/open_router.rb
 - lib/open_router/client.rb
+- lib/open_router/completion_options.rb
 - lib/open_router/http.rb
 - lib/open_router/json_healer.rb
 - lib/open_router/model_registry.rb