dify_llm 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ba52438e460fd7cb45ccae2718eef3f210288bda1c0964a9a3533b3abbb104
-  data.tar.gz: 36fc10f694fa81a5ce3cc1736a15bb7cbf7fa8f90c835f010ed0d3a4dd2ce924
+  metadata.gz: d0f99a2d917ed4eec1d713f9485558da63d1682463151199705a11c067580d00
+  data.tar.gz: c78eef62613a3295db307362b497367affc65687ed295889bd1bb87f2ec1898c
 SHA512:
-  metadata.gz: cded1cb65b8e6e3e5f21bcfcdc7d9acf1d2d9c448fa2f2852e06ff58fc85ec9577dc57cdd6e35bba3c61585cb78c33a534621e987d182cb42b8e48cc5fa8af3e
-  data.tar.gz: be43b11c4c108f31171ddb0cf27f4335ac506ac74fd25fd970e6cdc09aae182cd1678a91e4c322a5976512eca6572363c19f0bb8538efa97a04dd32a29a3072f
+  metadata.gz: 6cccd8779101a2f72b73e65aec7b84def9ac63368fd4a07e36347c3c544e687a03ea44ccc7ad85208833e8e7058ccb76d8316d86507951d4adc21be98a7edc1d
+  data.tar.gz: 4627baa37a9e94b0569ab25b7d7e39ceb5119022f13092c81f34c0a589c11f22d30b82cf02adf33e11914cf01b1304db111c4fc3253529dc91d7dc734631be0f

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  # Shared helpers for RubyLLM generators
+  module GeneratorHelpers
+    def parse_model_mappings
+      @model_names = {
+        chat: 'Chat',
+        message: 'Message',
+        tool_call: 'ToolCall',
+        model: 'Model'
+      }
+
+      model_mappings.each do |mapping|
+        if mapping.include?(':')
+          key, value = mapping.split(':', 2)
+          @model_names[key.to_sym] = value.classify
+        end
+      end
+
+      @model_names
+    end
+
+    %i[chat message tool_call model].each do |type|
+      define_method("#{type}_model_name") do
+        @model_names ||= parse_model_mappings
+        @model_names[type]
+      end
+
+      define_method("#{type}_table_name") do
+        table_name_for(send("#{type}_model_name"))
+      end
+    end
+
+    def acts_as_chat_declaration
+      params = []
+
+      add_association_params(params, :messages, message_table_name, message_model_name, plural: true)
+      add_association_params(params, :model, model_table_name, model_model_name)
+
+      "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def acts_as_message_declaration
+      params = []
+
+      add_association_params(params, :chat, chat_table_name, chat_model_name)
+      add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name, plural: true)
+      add_association_params(params, :model, model_table_name, model_model_name)
+
+      "acts_as_message#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def acts_as_model_declaration
+      params = []
+
+      add_association_params(params, :chats, chat_table_name, chat_model_name, plural: true)
+
+      "acts_as_model#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def acts_as_tool_call_declaration
+      params = []
+
+      add_association_params(params, :message, message_table_name, message_model_name)
+
+      "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def create_namespace_modules
+      namespaces = []
+
+      [chat_model_name, message_model_name, tool_call_model_name, model_model_name].each do |model_name|
+        if model_name.include?('::')
+          namespace = model_name.split('::').first
+          namespaces << namespace unless namespaces.include?(namespace)
+        end
+      end
+
+      namespaces.each do |namespace|
+        module_path = "app/models/#{namespace.underscore}.rb"
+        next if File.exist?(Rails.root.join(module_path))
+
+        create_file module_path do
+          <<~RUBY
+            module #{namespace}
+              def self.table_name_prefix
+                "#{namespace.underscore}_"
+              end
+            end
+          RUBY
+        end
+      end
+    end
+
+    def migration_version
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    end
+
+    def postgresql?
+      ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
+    rescue StandardError
+      false
+    end
+
+    def table_exists?(table_name)
+      ::ActiveRecord::Base.connection.table_exists?(table_name)
+    rescue StandardError
+      false
+    end
+
+    private
+
+    def add_association_params(params, default_assoc, table_name, model_name, plural: false)
+      assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
+
+      return if assoc == default_assoc
+
+      params << "#{default_assoc}: :#{assoc}"
+      params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != assoc.to_s.classify
+    end
+
+    def table_name_for(model_name)
+      # Convert namespaced model names to proper table names
+      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
+      model_name.underscore.pluralize.tr('/', '_')
+    end
+  end
+end

