ruby_llm-contract 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2803caa3f400a1c3ca1f2a3c062bf1e79080d25f4dd3d9a652300007eb363d21
-  data.tar.gz: 27cfd8b34f7ddeb2e2af72142c2d38994a84cd50a2ecd494c173d9fdaf220329
+  metadata.gz: c8111e9c77abab44b943129932bf6f225f619c930568bfe848c96b916cb72224
+  data.tar.gz: 4d54273d0b0dfd2fc4a44a34ff681aaa767956bbe89230659e975a91bf2a3821
 SHA512:
-  metadata.gz: f587bc603e2270a6e96979a62421bb0ac45cf68ae1d0ca53518bca6e394a72fd6ab2b8cb3622e0f98104fa0212aa3fe45fb5814a2aea6560b0ae2ae57a2f3041
-  data.tar.gz: b6dd0147f09e8936ac2198f95a26188913095cbb26d3a073a233c7822cb5441b04567ae88a1c68dacd79a792fe84e6479fd771282c1a51bfedb3fa0609ff0ebb
+  metadata.gz: d5226bdd266a5676bbf4bef0b71580387825f15eb77e9739426e6845b62d6410d22583d2f3f3ad47d2eacca8980fb0763a8a23bf1c1f04c723cae5d4f021ed68
+  data.tar.gz: 2ee39172b68a94fd8dae1b633d17cc1e0bfac4f82413a0d4233d50f1851b860527248887ca35ebf88ef6b1fc69de78f6fc2775712c75e272891f36d44ba30f57

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.2.2 (2026-03-23)
+
+Fixes from first real-world integration (persona_tool).
+
+- **`around_call` fires per-run** — not per-attempt. With retry_policy, callback fires once with final result. Signature: `around_call { |step, input, result| ... }`
+- **`Result#trace` always `Trace` object** — never bare Hash. `result.trace.model` works on success AND failure.
+- **`around_call` exception safe** — warns and returns result instead of crashing.
+- **`model` DSL** — `model "gpt-4o-mini"` per-step. Priority: context > step DSL > global config.
+- **Test adapter `raw_output` always String** — Hash/Array normalized to `.to_json`.
+- **`Trace#dig`** — `trace.dig(:usage, :input_tokens)` works.
+
 ## 0.2.1 (2026-03-23)
 
 Production DX improvements from first real-world integration (persona_tool).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_llm-contract (0.2.1)
+    ruby_llm-contract (0.2.2)
       dry-types (~> 1.7)
       ruby_llm (~> 1.0)
       ruby_llm-schema (~> 0.3)
@@ -165,7 +165,7 @@ CHECKSUMS
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   ruby_llm (1.14.0) sha256=57c6f7034fc4a44504ea137d70f853b07824f1c1cdbe774ab3ab3522e7098deb
-  ruby_llm-contract (0.2.1)
+  ruby_llm-contract (0.2.2)
   ruby_llm-schema (0.3.0) sha256=a591edc5ca1b7f0304f0e2261de61ba4b3bea17be09f5cf7558153adfda3dec6
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f

data/lib/ruby_llm/contract/adapters/test.rb

@@ -20,7 +20,7 @@ module RubyLLM
 
         def normalize_response(response)
           case response
-          when Hash, Array then response
+          when Hash, Array then response.to_json
           when nil then ""
           else response.to_s
           end

data/lib/ruby_llm/contract/pipeline/trace.rb

@@ -25,6 +25,13 @@ module RubyLLM
           public_send(key)
         end
 
