ask-llm-providers 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858bdb99927e65448a7c3c584f2b0bed51bbe1a12d9ee43e0c2e4a97a34ee344
-  data.tar.gz: 132b02262647f35a04232385e4148d4754b30a893da4d3015eef52a8cee72caf
+  metadata.gz: d9356b3e21bb6e8e3c69f531eda38a4ae965ac5c19f20e655bd0ebe3c927f729
+  data.tar.gz: 97d0c10a4937f3d8b6102392328d48b2f5bbf2ad73621fb8139759a892ff0df7
 SHA512:
-  metadata.gz: 8999b96cbe13c709393c4208be9e49513059f0e239da1755e4061be85d3084ae4bcd52418cfcbac6add0f2ded90ad58e43833f2e49488893151f4aea989893f6
-  data.tar.gz: 2b5dac9e60b02a4c28e8f406159064454b068c2fe45c215820629bd0e02f5d0da8f81d090d142f1ee0d0a91d68a37b267853327617cf34e8219bc0ec780ae39c
+  metadata.gz: 138d21391c23578668a9fecec6160a4403e8c01019a2c9795af0ab5f62e380958fe0f9735ef994b7f4a8b9115f060f8a83b724b58a558483465c14a81cb99b6c
+  data.tar.gz: e8e0e7bc5bd760723b01d9e246b443631f87e0a29fc473f2ac673e3115fe772d5732d2ae90f8e4903296e1d5b70c36ccc17de9d4900d4d66c658f5e5523b4add

data/CHANGELOG.md

@@ -1,4 +1,26 @@
-## [0.2.2] - 2026-06-25
+## [0.3.1] — 2026-07-14
+
+### Removed
+- `Ask::ModelCatalog::PROVIDER_PREFERENCE` removed from ask-core. `find(model_id)` now returns all matching models — no more provider preference disambiguation at the catalog level.
+
+## [0.3.0] — 2026-07-14
+
+### Added
+- **Model catalog system** — `Ask::LLM::Catalog` loads model definitions from per-provider JSON files (`lib/ask/llm/models/*.json`), user overrides (`~/.ask-llm-providers/models.json`), and provider API `list_models()` on explicit refresh.
+- **Per-provider model JSONs** — 12 JSON files (openai, anthropic, gemini, deepseek, opencode, opencode_go, mimo, openrouter, ollama, mistral, bedrock, cloudflare) with id, name, provider, capabilities, context window, modalities, and pricing.
+- **Model aliases** — `Ask::LLM::Aliases` resolves short names (e.g. `claude-sonnet-4` → `claude-sonnet-4-6`). Alias entries are automatically registered into `Ask::ModelCatalog` so `ModelCatalog.find` works with alias names.
+- **User config support** — `~/.ask-llm-providers/models.json` overrides bundled model fields or adds custom models.
+- **`opencode.json` includes `deepseek-v4-flash`** — matches the default model configuration.
+
+### Changed
+- Removed hardcoded `Ask::LLM::Models::OPENAI_MODELS` constants — replaced with catalog-driven model loading.
+- `Ask::LLM::Aliases.resolve` now aliases `deepseek-v4` → `deepseek-v4-flash`, `gpt-4o-latest` → `gpt-4o`, `gpt-4.1-latest` → `gpt-4.1`.
+
+### Fixed
+- Model entries now include `"provider"` field in JSON files (was missing from generated data).
+- User config merges properly override bundled values (was keeping old values on conflict).
+
+## [0.2.2] — 2026-06-25
 
 ### Changed
 - Extended per-provider tests (Anthropic 18t, Google 14t, DeepSeek 16t, Mistral, Ollama, Cloudflare, Bedrock). Fixed providers_test.rb syntax error. RuboCop, overcommit, gemspec test, SimpleCov, CI.

data/lib/ask/llm/aliases.json

@@ -0,0 +1,11 @@
+{
+  "claude-sonnet-4": "claude-sonnet-4-6",
+  "claude-sonnet-4-5": "claude-sonnet-4-6",
+  "claude-opus-4": "claude-opus-4-7",
+  "claude-opus-4-5": "claude-opus-4-7",
+  "claude-haiku-4": "claude-haiku-4-5",
+  "gemini-3": "gemini-3-flash",
+  "deepseek-v4": "deepseek-v4-flash",
+  "gpt-4o-latest": "gpt-4o",
+  "gpt-4.1-latest": "gpt-4.1"
+}

