disco 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d7b56a9c40088874bbd79ff7fa5bf8783a4406a9e5dadf1dddb04303ca7fee
-  data.tar.gz: 0d843da83fc246b5da2aa097eba3534d729b51d9b03c368226b884fe33e61795
+  metadata.gz: bb67e295f1ad63fed7441947934c3bf4c3b527cfddb1f1d9620d551c9e409223
+  data.tar.gz: 6c86546e3890792c89008fe9850a242e894b097eed2621bb9dba3bef6a213296
 SHA512:
-  metadata.gz: 49341b30e2ffa7348c19af2c0073f8f9e15afe3dcd856922fb5ae3fd3cd6e5ab555731c38bf3678f5f4efb064ecfce994d24b6238aa93fbc62e4621d7de036ab
-  data.tar.gz: 9bb387230927cf55e94c3614c4a68881031206c9ee2dee2d48c06f6053134cdff0af4c4d24eba825acf3429394556368378bd51860f4dfcddf0dd1742309794f
+  metadata.gz: f277e589e5a833a834874c5cf25dba32d7908b197047fe0b6e44ae6b8950a55204dc235de8d5c36c6b5ec6a78c53c4ba63c1607c64b8da4c1555eba4b0dcd7bd
+  data.tar.gz: 2abee5543ba9a600dc4692e15af30d63505dc87eb6ccc3dd42b530c4760aacef562c597882b26a9e1c586b813ae1f91c79307627d7511321298e879205d1a631

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.0.0 (2026-04-17)
+
+- Switched to `numo-narray-alt`
+- Fixed handling of new users and items in validation set
+- Dropped support for Daru
+- Dropped support for Ruby < 3.3 and Rails < 7.2
+
+## 0.5.2 (2025-09-12)
+
+- Fixed recommendations when numo-narray compiled with GCC 13+
+- Fixed error with Rover 0.5+
+
 ## 0.5.1 (2024-12-29)
 
 - Removed dependency on `base64` gem for serialization

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2024 Andrew Kane
+Copyright (c) 2019-2026 Andrew Kane
 
 MIT License
 

data/README.md