+        def dig(key, *rest)
+          value = self[key]
+          return value if rest.empty? || value.nil?
+
+          value.dig(*rest)
+        end
+
         def to_h
           { trace_id: @trace_id, total_latency_ms: @total_latency_ms,
             total_usage: @total_usage, step_traces: @step_traces,

data/lib/ruby_llm/contract/step/base.rb

@@ -63,14 +63,16 @@ module RubyLLM
           def run(input, context: {})
             warn_unknown_context_keys(context)
             adapter = resolve_adapter(context)
-            default_model = context[:model] || RubyLLM::Contract.configuration.default_model
+            default_model = context[:model] || model || RubyLLM::Contract.configuration.default_model
             policy = retry_policy
 
-            if policy
-              run_with_retry(input, adapter: adapter, default_model: default_model, policy: policy)
-            else
-              run_once(input, adapter: adapter, model: default_model, context_temperature: context[:temperature])
-            end
+            result = if policy
+                       run_with_retry(input, adapter: adapter, default_model: default_model, policy: policy)
+                     else
+                       run_once(input, adapter: adapter, model: default_model, context_temperature: context[:temperature])
+                     end
+
+            invoke_around_call(input, result)
           end
 
           def build_messages(input)
@@ -101,24 +103,28 @@ module RubyLLM
 
           def run_once(input, adapter:, model:, context_temperature: nil)
             effective_temp = context_temperature || temperature
-            runner = Runner.new(
+            Runner.new(
               input_type: input_type, output_type: output_type,
               prompt_block: prompt, contract_definition: effective_contract,
               adapter: adapter, model: model, output_schema: output_schema,
               max_output: max_output, max_input: max_input, max_cost: max_cost,
               temperature: effective_temp
-            )
-
-            if around_call
-              around_call.call(self, input) { runner.call(input) }
-            else
-              runner.call(input)
-            end
+            ).call(input)
           rescue ArgumentError => e
             Result.new(status: :input_error, raw_output: nil, parsed_output: nil,
                        validation_errors: [e.message])
           end
 
+          def invoke_around_call(input, result)
+            return result unless around_call
+
+            around_call.call(self, input, result)
+            result
+          rescue StandardError => e
+            warn "[ruby_llm-contract] around_call raised #{e.class}: #{e.message}"
+            result
+          end
+
           def effective_contract
             base = contract
             extra = class_validates

data/lib/ruby_llm/contract/step/dsl.rb

@@ -127,6 +127,18 @@ module RubyLLM
           end
         end
 
+        def model(name = nil)
+          if name
+            return @model = name
+          end
+
+          if defined?(@model)
+            @model
+          elsif superclass.respond_to?(:model)
+            superclass.model
+          end
+        end
+
         def temperature(value = nil)
           if value
             unless value.is_a?(Numeric) && value >= 0 && value <= 2

data/lib/ruby_llm/contract/step/result.rb

@@ -6,12 +6,12 @@ module RubyLLM
       class Result
         attr_reader :status, :raw_output, :parsed_output, :validation_errors, :trace
 
-        def initialize(status:, raw_output:, parsed_output:, validation_errors: [], trace: {})
+        def initialize(status:, raw_output:, parsed_output:, validation_errors: [], trace: nil)
           @status = status
           @raw_output = raw_output
           @parsed_output = parsed_output
           @validation_errors = validation_errors.freeze
-          @trace = trace.freeze
+          @trace = normalize_trace(trace)
           freeze
         end
 
@@ -23,6 +23,19 @@ module RubyLLM
           @status != :ok
         end
 
+        private
+
+        def normalize_trace(trace)
+          case trace
+          when Trace then trace
+          when Hash then Trace.new(**trace)
+          when nil then Trace.new
+          else trace
+          end.freeze
+        end
+
+        public
+
         def to_s
           if ok?
             "#{@status} (#{@trace})"

data/lib/ruby_llm/contract/step/trace.rb

@@ -26,6 +26,13 @@ module RubyLLM
           public_send(key)
         end
 
+        def dig(key, *rest)
+          value = self[key]
+          return value if rest.empty? || value.nil?
+
+          value.dig(*rest)
+        end
+
         def key?(key)
           KNOWN_KEYS.include?(key.to_sym) && !public_send(key).nil?
         end

data/lib/ruby_llm/contract/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module Contract
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-contract
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Justyna