data/lib/ask/llm/aliases.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Ask
+  module LLM
+    # Resolves model name aliases to canonical model IDs.
+    #
+    # Aliases are defined in aliases.json and allow users to refer
+    # to models by shorter or more familiar names. Resolution is
+    # provider-scoped — you can alias "claude-sonnet-4" to different
+    # canonical IDs depending on which provider serves it.
+    #
+    #   Ask::LLM::Aliases.resolve("claude-sonnet-4")
+    #   # => "claude-sonnet-4-6"
+    #
+    # Aliases are loaded lazily from the bundled JSON file.
+    module Aliases
+      ALIASES_PATH = File.expand_path("aliases.json", __dir__)
+
+      class << self
+        # Resolve an alias to a canonical model ID.
+        # Returns the input name unchanged if no alias is registered.
+        def resolve(name)
+          load_aliases unless @aliases
+          @aliases[name.to_s] || name.to_s
+        end
+
+        # Register a custom alias at runtime.
+        def register(short_name, canonical_id)
+          load_aliases unless @aliases
+          @aliases[short_name.to_s] = canonical_id.to_s
+        end
+
+        # Reload aliases from the bundled JSON file.
+        def reload!
+          @aliases = nil
+          load_aliases
+        end
+
+        # All registered aliases (for introspection).
+        def all
+          load_aliases unless @aliases
+          @aliases.dup
+        end
+
+        private
+
+        def load_aliases
+          @aliases = {}
+          path = ALIASES_PATH
+          return unless File.exist?(path)
+
+          raw = JSON.parse(File.read(path))
+          raw.each { |k, v| @aliases[k.to_s] = v.to_s }
+        rescue JSON::ParserError
+          # Invalid aliases file — log and use empty map
+        end
+      end
+    end
+  end
+end

data/lib/ask/llm/catalog.rb