data/lib/generators/ruby_llm/install/install_generator.rb

@@ -2,11 +2,13 @@
 
 require 'rails/generators'
 require 'rails/generators/active_record'
+require_relative '../generator_helpers'
 
 module RubyLLM
   # Generator for RubyLLM Rails models and migrations
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
+    include RubyLLM::GeneratorHelpers
 
     namespace 'ruby_llm:install'
 
@@ -24,127 +26,6 @@ module RubyLLM
       ::ActiveRecord::Generators::Base.next_migration_number(dirname)
     end
 
-    def migration_version
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    end
-
-    def postgresql?
-      ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
-    rescue StandardError
-      false
-    end
-
-    def parse_model_mappings
-      @model_names = {
-        chat: 'Chat',
-        message: 'Message',
-        tool_call: 'ToolCall',
-        model: 'Model'
-      }
-
-      model_mappings.each do |mapping|
-        if mapping.include?(':')
-          key, value = mapping.split(':', 2)
-          @model_names[key.to_sym] = value.classify
-        end
-      end
-
-      @model_names
-    end
-
-    %i[chat message tool_call model].each do |type|
-      define_method("#{type}_model_name") do
-        @model_names ||= parse_model_mappings
-        @model_names[type]
-      end
-
-      define_method("#{type}_table_name") do
-        table_name_for(send("#{type}_model_name"))
-      end
-    end
-
-    def acts_as_chat_declaration
-      acts_as_chat_params = []
-      messages_assoc = message_model_name.tableize.to_sym
-      model_assoc = model_model_name.underscore.to_sym
-
-      if messages_assoc != :messages
-        acts_as_chat_params << "messages: :#{messages_assoc}"
-        if message_model_name != messages_assoc.to_s.classify
-          acts_as_chat_params << "message_class: '#{message_model_name}'"
-        end
-      end
-
-      if model_assoc != :model
-        acts_as_chat_params << "model: :#{model_assoc}"
-        acts_as_chat_params << "model_class: '#{model_model_name}'" if model_model_name != model_assoc.to_s.classify
-      end
-
-      if acts_as_chat_params.any?
-        "acts_as_chat #{acts_as_chat_params.join(', ')}"
-      else
-        'acts_as_chat'
-      end
-    end
-
-    def acts_as_message_declaration
-      params = []
-
-      add_message_association_params(params, :chat, chat_model_name)
-      add_message_association_params(params, :tool_calls, tool_call_model_name, tableize: true)
-      add_message_association_params(params, :model, model_model_name)
-
-      params.any? ? "acts_as_message #{params.join(', ')}" : 'acts_as_message'
-    end
-
-    private
-
-    def add_message_association_params(params, default_assoc, model_name, tableize: false)
-      assoc = tableize ? model_name.tableize.to_sym : model_name.underscore.to_sym
-
-      return if assoc == default_assoc
-
-      params << "#{default_assoc}: :#{assoc}"
-      expected_class = assoc.to_s.classify
-      params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != expected_class
-    end
-
-    public
-
-    def acts_as_tool_call_declaration
-      acts_as_tool_call_params = []
-      message_assoc = message_model_name.underscore.to_sym
-
-      if message_assoc != :message
-        acts_as_tool_call_params << "message: :#{message_assoc}"
-        if message_model_name != message_assoc.to_s.classify
-          acts_as_tool_call_params << "message_class: '#{message_model_name}'"
-        end
-      end
-
-      if acts_as_tool_call_params.any?
-        "acts_as_tool_call #{acts_as_tool_call_params.join(', ')}"
-      else
-        'acts_as_tool_call'
-      end
-    end
-
-    def acts_as_model_declaration
-      acts_as_model_params = []
-      chats_assoc = chat_model_name.tableize.to_sym
-
-      if chats_assoc != :chats
-        acts_as_model_params << "chats: :#{chats_assoc}"
-        acts_as_model_params << "chat_class: '#{chat_model_name}'" if chat_model_name != chats_assoc.to_s.classify
-      end
-
-      if acts_as_model_params.any?
-        "acts_as_model #{acts_as_model_params.join(', ')}"
-      else
-        'acts_as_model'
-      end
-    end
-
     def create_migration_files
       # Create migrations with timestamps to ensure proper order
       # First create chats table
