htm 0.0.20 → 0.0.30

data/lib/htm/sql_builder.rb

@@ -105,29 +105,28 @@ class HTM
 
         prefix = table_alias ? "#{table_alias}." : ""
         full_column = "#{prefix}#{column}"
-        conn = ActiveRecord::Base.connection
 
         case timeframe
         when Range
-          begin_quoted = conn.quote(timeframe.begin.iso8601)
-          end_quoted = conn.quote(timeframe.end.iso8601)
+          begin_quoted = HTM.db.literal(timeframe.begin.iso8601)
+          end_quoted = HTM.db.literal(timeframe.end.iso8601)
           "(#{full_column} BETWEEN #{begin_quoted} AND #{end_quoted})"
         when Array
           conditions = timeframe.map do |range|
-            begin_quoted = conn.quote(range.begin.iso8601)
-            end_quoted = conn.quote(range.end.iso8601)
+            begin_quoted = HTM.db.literal(range.begin.iso8601)
+            end_quoted = HTM.db.literal(range.end.iso8601)
             "(#{full_column} BETWEEN #{begin_quoted} AND #{end_quoted})"
           end
           "(#{conditions.join(' OR ')})"
         end
       end
 
-      # Apply timeframe filter to ActiveRecord scope
+      # Apply timeframe filter to Sequel dataset
       #
-      # @param scope [ActiveRecord::Relation] Base scope
+      # @param scope [Sequel::Dataset] Base dataset
       # @param timeframe [nil, Range, Array<Range>] Time range(s)
       # @param column [Symbol] Column name (default: :created_at)
-      # @return [ActiveRecord::Relation] Scoped query
+      # @return [Sequel::Dataset] Filtered dataset
       #
       def apply_timeframe(scope, timeframe, column: :created_at)
         return scope if timeframe.nil?
@@ -136,8 +135,8 @@ class HTM
         when Range
           scope.where(column => timeframe)
         when Array
-          conditions = timeframe.map { |range| scope.where(column => range) }
-          conditions.reduce { |result, condition| result.or(condition) }
+          conditions = timeframe.map { |range| Sequel.expr(column => range) }
+          scope.where(Sequel.|(*conditions))
         else
           scope
         end
@@ -155,23 +154,22 @@ class HTM
 
         prefix = table_alias ? "#{table_alias}." : ""
         full_column = "#{prefix}#{column}"
-        conn = ActiveRecord::Base.connection
 
-        quoted_metadata = conn.quote(metadata.to_json)
+        quoted_metadata = HTM.db.literal(metadata.to_json)
         "(#{full_column} @> #{quoted_metadata}::jsonb)"
       end
 
-      # Apply metadata filter to ActiveRecord scope
+      # Apply metadata filter to Sequel dataset
       #
-      # @param scope [ActiveRecord::Relation] Base scope
+      # @param scope [Sequel::Dataset] Base dataset
       # @param metadata [Hash] Metadata to filter by
       # @param column [String] Column name (default: "metadata")
-      # @return [ActiveRecord::Relation] Scoped query
+      # @return [Sequel::Dataset] Filtered dataset
       #
       def apply_metadata(scope, metadata, column: "metadata")
         return scope if metadata.nil? || metadata.empty?
 
-        scope.where("#{column} @> ?::jsonb", metadata.to_json)
+        scope.where(Sequel.lit("#{column} @> ?::jsonb", metadata.to_json))
       end
     end
   end

data/lib/htm/tag_service.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'errors'
+require 'active_support/core_ext/string/inflections'
 
 class HTM
   # Tag Service - Processes and validates hierarchical tags
@@ -113,6 +114,8 @@ class HTM
       valid_tags = []
 
       tags.each do |tag|
+        # Normalize: convert plural levels to singular
+        tag = singularize_tag_levels(tag)
         # Check format
         unless tag.match?(TAG_FORMAT)
           HTM.logger.warn "TagService: Invalid tag format, skipping: #{tag}"
@@ -191,5 +194,80 @@ class HTM
         depth: levels.size
       }
     end
