riffer 0.52.1 → 0.53.0

data/sig/generated/riffer/{config/pricing → catalog}/rates.rbs

@@ -1,6 +1,6 @@
-# Generated from lib/riffer/config/pricing/rates.rb with RBS::Inline
+# Generated from lib/riffer/catalog/rates.rb with RBS::Inline
 
-class Riffer::Config::Pricing::Rates
+class Riffer::Catalog::Rates
   attr_reader input: Float
 
   attr_reader output: Float
@@ -10,10 +10,16 @@ class Riffer::Config::Pricing::Rates
   attr_reader cache_write: Float?
 
   # --
-  # : (input: Float, output: Float, ?cache_read: Float?, ?cache_write: Float?) -> void
-  def initialize: (input: Float, output: Float, ?cache_read: Float?, ?cache_write: Float?) -> void
+  # : (input: untyped, output: untyped, ?cache_read: untyped, ?cache_write: untyped) -> void
+  def initialize: (input: untyped, output: untyped, ?cache_read: untyped, ?cache_write: untyped) -> void
 
   # --
   # : (input_tokens: Integer, output_tokens: Integer, ?cache_read_tokens: Integer?, ?cache_write_tokens: Integer?) -> Float
   def cost_for: (input_tokens: Integer, output_tokens: Integer, ?cache_read_tokens: Integer?, ?cache_write_tokens: Integer?) -> Float
+
+  private
+
+  # --
+  # : (untyped, String) -> Float
+  def coerce_rate: (untyped, String) -> Float
 end

data/sig/generated/riffer/catalog.rbs

@@ -0,0 +1,77 @@
+# Generated from lib/riffer/catalog.rb with RBS::Inline
+
+class Riffer::Catalog
+  SUPPORTED_VERSIONS: Array[Integer]
+
+  FILE_KEYS: Array[String]
+
+  ENTRY_KEYS: Array[String]
+
+  PRICING_KEYS: Array[String]
+
+  @aliases: Hash[String, String]
+
+  @models: Hash[String, Hash[Symbol, untyped]]
+
+  # --
+  # : (Array[String]) -> Riffer::Catalog
+  def self.load: (Array[String]) -> Riffer::Catalog
+
+  # --
+  # : (models: Hash[String, Hash[Symbol, untyped]], aliases: Hash[String, String]) -> void
+  def initialize: (models: Hash[String, Hash[Symbol, untyped]], aliases: Hash[String, String]) -> void
+
+  # --
+  # : (String, Symbol) -> Hash[Symbol, untyped]?
+  def reasoning_options: (String, Symbol) -> Hash[Symbol, untyped]?
+
+  # --
+  # : (String) -> Riffer::Catalog::Rates?
+  def rates_for: (String) -> Riffer::Catalog::Rates?
+
+  # --
+  # : () -> bool
+  def empty?: () -> bool
+
+  # --
+  # : (String) -> Hash[String, Hash[Symbol, untyped]]
+  def self.parse_file: (String) -> Hash[String, Hash[Symbol, untyped]]
+
+  # --
+  # : (String, String, untyped) -> Hash[Symbol, untyped]
+  def self.parse_entry: (String, String, untyped) -> Hash[Symbol, untyped]
+
+  # --
+  # : (String, String, untyped) -> Array[String]
+  def self.parse_aliases: (String, String, untyped) -> Array[String]
+
+  # --
+  # : (String, String, untyped) -> Riffer::Catalog::Rates
+  def self.parse_pricing: (String, String, untyped) -> Riffer::Catalog::Rates
+
+  # --
+  # : (String, String, untyped) -> Hash[Symbol, Hash[Symbol, untyped]]
+  def self.parse_reasoning: (String, String, untyped) -> Hash[Symbol, Hash[Symbol, untyped]]
+
+  # --
+  # : (String, untyped, String) -> void
+  def self.validate_model_key!: (String, untyped, String) -> void
+
+  # --
+  # : (untyped) -> untyped
+  def self.symbolize_keys: (untyped) -> untyped
+
+  # --
+  # : (String, String) -> bot
+  def self.fail_load!: (String, String) -> bot
+
+  private
+
+  # --
+  # : (String) -> Hash[Symbol, untyped]?
+  def entry: (String) -> Hash[Symbol, untyped]?
+
+  # --
+  # : (untyped) -> untyped
+  def deep_freeze: (untyped) -> untyped
+end

