ruby_llm 0.1.0.pre43 → 0.1.0.pre45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2433d0b669ef8bd499507edf33ed672d011fc1c95c2de0febd4e83d2593e0b8
-  data.tar.gz: a818a1c59220404c29c0e562c473480ac630a6fd53fadee65ab102b8955e9ec5
+  metadata.gz: e122212234e51321ae20de6894bb476b46c83d745ca30bedd9ced246bdcff22f
+  data.tar.gz: c0619618ca5e09db904545594c613b87ade415a4d1ed38ebd2c8b5857933ea02
 SHA512:
-  metadata.gz: afa3882a1850692e63f16dbc8c379a9aa71d704096f1eb2d5d88aeefa0c9c17f2585e8e215be0ed126caa0ec6bb7d07b4c12b5b6eaa5a1cf69a054b976b0d9e8
-  data.tar.gz: a8089658eab75b8200f51d39568dc876cdcc2d61d6581dbd1e6c211f487fa127c9300e0fcbb318f958b6b109f5fb43c2f7f6824acd2f426e4a0a9ae2a7023c63
+  metadata.gz: e14f4c2ce93c2d6a4f8ba3909b78a2cad5fb336066b28999ace00135f6abb7a1c3a56389e5a01b41583c86a1b3521ff4296266be9eba831e06b591f558756045
+  data.tar.gz: 6b68676a11c6168cccb7237fd3e90624fbe624402b731ffd87925f3805bffec849a9358c807890dea142f83035a511964b097defbe52a9ef33c679f6cf9195a3

data/.rspec_status

@@ -35,7 +35,16 @@ example_id                                         | status | run_time        |
 ./spec/ruby_llm/embeddings_spec.rb[1:1:2:1]        | passed | 0.65614 seconds |
 ./spec/ruby_llm/embeddings_spec.rb[1:1:2:2]        | passed | 2.16 seconds    |
 ./spec/ruby_llm/error_handling_spec.rb[1:1]        | passed | 0.29366 seconds |
-./spec/ruby_llm/image_generation_spec.rb[1:1:1]    | passed | 11.61 seconds   |
-./spec/ruby_llm/image_generation_spec.rb[1:1:2]    | passed | 17.63 seconds   |
-./spec/ruby_llm/image_generation_spec.rb[1:1:3]    | passed | 8.77 seconds    |
-./spec/ruby_llm/image_generation_spec.rb[1:1:4]    | passed | 0.00319 seconds |
+./spec/ruby_llm/image_generation_spec.rb[1:1:1]    | passed | 24.16 seconds   |
+./spec/ruby_llm/image_generation_spec.rb[1:1:2]    | passed | 14.81 seconds   |
+./spec/ruby_llm/image_generation_spec.rb[1:1:3]    | passed | 9.17 seconds    |
+./spec/ruby_llm/image_generation_spec.rb[1:1:4]    | passed | 0.00083 seconds |
+./spec/ruby_llm/models_spec.rb[1:1:1]              | passed | 0.00337 seconds |
+./spec/ruby_llm/models_spec.rb[1:2:1]              | passed | 0.00435 seconds |
+./spec/ruby_llm/models_spec.rb[1:2:2]              | passed | 0.00491 seconds |
+./spec/ruby_llm/models_spec.rb[1:2:3]              | passed | 0.00028 seconds |
+./spec/ruby_llm/models_spec.rb[1:3:1]              | passed | 0.00007 seconds |
+./spec/ruby_llm/models_spec.rb[1:3:2]              | passed | 0.00036 seconds |
+./spec/ruby_llm/models_spec.rb[1:3:3]              | passed | 0.00252 seconds |
+./spec/ruby_llm/models_spec.rb[1:4:1]              | passed | 0.0016 seconds  |
+./spec/ruby_llm/models_spec.rb[1:4:2]              | passed | 0.00156 seconds |

data/lib/ruby_llm/image.rb

@@ -3,16 +3,39 @@
 module RubyLLM
   # Represents a generated image from an AI model.
   # Provides an interface to image generation capabilities
-  # from providers like DALL-E.
+  # from providers like DALL-E and Gemini's Imagen.
   class Image
-    attr_reader :url, :revised_prompt, :model_id
+    attr_reader :url, :data, :mime_type, :revised_prompt, :model_id
 
-    def initialize(url:, revised_prompt: nil, model_id: nil)
+    def initialize(url: nil, data: nil, mime_type: nil, revised_prompt: nil, model_id: nil)
       @url = url
+      @data = data
+      @mime_type = mime_type
       @revised_prompt = revised_prompt
       @model_id = model_id
     end
 
+    def base64?
+      !@data.nil?
+    end
+
+    # Returns the raw binary image data regardless of source
+    def to_blob
+      if base64?
+        Base64.decode64(@data)
+      else
+        # Use Faraday instead of URI.open for better security
+        response = Faraday.get(@url)
+        response.body
+      end
+    end
+
+    # Saves the image to a file path
+    def save(path)
+      File.binwrite(File.expand_path(path), to_blob)
+      path
+    end
+
     def self.paint(prompt, model: nil, size: '1024x1024')
       model_id = model || RubyLLM.config.default_image_model
       Models.find(model_id) # Validate model exists

data/lib/ruby_llm/models.rb

@@ -5,55 +5,100 @@ module RubyLLM
   # to discover and work with models from different providers.
   #
   # Example:
