Create new & manage Assistants

app/controllers/assistants_controller.rb

@@ -46,6 +46,6 @@ def set_assistant
   end
 
   def assistant_params
-    params.require(:assistant).permit(:user_id, :model, :name, :description, :instructions, :tools)
+    params.require(:assistant).permit(:user_id, :language_model_id, :name, :description, :instructions, :tools)
   end
 end

app/controllers/messages_controller.rb

@@ -58,7 +58,8 @@ def create
   def update
     # Clicking edit beneath a message actually submits to create and not here. This action is only used for next/prev conversation.
     # In order to force a morph we PATCH to here and redirect.
-    if @message.update(message_params)
+    @message.allow_deleted_assistant = true # disable that validation
+    if @message.update(version_navigate_message_params)
       redirect_to conversation_messages_path(@message.conversation, version: @version || @message.version)
     else
       render :edit, status: :unprocessable_entity
@@ -76,7 +77,7 @@ def set_conversation
   end
 
   def set_assistant
-    @assistant = Current.user.assistants.find_by(id: params[:assistant_id])
+    @assistant = Current.user.assistants_including_deleted.find_by(id: params[:assistant_id])
     @assistant ||= @conversation.latest_message_for_version(@version).assistant
   end
 
@@ -90,6 +91,7 @@ def set_nav_conversations
 
   def set_nav_assistants
     @nav_assistants = Current.user.assistants.ordered
+    @hide_settings_assistants_overflow = @nav_assistants.length > Assistant::MAX_LIST_DISPLAY
   end
 
   def message_params
@@ -110,4 +112,9 @@ def message_params
     end
     modified_params
   end
+
+  def version_navigate_message_params
+    params.require(:message).permit(:conversation_id, :version)
+  end
 end
+

app/controllers/settings/application_controller.rb

@@ -1,21 +1,22 @@
 class Settings::ApplicationController < ApplicationController
   layout "settings"
-  before_action :set_settings_menu
+  before_action :set_settings_assistants
 
   private
 