@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+require "json"
+require "date"
+require "fileutils"
+
+module Ask
+  module LLM
+    # Orchestrates model catalog loading from multiple sources:
+    #
+    #   1. Bundled JSON files in lib/ask/llm/models/*.json (shipped with the gem)
+    #   2. ~/.ask-llm-providers/models.json (user-defined overrides)
+    #   3. Provider API list_models() calls (on explicit refresh!)
+    #
+    # Loaded models are registered into Ask::ModelCatalog for use
+    # by ask-agent, ask-mcp, and llm-proxy.
+    #
+    #   Ask::LLM::Catalog.load!  # load bundled + user config
+    #   Ask::LLM::Catalog.refresh!  # also fetch from provider APIs
+    #
+    class Catalog
+      class Error < StandardError; end
+      class LoadError < Error; end
+
+      USER_CONFIG_PATH = File.expand_path("~/.ask-llm-providers/models.json").freeze
+
+      class << self
+        # Load bundled model definitions and user overrides into Ask::ModelCatalog.
+        # Idempotent — subsequent calls clear and reload.
+        def load!
+          instance.clear
+          instance.load_bundled
+          instance.load_user_config
+          instance.register_all
+          true
+        end
+
+        # Like load! but also fetches model lists from configured providers'
+        # list_models() APIs. Unknown models are added with minimal metadata.
+        def refresh!
+          load!
+          instance.fetch_from_providers
+          instance.register_all
+          true
+        end
+
+      private
+
+      def symbolize_keys(hash)
+        hash.transform_keys { |k| k.respond_to?(:to_sym) ? k.to_sym : k }
+      end
+
+        def instance
+          @instance ||= new
+        end
+      end
+
+      def initialize
+        @entries = []
+        @model_keys = Set.new
+      end
+
+      def clear
+        @entries.clear
+        @model_keys.clear
+      end
+
+      # Load bundled model JSONs from the gem's lib/ask/llm/models/ directory.
+      def load_bundled
+        pattern = File.expand_path("models/*.json", __dir__)
+        Dir[pattern].sort.each do |path|
+          raw = JSON.parse(File.read(path))
+          raw.each { |entry| add_entry(entry) }
+        end
+      end
+
+      # Load user-defined model overrides from ~/.ask-llm-providers/models.json.
+      # Silently skipped if the file doesn't exist.
+      def load_user_config
+        path = USER_CONFIG_PATH
+        return unless File.exist?(path)
+
+        raw = JSON.parse(File.read(path))
+        unless raw.is_a?(Array)
+          warn "Warning: #{path} should be a JSON array of model entries, got #{raw.class}"
+          return
+        end
+
+        raw.each { |entry| merge_or_add(entry) }
+      rescue JSON::ParserError => e
+        warn "Warning: Failed to parse #{path}: #{e.message}"
+      end
+
+      # Fetch model lists from all configured providers via their list_models() API.
+      # Adds unknown models with minimal metadata (no capability guessing).
+      def fetch_from_providers
+        Ask::Provider.providers.each do |slug, provider_class|
+          next unless provider_class.configured?(nil)
+
+          begin
+            provider = provider_class.new
+            models = provider.list_models
+            models.each do |m|
+              add_entry(m) unless @model_keys.include?([m[:id], slug.to_s])
+            end
+          rescue StandardError => e
+            warn "Warning: Failed to fetch models from #{slug}: #{e.message}"
+          end
+        end
+      end
+
+      # Register all accumulated entries into Ask::ModelCatalog.
+      # Also registers alias entries so models can be found by alias name.
+      def register_all
+        @entries.each do |entry|
+          info = build_model_info(entry)
+          Ask::ModelCatalog.instance.register(info)
+        end
+
+        register_alias_entries
+      end
+
+      private
+
+      # For each alias (short_name → canonical_id), register a duplicate
+      # ModelInfo for every canonical entry whose id matches.
+      def register_alias_entries
+        Ask::LLM::Aliases.all.each do |short_name, canonical_id|
+          next if short_name == canonical_id
+
+          @entries.each do |entry|
+            next unless entry["id"] == canonical_id || entry[:id] == canonical_id
+
+            alias_entry = entry.merge("id" => short_name)
+            info = build_model_info(alias_entry)
+            Ask::ModelCatalog.instance.register(info)
+          end
+        end
+      end
+
+      def symbolize_keys(hash)
+        hash.transform_keys { |k| k.respond_to?(:to_sym) ? k.to_sym : k }
+      end
+
+      def add_entry(entry)
+        key = entry_key(entry)
+        return if @model_keys.include?(key)
+
+        @entries << entry
+        @model_keys << key
+      end
+
+      def merge_or_add(entry)
+        key = entry_key(entry)
+        existing = @entries.find { |e| entry_key(e) == key }
+
+        if existing
+          existing.merge!(entry)
+        else
+          @entries << entry
+          @model_keys << key
+        end
+      end
+
+      def entry_key(entry)
+        id = entry["id"] || entry[:id]
+        provider = entry["provider"] || entry[:provider]
+        [id, provider.to_s]
+      end
+
+      def build_model_info(entry)
+        e = entry.transform_keys(&:to_sym)
+        modalities = e[:modalities]
+        modalities = symbolize_keys(modalities) if modalities
+
+        Ask::ModelInfo.new(
+          id: e[:id],
+          name: e[:name] || e[:id],
+          provider: e[:provider],
+          family: e[:family],
+          capabilities: Array(e[:capabilities]),
+          context_window: e[:context_window],
+          max_output_tokens: e[:max_output_tokens],
+          modalities: modalities || { input: %w[text], output: %w[text] },
+          pricing: e[:pricing] || {},
+          knowledge_cutoff: e[:knowledge_cutoff] ? Date.parse(e[:knowledge_cutoff].to_s) : nil,
+          created_at: e[:created_at] ? Date.parse(e[:created_at].to_s) : nil,
+          metadata: (e[:metadata] || {}).merge(source: e[:metadata]&.dig("source") || "bundled")
+        )
+      rescue Date::Error
+        Ask::ModelInfo.new(id: e[:id], provider: e[:provider])
+      end
+    end
+  end
+end

data/lib/ask/llm/models/anthropic.json

