raix 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 254c9a26d73389e655db17cf571ab2a47b54e6b2bc664741e0a260534d6d2537
-  data.tar.gz: f7846475556924487dc0206ba340f2c568a23e85ef4a0b2bd0504231c175f02a
+  metadata.gz: ec3b7449e51440e1d669e323dea0c371a3d18d7d4083090d61599ff1dbce3bbe
+  data.tar.gz: 6f2029218c2099ab1172d1d458be9ccb33836078d5abc9b04865cae0d497bc07
 SHA512:
-  metadata.gz: 8301e1d977df4f84c587da285890382856d7f1490845cec4b4ab19e955462680e55b1dc9263166250b5f2697eae8e4005939e2d12e1ab70ca2c8b6d81ea7e9d0
-  data.tar.gz: b30eb6832ab3a658a8bfcb6b7e6bf6d4349462d81dd35f79bab514be08104eee0712219b98169e692943413ad4bc47ad8e7a8883e74d1df47da48a59f9c41c4e
+  metadata.gz: 76e1d77e80023dbc634e4b2f72eaa269f05d539ea97470df1355e69e73d75a6cf4bd2bd7e627ab2cf01fcb381fd85c4b153d28005f32190ff1b8ae69c3bea275
+  data.tar.gz: 6fedf4bae5c406b72b83a1aacbc985849eb7c461237e7cc1e12d9ca73ea05a861912f13739bc92ba8ad992bf88f5a31fa530dc9468c5bdb4763f53caf3833843

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [Unreleased]
+
+## [2.0.4] - 2026-05-19
+
+### Fixed
+- `ruby_llm_request` now preserves the upstream provider's `id`, `model`, and `provider` fields, plus the full `usage` payload (including `prompt_tokens_details.cached_tokens` and `completion_tokens_details.reasoning_tokens`) on the OpenAI-compatible response hash. Previously the conversion dropped everything except `choices` and basic token counts, which broke callers that needed the generation id for authoritative cost lookups (e.g. OpenRouter's `/api/v1/generation` endpoint) or that wanted to verify prompt-cache hits via `cached_tokens`.
+- Added `require "active_support/core_ext/module/delegation"` so `Raix::ChatCompletion` loads cleanly without an external preload of ActiveSupport. The class uses `delegate :configuration, to: :class` but did not pull in the required core ext, so a bare `require "raix"` would raise `NoMethodError` for `delegate`.
+
+## [2.0.3] - 2026-04-30
+
+### Fixed
+- `NoMethodError: undefined method 'strip' for nil` in `Raix::ChatCompletion` when an LLM (notably Gemini under certain stop conditions) returns a final assistant message with `"content": null`. Three call sites in `lib/raix/chat_completion.rb` now use `content.to_s.strip` so a nil response coerces to `""` instead of raising.
+
 ## [2.0.2] - 2026-03-27
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    raix (2.0.1)
+    raix (2.0.4)
       activesupport (>= 6.0)
       faraday-retry (~> 2.0)
       ostruct
@@ -49,8 +49,8 @@ GEM
       net-http
     faraday-retry (2.4.0)
       faraday (~> 2.0)
-    ffi (1.17.2)
     ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
     formatador (1.1.0)
     guard (2.18.1)
       formatador (>= 0.2.4)
@@ -83,18 +83,16 @@ GEM
     lumberjack (1.2.10)
     marcel (1.1.0)
     method_source (1.1.0)
-    mini_portile2 (2.8.9)
     minitest (5.27.0)
     multipart-post (2.4.1)
     nenv (0.3.0)
     net-http (0.4.1)
       uri
     netrc (0.11.0)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
     nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)

data/lib/raix/chat_completion.rb

@@ -4,6 +4,7 @@ require "active_support/concern"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/filters"
 require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/module/delegation"
 require "ruby_llm"
 
 module Raix
@@ -56,9 +57,7 @@ module Raix
     end
 
     # Instance level access to the class-level configuration.
-    def configuration
-      self.class.configuration
-    end
+    delegate :configuration, to: :class
 
     # This method performs chat completion based on the provided transcript and parameters.
     #
@@ -174,7 +173,7 @@ module Raix
             # Process the final response
             content = response.dig("choices", 0, "message", "content")
             transcript << { assistant: content } if save_response