@@ -168,6 +49,8 @@ module RubyLLM
     end
 
     def create_model_files
+      create_namespace_modules
+
       template 'chat_model.rb.tt', "app/models/#{chat_model_name.underscore}.rb"
       template 'message_model.rb.tt', "app/models/#{message_model_name.underscore}.rb"
       template 'tool_call_model.rb.tt', "app/models/#{tool_call_model_name.underscore}.rb"
@@ -186,12 +69,6 @@ module RubyLLM
       rails_command 'active_storage:install'
     end
 
-    def table_name_for(model_name)
-      # Convert namespaced model names to proper table names
-      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
-      model_name.underscore.pluralize.tr('/', '_')
-    end
-
     def show_install_info
       say "\n  ✅ RubyLLM installed!", :green
 

data/lib/generators/ruby_llm/install/templates/create_models_migration.rb.tt

@@ -34,10 +34,7 @@ class Create<%= model_model_name.gsub('::', '').pluralize %> < ActiveRecord::Mig
     # Load models from JSON
     say_with_time "Loading models from models.json" do
       RubyLLM.models.load_from_json!
-      model_class = '<%= model_model_name %>'.constantize
-      model_class.save_to_database
-
-      "Loaded #{model_class.count} models"
+      <%= model_model_name %>.save_to_database
     end
   end
 end

data/lib/generators/ruby_llm/upgrade_to_v1_7/templates/migration.rb.tt

@@ -3,6 +3,14 @@ class MigrateToRubyLLMModelReferences < ActiveRecord::Migration<%= migration_ver
     model_class = <%= model_model_name %>
     chat_class = <%= chat_model_name %>
     message_class = <%= message_model_name %>
+<% if @model_table_already_existed %>
+    # Load models from models.json if Model table already existed
+    say_with_time "Loading models from models.json" do
+      RubyLLM.models.load_from_json!
+      model_class.save_to_database
+      "Loaded #{model_class.count} models"
+    end
+<% end %>
 
     # Then check for any models in existing data that aren't in models.json
     say_with_time "Checking for additional models in existing data" do

data/lib/generators/ruby_llm/upgrade_to_v1_7/upgrade_to_v1_7_generator.rb

@@ -2,10 +2,12 @@
 
 require 'rails/generators'
 require 'rails/generators/active_record'
+require_relative '../generator_helpers'
 
 module RubyLLM
   class UpgradeToV17Generator < Rails::Generators::Base # rubocop:disable Style/Documentation
     include Rails::Generators::Migration
+    include RubyLLM::GeneratorHelpers
 
     namespace 'ruby_llm:upgrade_to_v1_7'
     source_root File.expand_path('templates', __dir__)
@@ -27,38 +29,11 @@ module RubyLLM
       ::ActiveRecord::Generators::Base.next_migration_number(dirname)
     end
 
-    def parse_model_mappings
-      @model_names = {
-        chat: 'Chat',
-        message: 'Message',
-        tool_call: 'ToolCall',
-        model: 'Model'
-      }
-
-      model_mappings.each do |mapping|
-        if mapping.include?(':')
-          key, value = mapping.split(':', 2)
-          @model_names[key.to_sym] = value.classify
-        end
-      end
-
-      @model_names
-    end
-
-    %i[chat message tool_call model].each do |type|
-      define_method("#{type}_model_name") do
-        @model_names ||= parse_model_mappings
-        @model_names[type]
-      end
-
-      define_method("#{type}_table_name") do
-        table_name_for(send("#{type}_model_name"))
-      end
-    end
-
     def create_migration_file
+      @model_table_already_existed = table_exists?(table_name_for(model_model_name))
+
       # First check if models table exists, if not create it
-      unless table_exists?(table_name_for(model_model_name))
+      unless @model_table_already_existed
         migration_template 'create_models_migration.rb.tt',
                            "db/migrate/create_#{table_name_for(model_model_name)}.rb",
                            migration_version: migration_version,
@@ -73,98 +48,74 @@ module RubyLLM
                          chat_model_name: chat_model_name,
                          message_model_name: message_model_name,
                          tool_call_model_name: tool_call_model_name,
-                         model_model_name: model_model_name
+                         model_model_name: model_model_name,
+                         model_table_already_existed: @model_table_already_existed
     end
 
     def create_model_file
-      # Check if Model file already exists
-      model_path = "app/models/#{model_model_name.underscore}.rb"
-
-      if File.exist?(Rails.root.join(model_path))
-        say_status :skip, model_path, :yellow
-      else
-        create_file model_path do
-          <<~RUBY
-            class #{model_model_name} < ApplicationRecord
-              #{acts_as_model_declaration}
-            end
-          RUBY
-        end
-      end
+      create_namespace_modules
+
+      template 'model_model.rb.tt', "app/models/#{model_model_name.underscore}.rb"
     end
 
-    def acts_as_model_declaration
-      acts_as_model_params = []
-      chats_assoc = chat_model_name.tableize.to_sym
+    def update_existing_models
+      update_model_acts_as(chat_model_name, 'acts_as_chat', acts_as_chat_declaration)
+      update_model_acts_as(message_model_name, 'acts_as_message', acts_as_message_declaration)
+      update_model_acts_as(tool_call_model_name, 'acts_as_tool_call', acts_as_tool_call_declaration)
+    end
 
-      if chats_assoc != :chats
-        acts_as_model_params << "chats: :#{chats_assoc}"
-        acts_as_model_params << "chat_class: '#{chat_model_name}'" if chat_model_name != chats_assoc.to_s.classify
-      end
+    def update_initializer
+      initializer_path = 'config/initializers/ruby_llm.rb'
 
-      if acts_as_model_params.any?
-        "acts_as_model #{acts_as_model_params.join(', ')}"
-      else
-        'acts_as_model'
+      unless File.exist?(initializer_path)
+        say_status :warning, 'No initializer found. Creating one...', :yellow
+        template 'initializer.rb.tt', initializer_path
+        return
       end
-    end
 
-    def update_initializer
-      initializer_content = File.read('config/initializers/ruby_llm.rb')
-
-      unless initializer_content.include?('config.use_new_acts_as')
-        inject_into_file 'config/initializers/ruby_llm.rb', before: /^end/ do
-          lines = ["\n  # Enable the new Rails-like API", '  config.use_new_acts_as = true']
-          lines << "  config.model_registry_class = \"#{model_model_name}\"" if model_model_name != 'Model'
-          lines << "\n"
-          lines.join("\n")
-        end
+      initializer_content = File.read(initializer_path)
+
+      return if initializer_content.include?('config.use_new_acts_as')
+
+      inject_into_file initializer_path, before: /^end/ do
+        lines = ["\n  # Enable the new Rails-like API", '  config.use_new_acts_as = true']
+        lines << "  config.model_registry_class = \"#{model_model_name}\"" if model_model_name != 'Model'
+        lines << "\n"
+        lines.join("\n")
       end
-    rescue Errno::ENOENT
-      say_status :error, 'config/initializers/ruby_llm.rb not found', :red
     end
 
     def show_next_steps
-      say_status :success, 'Migration created!', :green
+      say_status :success, 'Upgrade prepared!', :green
       say <<~INSTRUCTIONS
 
         Next steps:
-        1. Review the migration: db/migrate/*_migrate_to_ruby_llm_model_references.rb
+        1. Review the generated migrations
         2. Run: rails db:migrate
-        3. Update config/initializers/ruby_llm.rb as shown above
-        4. Test your application thoroughly
+        3. Update your code to use the new API: #{chat_model_name}.create! now has the same signature as RubyLLM.chat
 
-        The migration will:
-        - Create the Models table if it doesn't exist
-        - Load all models from models.json
-        - Migrate your existing data to use foreign keys
-        - Preserve all existing data (string columns renamed to model_id_string)
+        ⚠️  If you get "undefined method 'acts_as_model'" during migration:
+           Add this to config/application.rb BEFORE your Application class:
+
+           RubyLLM.configure do |config|
+             config.use_new_acts_as = true
+           end
+
+        📚 See the full migration guide: https://rubyllm.com/upgrading-to-1-7/
 
       INSTRUCTIONS
     end
 
     private
 
-    def migration_version
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    end
-
-    def table_name_for(model_name)
-      # Convert namespaced model names to proper table names
-      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
-      model_name.underscore.pluralize.tr('/', '_')
-    end
+    def update_model_acts_as(model_name, old_acts_as, new_acts_as)
+      model_path = "app/models/#{model_name.underscore}.rb"
+      return unless File.exist?(Rails.root.join(model_path))
 
-    def table_exists?(table_name)
-      ::ActiveRecord::Base.connection.table_exists?(table_name)
-    rescue StandardError
-      false
-    end
+      content = File.read(Rails.root.join(model_path))
+      return unless content.match?(/^\s*#{old_acts_as}/)
 
-    def postgresql?
-      ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
-    rescue StandardError
-      false
+      gsub_file model_path, /^\s*#{old_acts_as}.*$/, "  #{new_acts_as}"
     end
   end
 end

data/lib/ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dify_llm
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Carmine Paolino
@@ -152,6 +152,7 @@ files:
 - lib/generators/ruby_llm/chat_ui/templates/views/models/_model.html.erb.tt
 - lib/generators/ruby_llm/chat_ui/templates/views/models/index.html.erb.tt
 - lib/generators/ruby_llm/chat_ui/templates/views/models/show.html.erb.tt
+- lib/generators/ruby_llm/generator_helpers.rb
 - lib/generators/ruby_llm/install/install_generator.rb
 - lib/generators/ruby_llm/install/templates/chat_model.rb.tt
 - lib/generators/ruby_llm/install/templates/create_chats_migration.rb.tt
@@ -275,14 +276,14 @@ files:
 - lib/tasks/release.rake
 - lib/tasks/ruby_llm.rake
 - lib/tasks/vcr.rake
-homepage: https://rubyllm.com
+homepage: https://github.com/crmne/ruby_llm/pull/168
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://rubyllm.com
+  homepage_uri: https://github.com/crmne/ruby_llm/pull/168
   source_code_uri: https://github.com/crmne/ruby_llm
   changelog_uri: https://github.com/crmne/ruby_llm/commits/main
-  documentation_uri: https://rubyllm.com
+  documentation_uri: https://github.com/crmne/ruby_llm/pull/168
   bug_tracker_uri: https://github.com/crmne/ruby_llm/issues
   rubygems_mfa_required: 'true'
 post_install_message: |