@@ -0,0 +1,188 @@
+[
+  {
+    "id": "claude-sonnet-4-5",
+    "name": "Claude Sonnet 4.5",
+    "family": "claude_sonnet",
+    "context_window": 200000,
+    "max_output_tokens": 64000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "structured_output",
+      "vision",
+      "reasoning",
+      "prompt_caching",
+      "tool_choice",
+      "parallel_tool_calls"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image",
+        "pdf"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  },
+  {
+    "id": "claude-sonnet-4",
+    "name": "Claude Sonnet 4",
+    "family": "claude_sonnet",
+    "context_window": 200000,
+    "max_output_tokens": 64000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "structured_output",
+      "vision",
+      "reasoning",
+      "prompt_caching",
+      "tool_choice",
+      "parallel_tool_calls"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image",
+        "pdf"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  },
+  {
+    "id": "claude-4-opus",
+    "name": "Claude Opus 4",
+    "family": "claude_opus",
+    "context_window": 200000,
+    "max_output_tokens": 64000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "structured_output",
+      "vision",
+      "reasoning",
+      "prompt_caching",
+      "tool_choice",
+      "parallel_tool_calls"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image",
+        "pdf"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  },
+  {
+    "id": "claude-haiku-4-5",
+    "name": "Claude Haiku 4.5",
+    "family": "claude_haiku",
+    "context_window": 200000,
+    "max_output_tokens": 64000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "structured_output",
+      "vision",
+      "reasoning",
+      "prompt_caching",
+      "tool_choice",
+      "parallel_tool_calls"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image",
+        "pdf"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  },
+  {
+    "id": "claude-opus-4-5",
+    "name": "Claude Opus 4.5",
+    "family": "claude_opus",
+    "context_window": 200000,
+    "max_output_tokens": 64000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "structured_output",
+      "vision",
+      "reasoning",
+      "prompt_caching",
+      "tool_choice",
+      "parallel_tool_calls"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image",
+        "pdf"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  },
+  {
+    "id": "claude-3.5-sonnet",
+    "name": "Claude 3.5 Sonnet",
+    "family": "claude_sonnet",
+    "context_window": 200000,
+    "max_output_tokens": 8192,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "vision",
+      "reasoning"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  },
+  {
+    "id": "claude-3.5-haiku",
+    "name": "Claude 3.5 Haiku",
+    "family": "claude_haiku",
+    "context_window": 200000,
+    "max_output_tokens": 8192,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "vision",
+      "reasoning"
+    ],
+    "modalities": {
+      "input": [
+        "text",
+        "image"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "anthropic"
+  }
+]

data/lib/ask/llm/models/bedrock.json

@@ -0,0 +1 @@
+[]

data/lib/ask/llm/models/cloudflare.json

@@ -0,0 +1 @@
+[]

data/lib/ask/llm/models/deepseek.json

@@ -0,0 +1,85 @@
+[
+  {
+    "id": "deepseek-v4-flash",
+    "name": "DeepSeek V4 Flash",
+    "family": "deepseek_v4",
+    "context_window": 1000000,
+    "max_output_tokens": 384000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "reasoning"
+    ],
+    "modalities": {
+      "input": [
+        "text"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "deepseek"
+  },
+  {
+    "id": "deepseek-v4-pro",
+    "name": "DeepSeek V4 Pro",
+    "family": "deepseek_v4",
+    "context_window": 1000000,
+    "max_output_tokens": 384000,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "reasoning"
+    ],
+    "modalities": {
+      "input": [
+        "text"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "deepseek"
+  },
+  {
+    "id": "deepseek-chat",
+    "name": "DeepSeek Chat",
+    "family": "deepseek_v3",
+    "context_window": 64000,
+    "max_output_tokens": 8192,
+    "capabilities": [
+      "function_calling",
+      "streaming"
+    ],
+    "modalities": {
+      "input": [
+        "text"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "deepseek"
+  },
+  {
+    "id": "deepseek-reasoner",
+    "name": "DeepSeek Reasoner",
+    "family": "deepseek_r1",
+    "context_window": 64000,
+    "max_output_tokens": 8192,
+    "capabilities": [
+      "function_calling",
+      "streaming",
+      "reasoning"
+    ],
+    "modalities": {
+      "input": [
+        "text"
+      ],
+      "output": [
+        "text"
+      ]
+    },
+    "provider": "deepseek"
+  }
+]