-            return raw ? response : content.strip
+            return raw ? response : content.to_s.strip
           end
 
           # Dispatch tool calls
@@ -215,7 +214,7 @@ module Raix
 
             content = response.dig("choices", 0, "message", "content")
             transcript << { assistant: content } if save_response
-            return raw ? response : content.strip
+            return raw ? response : content.to_s.strip
           end
         end
 
@@ -223,7 +222,7 @@ module Raix
           content = res.dig("choices", 0, "message", "content")
 
           transcript << { assistant: content } if save_response
-          content = content.strip
+          content = content.to_s.strip
 
           if json
             # Make automatic JSON parsing available to non-OpenAI providers that don't support the response_format parameter
@@ -398,8 +397,34 @@ module Raix
         # Non-streaming mode - return OpenAI-compatible response format
         response_message = has_user_message ? chat.complete : chat.ask
 
-        # Convert RubyLLM response to OpenAI format for compatibility
+        # Pull through the raw provider payload when available. OpenRouter's
+        # `id` is the only handle we have to look up authoritative billing
+        # cost via /api/v1/generation, and callers that watch the response
+        # snapshot for `model` / cached-token counts shouldn't have to break
+        # out of the OpenAI-compatible shape to get them.
+        raw_body = response_message.raw.respond_to?(:body) ? response_message.raw.body : nil
+        raw_body = {} unless raw_body.is_a?(Hash)
+
+        usage_payload = {
+          "prompt_tokens" => response_message.input_tokens,
+          "completion_tokens" => response_message.output_tokens,
+          "total_tokens" => (response_message.input_tokens || 0) + (response_message.output_tokens || 0)
+        }
+
+        # Merge prompt_tokens_details / completion_tokens_details (cached tokens,
+        # reasoning tokens) when the provider supplied them.
+        if (upstream_usage = raw_body["usage"]).is_a?(Hash)
+          upstream_usage.each do |key, value|
+            next if usage_payload.key?(key)
+
+            usage_payload[key] = value
+          end
+        end
+
         {
+          "id" => raw_body["id"],
+          "model" => raw_body["model"] || response_message.model_id,
+          "provider" => raw_body["provider"],
           "choices" => [
             {
               "message" => {
@@ -410,11 +435,7 @@ module Raix
               "finish_reason" => response_message.tool_call? ? "tool_calls" : "stop"
             }
           ],
-          "usage" => {
-            "prompt_tokens" => response_message.input_tokens,
-            "completion_tokens" => response_message.output_tokens,
-            "total_tokens" => (response_message.input_tokens || 0) + (response_message.output_tokens || 0)
-          }
+          "usage" => usage_payload
         }
       end
     rescue StandardError => e

data/lib/raix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Raix
-  VERSION = "2.0.2"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: raix
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Obie Fernandez
 bindir: exe
 cert_chain: []
-date: 2026-03-27 00:00:00.000000000 Z
+date: 2026-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,7 +114,6 @@ files:
 - lib/raix/response_format.rb
 - lib/raix/transcript_adapter.rb
 - lib/raix/version.rb
-- raix.gemspec
 - sig/raix.rbs
 homepage: https://github.com/OlympiaAI/raix
 licenses:

data/raix.gemspec

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/raix/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "raix"
-  spec.version = Raix::VERSION
-  spec.authors = ["Obie Fernandez"]
-  spec.email = ["obiefernandez@gmail.com"]
-
-  spec.summary = "Ruby AI eXtensions"
-  spec.homepage = "https://github.com/OlympiaAI/raix"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.2.2"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/OlympiaAI/raix"
-  spec.metadata["changelog_uri"] = "https://github.com/OlympiaAI/raix/blob/main/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
-    end
-  end
-
-  # Ensure all gem files are world-readable so they work in Docker containers
-  # where gems are installed as root but the app runs as a non-root user.
-  spec.files.each do |f|
-    path = File.join(__dir__, f)
-    File.chmod(0o644, path) if File.file?(path) && !File.executable?(path)
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activesupport", ">= 6.0"
-  spec.add_dependency "faraday-retry", "~> 2.0"
-  spec.add_dependency "ostruct"
-  spec.add_dependency "ruby_llm", "~> 1.9"
-  spec.add_dependency "zeitwerk", "~> 2.7"
-end