data/sig/generated/riffer/config/pricing.rbs

@@ -1,7 +1,13 @@
 # Generated from lib/riffer/config/pricing.rb with RBS::Inline
 
+# @deprecated Set pricing in a catalog file instead (see docs/CATALOG.md).
+# A catalog entry's pricing wins over rates registered here.
 class Riffer::Config::Pricing
-  @rates: Hash[String, Riffer::Config::Pricing::Rates]
+  DEPRECATION_MESSAGE: String
+
+  @rates: Hash[String, Riffer::Catalog::Rates]
+
+  self.@warned: bool
 
   # --
   # : () -> void
@@ -12,20 +18,15 @@ class Riffer::Config::Pricing
   def set: (String | Array[String], input: Numeric, output: Numeric, ?cache_read: Numeric?, ?cache_write: Numeric?) -> void
 
   # --
-  # : (String) -> Riffer::Config::Pricing::Rates?
-  def rates_for: (String) -> Riffer::Config::Pricing::Rates?
+  # : (String) -> Riffer::Catalog::Rates?
+  def rates_for: (String) -> Riffer::Catalog::Rates?
 
   # --
   # : () -> bool
   def empty?: () -> bool
 
-  private
-
+  # Once per process, so a boot that sets many models logs one line.
   # --
-  # : (untyped, String) -> Float
-  def coerce_rate: (untyped, String) -> Float
-
-  # --
-  # : (untyped, String) -> Float?
-  def coerce_optional_rate: (untyped, String) -> Float?
+  # : () -> void
+  def self.warn_deprecated: () -> void
 end

data/sig/generated/riffer/config.rbs

@@ -3,6 +3,8 @@
 class Riffer::Config
   VALID_MESSAGE_ID_STRATEGIES: untyped
 
+  @catalog: Riffer::Catalog?
+
   attr_reader amazon_bedrock: Riffer::Config::AmazonBedrock
 
   attr_reader anthropic: Riffer::Config::Anthropic
@@ -31,8 +33,23 @@ class Riffer::Config
 
   attr_reader files: Riffer::Config::Files
 
+  # @deprecated Use +catalog_files+.
   attr_reader pricing: Riffer::Config::Pricing
 
+  attr_reader catalog_files: Array[String]
+
+  # --
+  # : (Array[untyped]) -> void
+  def catalog_files=: (Array[untyped]) -> void
+
+  # --
+  # : () -> Riffer::Catalog
+  def catalog: () -> Riffer::Catalog
+
+  # --
+  # : () -> Riffer::Catalog
+  def reload_catalog: () -> Riffer::Catalog
+
   # When not +:none+, seeded messages passed to +Riffer::Agent#generate+ must
   # carry their own +id+.
   attr_reader message_id_strategy: Symbol

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

@@ -36,6 +36,12 @@ class Riffer::Providers::AmazonBedrock < Riffer::Providers::Base
   # : () -> untyped
   def build_client: () -> untyped
 
+  # Claude's fields, since application inference profile ARNs hide the model
+  # family; other families need a catalog entry.
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def build_request_params: (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]

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

@@ -32,6 +32,10 @@ class Riffer::Providers::Anthropic < Riffer::Providers::Base
   # : () -> untyped
   def build_client: () -> untyped
 
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def build_request_params: (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]

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

@@ -76,8 +76,28 @@ class Riffer::Providers::Base
   def apply_pricing: (Riffer::Providers::TokenUsage) -> Riffer::Providers::TokenUsage
 
   # --
