active_harness 0.2.33 → 0.2.35

data/lib/active_harness/pricing.rb

@@ -1,85 +1,59 @@
-# frozen_string_literal: true
-
 require "json"
-require "net/http"
-require "uri"
-require "fileutils"
 
 module ActiveHarness
-  # Provides access to AI model pricing data, filtered to providers supported
-  # by ActiveHarness (files present in lib/active_harness/providers/).
-  #
-  # Data source priority:
-  #   1. {project_root}/tmp/active_harness/pricing.json — fetched cache (refreshed once per day)
-  #   2. lib/active_harness/data/models.json           — bundled fallback (ships with gem)
-  #
-  # Usage:
-  #
-  #   # Fetch fresh data and save to tmp cache (also called automatically when stale)
-  #   ActiveHarness::Pricing.update
-  #
-  #   # All models (auto-updates cache if missing or older than 24h)
-  #   ActiveHarness::Pricing.all
-  #
-  #   # Single model by ID
-  #   ActiveHarness::Pricing.find("gpt-4o")
-  #
-  #   # By provider — method or bracket syntax
-  #   ActiveHarness::Pricing.providers.openai
-  #   ActiveHarness::Pricing.providers[:anthropic]
+  # Pricing namespace — shared types and a facade over pricing source modules.
   #
-  #   # List providers that have data
-  #   ActiveHarness::Pricing.providers.list
+  # Sources (in priority order):
+  #   Pricing::OpenRouter  — live data from OpenRouter API  (image models, 24h cache)
+  #   Pricing::ModelsDev   — live data from models.dev API  (all providers, 24h cache)
   #
+  # Public facade delegates to ModelsDev (used as the general fallback):
+  #   Pricing.find("gpt-4o")       → ModelPrice or nil
+  #   Pricing.all                  → Array<ModelPrice>
+  #   Pricing.providers.openai     → Array<ModelPrice>
+  #   Pricing.update               → refreshes ModelsDev cache
   module Pricing
-    BUNDLED_DATA_FILE = File.expand_path("data/models.json", __dir__).freeze
-    MODELS_DEV_URL    = "https://models.dev/api.json"
-    CACHE_TTL         = 86_400 # 24 hours in seconds
-
-    # Maps models.dev provider keys → ActiveHarness provider names.
-    # Only entries whose value matches a file in providers/ will be kept.
-    MODELS_DEV_PROVIDER_MAP = {
-      "openai"         => "openai",
-      "anthropic"      => "anthropic",
-      "google"         => "gemini",
-      "google-vertex"  => "vertexai",
-      "amazon-bedrock" => "bedrock",
-      "deepseek"       => "deepseek",
-      "mistral"        => "mistral",
-      "openrouter"     => "openrouter",
-      "perplexity"     => "perplexity",
-      "xai"            => "xai",
-      "groq"           => "groq",
-      "azure"          => "azure"
-    }.freeze
-
-    # Value object representing the pricing for a single model.
+    # Pricing rates for a single model.
+    # All *_per_million fields are in USD per 1M tokens.
+    # audio_input_per_million / audio_output_per_million may represent
+    # per-million audio tokens or per-unit (second/char) depending on provider.
     ModelPrice = Struct.new(
       :id,
       :name,
       :provider,
-      :input_per_million,
-      :output_per_million,
+      # Primary fields (used for cost calculation, backward-compatible)
+      :input_per_million,               # text tokens input
+      :output_per_million,              # primary output (text or image_output for imggen)
       :cache_read_input_per_million,
       :cache_write_input_per_million,
       :context_window,
       :max_output_tokens,
       :input_modalities,
       :output_modalities,
+      # Extended modality-specific pricing
+      :image_input_per_million,         # image tokens accepted as input (vision models)
+      :image_output_per_million,        # image generation output tokens (imggen models)
+      :audio_input_per_million,         # audio tokens accepted as input
+      :audio_output_per_million,        # audio output tokens (TTS models)
+      :web_search_per_request,          # per web-search call in USD
       keyword_init: true
     ) do
-      # Returns capability tags derived from modality data and model id/name.
-      # Possible values: "vision", "pdf", "audio", "video", "imggen", "embed"
+      # Capability tags derived from modality data.
+      # Possible values: "vision", "pdf", "audio", "video", "imggen", "embed",
+      #                  "speech", "transcription", "rerank"
       def categories
