activerecord-turbopuffer-adapter 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e4579b0235c712aef39dedae94abdb3e8053ef5b04fff2e46ee38c0fd5710a
-  data.tar.gz: dadc48af421f105ed95d7964b7929ced1dd613217fdda1b88b00a58c291867cf
+  metadata.gz: ae2b8fa993fe940121966a4d3c8c9b95a43afc484348f1598ed76bb24ad0c021
+  data.tar.gz: 02b90f77da9ec0f5133fc021fa516b64516a79eea2b6d63d0bacf6b7feb97399
 SHA512:
-  metadata.gz: 6037d2898aa914ed3990f238ac00b86c4b710d630fd3aa7c9dd3af9200f768736b9207cf8cedf079c01d60fd8fce614cdafdaa5873241b1c7a47fa1f6bb4b9df
-  data.tar.gz: 8b6c7caf5e1b82fbed33da7e5e06e1232cf9603aab035b6a9ef8540223047020429927721928911c80512c778fbdef5a52b1628ca0110ac4414d0419f18a9aed
+  metadata.gz: fe02be8410aae63cc2479a3cb9ec52e1b54ffae8f34e21b33a63168f3572edeef99d5ccce08a675ce30adc227f967e519f4dd66cedb160a4f1b0dc4299a79c1b
+  data.tar.gz: ba93057de23dd67659cdbfd4d0a8e822fddd7ff162129932b995061c8c8e8d19cb10ae832c08e41639b2edf619d5119239b7f01043d42404bd7aaaac1f0ce37e

data/README.md

@@ -109,6 +109,8 @@ Document.where(tags: nil)
 Document.where(scores: 90..)
 
 Document.order(:title).limit(20)
+Document.order(:category, views: :desc)
+Document.order(:title).limit(20).offset(20)
 Document.group(:title).count
 Document.count
 Document.find("018f...")
