lex-bedrock 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba4162f800e8419912e30cc4ce1477b5f9894f0f282bd67d3eafa3b61e74d9a
-  data.tar.gz: 2c26974438c1758108c6006c14eba339ede7feb48d6a65c157c1156de2c4dd68
+  metadata.gz: ee5a83a0ee7afd53d1d8f496bd8382332b1312939b3a49cbdf8c86b2269ff6ab
+  data.tar.gz: 467176f83f6f58de4a7640bea5f2fcd6b75be4e2a8d5a77d4fa8f3fe82854c2b
 SHA512:
-  metadata.gz: 8e3d7990c6e40d37a7ee94a58f2a792ded501d015e318e6d953589a0fe7592e1648dd631e911dc5b37b3f84d1769f7895d0fa628fc652255acb102a8c091c70b
-  data.tar.gz: 4c643c663bbcac6110209a9dcb202e04962689fee2a2268321e91e6543d76476d7bc0d14eddc7efd71e5f76e597d66e8b37f3b97a940e4e41e897f7559bc6b07
+  metadata.gz: 106a987eb8c0d61d3c8fc1e409b0168d95277db70f98fba5ee8ebd0dbe9b74c3770837b052b6cb04b32aae8bfd639511de8b907dfaccee09ee72c563792ae051
+  data.tar.gz: d8c81a605d36fd3e6b572580ad4a092a1a7bf913e5edf51e5e26302facf20cd2248da4311fcbf1867fe6cfc35eea78bea61c71c4c7ca0ff43c91d99b920482f6

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.2.1] - 2026-03-31
+
+### Added
+- `Helpers::Usage` — standardized usage hash normalization from SDK structs (`normalize`) and parsed JSON (`from_json`)
+- `Runners::Invoke#invoke_model` now returns a `usage:` key with standardized token counts extracted from the response body
+
+### Changed
+- `Runners::Converse#create` returns `usage:` as a plain hash (`{ input_tokens:, output_tokens:, cache_read_tokens:, cache_write_tokens: }`) instead of raw SDK struct
+- `Runners::Converse#create_stream` returns the same standardized usage hash
+- `Runners::Invoke#invoke_model` wrapped in `Helpers::Errors.with_retry` for production reliability
+
 ## [0.2.0] - 2026-03-31
 
 ### Added

data/lib/legion/extensions/bedrock/helpers/usage.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Legion
+  module Extensions
+    module Bedrock
+      module Helpers
+        module Usage
+          EMPTY_USAGE = {
+            input_tokens:       0,
+            output_tokens:      0,
+            cache_read_tokens:  0,
+            cache_write_tokens: 0
+          }.freeze
+
+          module_function
+
+          def normalize(sdk_usage)
+            return EMPTY_USAGE.dup unless sdk_usage
+
+            {
+              input_tokens:       sdk_usage.input_tokens || 0,
+              output_tokens:      sdk_usage.output_tokens || 0,
+              cache_read_tokens:  0,
+              cache_write_tokens: 0
+            }
+          end
+
+          def from_json(parsed)
+            return EMPTY_USAGE.dup unless parsed.is_a?(Hash)
+
+            usage = parsed['usage'] || {}
+            {
+              input_tokens:       usage['input_tokens'] || 0,
+              output_tokens:      usage['output_tokens'] || 0,
+              cache_read_tokens:  0,
+              cache_write_tokens: 0
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/legion/extensions/bedrock/runners/converse.rb

@@ -3,6 +3,7 @@
 require 'legion/extensions/bedrock/helpers/client'
 require 'legion/extensions/bedrock/helpers/errors'
 require 'legion/extensions/bedrock/helpers/thinking'
+require 'legion/extensions/bedrock/helpers/usage'
 
 module Legion
   module Extensions
@@ -30,7 +31,7 @@ module Legion
             response = Helpers::Errors.with_retry { client.converse(**request) }
             {
               result:      response.output,
-              usage:       response.usage,
+              usage:       Helpers::Usage.normalize(response.usage),
               stop_reason: response.stop_reason
             }
           end
@@ -83,7 +84,7 @@ module Legion
 
             {
               result:      accumulated_text,
-              usage:       final_usage,
+              usage:       Helpers::Usage.normalize(final_usage),
               stop_reason: final_stop
             }
           end

data/lib/legion/extensions/bedrock/runners/invoke.rb

@@ -2,6 +2,8 @@
 
 require 'json'
 require 'legion/extensions/bedrock/helpers/client'
+require 'legion/extensions/bedrock/helpers/errors'
+require 'legion/extensions/bedrock/helpers/usage'
 
 module Legion
   module Extensions
@@ -12,21 +14,25 @@ module Legion
                            content_type: 'application/json', accept: 'application/json',
                            region: Helpers::Client::DEFAULT_REGION, **)
             client = Helpers::Client.bedrock_runtime_client(
-              access_key_id:     access_key_id,
-              secret_access_key: secret_access_key,
-              region:            region
+              access_key_id:,
+              secret_access_key:,
+              region:
             )
 
-            response = client.invoke_model(
-              model_id:     model_id,
-              body:         ::JSON.dump(body),
-              content_type: content_type,
-              accept:       accept
-            )
+            response = Helpers::Errors.with_retry do
+              client.invoke_model(
+                model_id:,
+                body:         ::JSON.dump(body),
+                content_type:,
+                accept:
+              )
+            end
 
+            parsed = ::JSON.parse(response.body.read)
             {
-              result:       ::JSON.parse(response.body.read),
-              content_type: response.content_type
+              result:       parsed,
+              content_type: response.content_type,
+              usage:        Helpers::Usage.from_json(parsed)
             }
           end
 

data/lib/legion/extensions/bedrock/version.rb

@@ -3,7 +3,7 @@
 module Legion
   module Extensions
     module Bedrock
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/legion/extensions/bedrock.rb

@@ -6,6 +6,7 @@ require 'legion/extensions/bedrock/helpers/errors'
 require 'legion/extensions/bedrock/helpers/credentials'
 require 'legion/extensions/bedrock/helpers/thinking'
 require 'legion/extensions/bedrock/helpers/model_registry'
+require 'legion/extensions/bedrock/helpers/usage'
 require 'legion/extensions/bedrock/runners/models'
 require 'legion/extensions/bedrock/runners/converse'
 require 'legion/extensions/bedrock/runners/invoke'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lex-bedrock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Esity
@@ -161,6 +161,7 @@ files:
 - lib/legion/extensions/bedrock/helpers/errors.rb
 - lib/legion/extensions/bedrock/helpers/model_registry.rb
 - lib/legion/extensions/bedrock/helpers/thinking.rb
+- lib/legion/extensions/bedrock/helpers/usage.rb
 - lib/legion/extensions/bedrock/runners/converse.rb
 - lib/legion/extensions/bedrock/runners/invoke.rb
 - lib/legion/extensions/bedrock/runners/models.rb