-        inp = input_modalities  || []
-        out = output_modalities || []
+        inp = Array(input_modalities)
+        out = Array(output_modalities)
         cats = []
-        cats << "vision" if inp.include?("image")
-        cats << "pdf"    if inp.include?("pdf")
-        cats << "audio"  if inp.include?("audio") || out.include?("audio")
-        cats << "video"  if inp.include?("video")  || out.include?("video")
-        cats << "imggen" if out.include?("image")
-        cats << "embed"  if id.to_s.match?(/embed/i) || name.to_s.match?(/embed/i)
+        cats << "vision"        if inp.include?("image")
+        cats << "pdf"           if inp.include?("pdf")
+        cats << "audio"         if inp.include?("audio")
+        cats << "video"         if inp.include?("video") || out.include?("video")
+        cats << "imggen"        if out.include?("image")
+        cats << "speech"        if out.include?("speech")
+        cats << "transcription" if out.include?("transcription")
+        cats << "rerank"        if out.include?("rerank")
+        cats << "embed"         if out.include?("embeddings")
         cats
       end
 
@@ -93,201 +67,85 @@ module ActiveHarness
       end
     end
 
-    # Proxy object that exposes providers as methods and via [].
+    # Proxy returned by Pricing.providers — exposes providers as methods and [].
     class ProvidersProxy
+      def initialize(source = nil)
+        @source = source
+      end
+
       def [](name)
-        ActiveHarness::Pricing.for_provider(name.to_s)
+        source.for_provider(name.to_s)
       end
 
       def list
-        ActiveHarness::Pricing.provider_names
+        source.provider_names
       end
 
       def method_missing(name, *args, &block)
         provider = name.to_s
-        if ActiveHarness::Pricing.provider_names.include?(provider)
-          ActiveHarness::Pricing.for_provider(provider)
+        if source.provider_names.include?(provider)
+          source.for_provider(provider)
         else
           super
         end
       end
 
       def respond_to_missing?(name, include_private = false)
-        ActiveHarness::Pricing.provider_names.include?(name.to_s) || super
+        source.provider_names.include?(name.to_s) || super
+      end
+
+      private
+
+      def source
+        @source || ModelsDev
       end
     end
 
+    # ---------------------------------------------------------------------------
+    # Facade — delegates to ModelsDev (general fallback source)
+    # ---------------------------------------------------------------------------
     class << self
-      # Returns pricing data for all models from supported providers.
-      # Automatically fetches fresh data if the cache is missing or older than 24h.
-      def all
-        ensure_fresh_registry
-        registry.map { |raw| build_cost(raw) }
+      # Eagerly fetch all pricing sources and load them into memory.
+      # Called at Rails startup. Network failures are silently ignored.
+      def preload!
+        ModelsDev.preload!
+        OpenRouter.preload!
       end
 
-      # Returns pricing data for a single model by ID, or nil if not found.
       def find(model_id)
-        ensure_fresh_registry
-        raw = registry.find { |m| m[:id] == model_id.to_s }
-        raw ? build_cost(raw) : nil
+        ModelsDev.find(model_id)
+      end
+
+      def all
+        ModelsDev.all
       end
 
-      # Returns a ProvidersProxy for provider-scoped access.
       def providers
-        @providers_proxy ||= ProvidersProxy.new
+        ModelsDev.providers
       end
 
-      # Returns pricing data for all models from the given provider.
       def for_provider(name)
-        ensure_fresh_registry
-        registry
-          .select { |m| m[:provider] == name.to_s }
-          .map { |m| build_cost(m) }
+        ModelsDev.for_provider(name)
       end
 
-      # Returns a sorted list of provider names that have data.
       def provider_names
-        @provider_names ||= begin
-          ensure_fresh_registry
-          registry.map { |m| m[:provider] }.uniq.sort
-        end
+        ModelsDev.provider_names
       end
 
-      # Fetches fresh pricing data from models.dev, filters to supported providers,
-      # and writes the result to {project_root}/tmp/active_harness/pricing.json.
-      # Returns the number of models saved, or raises on HTTP failure.
       def update
-        raw_api = fetch_models_dev
-        models  = extract_models(raw_api)
-
-        FileUtils.mkdir_p(File.dirname(cache_file))
-        File.write(cache_file, JSON.generate(models))
-
-        reload!
-        models.size
+        ModelsDev.update
       end
 
-      # Reloads registry from disk on next access.
       def reload!
