final touches on basil v2

Author: drusepth

app/controllers/basil_controller.rb

@@ -353,9 +353,10 @@ def stats
 
   def page_stats
     @page_type = params[:page_type]
+    @version = params[:v] || 2
     # TODO verify page_type is valid
 
-    @commissions = BasilCommission.where(entity_type: @page_type)
+    @commissions = BasilCommission.where(entity_type: @page_type).where(basil_version: @version)
 
     # Feedback today
     @feedback_today = BasilFeedback.where('updated_at > ?', 24.hours.ago)
@@ -381,6 +382,7 @@ def page_stats
                                           .where(basil_commission_id: @commissions.pluck(:id))
                                           .order(:score_adjustment)
                                           .group(:score_adjustment)
+                                          .where(basil_version: @version)
                                           .count
     days_since_start = (Date.current - BasilFeedback.minimum(:updated_at).to_date)
     days_since_start = 1 if days_since_start.zero? # no dividing by 0 lol

app/jobs/generate_basil_image_job.rb

@@ -6,7 +6,7 @@
 require 'aws-sdk-s3'
 
 class GenerateBasilImageJob < ApplicationJob
-  queue_as :default
+  queue_as :basil
 
   # Define potential errors for rescue
   class ApiError < StandardError; end
@@ -18,13 +18,16 @@ def perform(basil_commission_id)
     # Skip if already completed (image attached)
     return if commission.image.attached?
 
+    # Filter out specific words from the prompt that we don't want to include in image generation
+    sanitized_commmission_prompt = commission.prompt.gsub(/(nudity|nsfw|nude|xxx|porn|pornographic|naked|sex|blowjob|undressed|stripped|stripping|stripper)/i, '')
+
     # Details we can use:
     # commission.prompt - the prompt for the image
     # commission.style - the style of the image
     # commission.entity_type - the type of entity the image is for (e.g. Character, Location, etc)
-    prompt_to_send = "(#{commission.style} style), #{commission.entity_type}, #{commission.prompt}"
+    prompt_to_send = "(#{commission.style} style), #{commission.entity_type}, #{sanitized_commmission_prompt}"
 
-    # Make the API request to generate the image
+    # Make the API request to generate the imagex
     endpoint_url = ENV.fetch("BASIL_ENDPOINT")
     api_url = URI.join(endpoint_url, '/sdapi/v1/txt2img')
 

app/models/basil_commission.rb

@@ -34,7 +34,7 @@ def submit_to_job_queue!
     # )
 
      # Enqueue the background job to generate the image
-     GenerateBasilImageJob.perform_now(self.id)
+     GenerateBasilImageJob.perform_later(self.id)
   end
 
   def cache_after_complete!

config/sidekiq.yml

@@ -3,6 +3,7 @@
   - paypal
   - analysis
   - mentions
+  - basil
   - default
   - cache
   - notifications