llm_logs 0.4.1 → 0.6.0

data/lib/llm_logs/ruby_llm_patches.rb

@@ -0,0 +1,54 @@
+require "llm_logs/ruby_llm_patches/bedrock_sigv4"
+require "llm_logs/ruby_llm_patches/converse_reasoning_config"
+require "llm_logs/ruby_llm_patches/converse_foreign_reasoning"
+require "llm_logs/ruby_llm_patches/converse_claude_adaptive_thinking"
+require "llm_logs/ruby_llm_patches/retry_ssl_error"
+
+module LlmLogs
+  # Bedrock fixes that upstream ruby_llm 2.0.0 lacks, applied with Module#prepend. Each
+  # backports an open upstream PR (crmne/ruby_llm#1024, #1025, #1026; see the README), so it
+  # can be dropped once a ruby_llm release includes that PR.
+  # Each was verified against 2.0.x only: on 1.x they are skipped (different internals),
+  # on a newer ruby_llm they still install but log a warning so we re-check whether
+  # upstream fixed the bug (then drop the patch) or moved the method (then the patch
+  # skips itself and logs why).
+  module RubyLLMPatches
+    PATCHES = [
+      BedrockSigV4, ConverseReasoningConfig, ConverseForeignReasoning, ConverseClaudeAdaptiveThinking, RetrySSLError
+    ].freeze
+    MINIMUM = Gem::Version.new("2.0.0")
+    VERIFIED = Gem::Requirement.new(">= 2.0.0", "< 2.1")
+
+    module_function
+
+    def install!
+      version = Gem::Version.new(RubyLLM::VERSION)
+      return [] if version < MINIMUM
+
+      unless VERIFIED.satisfied_by?(version)
+        warn_log("verified against ruby_llm #{VERIFIED}, running #{version}: check whether upstream " \
+                 "now fixes #{PATCHES.map(&:name).join(', ')} and drop the patches it does")
+      end
+      PATCHES.select(&:install!)
+    end
+
+    def warn_log(message)
+      logger = defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+      logger ? logger.warn("[llm_logs] #{message}") : Kernel.warn("[llm_logs] #{message}")
+    end
+
+    # Prepends +patch+ to +target+ when +target+ still defines every method in +methods+.
+    def prepend_checked(target, patch, methods)
+      return true if target <= patch
+
+      missing = methods.reject { |name| target.method_defined?(name) || target.private_method_defined?(name) }
+      if missing.any?
+        warn_log("#{patch.name} not installed: #{target} no longer defines #{missing.join(', ')}")
+        return false
+      end
+
+      target.prepend(patch)
+      true
+    end
+  end
+end

data/lib/llm_logs/version.rb

@@ -1,3 +1,3 @@
 module LlmLogs
-  VERSION = "0.4.1"
+  VERSION = "0.6.0"
 end

data/lib/llm_logs.rb

@@ -54,10 +54,6 @@ module LlmLogs
     configuration.batch_enabled
   end
 
-  def self.batch_provider
-    configuration.batch_provider
-  end
-
   def self.bedrock_batch
     configuration.bedrock_batch
   end
@@ -71,7 +67,7 @@ module LlmLogs
   end
 
   def self.batch_adapters
-    @batch_adapters ||= {openai_responses: LlmLogs::Batch::Adapters::OpenaiResponses.new}
+    @batch_adapters ||= {}
   end
 
   def self.register_batch_adapter(provider, adapter)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm_logs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Anton
@@ -97,30 +97,36 @@ dependencies:
   name: ruby_llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: ruby_llm-responses_api
+  name: aws-eventstream
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -186,10 +192,8 @@ files:
 - app/models/llm_logs/application_record.rb
 - app/models/llm_logs/batch.rb
 - app/models/llm_logs/batch/adapters/bedrock.rb
-- app/models/llm_logs/batch/adapters/openai_responses.rb
 - app/models/llm_logs/batch/handler_registry.rb
 - app/models/llm_logs/batch/reconciler.rb
-- app/models/llm_logs/batch/schema_format.rb
 - app/models/llm_logs/batch/submitter.rb
 - app/models/llm_logs/batch/trace_recorder.rb
 - app/models/llm_logs/batch_request.rb