-        @registry      = nil
-        @provider_names = nil
-        nil
+        ModelsDev.reload!
       end
 
-      # Path to the per-project cache file.
       def cache_file
-        File.join(project_root, "tmp", "active_harness", "pricing.json")
+        ModelsDev.cache_file
       end
 
-      # Names of providers supported by ActiveHarness (derived from providers/ directory).
       def available_providers
-        @available_providers ||= begin
-          providers_dir = File.expand_path("providers", __dir__)
-          Dir.glob("#{providers_dir}/*.rb")
-            .map { |f| File.basename(f, ".rb") }
-            .reject { |n| %w[base custom].include?(n) }
-        end
-      end
-
-      private
-
-      def ensure_fresh_registry
-        return if cache_file_fresh?
-
-        update
-      rescue StandardError
-        # Network unavailable or update failed — fall back to bundled/stale cache silently
-      end
-
-      def cache_file_fresh?
-        File.exist?(cache_file) && (Time.now - File.mtime(cache_file)) < CACHE_TTL
-      end
-
-      def registry
-        @registry ||= load_registry
-      end
-
-      def load_registry
-        if File.exist?(cache_file)
-          begin
-            data = JSON.parse(File.read(cache_file), symbolize_names: true)
-            return data if data.is_a?(Array)
-          rescue JSON::ParserError
-            # Cache file corrupted — fall through to bundled data
-          end
-        end
-        JSON.parse(File.read(BUNDLED_DATA_FILE), symbolize_names: true)
-      rescue JSON::ParserError, Errno::ENOENT
-        []
-      end
-
-      def fetch_models_dev
-        uri      = URI(MODELS_DEV_URL)
-        response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-          http.get(uri.request_uri)
-        end
-        raise "models.dev returned HTTP #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
-        JSON.parse(response.body, symbolize_names: true)
-      end
-
-      def extract_models(raw_api)
-        allowed = available_providers.to_set
-
-        raw_api.flat_map do |provider_key, provider_data|
-          ah_provider = MODELS_DEV_PROVIDER_MAP[provider_key.to_s]
-          next [] unless ah_provider && allowed.include?(ah_provider)
-
-          models_hash = provider_data.is_a?(Hash) ? (provider_data[:models] || {}) : {}
-          models_hash.values.filter_map do |m|
-            next unless m.is_a?(Hash) && m[:id]
-
-            cost = m[:cost] || {}
-            standard = {
-              input_per_million:             cost[:input],
-              output_per_million:            cost[:output],
-              cache_read_input_per_million:  cost[:cache_read],
-              cache_write_input_per_million: cost[:cache_write]
-            }.compact
-
-            mods = m[:modalities] || {}
-            {
-              id:                m[:id],
-              name:              m[:name] || m[:id],
-              provider:          ah_provider,
-              context_window:    m[:context_window] || m.dig(:limit, :context),
-              max_output_tokens: m[:max_output_tokens] || m.dig(:limit, :output),
-              input_modalities:  Array(mods[:input]),
-              output_modalities: Array(mods[:output]),
-              pricing:           standard.any? ? { text_tokens: { standard: standard } } : {}
-            }
-          end
-        end
-      end
-
-      def build_cost(raw)
-        standard = raw.dig(:pricing, :text_tokens, :standard) || {}
-        ModelPrice.new(
-          id:                            raw[:id],
-          name:                          raw[:name],
-          provider:                      raw[:provider],
-          input_per_million:             standard[:input_per_million],
-          output_per_million:            standard[:output_per_million],
-          cache_read_input_per_million:  standard[:cache_read_input_per_million],
-          cache_write_input_per_million: standard[:cache_write_input_per_million],
-          context_window:                raw[:context_window],
-          max_output_tokens:             raw[:max_output_tokens],
-          input_modalities:              Array(raw[:input_modalities]),
-          output_modalities:             Array(raw[:output_modalities])
-        )
-      end
-
-      def project_root
-        if defined?(Rails) && Rails.respond_to?(:root) && Rails.root
-          Rails.root.to_s
-        else
-          Dir.pwd
-        end
+        ModelsDev.available_providers
       end
     end
   end

data/lib/active_harness/providers/base.rb

@@ -22,14 +22,18 @@ module ActiveHarness
 
       # Normalize OpenAI-compatible usage object to a consistent hash.
       # Returns nil if the response contains no usage data.
