search-engine-for-typesense 30.9.2 → 30.9.3

data/lib/search_engine/test/stub_client.rb

@@ -2,6 +2,7 @@
 
 require 'monitor'
 require 'json'
+require 'search_engine/test/offline_client'
 
 module SearchEngine
   module Test
@@ -102,7 +103,7 @@ module SearchEngine
 
         entry = capture(:search, url: compiled_url(collection), params: params_hash, url_opts: url_opts)
         payload = dequeue_or_default(:search, entry)
-        wrap_single(payload)
+        block_given? ? yield(payload) : SearchEngine::Result.new(payload)
       end
 
       # Public API: multi search. Mirrors top-level helper client usage: returns raw Hash from Typesense.
@@ -117,9 +118,7 @@ module SearchEngine
 
         # Record a synthetic URL for multi endpoint; individual bodies are not posted here
         entry = capture(:multi_search, url: compiled_multi_url, params: searches, url_opts: url_opts)
-        dequeue_or_default(:multi_search, entry).tap do |raw|
-          return raw
-        end
+        dequeue_or_default(:multi_search, entry)
       end
 
       private
@@ -128,7 +127,7 @@ module SearchEngine
         val = @lock.synchronize { queue_for(method).shift }
         case val
         when nil
-          default_payload(method)
+          default_payload(entry)
         when Proc
           val.call(entry)
         when Exception
@@ -138,12 +137,11 @@ module SearchEngine
         end
       end
 
-      def default_payload(method)
-        if method == :search
-          { 'hits' => [], 'found' => 0, 'out_of' => 0 }
-        else
-          { 'results' => [] }
-        end
+      def default_payload(entry)
+        empty = SearchEngine::Test::OfflineClient::EMPTY_SEARCH
+        return empty if entry.verb == :search
+
+        { 'results' => entry.body.map { empty } }
       end
 
       def queue_for(method)
@@ -191,11 +189,6 @@ module SearchEngine
         @lock.synchronize { @calls[method] << entry }
         entry
       end
-
-      def wrap_single(payload)
-        # Mirror Client#search returning SearchEngine::Result
-        SearchEngine::Result.new(payload, klass: nil)
-      end
     end
   end
 end

data/lib/search_engine/update.rb

@@ -20,7 +20,7 @@ module SearchEngine
     def update_by(klass:, attributes:, filter: nil, hash: nil, into: nil, partition: nil, timeout_ms: nil)
       raise ArgumentError, 'attributes must be a non-empty Hash' unless attributes.is_a?(Hash) && !attributes.empty?
 
