legion-llm 0.9.35 → 0.9.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f260c2a456cc265c9ae615a84021ad73c8a82dd8bc7969e0c0d6afdab6c18e6
-  data.tar.gz: 38c4fac7b3fdb5ca97857317f17beda3fc202542aac0aed954d2959bb12c4beb
+  metadata.gz: 93611da95712602a9f99e00c4b34523c23838a99d34c3c441ea6bef642231e3f
+  data.tar.gz: 6ced6ad0b6091c5a3d53702b867eea5f04d35199892338023aebb6bb452ed867
 SHA512:
-  metadata.gz: 37ccea0f649857ee3492c4df9fb9c6c58667d5899bcba2fac5eb2daef119c2bf361c1ae58fe37815a952625ecb8d8722d760ca5860ec99644f04d423da47c6f0
-  data.tar.gz: 48c4845b82db666058aea36a4d98e20108c6754ba52cd15598c9e18f7b5a7921a9c37f34b81d8b3ece8f9e733f42dc0bf965c4c8120ecf40212e4b75692baa1a
+  metadata.gz: aa99ed858c6bef1fc214a45d4d59e51f1e9f0262f75dcdbd0f60645d59296edf6fa57e47dfa706dd0b06ec7c7f6dbf572f3832235d0d7125cd9992ec65aa6eee
+  data.tar.gz: dfe7e2db5cf883de39a5ac47438408a858372a52dd82230baa4a624e33e17b0558eb50359237345afa5b8a1df432b164149c3fce540304ac56ffbad888110c33

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Legion LLM Changelog
 
+## [0.9.36] - 2026-05-22
+
+### Fixed
+- Providers: `LexLLMAdapter` now preserves streamed token usage from the upstream `llm-gateway.uhg.com` Responses API payload added in LegionIO/legion-llm#130, including gateway-shaped `usage`, `raw[:data]`, and `raw[:response][:usage]` token fields, so LegionIO `response.completed.usage.input_tokens` no longer collapses to `0`
+
 ## [0.9.35] - 2026-05-22
 
 ### Fixed

data/lib/legion/llm/call/lex_llm_adapter.rb

@@ -336,10 +336,11 @@ module Legion
         end
 
         def accumulate_stream_usage(accumulator, chunk)
-          return unless chunk.respond_to?(:input_tokens)
+          usage = usage_hash(chunk)
+          return unless token_usage_signal?(chunk, usage)
 
           accumulator[:model] = chunk.model_id if chunk.respond_to?(:model_id)
-          accumulator[:usage] = usage_hash(chunk)
+          accumulator[:usage] = merge_usage_hash(accumulator[:usage], usage)
           accumulator[:raw] = chunk.raw if chunk.respond_to?(:raw)
         end
 
@@ -392,13 +393,89 @@ module Legion
 
         def usage_hash(response)
           {
-            input_tokens:       response.input_tokens.to_i,
-            output_tokens:      response.output_tokens.to_i,
-            cache_read_tokens:  response.cached_tokens.to_i,
-            cache_write_tokens: response.cache_creation_tokens.to_i
+            input_tokens:       extract_token_metric(response, :input_tokens, :prompt_tokens),
+            output_tokens:      extract_token_metric(response, :output_tokens, :completion_tokens),
+            cache_read_tokens:  extract_token_metric(response, :cache_read_tokens, :cached_tokens),
+            cache_write_tokens: extract_token_metric(response, :cache_write_tokens, :cache_creation_tokens)
           }
         end
 
+        def token_usage_signal?(response, usage)
+          usage.values.any?(&:positive?) ||
+            response.respond_to?(:usage) ||
+            response.respond_to?(:raw) ||
+            response.respond_to?(:input_tokens) ||
+            response.respond_to?(:output_tokens)
+        end
+
+        def merge_usage_hash(existing, incoming)
+          current = existing.is_a?(Hash) ? existing : {}
+          latest = incoming.is_a?(Hash) ? incoming : {}
+
+          {
+            input_tokens:       [current[:input_tokens].to_i, latest[:input_tokens].to_i].max,
+            output_tokens:      [current[:output_tokens].to_i, latest[:output_tokens].to_i].max,
+            cache_read_tokens:  [current[:cache_read_tokens].to_i, latest[:cache_read_tokens].to_i].max,
+            cache_write_tokens: [current[:cache_write_tokens].to_i, latest[:cache_write_tokens].to_i].max
+          }
+        end
+
+        def extract_token_metric(response, canonical_key, legacy_key = nil)
+          values = token_metric_candidates(response, canonical_key, legacy_key)
+          positive = values.find(&:positive?)
+          positive || values.first || 0
+        end
+
+        def token_metric_candidates(response, canonical_key, legacy_key = nil)
+          keys = [canonical_key, legacy_key].compact
+          token_metric_sources(response).flat_map do |source|
+            keys.filter_map { |key| extract_metric_value(source, key) }
+          end
+        end
+
+        def token_metric_sources(response)
+          sources = [response]
+          sources << response.usage if response.respond_to?(:usage)
+          sources << response.raw if response.respond_to?(:raw)
+
+          sources.compact.flat_map { |source| expand_token_metric_source(source) }.compact.uniq
+        end
+
+        def expand_token_metric_source(source, depth = 0)
+          return [] if source.nil?
+          return [source] unless source.respond_to?(:key?) && depth < 3
+
+          nested = [source]
+          nested << hash_value(source, :usage)
+          nested << hash_value(source, :data)
+          nested << hash_value(source, :response)
+          nested.compact.flat_map { |entry| [entry, *expand_token_metric_source(entry, depth + 1)] }
+        end
+
+        def extract_metric_value(source, key)
+          if source.respond_to?(key)
+            value = source.public_send(key)
+            return value.to_i unless value.nil?
+          end
+
+          return nil unless source.respond_to?(:key?)
+
+          value = hash_value(source, key)
+          value&.to_i
+        rescue StandardError => e
+          log.debug "[llm][adapter] action=extract_metric_value key=#{key} class=#{source.class} error=#{e.class}: #{e.message}"
+          nil
+        end
+
+        def hash_value(hash, key)
+          return hash[key] if hash.key?(key)
+
+          string_key = key.to_s
+          return hash[string_key] if hash.key?(string_key)
+
+          nil
+        end
+
         def stream_thinking_hash(accumulator)
           thinking_text = accumulator[:thinking_text]
           return nil if thinking_text.empty?

data/lib/legion/llm/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module LLM
-    VERSION = '0.9.35'
+    VERSION = '0.9.36'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legion-llm
 version: !ruby/object:Gem::Version
-  version: 0.9.35
+  version: 0.9.36
 platform: ruby
 authors:
 - Esity