+
+    # Words that should NOT be singularized (proper nouns, technical terms, etc.)
+    SINGULARIZE_SKIP_LIST = %w[
+      rails kubernetes aws gcp azure s3 ios macos redis postgres
+      postgresql mysql jenkins travis github gitlab mkdocs devops
+      analytics statistics mathematics physics ethics dynamics
+      graphics linguistics economics robotics
+      pages windows
+    ].freeze
+
+    # Normalize tag levels to singular form
+    #
+    # Converts plural levels to singular using ActiveSupport's singularize.
+    # This ensures taxonomy consistency (e.g., "users" -> "user").
+    #
+    # Skips:
+    # - Proper nouns and technical terms (Rails, MkDocs, etc.)
+    # - Words ending in -ics (analytics, robotics, etc.)
+    # - Words that don't end in common plural patterns
+    #
+    # @param tag [String] Tag with potentially plural levels
+    # @return [String] Tag with all levels singularized
+    #
+    def self.singularize_tag_levels(tag)
+      levels = tag.split(':')
+      singularized = levels.map do |level|
+        singularize_level(level)
+      end
+      singularized.join(':')
+    rescue NoMethodError
+      # singularize not available (ActiveSupport not loaded)
+      tag
+    end
+
+    # Singularize a single tag level with safety checks
+    #
+    # @param level [String] Single tag level
+    # @return [String] Singularized level or original if skipped
+    #
+    def self.singularize_level(level)
+      # Skip if in the skip list
+      return level if SINGULARIZE_SKIP_LIST.include?(level.downcase)
+
+      # Skip words ending in -ics (usually singular: analytics, robotics, etc.)
+      return level if level.end_with?('ics')
+
+      # Skip words ending in -ous (adjectives: victorious, precious, etc.)
+      return level if level.end_with?('ous')
+
+      # Skip words ending in -ss (class, access, etc.)
+      return level if level.end_with?('ss')
+
+      # Skip single-letter or very short words
+      return level if level.length <= 2
+
+      # Only singularize if it looks like a regular plural
+      # (ends in s but not ss, ics, ous)
+      unless level.end_with?('s')
+        return level
+      end
+
+      singular = level.singularize
+
+      # Sanity check: if singularize made it weird, keep original
+      # (e.g., "pages" -> "page" is fine, but "bus" -> "bu" is not)
+      if singular.length < level.length - 2
+        return level
+      end
+
+      if singular != level
+        HTM.logger.debug "TagService: Normalized '#{level}' to '#{singular}'"
+      end
+
+      singular
+    end
   end
 end

data/lib/htm/tasks.rb

@@ -65,6 +65,9 @@
 #
 
 if defined?(Rake)
+  # Load HTM before loading rake tasks
+  require_relative '../htm'
+
   # Load the rake tasks
   load File.expand_path('../tasks/htm.rake', __dir__)
   load File.expand_path('../tasks/jobs.rake', __dir__)

data/lib/htm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class HTM
-  VERSION = '0.0.20'
+  VERSION = '0.0.30'
 end

data/lib/htm/workflows/remember_workflow.rb

@@ -135,11 +135,12 @@ class HTM
             manual_tags = result.value[:tags] || []
 
             if is_new
-              # Add manual tags immediately
+              # Add manual tags immediately (including parent tags)
               if manual_tags.any?
                 manual_tags.each do |tag_name|
-                  tag = HTM::Models::Tag.find_or_create_by!(name: tag_name)
-                  HTM::Models::NodeTag.find_or_create_by!(node_id: node_id, tag_id: tag.id)
+                  HTM::Models::Tag.find_or_create_with_ancestors(tag_name).each do |tag|
+                    HTM::Models::NodeTag.find_or_create(node_id: node_id, tag_id: tag.id)
+                  end
                 end
               end
 
@@ -152,7 +153,7 @@ class HTM
             else
               # For existing nodes, only add manual tags
               if manual_tags.any?
-                node = HTM::Models::Node.find(node_id)
+                node = HTM::Models::Node[node_id]
                 node.add_tags(manual_tags)
               end
             end
@@ -196,7 +197,7 @@ class HTM
             htm.working_memory.add(node_id, result.value[:content], token_count: token_count, access_count: 0)
 
             # Mark as in working memory
-            robot_node.update!(working_memory: true)
+            robot_node.update(working_memory: true)
 
             # Update robot activity
             htm.long_term_memory.update_robot_activity(result.value[:robot_id])

data/lib/htm.rb

@@ -4,7 +4,7 @@ require_relative "htm/version"
 require_relative "htm/errors"
 require_relative "htm/config"
 require_relative "htm/circuit_breaker"
-require_relative "htm/active_record_config"
+require_relative "htm/sequel_config"
 require_relative "htm/database"
 require_relative "htm/long_term_memory"
 require_relative "htm/working_memory"
@@ -86,8 +86,8 @@ class HTM
     db_cache_size: 1000,
     db_cache_ttl: 300
   )
-    # Establish ActiveRecord connection if not already connected
-    HTM::ActiveRecordConfig.establish_connection! unless HTM::ActiveRecordConfig.connected?
+    # Establish Sequel connection if not already connected
+    HTM::SequelConfig.establish_connection! unless HTM::SequelConfig.db
 
     @robot_name = robot_name || "robot_#{SecureRandom.uuid[0..7]}"
 
@@ -179,7 +179,7 @@ class HTM
 
       # For existing nodes, only add manual tags if provided
       if tags.any?
-        node = HTM::Models::Node.find(node_id)
+        node = HTM::Models::Node[node_id]
         node.add_tags(tags)
         HTM.logger.info "Added #{tags.length} manual tags to existing node #{node_id}"
       end
@@ -194,7 +194,7 @@ class HTM
     @working_memory.add(node_id, content, token_count: token_count, access_count: 0)
 
     # Mark node as in working memory in the robot_nodes join table
-    result[:robot_node].update!(working_memory: true)
+    result[:robot_node].update(working_memory: true)
 
     update_robot_activity
     node_id
@@ -339,7 +339,7 @@ class HTM
     end
 
     # Verify node exists (including soft-deleted for restore scenarios)
-    node = HTM::Models::Node.with_deleted.find_by(id: node_id)
+    node = HTM::Models::Node.with_deleted.first(id: node_id)
     raise HTM::NotFoundError, "Node not found: #{node_id}" unless node
 
     if soft
@@ -388,8 +388,8 @@ class HTM
     end
 
     # Find all nodes containing the substring (case-insensitive)
-    matching_nodes = HTM::Models::Node.where("content ILIKE ?", "%#{content_substring}%")
-    node_ids = matching_nodes.pluck(:id)
+    matching_nodes = HTM::Models::Node.where(Sequel.ilike(:content, "%#{content_substring}%"))
+    node_ids = matching_nodes.select_map(:id)
 
     if node_ids.empty?
       HTM.logger.info "No nodes found containing: #{content_substring}"
@@ -419,7 +419,7 @@ class HTM
     raise ArgumentError, "Node ID cannot be nil" if node_id.nil?
 
     # Find including soft-deleted nodes
-    node = HTM::Models::Node.with_deleted.find_by(id: node_id)
+    node = HTM::Models::Node.with_deleted.first(id: node_id)
     raise HTM::NotFoundError, "Node not found: #{node_id}" unless node
 
     unless node.deleted?
@@ -472,7 +472,7 @@ class HTM
     # Update database: mark all as evicted from working memory
     count = HTM::Models::RobotNode
       .where(robot_id: @robot_id, working_memory: true)
-      .update_all(working_memory: false)
+      .update(working_memory: false)
 
     HTM.logger.info "Cleared #{count} nodes from working memory"
     count
@@ -536,17 +536,17 @@ class HTM
   # Get all nodes loaded from a specific file
   #
   # @param file_path [String] Path to the source file
-  # @return [ActiveRecord::Relation] Nodes from this file, ordered by chunk_position
+  # @return [Array<HTM::Models::Node>] Nodes from this file, ordered by chunk_position
   #
   # @example
   #   nodes = htm.nodes_from_file('/path/to/doc.md')
   #   nodes.each { |node| puts node.content }
   #
   def nodes_from_file(file_path)
-    source = HTM::Models::FileSource.find_by(file_path: File.expand_path(file_path))
-    return HTM::Models::Node.none unless source
+    source = HTM::Models::FileSource.first(file_path: File.expand_path(file_path))
+    return [] unless source
 
-    HTM::Models::Node.from_source(source.id)
+    HTM::Models::Node.from_source(source.id).all
   end
 
   # Unload a file (soft-delete all its chunks and remove source record)
@@ -559,12 +559,12 @@ class HTM
   #   puts "Unloaded #{count} chunks"
   #
   def unload_file(file_path)
-    source = HTM::Models::FileSource.find_by(file_path: File.expand_path(file_path))
+    source = HTM::Models::FileSource.first(file_path: File.expand_path(file_path))
     return 0 unless source
 
     count = source.soft_delete_chunks!
     @long_term_memory.clear_cache!
-    source.destroy
+    source.delete
 
     update_robot_activity
     count
@@ -589,11 +589,16 @@ class HTM
   end
 
   def enqueue_tags_job(node_id, manual_tags: [])
-    # Add manual tags immediately if provided
+    # Add manual tags immediately if provided (including all parent tags)
+    # For "database:postgresql:extensions", this creates and associates:
+    # - "database"
+    # - "database:postgresql"
+    # - "database:postgresql:extensions"
     if manual_tags.any?
       manual_tags.each do |tag_name|
-        tag = HTM::Models::Tag.find_or_create_by!(name: tag_name)
-        HTM::Models::NodeTag.find_or_create_by!(node_id: node_id, tag_id: tag.id)
+        HTM::Models::Tag.find_or_create_with_ancestors(tag_name).each do |tag|
+          HTM::Models::NodeTag.find_or_create(node_id: node_id, tag_id: tag.id)
+        end
       end
     end
 
@@ -637,9 +642,8 @@ class HTM
     )
 
     # Mark node as in working memory in the robot_nodes join table
-    HTM::Models::RobotNode
-      .find_by(robot_id: @robot_id, node_id: node_id)
-      &.update!(working_memory: true)
+    robot_node = HTM::Models::RobotNode.first(robot_id: @robot_id, node_id: node_id)
+    robot_node&.update(working_memory: true)
   end
 
   # Validation helper methods