+      # provider_cost is included when the provider returns a cost field (e.g. OpenRouter).
       def extract_usage_openai(data)
         u = data["usage"]
         return nil unless u
-        {
+
+        result = {
           input_tokens:  u["prompt_tokens"].to_i,
           output_tokens: u["completion_tokens"].to_i,
           total_tokens:  u["total_tokens"].to_i
         }
+        result[:provider_cost] = u["cost"].to_f if u.key?("cost")
+        result
       end
 
       # Normalize Anthropic usage object.

data/lib/active_harness/providers/images/openai.rb

@@ -0,0 +1,73 @@
+require "uri"
+
+module ActiveHarness
+  module Providers
+    module Images
+      class OpenAI < Base
+        ENDPOINT = "https://api.openai.com/v1/images/generations"
+
+        # @param model   [String]  "dall-e-2", "dall-e-3", "gpt-image-1"
+        # @param prompt  [String]  image description
+        # @param size    [String]  e.g. "1024x1024"
+        # @param quality [String]  "standard"/"hd" (dall-e-3), "low"/"medium"/"high"/"auto" (gpt-image-1)
+        def call(model:, prompt:, size: "1024x1024", quality: nil, **_)
+          headers = {
+            "Content-Type"  => "application/json",
+            "Authorization" => "Bearer #{api_key}"
+          }
+
+          raw  = post_json(URI(ENDPOINT), headers: headers, body: build_payload(model, prompt, size, quality), timeout: 60)
+          data = parse!(raw)
+          handle_error!(data)
+
+          b64 = data.dig("data", 0, "b64_json")
+          raise Errors::ProviderError, "No image data in response" unless b64
+
+          { content: b64, provider: :openai, model: model, usage: nil }
+        end
+
+        private
+
+        def build_payload(model, prompt, size, quality)
+          payload = { model: model, prompt: prompt, n: 1, size: size }
+          # gpt-image-* always returns b64_json; older models default to url
+          payload[:response_format] = "b64_json" unless model.start_with?("gpt-image")
+          payload[:quality] = quality if quality
+          payload
+        end
+
+        def api_key
+          key = config.openai_api_key.to_s
+          raise Errors::InvalidApiKeyError, "openai_api_key is not configured" if key.empty?
+          key
+        end
+
+        def handle_error!(data)
+          return unless data["error"]
+
+          msg      = data.dig("error", "message").to_s
+          code     = data.dig("error", "code").to_s
+          type     = data.dig("error", "type").to_s
+          metadata = data["error"].reject { |k, _| %w[message code type].include?(k) }
+          metadata = nil if metadata.empty?
+
+          case code
+          when "invalid_api_key", "unauthorized"
+            raise Errors::InvalidApiKeyError.new(msg,  error_code: code, metadata: metadata)
+          when "rate_limit_exceeded"
+            raise Errors::RateLimitError.new(msg,      error_code: code, metadata: metadata)
+          when "content_filter"
+            raise Errors::SafetyBlockedError.new(msg,  error_code: code, metadata: metadata)
+          else
+            case type
+            when "server_error"
+              raise Errors::ServerError.new(msg,       error_code: code, metadata: metadata)
+            else
+              raise Errors::InvalidRequestError.new(msg, error_code: code, metadata: metadata)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_harness/providers/images/openrouter.rb

@@ -0,0 +1,66 @@
+require "uri"
+
+module ActiveHarness
+  module Providers
+    module Images
+      class OpenRouter < Base
+        # @param model  [String]  e.g. "openai/gpt-5-image-mini", "google/gemini-2.5-flash-image"
+        # @param prompt [String]  image description
+        # @param size   [String]  ignored by OpenRouter (passed through for future support)
+        def call(model:, prompt:, size: nil, quality: nil, **_)
+          headers = {
+            "Content-Type"  => "application/json",
+            "Authorization" => "Bearer #{api_key}"
+          }
+          referer = config.openrouter_http_referer.to_s
+          headers["HTTP-Referer"] = referer unless referer.empty?
+
+          messages = [{ role: "user", content: prompt }]
+          body = { model: model, messages: messages, modalities: ["image", "text"] }
+          body[:size]    = size    if size
+          body[:quality] = quality if quality
+
+          raw  = post_json(URI(config.openrouter_api_url), headers: headers, body: body, timeout: 120)
+          data = parse!(raw)
+          handle_error!(data)
+
+          content = extract_image(data)
+          raise Errors::ProviderError, "No image data in response: #{data.dig('choices', 0, 'message')&.keys}" unless content
+
+          { content: content, provider: :openrouter, model: model, usage: extract_usage_openai(data) }
+        end
+
+        private
+
+        def extract_image(data)
+          images = data.dig("choices", 0, "message", "images")
+          return unless images.is_a?(Array) && images.any?
+
+          images.first&.dig("image_url", "url")
+        end
+
+        def api_key
+          key = config.openrouter_api_key.to_s
+          raise Errors::InvalidApiKeyError, "openrouter_api_key is not configured" if key.empty?
+          key
+        end
+
+        def handle_error!(data)
+          return unless data["error"]
+
+          msg      = data.dig("error", "message").to_s
+          code     = data.dig("error", "code").to_s
+          metadata = data.dig("error", "metadata")
+
+          case code
+          when "401"             then raise Errors::InvalidApiKeyError.new(msg,       error_code: code, metadata: metadata)
+          when "402", "429"      then raise Errors::RateLimitError.new(msg,           error_code: code, metadata: metadata)
+          when "500", "502",
+               "503", "504"      then raise Errors::ProviderUnavailableError.new(msg, error_code: code, metadata: metadata)
+          else                        raise Errors::InvalidRequestError.new(msg,      error_code: code, metadata: metadata)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_harness/railtie.rb

@@ -8,5 +8,9 @@ module ActiveHarness
         app.config.autoload_paths << path.to_s if path.exist?
       end
     end
+
+    config.after_initialize do
+      ActiveHarness::Pricing.preload!
+    end
   end
 end

data/lib/active_harness.rb

@@ -21,7 +21,11 @@ require_relative "active_harness/providers/azure"
 require_relative "active_harness/providers/bedrock"
 require_relative "active_harness/providers/vertexai"
 require_relative "active_harness/providers/custom"
+require_relative "active_harness/providers/images/openai"
+require_relative "active_harness/providers/images/openrouter"
 require_relative "active_harness/pricing"
+require_relative "active_harness/pricing/models_dev"
+require_relative "active_harness/pricing/openrouter"
 require_relative "active_harness/memory"
 require_relative "active_harness/agent"
 require_relative "active_harness/tribunal"
@@ -30,7 +34,7 @@ require_relative "active_harness/pipeline"
 require_relative "active_harness/railtie" if defined?(Rails::Railtie)
 
 module ActiveHarness
-  VERSION = "0.2.33"
+  VERSION = "0.2.35"
 
   class << self
     # Configure ActiveHarness.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_harness
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.35
 platform: ruby
 authors:
 - the-teacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-12 00:00:00.000000000 Z
+date: 2026-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -36,6 +36,7 @@ files:
 - lib/active_harness/agent/cost.rb
 - lib/active_harness/agent/custom_llm_backend.rb
 - lib/active_harness/agent/hooks.rb
+- lib/active_harness/agent/image.rb
 - lib/active_harness/agent/models.rb
 - lib/active_harness/agent/output_parser.rb
 - lib/active_harness/agent/prompt.rb
@@ -43,7 +44,6 @@ files:
 - lib/active_harness/configuration.rb
 - lib/active_harness/core/errors.rb
 - lib/active_harness/core/hooks.rb
-- lib/active_harness/data/models.json
 - lib/active_harness/http/client.rb
 - lib/active_harness/http/retry_policy.rb
 - lib/active_harness/http/streaming_client.rb
@@ -57,6 +57,8 @@ files:
 - lib/active_harness/pipeline/hooks.rb
 - lib/active_harness/pipeline/step.rb
 - lib/active_harness/pricing.rb
+- lib/active_harness/pricing/models_dev.rb
+- lib/active_harness/pricing/openrouter.rb
 - lib/active_harness/providers/PROVIDER_CONTRACT.md
 - lib/active_harness/providers/anthropic.rb
 - lib/active_harness/providers/azure.rb
@@ -67,6 +69,8 @@ files:
 - lib/active_harness/providers/gemini.rb
 - lib/active_harness/providers/gpustack.rb
 - lib/active_harness/providers/groq.rb
+- lib/active_harness/providers/images/openai.rb
+- lib/active_harness/providers/images/openrouter.rb
 - lib/active_harness/providers/mistral.rb
 - lib/active_harness/providers/ollama.rb
 - lib/active_harness/providers/openai.rb