@@ -256,12 +256,6 @@ Or a Rover data frame
 Rover.read_csv("ratings.csv")
 ```
 
-Or a Daru data frame
-
-```ruby
-Daru::DataFrame.from_csv("ratings.csv")
-```
-
 ## Performance
 
 If you have a large number of users or items, you can use an approximate nearest neighbors library like [Faiss](https://github.com/ankane/faiss) to improve the performance of certain methods.

data/lib/disco/data.rb

@@ -29,9 +29,7 @@ module Disco
 
     def download_file(fname, origin, file_hash:)
       require "digest"
-      require "fileutils"
-      require "net/http"
-      require "tmpdir"
+      require "open-uri"
 
       cache_home = ENV["XDG_CACHE_HOME"] || "#{ENV.fetch("HOME")}/.cache"
       dest = "#{cache_home}/disco/#{fname}"
@@ -39,38 +37,24 @@ module Disco
 
       return dest if File.exist?(dest)
 
-      temp_path = "#{Dir.tmpdir}/disco-#{Time.now.to_f}" # TODO better name
-
-      digest = Digest::SHA2.new
-
-      uri = URI(origin)
-
-      # Net::HTTP automatically adds Accept-Encoding for compression
-      # of response bodies and automatically decompresses gzip
-      # and deflateresponses unless a Range header was sent.
-      # https://ruby-doc.org/stdlib-2.6.4/libdoc/net/http/rdoc/Net/HTTP.html
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-        request = Net::HTTP::Get.new(uri)
-
-        puts "Downloading data from #{origin}"
-        File.open(temp_path, "wb") do |f|
-          http.request(request) do |response|
-            response.read_body do |chunk|
-              f.write(chunk)
-              digest.update(chunk)
-            end
+      puts "Downloading data from #{origin}"
+      URI.parse(origin).open(redirect: false) do |download|
+        digest =
+          if download.respond_to?(:path)
+            download.flush
+            Digest::SHA256.file(download.path).hexdigest
+          else
+            Digest::SHA256.hexdigest(download.string)
           end
+
+        if digest != file_hash
+          raise Error, "Bad hash: #{digest}"
         end
-      end
+        puts "Hash verified: #{file_hash}"
 
-      if digest.hexdigest != file_hash
-        raise Error, "Bad hash: #{digest.hexdigest}"
+        IO.copy_stream(download, dest)
       end
 
-      puts "Hash verified: #{file_hash}"
-
-      FileUtils.mv(temp_path, dest)
-
       dest
     end
   end

data/lib/disco/model.rb

@@ -1,8 +1,8 @@
 module Disco
   module Model
     def has_recommended(name, class_name: nil)
-      if ActiveRecord::VERSION::MAJOR < 7
-        raise Disco::Error, "Requires Active Record 7+"
+      if ActiveRecord::VERSION::STRING.to_f < 7.2
+        raise Disco::Error, "Requires Active Record 7.2+"
       end
 
       class_name ||= name.to_s.singularize.camelize

data/lib/disco/recommender.rb

@@ -38,18 +38,17 @@ module Disco
 
       @user_map = {}
       @item_map = {}
-      @rated = Hash.new { |hash, key| hash[key] = {} }
+      @rated = []
       input = []
       train_set.each do |v|
         # update maps and build matrix in single pass
         u = (@user_map[v[:user_id]] ||= @user_map.size)
         i = (@item_map[v[:item_id]] ||= @item_map.size)
-        @rated[u][i] = true
+        (@rated[u] ||= Set.new) << i
 
         # explicit will always have a value due to check_ratings
         input << [u, i, @implicit ? 1 : v[:rating]]
       end
-      @rated.default = nil
 
       # much more efficient than checking every value in another pass
       raise ArgumentError, "Missing user_id" if @user_map.key?(nil)
@@ -74,15 +73,24 @@ module Disco
       end
 
       eval_set = nil
-      if validation_set
+      if validation_set&.any?
         eval_set = []
         validation_set.each do |v|
           u = @user_map[v[:user_id]]
           i = @item_map[v[:item_id]]
 
-          # set to non-existent item
-          u ||= -1
-          i ||= -1
+          if @implicit
+            if u.nil?
+              raise ArgumentError, "Validation set cannot have new users for implicit feedback"
+            end
+
+            if i.nil?
+              raise ArgumentError, "Validation set cannot have new items for implicit feedback"
+            end
+          else
+            u ||= @user_map.size
+            i ||= @item_map.size
+          end
 
           eval_set << [u, i, @implicit ? 1 : v[:rating]]
         end
@@ -134,21 +142,17 @@ module Disco
         rated = item_ids ? {} : @rated[u]
 
         if item_ids
-          ids = Numo::NArray.cast(item_ids.map { |i| @item_map[i] }.compact)
+          ids = Numo::NArray.cast(item_ids.filter_map { |i| @item_map[i] })
           return [] if ids.size == 0
 
           predictions = @item_factors[ids, true].inner(@user_factors[u, true])
-          indexes = predictions.sort_index.reverse
-          indexes = indexes[0...[count + rated.size, indexes.size].min] if count
-          predictions = predictions[indexes]
+          predictions, indexes = top_k(predictions, count ? count + rated.size : nil)
           ids = ids[indexes]
         elsif @user_recs_index && count
           predictions, ids = @user_recs_index.search(@user_factors[u, true].expand_dims(0), count + rated.size).map { |v| v[0, true] }
         else
           predictions = @item_factors.inner(@user_factors[u, true])
-          indexes = predictions.sort_index.reverse # reverse just creates view
-          indexes = indexes[0...[count + rated.size, indexes.size].min] if count
-          predictions = predictions[indexes]
+          predictions, indexes = top_k(predictions, count ? count + rated.size : nil)
           ids = indexes
         end
 
@@ -157,7 +161,7 @@ module Disco
         keys = @item_map.keys
         result = []
         ids.each_with_index do |item_id, i|
-          next if rated[item_id]
+          next if rated.include?(item_id)
 
           result << {item_id: keys[item_id], score: predictions[i]}
           break if result.size == count
@@ -196,7 +200,7 @@ module Disco
         # wilson score with continuity correction
         # https://en.wikipedia.org/wiki/Binomial_proportion_confidence_interval#Wilson_score_interval_with_continuity_correction
         z = 1.96 # 95% confidence
-        range = @max_rating - @min_rating
+        range = @max_rating - min_rating
         n = Numo::DFloat.cast(@item_count)
         phat = (Numo::DFloat.cast(@item_sum) - (min_rating * n)) / range / n
         phat = (phat - (1 / (2 * n))).clip(0, nil) # continuity correction
@@ -204,9 +208,7 @@ module Disco
         scores = scores * range + min_rating
       end
 
-      indexes = scores.sort_index.reverse
-      indexes = indexes[0...[count, indexes.size].min] if count
-      scores = scores[indexes]
+      scores, indexes = top_k(scores, count)
 
       keys = @item_map.keys
       indexes.size.times.map do |i|
@@ -267,7 +269,7 @@ module Disco
         implicit: @implicit,
         user_ids: @user_map.keys,
         item_ids: @item_map.keys,
-        rated: @user_map.map { |_, u| (@rated[u] || {}).keys },
+        rated: @rated.map { |v| v.to_a.sort },
         global_mean: @global_mean,
         user_factors: [@user_factors.to_binary].pack("m0"),
         item_factors: [@item_factors.to_binary].pack("m0"),
@@ -371,9 +373,7 @@ module Disco
           end
         else
           predictions = factors.inner(factors[i, true]) / (norms * norms[i])
-          indexes = predictions.sort_index.reverse
-          indexes = indexes[0...[count + 1, indexes.size].min] if count
-          predictions = predictions[indexes]
+          predictions, indexes = top_k(predictions, count ? count + 1 : nil)
           ids = indexes
         end
 
@@ -394,6 +394,12 @@ module Disco
       end
     end
 
+    def top_k(values, count)
+      indexes = values.sort_index.reverse
+      indexes = indexes[0...[count, indexes.size].min] if count
+      [values[indexes], indexes]
+    end
+
     def check_ratings(ratings)
       unless ratings.all? { |r| !r[:rating].nil? }
         raise ArgumentError, "Missing rating"
@@ -414,17 +420,7 @@ module Disco
     def to_dataset(dataset)
       if defined?(Rover::DataFrame) && dataset.is_a?(Rover::DataFrame)
         # convert keys to symbols
-        dataset = dataset.dup
-        dataset.keys.each do |k, v|
-          dataset[k.to_sym] ||= dataset.delete(k)
-        end
-        dataset.to_a
-      elsif defined?(Daru::DataFrame) && dataset.is_a?(Daru::DataFrame)
-        # convert keys to symbols
-        dataset = dataset.dup
-        new_names = dataset.vectors.to_a.map { |k| [k, k.to_sym] }.to_h
-        dataset.rename_vectors!(new_names)
-        dataset.to_a[0]
+        dataset.each_row.map { |v| v.transform_keys(&:to_sym) }
       else
         dataset
       end
@@ -434,7 +430,7 @@ module Disco
       @implicit = obj["implicit"]
       @user_map = obj["user_ids"].map.with_index.to_h
       @item_map = obj["item_ids"].map.with_index.to_h
-      @rated = obj["rated"].map.with_index.to_h { |r, i| [i, r.to_h { |v| [v, true] }] }
+      @rated = obj["rated"].map { |r| Set.new(r) }
       @global_mean = obj["global_mean"].to_f
       @factors = obj["factors"].to_i
       @user_factors = Numo::SFloat.from_binary(obj["user_factors"].unpack1("m0"), [@user_map.size, @factors])

data/lib/disco/version.rb

@@ -1,3 +1,3 @@
 module Disco
-  VERSION = "0.5.1"
+  VERSION = "1.0.0"
 end

data/lib/disco.rb

@@ -1,6 +1,9 @@
 # dependencies
 require "libmf"
-require "numo/narray"
+require "numo/narray/alt"
+
+# stdlib
+require "set"
 
 # modules
 require_relative "disco/data"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: disco
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Kane
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libmf
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: numo-narray
+  name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.10'
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -66,14 +66,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Recommendations for Ruby and Rails using collaborative filtering
 test_files: []