-      filter_str = SearchEngine::Deletion.build_filter(filter, hash)
+      filter_str = SearchEngine::Deletion.build_filter(filter, hash, klass: klass)
       collection = SearchEngine::Deletion.resolve_into(klass: klass, partition: partition, into: into)
 
       resp = SearchEngine.client.update_documents_by_filter(

data/lib/search_engine/version.rb

@@ -3,5 +3,5 @@
 module SearchEngine
   # Current gem version.
   # @return [String]
-  VERSION = '30.9.2'
+  VERSION = '30.9.3'
 end

data/lib/search_engine.rb

@@ -56,6 +56,8 @@ require 'search_engine/active_record_syncable'
 # Top-level namespace for the SearchEngine gem.
 # Provides Typesense integration points for Rails applications.
 module SearchEngine
+  autoload :IndexPartitionJob, 'search_engine/index_partition_job'
+
   class << self
     # Access the singleton configuration instance.
     # @return [SearchEngine::Config]
@@ -122,21 +124,8 @@ module SearchEngine
     #   res[:products].found
     # @note Emits "search_engine.multi_search" via ActiveSupport::Notifications with
     #   payload: { searches_count, labels, http_status, source: :multi }.
-    def multi_search(common: {})
-      raise ArgumentError, 'block required' unless block_given?
-
-      builder = SearchEngine::Multi.new
-      yield builder
-
-      labels = builder.labels
-      raw = execute_multi_search_internal(builder: builder, common: common, labels: labels, use_custom_client: false)
-
-      # Typesense client returns symbolized keys; be resilient to both forms.
-      # Expect: { results: [ { ... }, ... ] }
-      list = Array(raw && (raw[:results] || raw['results']))
-      pairs = build_label_result_pairs(list, labels, builder)
-
-      SearchEngine::Multi::ResultSet.new(pairs)
+    def multi_search(common: {}, &block)
+      multi_search_result(common: common, &block).result_set
     end
 
     # Execute a federated multi-search and return a MultiResult wrapper.
@@ -157,17 +146,8 @@ module SearchEngine
     #   mr[:products].found
     # @note Emits "search_engine.multi_search" via ActiveSupport::Notifications with
     #   payload: { searches_count, labels, http_status, source: :multi }.
-    def multi_search_result(common: {})
-      raise ArgumentError, 'block required' unless block_given?
-
-      builder = SearchEngine::Multi.new
-      yield builder
-
-      labels = builder.labels
-      raw = execute_multi_search_internal(builder: builder, common: common, labels: labels, use_custom_client: false)
-
-      list = Array(raw && (raw[:results] || raw['results']))
-      SearchEngine::MultiResult.new(labels: labels, raw_results: list, klasses: builder.klasses)
+    def multi_search_result(common: {}, &block)
+      multi_search_builder(&block).execute(common: common)
     end
 
     # Execute a federated multi-search and return the raw response.
@@ -183,16 +163,8 @@ module SearchEngine
     # @raise [SearchEngine::Errors::Api] when Typesense returns a non-2xx status
     # @note Emits "search_engine.multi_search" via ActiveSupport::Notifications with
     #   payload: { searches_count, labels, http_status, source: :multi }.
-    def multi_search_raw(common: {})
-      raise ArgumentError, 'block required' unless block_given?
-
-      builder = SearchEngine::Multi.new
-      yield builder
-
-      labels = builder.labels
-      execute_multi_search_internal(builder: builder, common: common, labels: labels, use_custom_client: true)
-    rescue Errors::Api => error
-      raise augment_multi_api_error(error, labels)
+    def multi_search_raw(common: {}, &block)
+      multi_search_builder(&block).execute(common: common, raw: true)
     end
 
     # Build and render a graph of Typesense collections and their interconnections.
@@ -220,120 +192,10 @@ module SearchEngine
       @config_mutex ||= Mutex.new
     end
 
-    # Internal method that executes multi-search request with common setup and error handling.
-    # Returns the raw Typesense response.
-    #
-    # @param builder [SearchEngine::Multi] configured builder instance
-    # @param common [Hash] optional params merged into each per-search payload
-    # @param labels [Array<Symbol>] ordered labels for the search list
-    # @param use_custom_client [Boolean] whether to check config.client for custom client instance
-    # @return [Hash] raw Typesense multi-search response
-    # @raise [ArgumentError] when the number of searches exceeds the configured limit
-    # @raise [SearchEngine::Errors::Api] when Typesense returns a non-2xx status
-    def execute_multi_search_internal(builder:, common:, labels:, use_custom_client:)
-      count = builder.labels.size
-      limit = SearchEngine.config.multi_search_limit
-      enforce_multi_limit!(count, limit)
-
-      payloads = builder.to_payloads(common: common)
-      url_opts = SearchEngine::ClientOptions.url_options_from_config(SearchEngine.config)
-
-      client_obj = SearchEngine.client(use_config_client: use_custom_client)
-
-      if defined?(ActiveSupport::Notifications)
-        se_payload = build_multi_event_payload(count, labels, url_opts)
-        begin
-          SearchEngine::Instrumentation.instrument('search_engine.multi_search', se_payload) do |ctx|
-            client_obj.multi_search(searches: payloads, url_opts: url_opts).tap do
-              ctx[:http_status] = 200
-            end
-          rescue Errors::Api => error
-            ctx[:http_status] = error.status
-            raise
-          end
-        rescue Errors::Api => error
-          raise augment_multi_api_error(error, labels)
-        end
-      else
-        begin
-          client_obj.multi_search(searches: payloads, url_opts: url_opts)
-        rescue Errors::Api => error
-          raise augment_multi_api_error(error, labels)
-        end
-      end
-    end
-
-    def enforce_multi_limit!(count, limit)
-      return unless count > limit
-
-      raise ArgumentError,
-            "multi_search: #{count} searches exceed limit (#{limit}). " \
-            'Increase `SearchEngine.config.multi_search_limit` if necessary.'
-    end
-
-    def build_multi_event_payload(count, labels, url_opts)
-      {
-        searches_count: count,
-        labels: labels.map(&:to_s),
-        http_status: nil,
-        source: :multi,
-        url_opts: Observability.filtered_url_opts(url_opts)
-      }
-    end
-
-    def build_label_result_pairs(list, labels, builder)
-      pairs = []
-      list.each_with_index do |item, idx|
-        label = labels[idx]
-        klass = builder.klasses[idx]
-        result = SearchEngine::Result.new(item, klass: klass)
-        pairs << [label, result]
-      end
-      pairs
-    end
-
-    # Build an API error with additional label context when possible.
-    # @param error [SearchEngine::Errors::Api]
-    # @param labels [Array<Symbol>] ordered labels for the search list
-    # @return [SearchEngine::Errors::Api]
-    def augment_multi_api_error(error, labels)
-      body = error.body
-      failing_index = nil
-      failing_status = nil
+    def multi_search_builder(&block)
+      raise ArgumentError, 'block required' unless block
 
-      if body.is_a?(Hash)
-        results = body['results'] || body[:results]
-        if results.is_a?(Array)
-          results.each_with_index do |item, idx|
-            status = item.is_a?(Hash) ? (item['status'] || item[:status] || item['code'] || item[:code]) : nil
-            next if status.nil? || status.to_i == 200
-
-            failing_index = idx
-            failing_status = status.to_i
-            break
-          end
-        end
-      end
-
-      if failing_index && labels[failing_index]
-        label = labels[failing_index]
-        msg = "Multi-search failed for label :#{label} (status #{failing_status})."
-        return Errors::Api.new(msg, status: error.status, body: error.body)
-      end
-
-      # Fallback: summarize
-      codes = []
-      if body.is_a?(Hash)
-        results = body['results'] || body[:results]
-        if results.is_a?(Array)
-          results.each do |item|
-            codes << (item['status'] || item[:status] || item['code'] || item[:code])
-          end
-        end
-      end
-      Errors::Api.new("Multi-search failed (statuses: #{codes.compact.join(', ')})", status: error.status,
-body: error.body
-      )
+      SearchEngine::Multi.new.tap(&block)
     end
   end
 end

data/lib/tasks/search_engine.rake

@@ -75,7 +75,8 @@ namespace :search_engine do
           parts = SearchEngine::Cli.partitions_for(klass)
           parts = [nil] if parts.nil? || parts.respond_to?(:empty?) && parts.empty?
           parts.each do |part|
-            SearchEngine::Indexer.rebuild_partition!(klass, partition: part, into: physical)
+            imported = SearchEngine::Indexer.rebuild_partition!(klass, partition: part, into: physical)
+            raise SearchEngine::Errors::PartitionImportFailed, imported unless imported.status == :ok
           end
         end
       end
@@ -90,9 +91,6 @@ namespace :search_engine do
       end
 
       Kernel.exit(0)
-    rescue ArgumentError => error
-      warn("schema:apply failed: #{error.message}")
-      Kernel.exit(1)
     rescue StandardError => error
       warn("schema:apply failed: #{error.message}")
       Kernel.exit(1)
@@ -523,7 +521,7 @@ namespace :search_engine do
 
       Tips:
         - FORCE_REBUILD=true forces the guarded physical create/reindex/swap lifecycle even when schema is current.
-        - Explicit rollback targets are compare-and-swap safe when expected_current is supplied.
+        - expected_current requires a schema.around_rebuild lock shared by all alias writers.
         - Repeating a successful rollback is a no-op; use an explicit target when newer orphaned physicals exist.
         - Quote rake tasks with brackets to avoid shell globbing (e.g., zsh):
           rails 'search_engine:index:rebuild_partition[SearchEngine::Product,42]'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search-engine-for-typesense
 version: !ruby/object:Gem::Version
-  version: 30.9.2
+  version: 30.9.3
 platform: ruby
 authors:
 - Nikita Shkoda
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
 description: Rails::Engine providing a thin wrapper around Typesense with idiomatic
   Rails integration.
 email:
@@ -64,8 +78,6 @@ files:
 - LICENSE
 - README.md
 - app/search_engine/search_engine/app_info.rb
-- app/search_engine/search_engine/index_partition_job.rb
-- app/search_engine/search_engine/postgres_outbox/drain_job.rb
 - lib/generators/search_engine/install/install_generator.rb
 - lib/generators/search_engine/install/templates/initializer.rb.tt
 - lib/generators/search_engine/model/model_generator.rb
@@ -151,6 +163,7 @@ files:
 - lib/search_engine/filters/sanitizer.rb
 - lib/search_engine/hydration/materializers.rb
 - lib/search_engine/hydration/selection_context.rb
+- lib/search_engine/index_partition_job.rb
 - lib/search_engine/indexer.rb
 - lib/search_engine/indexer/batch_planner.rb
 - lib/search_engine/indexer/bulk_import.rb
@@ -186,6 +199,7 @@ files:
 - lib/search_engine/postgres_outbox/database_queries.rb
 - lib/search_engine/postgres_outbox/delivery_target.rb
 - lib/search_engine/postgres_outbox/drain_enqueuer.rb
+- lib/search_engine/postgres_outbox/drain_job.rb
 - lib/search_engine/postgres_outbox/drainer.rb
 - lib/search_engine/postgres_outbox/event.rb
 - lib/search_engine/postgres_outbox/event_processor.rb