Merge branch 'main' into mistral

Author: crmne

lib/ruby_llm/aliases.rb

@@ -18,14 +18,14 @@ class << self
       # @param model_id [String] the model identifier or alias
       # @param provider_slug [String, Symbol, nil] optional provider to resolve for
       # @return [String] the resolved model ID or the original if no alias exists
-      def resolve(model_id, provider_slug = nil)
-        provider_aliases = aliases[model_id]
-        return model_id unless provider_aliases
+      def resolve(model_id, provider = nil)
+        return model_id unless aliases[model_id]
 
-        if provider_slug
-          provider_aliases[provider_slug.to_s] || model_id
+        if provider
+          aliases[model_id][provider.to_s] || model_id
         else
-          provider_aliases.values.first || model_id
+          # Get native provider's version
+          aliases[model_id].values.first || model_id
         end
       end
 

lib/ruby_llm/chat.rb

@@ -15,8 +15,7 @@ class Chat
 
     def initialize(model: nil, provider: nil)
       model_id = model || RubyLLM.config.default_model
-      self.model = model_id
-      self.provider = provider if provider
+      with_model(model_id, provider: provider)
       @temperature = 0.7
       @messages = []
       @tools = {}
@@ -48,23 +47,9 @@ def with_tools(*tools)
       self
     end
 
-    def model=(model_id)
-      @model = Models.find model_id
-      @provider = Models.provider_for model_id
-    end
-
-    def provider=(provider_slug)
-      @provider = Provider.providers[provider_slug.to_sym] ||
-                  raise(Error, "Unknown provider: #{provider_slug}")
-    end
-
-    def with_provider(provider_slug)
-      self.provider = provider_slug
-      self
-    end
-
-    def with_model(model_id)
-      self.model = model_id
+    def with_model(model_id, provider: nil)
+      @model = Models.find model_id, provider
+      @provider = Provider.providers[@model.provider.to_sym] || raise(Error, "Unknown provider: #{@model.provider}")
       self
     end
 

lib/ruby_llm/models.rb

@@ -73,20 +73,13 @@ def each(&)
     end
 
     # Find a specific model by ID
-    def find(model_id)
-      # Try exact match first
-      exact_match = all.find { |m| m.id == model_id }
-      return exact_match if exact_match
-
-      # Try to resolve via alias
-      resolved_id = Aliases.resolve(model_id)
-      if resolved_id != model_id
-        alias_match = all.find { |m| m.id == resolved_id }
-        return alias_match if alias_match
-      end
+    def find(model_id, provider = nil)
+      return find_with_provider(model_id, provider) if provider
 
-      # Not found
-      raise ModelNotFoundError, "Unknown model: #{model_id}"
+      # Find native model
+      all.find { |m| m.id == model_id } ||
+        all.find { |m| m.id == Aliases.resolve(model_id) } ||
+        raise(ModelNotFoundError, "Unknown model: #{model_id}")
     end
 
     # Filter to only chat models
@@ -123,5 +116,13 @@ def by_provider(provider)
     def refresh!
       self.class.refresh!
     end
+
+    private
+
+    def find_with_provider(model_id, provider)
+      provider_id = Aliases.resolve(model_id, provider)
+      all.find { |m| m.id == provider_id && m.provider == provider.to_s } ||
+        raise(ModelNotFoundError, "Unknown model: #{model_id} for provider: #{provider}")
+    end
   end
 end