-  #   RubyLLM.models.all                  # All available models
-  #   RubyLLM.models.chat_models          # Models that support chat
-  #   RubyLLM.models.find('claude-3')     # Get info about a specific model
-  module Models
-    module_function
+  #   RubyLLM.models.all                                  # All available models
+  #   RubyLLM.models.chat_models                          # Models that support chat
+  #   RubyLLM.models.by_provider('openai').chat_models    # OpenAI chat models
+  #   RubyLLM.models.find('claude-3')                     # Get info about a specific model
+  class Models
+    include Enumerable
 
-    def provider_for(model)
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.provider_for(model)
       Provider.for(model)
     end
 
-    def all
-      @all ||= begin
-        data = JSON.parse(File.read(File.expand_path('models.json', __dir__)))
-        data.map { |model| ModelInfo.new(model.transform_keys(&:to_sym)) }
+    def self.refresh!
+      models = RubyLLM.providers.flat_map(&:list_models).sort_by(&:id)
+      # Write to models.json
+      File.write(File.expand_path('models.json', __dir__), JSON.pretty_generate(models.map(&:to_h)))
+      @instance = new(models)
+    end
+
+    # Delegate class methods to the singleton instance
+    class << self
+      def method_missing(method, ...)
+        if instance.respond_to?(method)
+          instance.send(method, ...)
+        else
+          super
+        end
       end
+
+      def respond_to_missing?(method, include_private = false)
+        instance.respond_to?(method, include_private) || super
+      end
+    end
+
+    # Initialize with optional pre-filtered models
+    def initialize(models = nil)
+      @models = models || load_models
+    end
+
+    # Load models from the JSON file
+    def load_models
+      data = JSON.parse(File.read(File.expand_path('models.json', __dir__)))
+      data.map { |model| ModelInfo.new(model.transform_keys(&:to_sym)) }
     rescue Errno::ENOENT
       [] # Return empty array if file doesn't exist yet
     end
 
+    # Return all models in the collection
+    def all
+      @models
+    end
+
+    # Allow enumeration over all models
+    def each(&)
+      all.each(&)
+    end
+
+    # Find a specific model by ID
     def find(model_id)
-      all.find { |m| m.id == model_id } or raise ModelNotFoundError, "Unknown model: #{model_id}"
+      all.find { |m| m.id == model_id } or
+        raise ModelNotFoundError, "Unknown model: #{model_id}"
     end
 
+    # Filter to only chat models
     def chat_models
-      all.select { |m| m.type == 'chat' }
+      self.class.new(all.select { |m| m.type == 'chat' })
     end
 
+    # Filter to only embedding models
     def embedding_models
-      all.select { |m| m.type == 'embedding' }
+      self.class.new(all.select { |m| m.type == 'embedding' })
     end
 
+    # Filter to only audio models
     def audio_models
-      all.select { |m| m.type == 'audio' }
+      self.class.new(all.select { |m| m.type == 'audio' })
     end
 
+    # Filter to only image models
     def image_models
-      all.select { |m| m.type == 'image' }
+      self.class.new(all.select { |m| m.type == 'image' })
     end
 
+    # Filter models by family
     def by_family(family)
-      all.select { |m| m.family == family }
-    end
-
-    def default_model
-      'gpt-4o-mini'
+      self.class.new(all.select { |m| m.family == family.to_s })
     end
 
-    def refresh!
-      @all = RubyLLM.providers.flat_map(&:list_models).sort_by(&:id)
+    # Filter models by provider
+    def by_provider(provider)
+      self.class.new(all.select { |m| m.provider == provider.to_s })
     end
   end
 end

data/lib/ruby_llm/provider.rb

@@ -158,6 +158,16 @@ module RubyLLM
       end
     end
 
+    def parse_data_uri(uri)
+      if uri&.start_with?('data:')
+        match = uri.match(/\Adata:([^;]+);base64,(.+)\z/)
+        return { mime_type: match[1], data: match[2] } if match
+      end
+
+      # If it's not a data URI, return nil
+      nil
+    end
+
     class << self
       def extended(base)
         base.extend(Methods)

data/lib/ruby_llm/providers/gemini/images.rb

@@ -37,12 +37,13 @@ module RubyLLM
             raise Error, 'Unexpected response format from Gemini image generation API'
           end
 
-          # Handle response with base64 encoded image data
-          image_url = "data:#{image_data['mimeType'] || 'image/png'};base64,#{image_data['bytesBase64Encoded']}"
+          # Extract mime type and base64 data
+          mime_type = image_data['mimeType'] || 'image/png'
+          base64_data = image_data['bytesBase64Encoded']
+
           Image.new(
-            url: image_url,
-            revised_prompt: '', # Imagen doesn't return revised prompts
-            model_id: ''
+            data: base64_data,
+            mime_type: mime_type
           )
         end
       end

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

@@ -26,6 +26,7 @@ module RubyLLM
 
           Image.new(
             url: image_data['url'],
+            mime_type: 'image/png', # DALL-E typically returns PNGs
             revised_prompt: image_data['revised_prompt'],
             model_id: data['model']
           )

data/lib/ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  VERSION = '0.1.0.pre43'
+  VERSION = '0.1.0.pre45'
 end

data/lib/ruby_llm.rb

@@ -39,7 +39,7 @@ module RubyLLM
     end
 
     def models
-      Models
+      Models.instance
     end
 
     def providers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre43
+  version: 0.1.0.pre45
 platform: ruby
 authors:
 - Carmine Paolino