riffer 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2818fb04f43e8b5bd3a4a2ecfc2302af15ac073985e08f3fd36c461bafdf8c
-  data.tar.gz: e5ec190ea0c927eb38604849798b44fc96a03ba80510376d1d0e2eb2f5138fd0
+  metadata.gz: 89f3c7419e5a1cde4cf2a7ade73a224dc30ac5ae900041938eb165a31e568e81
+  data.tar.gz: a07f353544bbdd3904092b34d2c4c03e1dadaad6374876f2ef3dc3767f3373d2
 SHA512:
-  metadata.gz: c841653977d2277537ae2930a874d32748f874a4995fa058fd2abdff798d70f99cecdc4e75058179194f7b78502e209c4c97d916b4f568cab5935b9f4d470e84
-  data.tar.gz: 383682e8b929bc8f164c9bce1ae0b6bbec9a6ea7a30a5282bde79becfe886b22e7177f45ac5421ec97aad7fdfd2adf0150d649d0791c14f931c59ab737b36940
+  metadata.gz: 85e7b09d7491c6d670ac76f7fa981410fec26a04c8d73dfe7c4ca4a4f6b9a722c58ebbecfd9527cf3df30784e3c0ffa90098e3e9545d0bafdf3efd6997b0133d
+  data.tar.gz: 5aaac2e175f09429587fc2e7d6878aaa97114ef5a9d8a038ca6647662f364ef1403d5b43a5731b4fbed263b1a08d7ba4a42a459d630b6bc9039ca09a40c0f513

data/.agents/providers.md

@@ -10,14 +10,15 @@
 
 ## Architecture
 
-The base class uses the **template method** pattern. The public methods `generate_text` and `stream_text` orchestrate the flow, delegating to five hook methods that each provider implements:
+The base class uses the **template method** pattern. The public methods `generate_text` and `stream_text` orchestrate the flow, delegating to hook methods that each provider implements:
 
 ```
 generate_text
   ├─ build_request_params
   ├─ execute_generate
-  ├─ extract_token_usage
-  └─ extract_assistant_message
+  ├─ extract_content
+  ├─ extract_tool_calls
+  └─ extract_token_usage
 
 stream_text
   ├─ build_request_params
@@ -78,12 +79,18 @@ class Riffer::Providers::YourProvider < Riffer::Providers::Base
     )
   end
 
-  # Parse the SDK response into an Assistant message.
+  # Extract text content from the SDK response.
   #
-  #: (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message(response, token_usage = nil)
-    # Extract text and tool_calls from the response
-    Riffer::Messages::Assistant.new(text, tool_calls: tool_calls, token_usage: token_usage)
+  #: (untyped) -> String
+  def extract_content(response)
+    # Return the text content from the response
+  end
+
+  # Extract tool calls from the SDK response.
+  #
+  #: (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls(response)
+    # Return an array of ToolCall structs
   end
 end
 ```

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.14.0"
+  ".": "0.15.0"
 }