@@ -128,7 +130,7 @@ Document
   .limit(10)
 ```
 
-> Note that turbopuffer has a limit on the maximum number of documents returned (https://turbopuffer.com/docs/query#param-limit), so Document.all.to_a etc. will only return at most 10,000 items
+> Note that turbopuffer has a limit on the maximum number of documents returned (https://turbopuffer.com/docs/query#param-limit), so Document.all.to_a etc. will only return at most 10,000 items, and `limit` plus `offset` must stay within that
 
 > Eventual reads are cheaper but may not include writes from the last few seconds. Set a default with `turbopuffer_consistency "eventual"` in a model or `consistency: eventual` in `database.yml`. Strong is the default.
 

data/lib/active_record/connection_adapters/turbopuffer_adapter.rb

@@ -279,10 +279,12 @@ module ActiveRecord
 
         tpuf_query_args = {
           include_attributes: fields,
-          top_k: query.top_k.present? ? query.top_k : 10_000
+          top_k: query.top_k.present? ? query.top_k : 10_000 - query.offset.to_i
         }
 
-        tpuf_query_args[:rank_by] = query.rank_by.first if query.rank_by.present?
+        tpuf_query_args[:offset] = query.offset if query.offset
+
+        tpuf_query_args[:rank_by] = query.rank_by if query.rank_by
         tpuf_query_args[:filters] = query.filters if query.filters
         consistency = consistency_for(query)
         tpuf_query_args[:consistency] = consistency if consistency

data/lib/arel/visitors/turbopuffer.rb

@@ -12,7 +12,8 @@ module Arel::Visitors
         aggregate_by: @aggregate_by,
         upsert_rows: @upsert_rows,
         consistency: @consistency,
-        namespace_override: @namespace_override
+        namespace_override: @namespace_override,
+        offset: @offset
       }
     end
     def to_s = JSON.generate(to_h)
@@ -22,10 +23,10 @@ module Arel::Visitors
     alias == eql?
 
     attr_reader :op, :namespace, :filters, :top_k, :rank_by, :include_attributes, :upsert_rows, :aggregate_by, :group_by,
-                :consistency, :namespace_override
+                :consistency, :namespace_override, :offset
 
-    def initialize(op:, namespace:, filters: nil, top_k: nil, rank_by: nil, include_attributes: nil,
-                   upsert_rows: nil, aggregate_by: nil, group_by: nil, consistency: nil, namespace_override: nil)
+    def initialize(op:, namespace:, filters: nil, top_k: nil, rank_by: nil, include_attributes: nil, upsert_rows: nil,
+                   aggregate_by: nil, group_by: nil, consistency: nil, namespace_override: nil, offset: nil)
       @op = op
       @namespace = namespace
       @filters = filters
@@ -37,6 +38,7 @@ module Arel::Visitors
       @upsert_rows = upsert_rows
       @consistency = consistency
       @namespace_override = namespace_override
+      @offset = offset
     end
   end
 
@@ -99,12 +101,18 @@ module Arel::Visitors
       end
     end
 
-    def visit_Arel_Nodes_SelectStatement(o)
-      raise NotImplementedError, "offset is not supported, filter on a sortable attribute for cursor pagination" if o.offset
-      # https://turbopuffer.com/docs/query#ordering-by-attributes: "Ordering by
-      # multiple attributes isn't yet implemented."
-      raise NotImplementedError, "one ranking per query, sort in Ruby after loading" if o.orders.size > 1
+    def ranking(orders)
+      return if orders.empty?
+      return visit(orders.first) if orders.size == 1
+
+      if orders.any? { |order| order.is_a?(Arel::Nodes::RankByNode) }
+        raise NotImplementedError, "a ranking cannot be combined with other orderings, sort in Ruby after loading"
+      end
+
+      orders.map { |order| visit(order) }
+    end
 
+    def visit_Arel_Nodes_SelectStatement(o)
       core = o.cores.last
 
       raise NotImplementedError, "distinct is not implemented yet" if core.set_quantifier
@@ -113,6 +121,8 @@ module Arel::Visitors
       aggregates, attributes = core.projections.partition { |p| aggregate?(p) }
       aggregate = aggregates.first
 
+      raise NotImplementedError, "offset is not supported on aggregate queries" if o.offset && aggregate
+
       filters = core.wheres.map { |w| visit(w) }
       counted = aggregate && counted_attribute(aggregate)
       filters << [ visit(counted), "NotEq", nil ] if counted
@@ -122,12 +132,13 @@ module Arel::Visitors
         namespace:          visit(core.source),
         filters:            conjoin(filters),
         top_k:              o.limit && visit(o.limit),
-        rank_by:            o.orders.map { |ord| visit(ord) },
+        rank_by:            ranking(o.orders),
         include_attributes: attributes.flat_map { |p| visit(p) },
         group_by:           core.groups.map { |g| visit(g) },
         aggregate_by:       aggregate && visit(aggregate),
         consistency:        consistency_hint(core.optimizer_hints),
-        namespace_override: namespace_annotation(core.comment)
+        namespace_override: namespace_annotation(core.comment),
+        offset:             o.offset && visit(o.offset)
       )
     end
 
@@ -207,6 +218,10 @@ module Arel::Visitors
       visit(o.left)
     end
 
+    def visit_Arel_Nodes_TableAlias(o)
+      raise NotImplementedError, "subqueries are not supported, count a limited or offset relation in Ruby after loading"
+    end
+
     def visit_Arel_Table(o) = o.name
 
     # filters
@@ -293,6 +308,7 @@ module Arel::Visitors
     def visit_Arel_Nodes_Casted(o)         = o.value_for_database
     def visit_Arel_Nodes_Quoted(o)         = o.expr
     def visit_Arel_Nodes_Limit(o)          = visit(o.expr)
+    def visit_Arel_Nodes_Offset(o)         = visit(o.expr)
     def visit_Arel_Nodes_Ascending(o)      = [ visit(o.expr), "asc" ]
     def visit_Arel_Nodes_Descending(o)     = [ visit(o.expr), "desc" ]
 

data/lib/turbopuffer/active_record/version.rb

@@ -1,5 +1,5 @@
 module Turbopuffer
   module ActiveRecord
-    VERSION = "0.1.8"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turbopuffer-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Richard Monette
 bindir: bin
 cert_chain: []
-date: 2026-10-07 00:00:00.000000000 Z
+date: 2026-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'