ragdoll 0.1.8 → 0.1.10

data/lib/ragdoll/core/client.rb

@@ -49,7 +49,15 @@ module Ragdoll
 
       # Get relevant context without prompt enhancement
       def get_context(query:, limit: 10, **options)
-        results = search_similar_content(query: query, limit: limit, **options)
+        search_response = search_similar_content(query: query, limit: limit, **options)
+        
+        # Handle both old format (array) and new format (hash with results/statistics)
+        if search_response.is_a?(Hash) && search_response.key?(:results)
+          results = search_response[:results]
+        else
+          # Fallback for old format
+          results = search_response || []
+        end
 
         context_chunks = results.map do |result|
           {
@@ -76,13 +84,31 @@ module Ragdoll
 
       # Semantic search++ should incorporate hybrid search
       def search(query:, **options)
-        results = search_similar_content(query: query, **options)
-
-        {
-          query: query,
-          results: results,
-          total_results: results.length
-        }
+        # Pass through tracking options to the search engine
+        search_response = search_similar_content(query: query, **options)
+        
+        # Handle both old format (array) and new format (hash with results/statistics)
+        if search_response.is_a?(Hash) && search_response.key?(:results)
+          results = search_response[:results]
+          statistics = search_response[:statistics]
+          execution_time_ms = search_response[:execution_time_ms]
+          
+          {
+            query: query,
+            results: results,
+            total_results: results.length,
+            statistics: statistics,
+            execution_time_ms: execution_time_ms
+          }
+        else
+          # Fallback for old format
+          results = search_response || []
+          {
+            query: query,
+            results: results,
+            total_results: results.length
+          }
+        end
       end
 
       # Search similar content (core functionality)
@@ -92,11 +118,52 @@ module Ragdoll
 
       # Hybrid search combining semantic and full-text search
       def hybrid_search(query:, **options)
+        start_time = Time.current
+        
+        # Extract tracking options
+        session_id = options[:session_id]
+        user_id = options[:user_id]
+        track_search = options.fetch(:track_search, true)
+        
         # Generate embedding for the query
         query_embedding = @embedding_service.generate_embedding(query)
 
         # Perform hybrid search
         results = Ragdoll::Document.hybrid_search(query, query_embedding: query_embedding, **options)
+        
+        execution_time = ((Time.current - start_time) * 1000).round
+        
+        # Record search if tracking enabled
+        if track_search && query && !query.empty?
+          begin
+            # Format results for search recording - hybrid search returns different format
+            search_results = results.map do |result|
+              {
+                embedding_id: result[:embedding_id] || result[:id],
+                similarity: result[:similarity] || result[:score] || 0.0
+              }
+            end
+            
+            # Extract filters from options
+            filters = options.slice(:document_type, :status).compact
+            search_options = options.slice(:limit, :semantic_weight, :text_weight).compact
+            
+            Ragdoll::Search.record_search(
+              query: query,
+              query_embedding: query_embedding,
+              results: search_results,
+              search_type: "hybrid",
+              filters: filters,
+              options: search_options,
+              execution_time_ms: execution_time,
+              session_id: session_id,
+              user_id: user_id
+            )
+          rescue => e
+            # Log error but don't fail the search
+            puts "Warning: Hybrid search tracking failed: #{e.message}" if ENV["RAGDOLL_DEBUG"]
+          end
+        end
 
         {
           query: query,

data/lib/ragdoll/core/database.rb

@@ -90,10 +90,10 @@ module Ragdoll
         # Drop all tables in correct order (respecting foreign key constraints)
         # Order: dependent tables first, then parent tables
         tables_to_drop = %w[
+          ragdoll_search_results
+          ragdoll_searches
           ragdoll_embeddings
-          ragdoll_text_contents
-          ragdoll_image_contents
-          ragdoll_audio_contents
+          ragdoll_contents
           ragdoll_documents
           schema_migrations
         ]
@@ -109,6 +109,11 @@ module Ragdoll
           end
         end
 
+        # Also drop any functions/triggers that might exist
+        if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgresql")
+          ActiveRecord::Base.connection.execute("DROP FUNCTION IF EXISTS ragdoll_documents_vector_update() CASCADE")
+        end
+
         migrate!
       end
 

data/lib/ragdoll/core/model.rb

@@ -8,6 +8,14 @@ module Ragdoll
     # The provider is optional.
     # Can be initialized with nil or empty string.
     Model = Data.define(:name) do
+      def initialize(name:)
+        # Handle case where a Model object is passed instead of a string
+        if name.is_a?(Model)
+          super(name: name.name)
+        else
+          super(name: name)
+        end
+      end
       # @return [Symbol, nil] the provider part of the name, or nil if not present.
       def provider
         return nil if name.nil? || name.empty?
@@ -31,6 +39,11 @@ module Ragdoll
         name.nil? ? "" : name
       end
 
+      # @return [Boolean] true if the name is nil or empty.
+      def empty?
+        name.nil? || name.empty?
+      end
+
       # @return [Hash] a hash representation of the model.
       def to_h
         { provider: provider, model: model }

data/lib/ragdoll/core/version.rb

@@ -3,6 +3,6 @@
 
 module Ragdoll
   module Core
-    VERSION = "0.1.8"
+    VERSION = "0.1.10"
   end
 end

data/lib/ragdoll/core.rb

@@ -30,6 +30,8 @@ require "ragdoll/content"
 require "ragdoll/text_content"
 require "ragdoll/audio_content"
 require "ragdoll/image_content"
+require "ragdoll/search"
+require "ragdoll/search_result"
 require "ragdoll/document_processor"
 require "ragdoll/document_management"
 require "ragdoll/text_chunker"

data/lib/ragdoll.rb

@@ -196,6 +196,23 @@ module Ragdoll
       Ragdoll::Core.search_similar_content(*args, **kwargs)
     end
 
+    # Perform hybrid search combining semantic and full-text search.
+    # @param query [String] the search query string.
+    # @param semantic_weight [Float] weight for semantic search results (0.0 - 1.0).
+    # @param text_weight [Float] weight for full-text search results (0.0 - 1.0).
+    # @param options [Hash] additional search options, such as filters and limits.
+    # @example
+    #   results = Ragdoll.hybrid_search(
+    #     query: "machine learning",
+    #     semantic_weight: 0.7,
+    #     text_weight: 0.3
+    #   )
+    #   results.each { |result| puts result[:document_title] }
+    # @return [Array<Hash>] an array of search results combining semantic and text search.
+    def hybrid_search(*args, **kwargs)
+      Ragdoll::Core.hybrid_search(*args, **kwargs)
+    end
+
 
     ###############
     # Misc. Stuff #

data/lib/tasks/db.rake

@@ -8,9 +8,9 @@ namespace :db do
     require_relative "../ragdoll-core"
 
     config = Ragdoll::Core.configuration
-    puts "Creating database with config: #{config.database_config.inspect}"
+    puts "Creating database with config: #{config.database.inspect}"
 
-    case config.database_config[:adapter]
+    case config.database[:adapter]
     when "postgresql"
       puts "PostgreSQL database setup - running as superuser to create database and role..."
       
@@ -20,27 +20,22 @@ namespace :db do
         database: 'postgres', # Connect to postgres database initially
         username: ENV.fetch('POSTGRES_SUPERUSER', 'postgres'),
         password: ENV['POSTGRES_SUPERUSER_PASSWORD'],
-        host: config.database_config[:host] || 'localhost',
-        port: config.database_config[:port] || 5432
+        host: config.database[:host] || 'localhost',
+        port: config.database[:port] || 5432
       )
       
       # Run individual SQL commands to avoid transaction block issues
-      begin
-        ActiveRecord::Base.connection.execute("DROP DATABASE IF EXISTS ragdoll_development")
-      rescue => e
-        puts "Note: #{e.message}" if e.message.include?("does not exist")
-      end
-      
-      begin
-        ActiveRecord::Base.connection.execute("DROP ROLE IF EXISTS ragdoll")
-      rescue => e
-        puts "Note: #{e.message}" if e.message.include?("does not exist")
-      end
+      # Note: Removed the DROP DATABASE/ROLE here since that should be done via db:drop task
       
       begin
         ActiveRecord::Base.connection.execute("CREATE ROLE ragdoll WITH LOGIN CREATEDB")
+        puts "Role 'ragdoll' created successfully"
       rescue => e
-        puts "Note: Role already exists, continuing..." if e.message.include?("already exists")
+        if e.message.include?("already exists")
+          puts "Note: Role 'ragdoll' already exists, continuing..."
+        else
+          raise e
+        end
       end
       
       begin
@@ -50,8 +45,16 @@ namespace :db do
             ENCODING = 'UTF8'
             CONNECTION LIMIT = -1
         SQL
+        puts "Database 'ragdoll_development' created successfully"
       rescue => e
-        puts "Note: Database already exists, continuing..." if e.message.include?("already exists")
+        if e.message.include?("already exists")
+          puts "ERROR: Database 'ragdoll_development' already exists!"
+          puts "Please run 'rake db:drop' first to remove the existing database, then run 'rake db:create' again."
+          puts "Or use 'rake db:reset' to drop, create, and migrate in one step."
+          exit 1
+        else
+          raise e
+        end
       end
       
       ActiveRecord::Base.connection.execute("GRANT ALL PRIVILEGES ON DATABASE ragdoll_development TO ragdoll")
@@ -62,8 +65,8 @@ namespace :db do
         database: 'ragdoll_development',
         username: ENV.fetch('POSTGRES_SUPERUSER', 'postgres'),
         password: ENV['POSTGRES_SUPERUSER_PASSWORD'],
-        host: config.database_config[:host] || 'localhost',
-        port: config.database_config[:port] || 5432
+        host: config.database[:host] || 'localhost',
+        port: config.database[:port] || 5432
       )
       
       ActiveRecord::Base.connection.execute <<-SQL