-  def set_settings_menu
-    # controller_name => array of items
-    @settings_menu = {
-      assistants: Current.user.assistants.ordered.map {
+  def set_settings_assistants
+    settings_assistants = Current.user.assistants.ordered.map {
         |assistant| [ assistant, edit_settings_assistant_path(assistant) ]
-      }.to_h.merge({
-        #'New Assistant': new_settings_assistant_path(assistant)
-      }),
-
-      people: {
-        'Account': edit_settings_person_path
       }
-    }
+    if settings_assistants.length > Assistant::MAX_LIST_DISPLAY
+      assistants_to_hide = settings_assistants[Assistant::MAX_LIST_DISPLAY, settings_assistants.length - Assistant::MAX_LIST_DISPLAY]
+      # If user is editing an "overflow assistant" don't collapse that section, keep it open from the start
+      @hide_settings_assistants_overflow = params[:controller] !='settings/assistants' ||
+        params[:action] != 'edit' ||
+        !assistants_to_hide.map(&:first).map(&:id).include?(params[:id].to_i)
+    end
+    @settings_menu = {assistants: settings_assistants.to_h,
+      new_assistant: {'New Assistant': new_settings_assistant_path},
+      people: {'Account': edit_settings_person_path}}
   end
 end

app/controllers/settings/assistants_controller.rb

@@ -34,10 +34,13 @@ def destroy
   private
 
   def set_assistant
-    @assistant = Current.user.assistants.find(params[:id])
+    @assistant = Current.user.assistants.where(id: params[:id]).first
+    if @assistant.nil?
+      redirect_to new_settings_assistant_url, notice: 'The assistant was deleted', status: :see_other
+    end
   end
 
   def assistant_params
-    params.require(:assistant).permit(:name, :description, :instructions)
+    params.require(:assistant).permit(:name, :description, :instructions, :language_model_id)
   end
 end

app/helpers/application_helper.rb

@@ -1,4 +1,16 @@
 module ApplicationHelper
+
+  def hide_assistant_class(item, item_counter)
+    return nil unless item.is_a?(Assistant)
+    return 'hidden' if @hide_settings_assistants_overflow && item_counter >= Assistant::MAX_LIST_DISPLAY
+    nil
+  end
+
+  def assitant_data_transaction_target(item, item_counter)
+    return nil unless item.is_a?(Assistant)
+    return 'data-transition-target="transitionable"'.html_safe if @hide_settings_assistants_overflow && item_counter >= Assistant::MAX_LIST_DISPLAY
+  end
+
   def spinner(opts = {})
     html = <<~HTML
       <svg class="animate-spin -ml-1 mr-3 h-#{opts[:size]} w-#{opts[:size]} #{opts[:class]}" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">

app/jobs/get_next_ai_message_job.rb

@@ -5,11 +5,7 @@ class WaitForPrevious < StandardError; end
   retry_on WaitForPrevious, wait: ->(run) { (2**run - 1).seconds }, attempts: 3
 
   def ai_backend
-    if @assistant.model.starts_with?('gpt-')
-      AIBackends::OpenAI
-    else
-      AIBackends::Anthropic
-    end
+    @assistant.language_model.ai_backend
   end
 
   def perform(user_id, message_id, assistant_id, attempt = 1)

app/models/assistant.rb

@@ -7,10 +7,17 @@ class Assistant < ApplicationRecord
   has_many :steps, dependent: :destroy
   has_many :messages # TODO: What should happen if an assistant is deleted?
 
+  belongs_to :language_model
+
   validates :tools, presence: true, allow_blank: true
+  validates :name, presence: true
+
+  MAX_LIST_DISPLAY = 5
 
   scope :ordered, -> { order(:id) }
 
+  scope :not_deleted, -> { where(deleted_at: nil) }
+
   def initials
     return nil if name.blank?
 
@@ -20,6 +27,15 @@ def initials
       parts[1]&.try(:[], 0)&.capitalize.to_s
   end
 
+  def destroy
+    raise "Can't delete user's last assistant" if user.assistants.count < 2
+    update!(deleted_at: Time.now)
+  end
+
+  def deleted?
+    deleted_at.present?
+  end
+
   def to_s
     name
   end

app/models/concerns/user/registerable.rb

@@ -8,9 +8,9 @@ module User::Registerable
   private
 
   def create_initial_assistants
-    assistants.create! name: "GPT-4",   model: "gpt-4o-2024-05-13",  images: true
-    assistants.create! name: "GPT-3.5", model: "gpt-3.5-turbo-0125",    images: false
-    assistants.create! name: "Claude 3 Opus", model: "claude-3-opus-20240229", images: true
-    assistants.create! name: "Claude 3 Sonnet", model: "claude-3-sonnet-20240229", images: true
+    assistants.create! name: "GPT (best)", language_model_id: LanguageModel::GPT_BEST_ID,  images: true
+    assistants.create! name: "GPT-3.5", language_model_id: LanguageModel::GPT_3_5_ID, images: false
+    assistants.create! name: "Claude (best)", language_model_id: LanguageModel::CLAUDE_BEST_ID, images: true
+    assistants.create! name: "Claude 3 Sonnet", language_model_id: LanguageModel::CLAUDE_3_SONNET_ID, images: true
   end
 end

app/models/language_model.rb

@@ -0,0 +1,30 @@
+# We don't care about large or not
+class LanguageModel < ApplicationRecord
+  def readonly?
+    !new_record?
+  end
+
+  def before_destroy
+    raise ActiveRecord::ReadOnlyRecord
+  end
+
+  PROVIDER_ID_MAP = {'gpt-best': 'gpt-4-turbo',
+     'claude-best': 'claude-3-opus-20240229'}
+
+  GPT_BEST_ID        = 1
+  CLAUDE_BEST_ID     = 2
+  GPT_3_5_ID         = 12
+  CLAUDE_3_SONNET_ID = 18
+
+  def provider_id
+    PROVIDER_ID_MAP[self.name.to_sym] || self.name unless self.name =~ /^best/
+  end
+
+  def ai_backend
+    if name.starts_with?('gpt-')
+      AIBackends::OpenAI
+    else
+      AIBackends::Anthropic
+    end
+  end
+end

app/models/message.rb

@@ -26,6 +26,7 @@ class Message < ApplicationRecord
 
   scope :ordered, -> { latest_version_for_conversation }
 
+  attr_accessor :allow_deleted_assistant
   private
 
   def create_conversation
@@ -38,6 +39,7 @@ def validate_conversation
 
   def validate_assistant
     errors.add(:assistant, 'is invalid') unless assistant.user == Current.user
+    errors.add(:assistant, 'has been deleted') if assistant.deleted? && !allow_deleted_assistant
   end
 
   def start_assistant_reply

app/models/run.rb

@@ -7,6 +7,13 @@ class Run < ApplicationRecord
 
   enum status: %w[queued in_progress requires_action cancelling cancelled failed completed expired].index_by(&:to_sym)
 
+  before_validation :set_model, on: :create
   validates :status, :expired_at, :model, :instructions, presence: true
   validates :tools, :file_ids, presence: true, allow_blank: true
+
+  private
+
+  def set_model
+    self.model = assistant&.language_model&.name
+  end
 end

app/models/user.rb

@@ -9,7 +9,8 @@ class User < ApplicationRecord
   validates :first_name, presence: true
   validates :last_name, presence: true, on: :create
 
-  has_many :assistants, dependent: :destroy
+  has_many :assistants, -> { not_deleted }, dependent: :destroy
+  has_many :assistants_including_deleted, class_name: "Assistant"
   has_many :conversations, dependent: :destroy
   belongs_to :last_cancelled_message, class_name: "Message", optional: true
 

app/services/ai_backends/anthropic.rb

@@ -49,7 +49,7 @@ def get_next_chat_message(&chunk_received_handler)
 
     begin
       response = @client.messages(
-        model: @assistant.model,
+        model: @assistant.language_model.provider_id,
         system: @assistant.instructions,
         messages: preceding_messages,
         parameters: {

app/services/ai_backends/open_ai.rb

@@ -49,7 +49,7 @@ def get_next_chat_message(&chunk_received_handler)
 
     begin
       response = @client.chat(parameters: {
-        model: @assistant.model,
+        model: @assistant.language_model.provider_id,
         messages: system_message + preceding_messages,
         stream: response_handler,
         max_tokens: 2000, # we should really set this dynamically, based on the model, to the max

app/views/assistants/_assistant.html.erb

@@ -13,11 +13,13 @@
               group cursor-pointer
               text-sm rounded-lg
               <%= selected && 'relationship' %>
+              <%= hide_assistant_class(assistant, assistant_counter) %>
             "
       data-role="assistant"
       data-radio-behavior-target="radio"
       data-action="radio-changed@window->radio-behavior#select"
       data-radio-behavior-id-param="<%= assistant.id %>"
+      <%= assitant_data_transaction_target(assistant, assistant_counter) %>
   >
     <%= link_to new_assistant_message_path(assistant), class: "flex-1 flex items-center text-gray-950 dark:text-gray-100 font-medium truncate", data: { role: "name" } do %>
       <%= render partial: "layouts/assistant_avatar", locals: { assistant: assistant, size: 7, classes: "mr-2" } %>

app/views/assistants/_form.html.erb

@@ -17,8 +17,8 @@
   </div>
 
   <div class="my-5">
-    <%= form.label :model %>
-    <%= form.text_field :model, value: "gpt-4", class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+    <%= form.label :language_model_id  %><br/>
+    <%= form.select :language_model_id, LanguageModel.order(:description).all.pluck(:description, :id), class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full dark:text-black" %>
   </div>
 
   <div class="my-5">

app/views/assistants/show.html.erb

@@ -9,7 +9,7 @@
 
       <p class="my-5">
         <strong class="block font-medium mb-1">Model:</strong>
-        <%= @assistant.model %>
+        <%= @assistant.language_model.description %>
       </p>
 
       <p class="my-5">

app/views/layouts/_settings_item.erb

@@ -1,6 +1,8 @@
 <% item, link = settings_item %>
 <% selected = (controller.to_s == controller_name.to_s) %>
-<% selected = selected && params[:id] == item.id.to_s  if params[:id] %>
+<% compare_id = item.respond_to?(:id) ? item.id.to_s : '' %>
+<% selected = selected && params[:id] == compare_id  if params[:id] %>
+<% selected = selected && request.fullpath == link if params[:id].blank? %>
 
 <div class="
             flex justify-between items-center
@@ -9,8 +11,10 @@
             group
             text-sm rounded-s-lg
             <%= selected ? "bg-gray-200 hover:bg-gray-200 dark:bg-gray-700 dark:hover:bg-gray-700 cursor-default" : "cursor-pointer" %>
+            <%= hide_assistant_class(item, settings_item_counter) %>
           "
     data-role="assistant"
+    <%= assitant_data_transaction_target(item, settings_item_counter) %>
 >
   <%= link_to link,
         class: %|
@@ -27,8 +31,6 @@
       <div id="profile" class="mr-2 w-7 h-7 bg-blue-200 rounded-full"></div>
     <% end %>
 
-    <span class="<%= !item.is_a?(Assistant) && "ml-1 text-base" %>">
-      <%= item.to_s %>
-    </span>
+    <%= content_tag :span, item.to_s, class: !item.is_a?(Assistant) && "ml-1 text-base" %>
   <% end %>
 </div>

app/views/layouts/settings.html.erb

@@ -16,9 +16,19 @@
     Settings
   </header>
   <section id="menu" data-controller="radio-behavior" data-radio-behavior-selected-class="relationship">
-    <% @settings_menu.each do |controller, settings_items| %>
+    <% if @hide_settings_assistants_overflow %>
+      <div data-controller="transition" data-transition-toggle-class="hidden">
+        <%= button_tag type: "button",
+          class: "p-1 text-sm",
+          data: {transition_target: "transitionable", action: "transition#toggleClass",
+          } do %>
+          Show Remaining
+     <% end %>
+   <% end %>
+
+    <% @settings_menu.each do | controller, settings_items| %>
       <div class="mb-5">
-        <%= render partial: "layouts/settings_item", collection: settings_items, locals: { controller: controller } %>
+        <%= render partial: "layouts/settings_item", collection: settings_items, locals: { controller: :assistants } %>
       </div>
     <% end %>
   </section>

app/views/messages/_main_column.html.erb

@@ -125,10 +125,15 @@
         <% end %>
       </div>
 
-      <div  id="composer"
+      <div id="composer"
             class="flex-1 pl-6 pr-6 w-full md:max-w-none lg:max-w-[700px] xl:max-w-[810px] mx-auto relative leading-relaxed <%= @assistant.images.blank? && 'relationship' %>"
             data-controller="composer image-upload"
       >
+        <% if @assistant.deleted? %>
+          <div class="text-center">
+            <p>This assistant has been deleted, and cannot assist any longer.</p>
+          </div>
+        <% else %>
         <%= button_tag type: "button",
               id: "attach-button",
               class: "absolute left-11 bottom-[26px] w-[23px] h-[23px] relationship:hidden",
@@ -362,6 +367,7 @@
           </div>
 
         <% end %>
+      <% end %>
       </div>
 
       <div class="w-full mb-2 text-xs text-center text-gray-400 dark:text-gray-300">

app/views/messages/_message.html.erb

@@ -162,7 +162,7 @@ end
             <% end %>
           <% end %>
 
-          <% if message.user? && !message.has_document_image? %>
+          <% if message.user? && !message.has_document_image? && !message.assistant.deleted? %>
             <%= link_to edit_assistant_message_path(message.assistant, message),
               class: "cursor-pointer hover:text-gray-900 dark:hover:text-white flex items-center",
               data: {
@@ -171,7 +171,7 @@ end
               } do %>
               <%= icon "pencil", variant: :outline, size: 18, title: "Edit" %>
             <% end %>
-          <% elsif message.assistant? %>
+          <% elsif message.assistant? && !message.assistant.deleted? %>
             <%= button_tag type: "button",
                   class: "cursor-pointer hover:text-gray-900 dark:hover:text-white",
                   data: {
@@ -261,4 +261,4 @@ end
       <% end %>
     </div>
   </div>
-</div>
+</div>