data/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.15.0](https://github.com/janeapp/riffer/compare/riffer/v0.14.0...riffer/v0.15.0) (2026-02-25)
+
+
+### Features
+
+* store structured output in assistant messages ([#140](https://github.com/janeapp/riffer/issues/140)) ([9cdb2e2](https://github.com/janeapp/riffer/commit/9cdb2e2adad5eab6745212e573534d3369528ccb))
+
 ## [0.14.0](https://github.com/janeapp/riffer/compare/riffer/v0.13.0...riffer/v0.14.0) (2026-02-24)
 
 

data/docs/03_AGENTS.md

@@ -425,6 +425,19 @@ response.structured_output  # => {sentiment: "positive", score: 0.95}
 
 Returns `nil` when structured output is not configured or when validation fails.
 
+The assistant message in the message history stores the parsed hash, so you can access structured output directly from persisted messages:
+
+```ruby
+agent = SentimentAgent.new
+agent.generate('Analyze: "I love this!"')
+
+msg = agent.messages.last
+msg.structured_output?    # => true
+msg.structured_output     # => {sentiment: "positive", score: 0.95}
+```
+
+See [Messages — Structured Output on Messages](05_MESSAGES.md#structured-output-on-messages) for details.
+
 ## Class Methods
 
 ### find

data/docs/05_MESSAGES.md

@@ -65,6 +65,28 @@ if msg.token_usage
 end
 ```
 
+#### Structured Output on Messages
+
+When an agent has `structured_output` configured, the final assistant message stores the parsed hash directly. The `structured_output?` predicate checks for a non-nil value:
+
+```ruby
+msg = Riffer::Messages::Assistant.new('{"sentiment":"positive"}', structured_output: {sentiment: "positive"})
+msg.structured_output?    # => true
+msg.structured_output     # => {sentiment: "positive"}
+
+# When not provided, structured_output returns nil
+msg = Riffer::Messages::Assistant.new('{"sentiment":"positive"}')
+msg.structured_output?    # => false
+msg.structured_output     # => nil
+```
+
+The `to_h` representation includes `structured_output` only when present:
+
+```ruby
+msg = Riffer::Messages::Assistant.new('{"sentiment":"positive"}', structured_output: {sentiment: "positive"})
+msg.to_h  # => {role: :assistant, content: '{"sentiment":"positive"}', structured_output: {sentiment: "positive"}}
+```
+
 ### Tool
 
 Tool messages contain the results of tool executions:

data/lib/riffer/agent.rb

@@ -320,17 +320,17 @@ class Riffer::Agent
         execute_tool_calls(processed_response)
       end
 
-      content = extract_final_response
-      structured_output = parse_structured_content(content)
-      return build_response(content, modifications: all_modifications, structured_output: structured_output)
+      response = extract_final_response
+
+      return build_response(response.content, modifications: all_modifications, structured_output: validate_structured_output(response))
     end
 
     # catch returns the thrown value when throw :riffer_interrupt fires;
     # the return above exits on the successful (non-interrupted) path.
     @interrupted = true
-    content = extract_final_response
-    structured_output = parse_structured_content(content)
-    build_response(content, modifications: all_modifications, interrupted: true, interrupt_reason: reason, structured_output: structured_output)
+    response = extract_final_response
+
+    build_response(response.content, modifications: all_modifications, interrupted: true, interrupt_reason: reason, structured_output: validate_structured_output(response))
   end
 
   #: (Riffer::Messages::Base) -> void
@@ -614,10 +614,9 @@ class Riffer::Agent
     args.transform_keys(&:to_sym)
   end
 
-  #: () -> String
+  #: () -> Riffer::Messages::Assistant?
   def extract_final_response
-    last_assistant_message = @messages.reverse.find { |msg| msg.is_a?(Riffer::Messages::Assistant) }
-    last_assistant_message&.content || ""
+    @messages.reverse.find { |msg| msg.is_a?(Riffer::Messages::Assistant) }
   end
 
   #: () -> [Riffer::Guardrails::Tripwire?, Array[Riffer::Guardrails::Modification]]
@@ -645,6 +644,13 @@ class Riffer::Agent
     [processed_response, tripwire, modifications]
   end
 
+  #: (Riffer::Messages::Assistant?) -> Hash[Symbol, untyped]?
+  def validate_structured_output(response)
+    return unless response&.structured_output? && @structured_output
+
+    @structured_output.parse_and_validate(response.content).object
+  end
+
   #: () -> Riffer::StructuredOutput?
   def resolve_structured_output
     params = self.class.structured_output
@@ -658,13 +664,6 @@ class Riffer::Agent
     opts
   end
 
-  #: (String) -> Hash[Symbol, untyped]?
-  def parse_structured_content(content)
-    return nil unless @structured_output
-    result = @structured_output.parse_and_validate(content)
-    result.object
-  end
-
   #: (String, ?tripwire: Riffer::Guardrails::Tripwire?, ?modifications: Array[Riffer::Guardrails::Modification], ?interrupted: bool, ?interrupt_reason: (String | Symbol)?, ?structured_output: Hash[Symbol, untyped]?) -> Riffer::Agent::Response
   def build_response(content, tripwire: nil, modifications: [], interrupted: false, interrupt_reason: nil, structured_output: nil)
     Riffer::Agent::Response.new(content, tripwire: tripwire, modifications: modifications, interrupted: interrupted, interrupt_reason: interrupt_reason, structured_output: structured_output)

data/lib/riffer/messages/assistant.rb

@@ -19,11 +19,15 @@ class Riffer::Messages::Assistant < Riffer::Messages::Base
   # Token usage data for this response.
   attr_reader :token_usage #: Riffer::TokenUsage?
 
-  #: (String, ?tool_calls: Array[Riffer::Messages::Assistant::ToolCall], ?token_usage: Riffer::TokenUsage?) -> void
-  def initialize(content, tool_calls: [], token_usage: nil)
+  # Parsed structured output hash, or nil when not applicable.
+  attr_reader :structured_output #: Hash[Symbol, untyped]?
+
+  #: (String, ?tool_calls: Array[Riffer::Messages::Assistant::ToolCall], ?token_usage: Riffer::TokenUsage?, ?structured_output: Hash[Symbol, untyped]?) -> void
+  def initialize(content, tool_calls: [], token_usage: nil, structured_output: nil)
     super(content)
     @tool_calls = tool_calls
     @token_usage = token_usage
+    @structured_output = structured_output
   end
 
   #: () -> Symbol
@@ -31,6 +35,11 @@ class Riffer::Messages::Assistant < Riffer::Messages::Base
     :assistant
   end
 
+  # @rbs () -> bool
+  def structured_output?
+    !@structured_output.nil?
+  end
+
   # Converts the message to a hash.
   #
   #: () -> Hash[Symbol, untyped]
@@ -38,6 +47,7 @@ class Riffer::Messages::Assistant < Riffer::Messages::Base
     hash = {role: role, content: content}
     hash[:tool_calls] = tool_calls.map(&:to_h) unless tool_calls.empty?
     hash[:token_usage] = token_usage.to_h if token_usage
+    hash[:structured_output] = structured_output if structured_output?
     hash
   end
 end

data/lib/riffer/messages/converter.rb

@@ -68,7 +68,8 @@ module Riffer::Messages::Converter
       Riffer::Messages::User.new(content, files: files)
     when :assistant
       tool_calls = hash[:tool_calls] || hash["tool_calls"] || []
-      Riffer::Messages::Assistant.new(content, tool_calls: tool_calls)
+      structured_output = hash[:structured_output] || hash["structured_output"]
+      Riffer::Messages::Assistant.new(content, tool_calls: tool_calls, structured_output: structured_output)
     when :system
       Riffer::Messages::System.new(content)
     when :tool

data/lib/riffer/providers/amazon_bedrock.rb

@@ -84,21 +84,29 @@ class Riffer::Providers::AmazonBedrock < Riffer::Providers::Base
     )
   end
 
-  #: (Aws::BedrockRuntime::Types::ConverseResponse, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message(response, token_usage = nil)
-    output = response.output
-    raise Riffer::Error, "No output returned from Bedrock API" if output.nil? || output.message.nil?
-
-    content_blocks = output.message.content
-    raise Riffer::Error, "No content returned from Bedrock API" if content_blocks.nil? || content_blocks.empty?
+  #: (Aws::BedrockRuntime::Types::ConverseResponse) -> String
+  def extract_content(response)
+    content_blocks = response.output&.message&.content
+    return "" if content_blocks.nil? || content_blocks.empty?
 
     text_content = ""
+
+    content_blocks.each do |block|
+      text_content = block.text if block.respond_to?(:text) && block.text
+    end
+
+    text_content
+  end
+
+  #: (Aws::BedrockRuntime::Types::ConverseResponse) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls(response)
+    content_blocks = response.output&.message&.content
+    return [] if content_blocks.nil? || content_blocks.empty?
+
     tool_calls = []
 
     content_blocks.each do |block|
-      if block.respond_to?(:text) && block.text
-        text_content = block.text
-      elsif block.respond_to?(:tool_use) && block.tool_use
+      if block.respond_to?(:tool_use) && block.tool_use
         tool_calls << Riffer::Messages::Assistant::ToolCall.new(
           id: block.tool_use.tool_use_id,
           call_id: block.tool_use.tool_use_id,
@@ -108,11 +116,7 @@ class Riffer::Providers::AmazonBedrock < Riffer::Providers::Base
       end
     end
 
-    if text_content.empty? && tool_calls.empty?
-      raise Riffer::Error, "No content returned from Bedrock API"
-    end
-
-    Riffer::Messages::Assistant.new(text_content, tool_calls: tool_calls, token_usage: token_usage)
+    tool_calls
   end
 
   #: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/lib/riffer/providers/anthropic.rb

@@ -81,20 +81,29 @@ class Riffer::Providers::Anthropic < Riffer::Providers::Base
     )
   end
 
-  #: (Anthropic::Models::Message, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message(response, token_usage = nil)
+  #: (Anthropic::Models::Message) -> String
+  def extract_content(response)
     content_blocks = response.content
-    raise Riffer::Error, "No content returned from Anthropic API" if content_blocks.nil? || content_blocks.empty?
+    return "" if content_blocks.nil? || content_blocks.empty?
 
     text_content = ""
+
+    content_blocks.each do |block|
+      text_content = block.text if block.type.to_s == "text"
+    end
+
+    text_content
+  end
+
+  #: (Anthropic::Models::Message) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls(response)
+    content_blocks = response.content
+    return [] if content_blocks.nil? || content_blocks.empty?
+
     tool_calls = []
 
     content_blocks.each do |block|
-      block_type = block.type.to_s
-      case block_type
-      when "text"
-        text_content = block.text
-      when "tool_use"
+      if block.type.to_s == "tool_use"
         tool_calls << Riffer::Messages::Assistant::ToolCall.new(
           id: block.id,
           call_id: block.id,
@@ -104,11 +113,7 @@ class Riffer::Providers::Anthropic < Riffer::Providers::Base
       end
     end
 
-    if text_content.empty? && tool_calls.empty?
-      raise Riffer::Error, "No content returned from Anthropic API"
-    end
-
-    Riffer::Messages::Assistant.new(text_content, tool_calls: tool_calls, token_usage: token_usage)
+    tool_calls
   end
 
   #: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/lib/riffer/providers/base.rb

@@ -14,7 +14,8 @@ require "json"
 # - +execute_generate+ — call the SDK and return the raw response
 # - +execute_stream+ — call the streaming SDK, mapping events to the yielder
 # - +extract_token_usage+ — pull token counts from the SDK response
-# - +extract_assistant_message+ — parse the SDK response into an +Assistant+ message
+# - +extract_content+ — extract text content from the SDK response
+# - +extract_tool_calls+ — extract tool calls from the SDK response
 class Riffer::Providers::Base
   include Riffer::Helpers::Dependencies
   include Riffer::Messages::Converter
@@ -28,7 +29,18 @@ class Riffer::Providers::Base
     validate_normalized_messages!(messages)
     params = build_request_params(messages, model, options)
     response = execute_generate(params)
-    extract_assistant_message(response, extract_token_usage(response))
+
+    content = extract_content(response)
+    tool_calls = extract_tool_calls(response)
+    token_usage = extract_token_usage(response)
+    structured_output = parse_structured_output(content) if options[:structured_output] && tool_calls.empty?
+
+    Riffer::Messages::Assistant.new(
+      content,
+      tool_calls: tool_calls,
+      token_usage: token_usage,
+      structured_output: structured_output
+    )
   end
 
   # Streams text from the provider.
@@ -66,9 +78,21 @@ class Riffer::Providers::Base
     raise NotImplementedError, "Subclasses must implement #extract_token_usage"
   end
 
-  #: (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message(response, token_usage = nil)
-    raise NotImplementedError, "Subclasses must implement #extract_assistant_message"
+  #: (untyped) -> String
+  def extract_content(response)
+    raise NotImplementedError, "Subclasses must implement #extract_content"
+  end
+
+  #: (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls(response)
+    raise NotImplementedError, "Subclasses must implement #extract_tool_calls"
+  end
+
+  #: (String) -> Hash[Symbol, untyped]?
+  def parse_structured_output(content)
+    JSON.parse(content, symbolize_names: true)
+  rescue JSON::ParserError
+    nil
   end
 
   #: ((String | Hash[String, untyped])?) -> Hash[String, untyped]

data/lib/riffer/providers/mock.rb

@@ -67,17 +67,14 @@ class Riffer::Providers::Mock < Riffer::Providers::Base
     response[:token_usage]
   end
 
-  #: (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message(response, token_usage = nil)
-    if response.is_a?(Hash)
-      Riffer::Messages::Assistant.new(
-        response[:content],
-        tool_calls: response[:tool_calls] || [],
-        token_usage: token_usage
-      )
-    else
-      response
-    end
+  #: (untyped) -> String
+  def extract_content(response)
+    response.is_a?(Hash) ? (response[:content] || "") : response.content
+  end
+
+  #: (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls(response)
+    response.is_a?(Hash) ? (response[:tool_calls] || []) : response.tool_calls
   end
 
   #: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/lib/riffer/providers/open_ai.rb

@@ -77,19 +77,26 @@ class Riffer::Providers::OpenAI < Riffer::Providers::Base
     )
   end
 
-  #: (OpenAI::Models::Responses::Response, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message(response, token_usage = nil)
-    output_items = response.output
-
+  #: (OpenAI::Models::Responses::Response) -> String
+  def extract_content(response)
     text_content = ""
-    tool_calls = []
 
-    output_items.each do |item|
-      case item.type
-      when :message
+    response.output.each do |item|
+      if item.type == :message
         text_block = item.content&.find { |c| c.type == :output_text }
         text_content = text_block&.text || "" if text_block
-      when :function_call
+      end
+    end
+
+    text_content
+  end
+
+  #: (OpenAI::Models::Responses::Response) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls(response)
+    tool_calls = []
+
+    response.output.each do |item|
+      if item.type == :function_call
         tool_calls << Riffer::Messages::Assistant::ToolCall.new(
           id: item.id,
           call_id: item.call_id,
@@ -99,11 +106,7 @@ class Riffer::Providers::OpenAI < Riffer::Providers::Base
       end
     end
 
-    if text_content.empty? && tool_calls.empty?
-      raise Riffer::Error, "No output returned from OpenAI API"
-    end
-
-    Riffer::Messages::Assistant.new(text_content, tool_calls: tool_calls, token_usage: token_usage)
+    tool_calls
   end
 
   #: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/lib/riffer/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Riffer
-  VERSION = "0.14.0" #: String
+  VERSION = "0.15.0" #: String
 end

data/sig/generated/riffer/agent.rbs

@@ -231,8 +231,8 @@ class Riffer::Agent
   # : ((String | Hash[String, untyped])?) -> Hash[Symbol, untyped]
   def parse_tool_arguments: ((String | Hash[String, untyped])?) -> Hash[Symbol, untyped]
 
-  # : () -> String
-  def extract_final_response: () -> String
+  # : () -> Riffer::Messages::Assistant?
+  def extract_final_response: () -> Riffer::Messages::Assistant?
 
   # : () -> [Riffer::Guardrails::Tripwire?, Array[Riffer::Guardrails::Modification]]
   def run_before_guardrails: () -> [ Riffer::Guardrails::Tripwire?, Array[Riffer::Guardrails::Modification] ]
@@ -240,15 +240,15 @@ class Riffer::Agent
   # : (Riffer::Messages::Assistant) -> [untyped, Riffer::Guardrails::Tripwire?, Array[Riffer::Guardrails::Modification]]
   def run_after_guardrails: (Riffer::Messages::Assistant) -> [ untyped, Riffer::Guardrails::Tripwire?, Array[Riffer::Guardrails::Modification] ]
 
+  # : (Riffer::Messages::Assistant?) -> Hash[Symbol, untyped]?
+  def validate_structured_output: (Riffer::Messages::Assistant?) -> Hash[Symbol, untyped]?
+
   # : () -> Riffer::StructuredOutput?
   def resolve_structured_output: () -> Riffer::StructuredOutput?
 
   # : () -> Hash[Symbol, untyped]
   def merged_model_options: () -> Hash[Symbol, untyped]
 
-  # : (String) -> Hash[Symbol, untyped]?
-  def parse_structured_content: (String) -> Hash[Symbol, untyped]?
-
   # : (String, ?tripwire: Riffer::Guardrails::Tripwire?, ?modifications: Array[Riffer::Guardrails::Modification], ?interrupted: bool, ?interrupt_reason: (String | Symbol)?, ?structured_output: Hash[Symbol, untyped]?) -> Riffer::Agent::Response
   def build_response: (String, ?tripwire: Riffer::Guardrails::Tripwire?, ?modifications: Array[Riffer::Guardrails::Modification], ?interrupted: bool, ?interrupt_reason: (String | Symbol)?, ?structured_output: Hash[Symbol, untyped]?) -> Riffer::Agent::Response
 end

data/sig/generated/riffer/messages/assistant.rbs

@@ -28,12 +28,18 @@ class Riffer::Messages::Assistant < Riffer::Messages::Base
   # Token usage data for this response.
   attr_reader token_usage: Riffer::TokenUsage?
 
-  # : (String, ?tool_calls: Array[Riffer::Messages::Assistant::ToolCall], ?token_usage: Riffer::TokenUsage?) -> void
-  def initialize: (String, ?tool_calls: Array[Riffer::Messages::Assistant::ToolCall], ?token_usage: Riffer::TokenUsage?) -> void
+  # Parsed structured output hash, or nil when not applicable.
+  attr_reader structured_output: Hash[Symbol, untyped]?
+
+  # : (String, ?tool_calls: Array[Riffer::Messages::Assistant::ToolCall], ?token_usage: Riffer::TokenUsage?, ?structured_output: Hash[Symbol, untyped]?) -> void
+  def initialize: (String, ?tool_calls: Array[Riffer::Messages::Assistant::ToolCall], ?token_usage: Riffer::TokenUsage?, ?structured_output: Hash[Symbol, untyped]?) -> void
 
   # : () -> Symbol
   def role: () -> Symbol
 
+  # @rbs () -> bool
+  def structured_output?: () -> bool
+
   # Converts the message to a hash.
   #
   # : () -> Hash[Symbol, untyped]

data/sig/generated/riffer/providers/amazon_bedrock.rbs

@@ -22,8 +22,11 @@ class Riffer::Providers::AmazonBedrock < Riffer::Providers::Base
   # : (Aws::BedrockRuntime::Types::ConverseResponse) -> Riffer::TokenUsage?
   def extract_token_usage: (Aws::BedrockRuntime::Types::ConverseResponse) -> Riffer::TokenUsage?
 
-  # : (Aws::BedrockRuntime::Types::ConverseResponse, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message: (Aws::BedrockRuntime::Types::ConverseResponse, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
+  # : (Aws::BedrockRuntime::Types::ConverseResponse) -> String
+  def extract_content: (Aws::BedrockRuntime::Types::ConverseResponse) -> String
+
+  # : (Aws::BedrockRuntime::Types::ConverseResponse) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls: (Aws::BedrockRuntime::Types::ConverseResponse) -> Array[Riffer::Messages::Assistant::ToolCall]
 
   # : (Hash[Symbol, untyped], Enumerator::Yielder) -> void
   def execute_stream: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/sig/generated/riffer/providers/anthropic.rbs

@@ -24,8 +24,11 @@ class Riffer::Providers::Anthropic < Riffer::Providers::Base
   # : (Anthropic::Models::Message) -> Riffer::TokenUsage?
   def extract_token_usage: (Anthropic::Models::Message) -> Riffer::TokenUsage?
 
-  # : (Anthropic::Models::Message, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message: (Anthropic::Models::Message, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
+  # : (Anthropic::Models::Message) -> String
+  def extract_content: (Anthropic::Models::Message) -> String
+
+  # : (Anthropic::Models::Message) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls: (Anthropic::Models::Message) -> Array[Riffer::Messages::Assistant::ToolCall]
 
   # : (Hash[Symbol, untyped], Enumerator::Yielder) -> void
   def execute_stream: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/sig/generated/riffer/providers/base.rbs

@@ -11,7 +11,8 @@
 # - +execute_generate+ — call the SDK and return the raw response
 # - +execute_stream+ — call the streaming SDK, mapping events to the yielder
 # - +extract_token_usage+ — pull token counts from the SDK response
-# - +extract_assistant_message+ — parse the SDK response into an +Assistant+ message
+# - +extract_content+ — extract text content from the SDK response
+# - +extract_tool_calls+ — extract tool calls from the SDK response
 class Riffer::Providers::Base
   include Riffer::Helpers::Dependencies
 
@@ -41,8 +42,14 @@ class Riffer::Providers::Base
   # : (untyped) -> Riffer::TokenUsage?
   def extract_token_usage: (untyped) -> Riffer::TokenUsage?
 
-  # : (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message: (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
+  # : (untyped) -> String
+  def extract_content: (untyped) -> String
+
+  # : (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls: (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
+
+  # : (String) -> Hash[Symbol, untyped]?
+  def parse_structured_output: (String) -> Hash[Symbol, untyped]?
 
   # : ((String | Hash[String, untyped])?) -> Hash[String, untyped]
   def parse_tool_arguments: ((String | Hash[String, untyped])?) -> Hash[String, untyped]

data/sig/generated/riffer/providers/mock.rbs

@@ -39,8 +39,11 @@ class Riffer::Providers::Mock < Riffer::Providers::Base
   # : (untyped) -> Riffer::TokenUsage?
   def extract_token_usage: (untyped) -> Riffer::TokenUsage?
 
-  # : (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message: (untyped, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
+  # : (untyped) -> String
+  def extract_content: (untyped) -> String
+
+  # : (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls: (untyped) -> Array[Riffer::Messages::Assistant::ToolCall]
 
   # : (Hash[Symbol, untyped], Enumerator::Yielder) -> void
   def execute_stream: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

data/sig/generated/riffer/providers/open_ai.rbs

@@ -22,8 +22,11 @@ class Riffer::Providers::OpenAI < Riffer::Providers::Base
   # : (OpenAI::Models::Responses::Response) -> Riffer::TokenUsage?
   def extract_token_usage: (OpenAI::Models::Responses::Response) -> Riffer::TokenUsage?
 
-  # : (OpenAI::Models::Responses::Response, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
-  def extract_assistant_message: (OpenAI::Models::Responses::Response, ?Riffer::TokenUsage?) -> Riffer::Messages::Assistant
+  # : (OpenAI::Models::Responses::Response) -> String
+  def extract_content: (OpenAI::Models::Responses::Response) -> String
+
+  # : (OpenAI::Models::Responses::Response) -> Array[Riffer::Messages::Assistant::ToolCall]
+  def extract_tool_calls: (OpenAI::Models::Responses::Response) -> Array[Riffer::Messages::Assistant::ToolCall]
 
   # : (Hash[Symbol, untyped], Enumerator::Yielder) -> void
   def execute_stream: (Hash[Symbol, untyped], Enumerator::Yielder) -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riffer
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jake Bottrall