-  # : () -> Riffer::Config::Pricing::Rates?
-  def pricing_rates: () -> Riffer::Config::Pricing::Rates?
+  # : () -> Riffer::Catalog::Rates?
+  def pricing_rates: () -> Riffer::Catalog::Rates?
+
+  # --
+  # : (String) -> String?
+  def catalog_key: (String) -> String?
+
+  # A catalog fragment beats the provider default per level; the caller's
+  # options are merged over either, so +model_options+ always wins.
+  # --
+  # : (String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
+  def apply_reasoning: (String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
+
+  # Maps a level onto the provider's own reasoning params when the catalog has
+  # no entry; +nil+ means riffer raises before the request.
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]?
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]?
+
+  # --
+  # : (Hash[Symbol, untyped], Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
+  def deep_merge: (Hash[Symbol, untyped], Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
 
   # --
   # : (untyped) -> Riffer::Providers::FinishReason?

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

@@ -23,6 +23,10 @@ class Riffer::Providers::Gemini < Riffer::Providers::Base
   # : () -> untyped
   def build_client: () -> untyped
 
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def build_request_params: (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]

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

@@ -35,6 +35,11 @@ class Riffer::Providers::Mock < Riffer::Providers::Base
   # : (Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def normalize_response: (Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
 
+  # Never raises, so test suites can set +reasoning+ without catalog entries.
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def build_request_params: (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]

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

@@ -29,6 +29,10 @@ class Riffer::Providers::OpenAI < Riffer::Providers::Base
   # : () -> untyped
   def build_client: () -> untyped
 
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def build_request_params: (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]

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

@@ -34,6 +34,10 @@ class Riffer::Providers::OpenRouter < Riffer::Providers::Base
   # : () -> untyped
   def build_client: () -> untyped
 
+  # --
+  # : (Symbol) -> Hash[Symbol, untyped]
+  def default_reasoning_options: (Symbol) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
   def build_request_params: (Array[Riffer::Messages::Base], String?, Hash[Symbol, untyped]) -> Hash[Symbol, untyped]

data/sig/generated/riffer.rbs

@@ -55,6 +55,7 @@ module Riffer
   # : () -> Riffer::Config
   def config: () -> Riffer::Config
 
+  # Builds the catalog after the block, so a bad catalog file fails boot.
   # --
   # : () ?{ (Riffer::Config) -> void } -> void
   def configure: () ?{ (Riffer::Config) -> void } -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riffer
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.53.0
 platform: ruby
 authors:
 - Jake Bottrall
@@ -83,6 +83,7 @@ files:
 - docs/AGENTS.md
 - docs/AGENT_LIFECYCLE.md
 - docs/AGENT_LOOP.md
+- docs/CATALOG.md
 - docs/CONFIGURATION.md
 - docs/EVALS.md
 - docs/GETTING_STARTED.md
@@ -119,6 +120,8 @@ files:
 - lib/riffer/agent/structured_output.rb
 - lib/riffer/agent/structured_output/parser.rb
 - lib/riffer/agent/structured_output/result.rb
+- lib/riffer/catalog.rb
+- lib/riffer/catalog/rates.rb
 - lib/riffer/config.rb
 - lib/riffer/config/amazon_bedrock.rb
 - lib/riffer/config/anthropic.rb
@@ -130,7 +133,6 @@ files:
 - lib/riffer/config/open_ai.rb
 - lib/riffer/config/open_router.rb
 - lib/riffer/config/pricing.rb
-- lib/riffer/config/pricing/rates.rb
 - lib/riffer/config/skills.rb
 - lib/riffer/config/tracing.rb
 - lib/riffer/evals.rb
@@ -268,6 +270,8 @@ files:
 - sig/generated/riffer/agent/structured_output.rbs
 - sig/generated/riffer/agent/structured_output/parser.rbs
 - sig/generated/riffer/agent/structured_output/result.rbs
+- sig/generated/riffer/catalog.rbs
+- sig/generated/riffer/catalog/rates.rbs
 - sig/generated/riffer/config.rbs
 - sig/generated/riffer/config/amazon_bedrock.rbs
 - sig/generated/riffer/config/anthropic.rbs
@@ -279,7 +283,6 @@ files:
 - sig/generated/riffer/config/open_ai.rbs
 - sig/generated/riffer/config/open_router.rbs
 - sig/generated/riffer/config/pricing.rbs
-- sig/generated/riffer/config/pricing/rates.rbs
 - sig/generated/riffer/config/skills.rbs
 - sig/generated/riffer/config/tracing.rbs
 - sig/generated/riffer/evals.rbs