data/lib/tasks/db.rake

@@ -3,7 +3,6 @@
 namespace :db do
   desc "Run database migrations"
   task :migrate do
-    require_relative '../htm'
 
     HTM::Database.migrate
     puts "Database migrations completed successfully"
@@ -11,7 +10,6 @@ namespace :db do
 
   desc "Setup database schema (includes migrations)"
   task :setup do
-    require_relative '../htm'
 
     HTM::Database.setup
     puts "Database setup completed successfully"

data/lib/tasks/doc.rake

@@ -206,7 +206,7 @@ namespace :htm do
         # Skip error classes and internal classes
         next if class_name.end_with?("Error")
         next if class_name.include?("Railtie")
-        next if class_name.include?("ActiveRecordConfig")
+        next if class_name.include?("SequelConfig")
 
         # Get description
         simple_name = basename
@@ -228,7 +228,7 @@ namespace :htm do
             basename = File.basename(file, ".html")
             next if basename.end_with?("Error")
             next if basename == "Railtie"
-            next if basename == "ActiveRecordConfig"
+            next if basename == "SequelConfig"
 
             desc = descriptions[basename] || "#{basename} class"
             classes << ["HTM::#{basename}", desc, "yard/HTM/#{basename}.html"]

data/lib/tasks/files.rake

@@ -12,7 +12,6 @@ namespace :htm do
   namespace :files do
     desc "Load a markdown file into long-term memory. Usage: rake htm:files:load[path/to/file.md]"
     task :load, [:path] do |_t, args|
-      require 'htm'
 
       path = args[:path]
       unless path
@@ -27,7 +26,7 @@ namespace :htm do
       end
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       htm = HTM.new(robot_name: "FileLoader")
       force = ENV['FORCE'] == 'true'
@@ -49,7 +48,6 @@ namespace :htm do
 
     desc "Load all markdown files from a directory. Usage: rake htm:files:load_dir[path/to/dir]"
     task :load_dir, [:path, :pattern] do |_t, args|
-      require 'htm'
 
       path = args[:path]
       unless path
@@ -65,7 +63,7 @@ namespace :htm do
       end
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       htm = HTM.new(robot_name: "FileLoader")
       pattern = args[:pattern] || '**/*.md'
@@ -104,10 +102,9 @@ namespace :htm do
 
     desc "List all loaded file sources"
     task :list do
-      require 'htm'
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       sources = HTM::Models::FileSource.order(:file_path)
       count = sources.count
@@ -136,7 +133,6 @@ namespace :htm do
 
     desc "Show details for a loaded file. Usage: rake htm:files:info[path/to/file.md]"
     task :info, [:path] do |_t, args|
-      require 'htm'
 
       path = args[:path]
       unless path
@@ -146,11 +142,11 @@ namespace :htm do
       end
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       # Try to find by exact path or expanded path
-      source = HTM::Models::FileSource.find_by(file_path: path) ||
-               HTM::Models::FileSource.find_by(file_path: File.expand_path(path))
+      source = HTM::Models::FileSource.first(file_path: path) ||
+               HTM::Models::FileSource.first(file_path: File.expand_path(path))
 
       unless source
         puts "Error: File not loaded: #{path}"
@@ -192,7 +188,6 @@ namespace :htm do
 
     desc "Unload a file from memory. Usage: rake htm:files:unload[path/to/file.md]"
     task :unload, [:path] do |_t, args|
-      require 'htm'
 
       path = args[:path]
       unless path
@@ -202,7 +197,7 @@ namespace :htm do
       end
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       htm = HTM.new(robot_name: "FileLoader")
       result = htm.unload_file(path)
@@ -216,10 +211,9 @@ namespace :htm do
 
     desc "Sync all loaded files (reload changed files)"
     task :sync do
-      require 'htm'
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       htm = HTM.new(robot_name: "FileLoader")
       sources = HTM::Models::FileSource.all
@@ -263,18 +257,17 @@ namespace :htm do
 
     desc "Show file loading statistics"
     task :stats do
-      require 'htm'
 
       # Ensure database connection
-      HTM::ActiveRecordConfig.establish_connection!
+      HTM::SequelConfig.establish_connection!
 
       total_sources = HTM::Models::FileSource.count
-      total_chunks = HTM::Models::Node.where.not(source_id: nil).count
+      total_chunks = HTM::Models::Node.exclude(source_id: nil).count
 
       # Count files needing sync (checking actual file mtime)
       needs_sync = 0
       missing = 0
-      HTM::Models::FileSource.find_each do |source|
+      HTM::Models::FileSource.paged_each do |source|
         if File.exist?(source.file_path)
           current_mtime = File.mtime(source.file_path)
           needs_sync += 1 if source.needs_sync?(current_mtime)