Update assistants/language_models link, add LanguageModel constants according to the ids used in the migration

Author: stephan-buckmaster

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

@@ -9,14 +9,6 @@ class Assistant < ApplicationRecord
 
   belongs_to :language_model, required: false
 
-  def model=(model_name)
-    self.language_model_id = LanguageModel.where(name: model_name).first.id
-  end
-
-  def model
-    self.language_model.name
-  end
-
   validates :tools, presence: true, allow_blank: true
 
   MAX_LIST_DISPLAY = 5

app/models/concerns/user/registerable.rb

@@ -8,9 +8,9 @@ module User::Registerable
   private
 
   def create_initial_assistants
-    assistants.create! name: "GPT (best)",   model: "gpt-best",  images: true
-    assistants.create! name: "GPT-3.5", model: "gpt-3.5-turbo-0125",    images: false
-    assistants.create! name: "Claude (best)", model: "claude-best", 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

@@ -1,11 +1,25 @@
 # We don't care about large or not
 class LanguageModel < ApplicationRecord
-   def readonly?() = !new_record?
-   def before_destroy() = raise ActiveRecord::ReadOnlyRecord
+  def readonly?() = !new_record?
+  def before_destroy() = raise ActiveRecord::ReadOnlyRecord
 
-   PROVIDER_ID_MAP = {'gpt-best': 'gpt-4-turbo',
+  PROVIDER_ID_MAP = {'gpt-best': 'gpt-4-turbo',
      'claude-best': 'claude-3-opus-20240229'}             
-   def provider_id
-     PROVIDER_ID_MAP[self.name.to_sym] || self.name unless self.name =~ /^best/
-   end
+
+  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/run.rb

@@ -7,6 +7,6 @@ class Run < ApplicationRecord
 
   enum status: %w[queued in_progress requires_action cancelling cancelled failed completed expired].index_by(&:to_sym)
 
-  validates :status, :expired_at, :model, :instructions, presence: true
+  validates :status, :expired_at, :instructions, presence: true
   validates :tools, :file_ids, presence: true, allow_blank: true
 end

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">

db/migrate/20240515080700_create_language_models.rb

@@ -9,31 +9,31 @@ def up
 
     # Currently supported models
     {
-      'gpt-best': 'Best OpenAI Model',
-      'claude-best': 'Best Anthropic Model',
-
-      'gpt-4': 'ChatGPT 4',
-      'gpt-4-turbo': 'ChatGPT 4 Turbo with Vision (may update in future)',
-      'gpt-4-turbo-2024-04-09': 'ChatGPT-4 Turbo with Vision (2024-04-09)',
-      'gpt-4-turbo-preview': 'ChatGPT 4 Turbo Preview',
-      'gpt-4-0125-preview': 'ChatGPT 4 Turbo Preview (2024-01-25)',
-      'gpt-4-1106-preview': 'ChatGPT 4 Turbo Preview (2023-11-06)',
-      'gpt-4-vision-preview': 'ChatGPT 4 Turbo Model preview with the ability to understand images (2023-11-06)',
-      'gpt-4-1106-vision-preview': 'ChatGPT 4 Turbo preview with the ability to understand images (2023-11-06)',
-      'gpt-4-0613': 'ChatGPT 4 Snapshot improved function calling (2023-06-13)',
-
-      'gpt-3.5-turbo': 'ChatGPT 3.5 Turbo',
-      'gpt-3.5-turbo-16k-0613': 'ChatGPT 3.5 Turbo (2022-06-13)',
-      'gpt-3.5-turbo-0125': 'ChatGPT 3.5 Turbo (2022-01-25)',
-      'gpt-3.5-turbo-1106': 'ChatGPT 3.5 Turbo (2022-11-06)',
-      'gpt-3.5-turbo-instruct': 'ChatGPT 3.5 Turbo Instruct',
-
-      'claude-3-opus-20240229': 'Claude 3 Opus (2024-02-29)',
-      'claude-3-sonnet-20240229': 'Claude 3 Sonnet (2024-02-29)',
-      'claude-3-haiku-20240307': 'Claude 3 Haiku (2024-03-07)',
-      'claude-2.1': 'Claude 2.1',
-      'claude-2.0': 'Claude 2.0',
-      'claude-instant-1.2': 'Claude Instant 1.2'
+      1, 'gpt-best': 'Best OpenAI Model',
+      2, 'claude-best': 'Best Anthropic Model',
+
+      3, 'gpt-4': 'ChatGPT 4',
+      4, 'gpt-4-turbo': 'ChatGPT 4 Turbo with Vision (may update in future)',
+      5, 'gpt-4-turbo-2024-04-09': 'ChatGPT-4 Turbo with Vision (2024-04-09)',
+      6, 'gpt-4-turbo-preview': 'ChatGPT 4 Turbo Preview',
+      7, 'gpt-4-0125-preview': 'ChatGPT 4 Turbo Preview (2024-01-25)',
+      8, 'gpt-4-1106-preview': 'ChatGPT 4 Turbo Preview (2023-11-06)',
+      9, 'gpt-4-vision-preview': 'ChatGPT 4 Turbo Model preview with the ability to understand images (2023-11-06)',
+      10, 'gpt-4-1106-vision-preview': 'ChatGPT 4 Turbo preview with the ability to understand images (2023-11-06)',
+      11, 'gpt-4-0613': 'ChatGPT 4 Snapshot improved function calling (2023-06-13)',
+
+      12, 'gpt-3.5-turbo': 'ChatGPT 3.5 Turbo',
+      13, 'gpt-3.5-turbo-16k-0613': 'ChatGPT 3.5 Turbo (2022-06-13)',
+      14, 'gpt-3.5-turbo-0125': 'ChatGPT 3.5 Turbo (2022-01-25)',
+      15, 'gpt-3.5-turbo-1106': 'ChatGPT 3.5 Turbo (2022-11-06)',
+      16, 'gpt-3.5-turbo-instruct': 'ChatGPT 3.5 Turbo Instruct',
+
+      17, 'claude-3-opus-20240229': 'Claude 3 Opus (2024-02-29)',
+      18, 'claude-3-sonnet-20240229': 'Claude 3 Sonnet (2024-02-29)',
+      19, 'claude-3-haiku-20240307': 'Claude 3 Haiku (2024-03-07)',
+      20, 'claude-2.1': 'Claude 2.1',
+      21, 'claude-2.0': 'Claude 2.0',
+      22, 'claude-instant-1.2': 'Claude Instant 1.2'
     }.each do |name, description|
       LanguageModel.create(name: name, description: description)
     end
@@ -56,5 +56,7 @@ def down
 
     remove_column :assistants, :language_model_id
     drop_table :language_models
+
+    remove_column :runs, :model
   end
 end

db/schema.rb

@@ -174,7 +174,6 @@
     t.datetime "cancelled_at", precision: nil
     t.datetime "failed_at", precision: nil
     t.datetime "completed_at", precision: nil
-    t.string "model", null: false
     t.string "instructions"
     t.string "additional_instructions"
     t.jsonb "tools", default: [], null: false

test/controllers/assistants_controller_test.rb

@@ -19,7 +19,7 @@ class AssistantsControllerTest < ActionDispatch::IntegrationTest
 
   test "should create assistant" do
     assert_difference("Assistant.count") do
-      post assistants_url, params: {assistant: {description: @assistant.description, instructions: @assistant.instructions, model: @assistant.model, name: @assistant.name, tools: @assistant.tools, user_id: @assistant.user_id}}
+      post assistants_url, params: {assistant: {description: @assistant.description, instructions: @assistant.instructions, alnguage_model_id: 1, name: @assistant.name, tools: @assistant.tools, user_id: @assistant.user_id}}
     end
 
     assert_redirected_to assistant_url(Assistant.last)
@@ -36,7 +36,7 @@ class AssistantsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should update assistant" do
-    patch assistant_url(@assistant), params: {assistant: {description: @assistant.description, instructions: @assistant.instructions, model: @assistant.model, name: @assistant.name, tools: @assistant.tools, user_id: @assistant.user_id}}
+    patch assistant_url(@assistant), params: {assistant: {description: @assistant.description, instructions: @assistant.instructions, language_model_id: @assistant.language_model_id, name: @assistant.name, tools: @assistant.tools, user_id: @assistant.user_id}}
     assert_redirected_to assistant_url(@assistant)
   end
 

test/fixtures/assistants.yml

@@ -1,6 +1,6 @@
 samantha:
   user: keith
-  language_model_id: 123456
+  language_model_id: 3
   name: Samantha
   description: My personal assistant
   instructions: You are a helpful assistant
@@ -9,7 +9,7 @@ samantha:
 
 keith_gpt4:
   user: keith
-  language_model_id: 12345678
+  language_model_id: 3
   name: GPT-4
   description: OpenAI's GPT-4
   instructions:
@@ -18,7 +18,7 @@ keith_gpt4:
 
 keith_claude3:
   user: keith
-  language_model_id: 1234567
+  language_model_id: 17
   name: Claude 3 Opus
   description: Claude 3, Opus version
   instructions:
@@ -27,7 +27,7 @@ keith_claude3:
 
 rob_gpt4:
   user: rob
-  language_model_id: 12345678
+  language_model_id: 3
   name: GPT-4
   description: OpenAI's GPT-4
   instructions: