disco 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4af4d7df56f884618557fd98f97da2686cecbfaf3ce1f1f52b6ba1a3a9155f5
-  data.tar.gz: ddbc7551c3534c41284e958042a94d988cdd5c52248f3ca7e4a8d8a72c6b168e
+  metadata.gz: 0fb469aae804d8f6ed2fe398b3584e67d1ebf29cd0d0d394eda952d32c0756f9
+  data.tar.gz: 295bde072449c13e3da22975efa0bdbe9ea5a1fdbbb787f0b0d63411056e6799
 SHA512:
-  metadata.gz: 5f40f125fe4096dcf09eaf1d1295f23e68fef9bbe1e5651a1ecfa1ed06748df7a0f4c9ea048b767b429b67b4d0add1f32663388707616571a6936a55ffd1d6b7
-  data.tar.gz: baf3caa4deec5422bd85e9372bc717f683d4cbb067f468eb7d4c964556885f7bb273fa0b6339201aef917c8f046346c20356358462fc73103243608a5245ebe6
+  metadata.gz: 287c44da295f55d2f95788fb7c0488738c1f70a409bb372461ad37d1786ade8fd0650abb8de62f023805a03bd667f74b509069bbaa9ca4f58a56aa1628d8b7c4
+  data.tar.gz: 81bceaa14ffc78918157b25c4cb4a21f0d08d625042867866032fe006a8cbfcd041914dfa19c720a0bc7211d00fe40d14f95fc2e1d769b7a9af59711641dcc78

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.4.0 (2023-01-30)
+
+- Fixed issue with `has_recommended` and inheritance with Rails < 6.1
+- Deprecated marshal serialization
+- Dropped support for Ruby < 2.7 and Rails < 6
+
+## 0.3.2 (2022-09-26)
+
+- Fixed issue when `fit` is called multiple times
+
 ## 0.3.1 (2022-07-10)
 
 - Added support for JSON serialization

data/README.md

@@ -176,8 +176,6 @@ user.update_recommended_products_v2(recs)
 user.recommended_products_v2
 ```
 
-For Rails < 6, speed up inserts by adding [activerecord-import](https://github.com/zdennis/activerecord-import) to your app.
-
 ## Storing Recommenders
 
 If you’d prefer to perform recommendations on-the-fly, store the recommender
@@ -187,9 +185,7 @@ json = recommender.to_json
 File.write("recommender.json", json)
 ```
 
-> You can save it to a file, database, or any other storage system. Also, user and item IDs should be integers or strings for this.
-
-The serialized recommender includes user activity from the training data (to avoid recommending previously rated items), so be sure to protect it.
+The serialized recommender includes user activity from the training data (to avoid recommending previously rated items), so be sure to protect it. You can save it to a file, database, or any other storage system, or use a tool like [Trove](https://github.com/ankane/trove). Also, user and item IDs should be integers or strings for this.
 
 Load a recommender
 
@@ -225,7 +221,7 @@ recommender.fit(data, validation_set: validation_set)
 
 ## Cold Start
 
-Collaborative filtering suffers from the [cold start problem](https://www.yuspify.com/blog/cold-start-problem-recommender-systems/). It’s unable to make good recommendations without data on a user or item, which is problematic for new users and items.
+Collaborative filtering suffers from the [cold start problem](https://en.wikipedia.org/wiki/Cold_start_(recommender_systems)). It’s unable to make good recommendations without data on a user or item, which is problematic for new users and items.
 
 ```ruby
 recommender.user_recs(new_user_id) # returns empty array

data/lib/disco/model.rb

@@ -1,7 +1,12 @@
 module Disco
   module Model
     def has_recommended(name, class_name: nil)
+      if ActiveRecord::VERSION::MAJOR < 6
+        raise Disco::Error, "Requires Active Record 6+"
+      end
+
       class_name ||= name.to_s.singularize.camelize
+      subject_type = model_name.name
 
       class_eval do
         unless reflect_on_association(:recommendations)
@@ -12,21 +17,13 @@ module Disco
 
         define_method("update_recommended_#{name}") do |items|
           now = Time.now
-          items = items.map { |item| {subject_type: model_name.name, subject_id: id, item_type: class_name, item_id: item.fetch(:item_id), context: name, score: item.fetch(:score), created_at: now, updated_at: now} }
+          items = items.map { |item| {subject_type: subject_type, subject_id: id, item_type: class_name, item_id: item.fetch(:item_id), context: name, score: item.fetch(:score), created_at: now, updated_at: now} }
 
           self.class.transaction do
             recommendations.where(context: name).delete_all
 
             if items.any?
-              if recommendations.respond_to?(:insert_all!)
-                # Rails 6
-                recommendations.insert_all!(items)
-              elsif recommendations.respond_to?(:bulk_import!)
-                # activerecord-import
-                recommendations.bulk_import!(items, validate: false)
-              else
-                recommendations.create!([items])
-              end
+              recommendations.insert_all!(items)
             end
           end
         end

data/lib/disco/recommender.rb

@@ -36,6 +36,8 @@ module Disco
         end
       end
 
+      @user_map = {}
+      @item_map = {}
       @rated = Hash.new { |hash, key| hash[key] = {} }
       input = []
       train_set.each do |v|
@@ -56,6 +58,9 @@ module Disco
       # TODO improve performance
       unless @implicit
         @min_rating, @max_rating = train_set.minmax_by { |o| o[:rating] }.map { |o| o[:rating] }
+      else
+        @min_rating = nil
+        @max_rating = nil
       end
 
       if @top_items
@@ -425,6 +430,8 @@ module Disco
     end
 
     def marshal_dump
+      warn "[disco] Marshal serialization is deprecated - use JSON instead"
+
       obj = {
         implicit: @implicit,
         user_map: @user_map,
@@ -452,6 +459,8 @@ module Disco
     end
 
     def marshal_load(obj)
+      warn "[disco] Marshal serialization is deprecated - use JSON instead"
+
       @implicit = obj[:implicit]
       @user_map = obj[:user_map]
       @item_map = obj[:item_map]

data/lib/disco/version.rb

@@ -1,3 +1,3 @@
 module Disco
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/disco.rb

@@ -3,13 +3,13 @@ require "libmf"
 require "numo/narray"
 
 # modules
-require "disco/data"
-require "disco/metrics"
-require "disco/recommender"
-require "disco/version"
+require_relative "disco/data"
+require_relative "disco/metrics"
+require_relative "disco/recommender"
+require_relative "disco/version"
 
 # integrations
-require "disco/engine" if defined?(Rails)
+require_relative "disco/engine" if defined?(Rails)
 
 module Disco
   class Error < StandardError; end
@@ -19,7 +19,7 @@ end
 
 if defined?(ActiveSupport.on_load)
   ActiveSupport.on_load(:active_record) do
-    require "disco/model"
+    require_relative "disco/model"
     extend Disco::Model
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disco
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-10 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libmf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
@@ -69,14 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Recommendations for Ruby and Rails using collaborative filtering