@@ -237,6 +241,12 @@ files:
 - lib/llm_logs/engine.rb
 - lib/llm_logs/instrumentation/ruby_llm_chat.rb
 - lib/llm_logs/prompt_renderer.rb
+- lib/llm_logs/ruby_llm_patches.rb
+- lib/llm_logs/ruby_llm_patches/bedrock_sigv4.rb
+- lib/llm_logs/ruby_llm_patches/converse_claude_adaptive_thinking.rb
+- lib/llm_logs/ruby_llm_patches/converse_foreign_reasoning.rb
+- lib/llm_logs/ruby_llm_patches/converse_reasoning_config.rb
+- lib/llm_logs/ruby_llm_patches/retry_ssl_error.rb
 - lib/llm_logs/tracer.rb
 - lib/llm_logs/version.rb
 - lib/tasks/llm_logs.rake

data/app/models/llm_logs/batch/adapters/openai_responses.rb

@@ -1,63 +0,0 @@
-module LlmLogs
-  class Batch
-    module Adapters
-      # Wraps ruby_llm-responses_api's OpenAI Batch API. Contains the remote-API logic
-      # previously inline in Submitter/Reconciler; the DB/claim lifecycle stays in those.
-      class OpenaiResponses
-        PROVIDER = :openai_responses
-
-        def submit(_batch, requests)
-          rubyllm_batch = RubyLLM.batch(model: requests.first.model, provider: PROVIDER)
-          requests.each do |request|
-            payload = request.payload
-            rubyllm_batch.add(
-              payload["input"],
-              id: request.custom_id,
-              instructions: payload["instructions"],
-              temperature: payload["temperature"],
-              **reasoning_extra(payload["reasoning_effort"]),
-              **schema_extra(payload["schema"])
-            )
-          end
-          rubyllm_batch.create!
-          {provider_batch_id: rubyllm_batch.id, openai_batch_id: rubyllm_batch.id, provider_metadata: {}}
-        end
-
-        def terminal_status(batch)
-          resume(batch).status
-        end
-
-        def results(batch)
-          resume(batch).results
-        end
-
-        def error_ids(batch)
-          resume(batch).errors.filter_map { |e| e["custom_id"] }
-        end
-
-        private
-
-        # The Responses API nests effort under `reasoning:`; `reasoning_effort` is the
-        # Chat Completions spelling and is silently ignored here.
-        def reasoning_extra(effort)
-          return {} if effort.blank?
-
-          {reasoning: {effort: effort}}
-        end
-
-        # No memoization: LlmLogs.batch_adapters holds one shared instance of this adapter
-        # for the life of the process, so caching the resumed handle here would go stale
-        # for a long-running PollJob worker (in-progress batches would never re-fetch a
-        # later terminal status) and would grow unbounded. Build a fresh handle every call.
-        def resume(batch)
-          RubyLLM.batch(id: batch.provider_batch_id, provider: PROVIDER)
-        end
-
-        def schema_extra(schema)
-          format = SchemaFormat.call(schema)
-          format ? {text: format} : {}
-        end
-      end
-    end
-  end
-end

data/app/models/llm_logs/batch/schema_format.rb

@@ -1,25 +0,0 @@
-module LlmLogs
-  class Batch
-    # Translates a {name:, schema:, strict:} schema (the shape RubyLLM::Chat#with_schema
-    # produces) into the OpenAI Responses API `text.format` block. The batch path builds
-    # request bodies directly via RubyLLM.batch#add(**extra), bypassing with_schema, so
-    # we must hand the json_schema block in ourselves.
-    module SchemaFormat
-      module_function
-
-      def call(schema)
-        return nil if schema.nil?
-
-        schema = schema.symbolize_keys if schema.respond_to?(:symbolize_keys)
-        {
-          format: {
-            type: "json_schema",
-            name: schema[:name] || "response",
-            schema: schema[:schema] || schema,
-            strict: schema.key?(:strict) ? schema[:strict] : true
-          }
-        }
-      end
-    end
-  end
-end