smart_rag 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126c6c21c530311732722fc39ddad72632a9fb64c6dcdb8a467665d92871f44e
-  data.tar.gz: '09cab17c6e5aa7cef64548ef95833e74af40ca45659e6142a4125a680c89426d'
+  metadata.gz: b8c4c7c6f458001f016b74e56d5050632bc819d23c25e6b810c7900605b1d401
+  data.tar.gz: 3793d26b5fd103ca5ef0e32ff708f7fb235fbd5888d2f306db8f39416ab832f3
 SHA512:
-  metadata.gz: 30102eda862fa9d04aec069b1a0454d2b7fdef78eb5a9684e82509f096af40369e4a20982b63d9cb2672635ba3be00401e90a7beebca36dbdd76825ef453e005
-  data.tar.gz: 6b2b5b5f58d4168349e36f9622aa36c12948c3cdc77b9194db2eb2badb98b3a4900ee009f668b4979c334bdea051ae3d59e79d71c2b1d610f89a90f846b2a548
+  metadata.gz: 45d530acad3be58c9126d61bc426780873ab03dd9129cbb4b8220b8d9655012ab4e2ae9304b813ebd9a334f0dc444c237c4ab46166edb182582f39db4ceefbc9
+  data.tar.gz: ed4c245e61190954e33460679faacc13b2d2ac6c8d23b296f09b7325e86aa899a515c4b1147bf1b9d56750b7616115292a12d3f198cf004c917ffd415fe04418

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    smart_rag (0.2.2)
+    smart_rag (0.2.3)
       aws-sdk-s3 (~> 1.0)
       concurrent-ruby (~> 1.0)
       dotenv (~> 2.8)
@@ -381,7 +381,7 @@ CHECKSUMS
   simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
   smart_prompt (0.5.4) sha256=81d5e052cf05d63051a68e946e0ba25bcd280dca5e43ce96664551a33656e5bc
-  smart_rag (0.2.2)
+  smart_rag (0.2.3)
   standardwebhooks (1.1.0) sha256=356ba711c14def4fb27310e4163b26bd5cccf325212c3440cabadd825e4be11f
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
   tiktoken_ruby (0.0.17-x64-mingw-ucrt) sha256=8bd2f8e2c38ee9052a8cd4fc83fcb41362beb476d8885ac121125cd4dd065596

data/lib/smart_rag/core/fulltext_manager.rb

@@ -28,6 +28,13 @@ module SmartRAG
         @query_parser = options[:query_parser] || Parsers::QueryParser.new
         @logger = options[:logger] || Logger.new(STDOUT)
         @config = DEFAULT_CONFIG.merge(options)
+
+        # Callers either hand over the whole configuration (with a nested
+        # `fulltext_search` section) or the section itself. Surface the nested
+        # keys either way so options like `enable_jieba` are actually visible.
+        nested = @config[:fulltext_search] || @config['fulltext_search'] ||
+                 @config[:fulltext] || @config['fulltext']
+        @config = @config.merge(nested) if nested.is_a?(Hash)
       end
 
       # Store or update full-text index for a section
@@ -345,29 +352,67 @@ module SmartRAG
         dataset
       end
 
+      # Text search configurations shipped by the pg_jieba extension: upstream
+      # installs `jiebacfg` (mix segmentation, recommended) plus `jiebaqry`,
+      # `jiebamp` and `jiebahmm`. No released version provides a configuration
+      # literally named `jieba` — probing that name always failed, which silently
+      # downgraded Chinese search to `simple` even with the extension installed.
+      JIEBA_CONFIG = 'jiebacfg'
+      JIEBA_CONFIG_NAMES = %w[jieba jiebacfg jiebaqry jiebamp jiebahmm].freeze
+
       # Get text search configuration
       def get_text_search_config(language)
         config = Models::TextSearchConfig.first(language_code: language.to_s)&.config_name
         return 'pg_catalog.simple' unless config
+        return config unless jieba_config?(config)
+        # `fulltext_search.enable_jieba` (on unless explicitly disabled) is the
+        # switch for Chinese segmentation.
+        return 'pg_catalog.simple' unless jieba_enabled?
 
-        # For development/test environments, always fall back to simple if pg_jieba is not available
-        if config == 'jieba'
-          begin
-            # Test if pg_jieba is available in a separate transaction
-            db.fetch("SELECT to_tsvector('jieba', 'test')").first
-            return 'jieba'
-          rescue StandardError => e
-            @logger.warn "pg_jieba extension not available, falling back to simple: #{e.message}"
-            return 'pg_catalog.simple'
-          end
-        end
-
-        config
+        jieba_config_name(config) || 'pg_catalog.simple'
       rescue StandardError => e
         @logger.warn "Failed to get text search config for #{language}: #{e.message}, using simple"
         'pg_catalog.simple'
       end
 
+      # Does this configuration name belong to pg_jieba?
+      def jieba_config?(name)
+        JIEBA_CONFIG_NAMES.include?(name.to_s.sub(/\Apg_catalog\./, ''))
+      end
+
+      # `enable_jieba` defaults to on; only an explicit false switches it off.
+      def jieba_enabled?
+        value = config_value(:enable_jieba)
+        return true if value.nil?
+
+        value != false && value.to_s != 'false'
+      end
+
+      # Return a configuration the server actually has: prefer the name the
+      # database row specifies, then the name pg_jieba really installs.
+      #
+      # This asks the catalogue instead of probing with `to_tsvector(name, ...)`:
+      # a probe that raises would abort any enclosing transaction (PostgreSQL
+      # refuses further statements until it is rolled back), which made every
+      # lookup after the first failure fall back to simple.
+      def jieba_config_name(preferred)
+        candidates = [preferred.to_s, JIEBA_CONFIG].uniq
+        present = db[:pg_ts_config].where(cfgname: candidates).select_map(:cfgname)
+        name = candidates.find { |candidate| present.include?(candidate) }
+        return name if name
+
+        @logger.warn "pg_jieba text search configuration unavailable " \
+                     "(tried: #{candidates.join(', ')}), falling back to simple"
+        nil
+      end
+
+      def config_value(key)
+        return @config[key] if @config.key?(key)
+        return @config[key.to_s] if @config.key?(key.to_s)
+
+        nil
+      end
+
       # Set weight for tsvector (helper method)
       def setweight(vector, weight)
         return '' if vector.nil? || vector.to_s.strip.empty?

data/lib/smart_rag/version.rb

@@ -1,3 +1,3 @@
 module SmartRAG
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/smart_rag.rb

@@ -1026,7 +1026,13 @@ module SmartRAG
         db_connection = ::SmartRAG.db
 
         embedding_manager = ::SmartRAG::Core::Embedding.new(@config[:database])
-        fulltext_manager = ::SmartRAG::Core::FulltextManager.new(db_connection, (@config[:fulltext] || {}).merge(logger: @logger))
+        # `fulltext_search` is the section name used by the configuration files;
+        # it used to be read as `fulltext`, so the whole section (including
+        # `enable_jieba`) never reached FulltextManager.
+        fulltext_section = @config[:fulltext_search] || @config[:fulltext] || {}
+        fulltext_manager = ::SmartRAG::Core::FulltextManager.new(
+          db_connection, fulltext_section.merge(logger: @logger)
+        )
 
         @query_processor = ::SmartRAG::Core::QueryProcessor.new(
           config: @config,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_rag
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - SmartRAG Team