@@ -94,11 +97,56 @@ namespace :db do
     require_relative "../ragdoll-core"
 
     config = Ragdoll::Core.configuration
-    puts "Dropping database with config: #{config.database_config.inspect}"
+    puts "Dropping database with config: #{config.database.inspect}"
 
-    case config.database_config[:adapter]
-    when "postgresql", "mysql2"
-      puts "For #{config.database_config[:adapter]}, please drop the database manually on your server"
+    case config.database[:adapter]
+    when "postgresql"
+      puts "PostgreSQL database drop - running as superuser to drop database and role..."
+      
+      # Connect as superuser to drop database and role
+      ActiveRecord::Base.establish_connection(
+        adapter: 'postgresql',
+        database: 'postgres', # Connect to postgres database initially
+        username: ENV.fetch('POSTGRES_SUPERUSER', 'postgres'),
+        password: ENV['POSTGRES_SUPERUSER_PASSWORD'],
+        host: config.database[:host] || 'localhost',
+        port: config.database[:port] || 5432
+      )
+      
+      # Drop the database if it exists
+      begin
+        ActiveRecord::Base.connection.execute("DROP DATABASE IF EXISTS ragdoll_development")
+        puts "Database 'ragdoll_development' dropped successfully"
+      rescue => e
+        puts "Error dropping database: #{e.message}"
+      end
+      
+      # Optionally drop the role (commented out by default to preserve user)
+      # begin
+      #   ActiveRecord::Base.connection.execute("DROP ROLE IF EXISTS ragdoll")
+      #   puts "Role 'ragdoll' dropped successfully"
+      # rescue => e
+      #   puts "Error dropping role: #{e.message}"
+      # end
+      
+    when "mysql2"
+      puts "MySQL database drop - connecting to drop database..."
+      
+      # Connect without specifying database
+      ActiveRecord::Base.establish_connection(
+        adapter: 'mysql2',
+        username: config.database[:username],
+        password: config.database[:password],
+        host: config.database[:host] || 'localhost',
+        port: config.database[:port] || 3306
+      )
+      
+      begin
+        ActiveRecord::Base.connection.execute("DROP DATABASE IF EXISTS #{config.database[:database]}")
+        puts "Database '#{config.database[:database]}' dropped successfully"
+      rescue => e
+        puts "Error dropping database: #{e.message}"
+      end
     end
 
     puts "Database drop completed"
@@ -216,9 +264,9 @@ namespace :db do
 
     config = Ragdoll::Core.configuration
 
-    case config.database_config[:adapter]
+    case config.database[:adapter]
     when "postgresql"
-      db_config = config.database_config
+      db_config = config.database
       psql_cmd = "psql"
       psql_cmd += " -h #{db_config[:host]}" if db_config[:host]
       psql_cmd += " -p #{db_config[:port]}" if db_config[:port]
@@ -227,7 +275,7 @@ namespace :db do
       puts "Opening PostgreSQL console..."
       system(psql_cmd)
     when "mysql2"
-      db_config = config.database_config
+      db_config = config.database
       mysql_cmd = "mysql"
       mysql_cmd += " -h #{db_config[:host]}" if db_config[:host]
       mysql_cmd += " -P #{db_config[:port]}" if db_config[:port]
@@ -237,7 +285,7 @@ namespace :db do
       puts "Opening MySQL console..."
       system(mysql_cmd)
     else
-      puts "Console not supported for adapter: #{config.database_config[:adapter]}"
+      puts "Console not supported for adapter: #{config.database[:adapter]}"
     end
   end