llm_meta_client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd284d6a68a9bbad852fbcb19054ce2aeda512f0ffe17c2ac7029eb30907a7e4
-  data.tar.gz: 5fe0cd2beef4c9bbc7fb75ee49099558a07626e0affa6b9ba9b065eca940dc67
+  metadata.gz: 95bb1f421088cc0c287b4f79e961455a1a5275b860b372fb23523ddc8781d37a
+  data.tar.gz: d4f92a150de0d9996d3ea6c54e69fe24989763f4bd359ce46a6b7ff69d36ecb7
 SHA512:
-  metadata.gz: 53f9fcccc2ffee1c08ba3df22bf95e08bc857d8da0cd748f520f26a7144b03dded4a3ceb4ca67b3108fda12d79f521ed88e5ce0b30cb8b232ac5185941d9832f
-  data.tar.gz: e5529bc832a453030d348cd8d01100bb664896d03cee385f83ee43b945c316b0c1d03d4227c65b23d6b360943e91e1c9727e7d52d1311b107eacf2bf7f58799f
+  metadata.gz: 480919bad702190fec4166d8a2659121ff62b1880123e6db168d9a1c8a8b7f80f23ca175e2e6f4a31b96e6bde97fd0723d95caa71439845a5017c351c18e373e
+  data.tar.gz: c2600201eccae124c9929eabcd8b7d755b7dbac4092cd5441c55d1caf79c839af8f0b41b49d7bf1c2e6a324e33c6bd1957d29a1ac3e837a7ab6924d727e8ae91

data/lib/generators/llm_meta_client/scaffold/scaffold_generator.rb

@@ -56,6 +56,7 @@ module LlmMetaClient
       def add_migrations
         migration_template "db/migrate/create_chats.rb", "db/migrate/create_chats.rb"
         migration_template "db/migrate/create_messages.rb", "db/migrate/create_messages.rb"
+        migration_template "db/migrate/migrate_llm_uuid_to_prompt_executions.rb", "db/migrate/migrate_llm_uuid_to_prompt_executions.rb"
       end
 
       def configure_routes

data/lib/generators/llm_meta_client/scaffold/templates/app/controllers/chats_controller.rb

@@ -61,9 +61,7 @@ class ChatsController < ApplicationController
     # Find or create chat
     @chat = Chat.find_or_switch_for_session(
       session,
-      current_user,
-      llm_uuid: params[:api_key_uuid],
-      model: params[:model]
+      current_user
     )
     add_chat @chat
     @messages = @chat&.ordered_messages || []
@@ -86,6 +84,7 @@ class ChatsController < ApplicationController
 
       # Add user message (will be rendered via turbo stream)
       @prompt_execution, @user_message = @chat.add_user_message(params[:message],
+                                                                params[:api_key_uuid],
                                                                 params[:model],
                                                                 params[:branch_from_uuid])
       # Push to history for rendering
@@ -144,9 +143,7 @@ class ChatsController < ApplicationController
 
     @chat = Chat.find_or_switch_for_session(
       session,
-      current_user,
-      llm_uuid: params[:api_key_uuid],
-      model: params[:model]
+      current_user
     )
     @messages = @chat&.ordered_messages || []
     # initialize history for the chat
@@ -184,6 +181,7 @@ class ChatsController < ApplicationController
 
       # Add user message (will be rendered via turbo stream)
       @prompt_execution, @user_message = @chat.add_user_message(params[:message],
+                                                               params[:api_key_uuid],
                                                                params[:model],
                                                                params[:branch_from_uuid])
       # Push to history for rendering

data/lib/generators/llm_meta_client/scaffold/templates/app/models/chat.rb

@@ -6,23 +6,14 @@ class Chat < ApplicationRecord
 
   before_create :set_uuid
 
-  validates :llm_uuid, presence: true
-  validates :model, presence: true
-
   # Find existing chat from session or create new one
   class << self
-    def find_or_switch_for_session(session, current_user, llm_uuid: nil, model: nil)
+    def find_or_switch_for_session(session, current_user)
       chat = find_by_session_chat_id(session, current_user)
-      return chat if llm_uuid.nil? || model.nil?
-
-      if chat.present?
-        # Update LLM/model on existing chat if changed
-        chat.update!(llm_uuid: llm_uuid, model: model) if chat.needs_reset?(llm_uuid, model)
-      else
-        chat = create!(user: current_user, llm_uuid: llm_uuid, model: model)
-        session[:chat_id] = chat.id
-      end
+      return chat if chat.present?
 
+      chat = create!(user: current_user)
+      session[:chat_id] = chat.id
       chat
     end
 
@@ -39,15 +30,8 @@ class Chat < ApplicationRecord
     end
   end
 
-  # Get the LLM type for this chat
-  def llm_type(jwt_token)
-    llm_options = LlmMetaClient::ServerResource.available_llm_options(jwt_token)
-    selected_llm = llm_options.find { |opt| opt[:uuid] == llm_uuid }
-    selected_llm&.dig(:llm_type) || "unknown"
-  end
-
   # Add a user message to the chat
-  def add_user_message(message, model, branch_from_execution_id = nil)
+  def add_user_message(message, llm_uuid, model, branch_from_execution_id = nil)
     previous_id = if branch_from_execution_id.present?
       PromptNavigator::PromptExecution.find_by(execution_id: branch_from_execution_id)&.id
     else
@@ -55,6 +39,7 @@ class Chat < ApplicationRecord
     end
     prompt_execution = PromptNavigator::PromptExecution.create!(
       prompt: message,
+      llm_uuid: llm_uuid,
       model: model,
       configuration: "",
       previous_id: previous_id
@@ -70,9 +55,9 @@ class Chat < ApplicationRecord
 
   # Add assistant response by sending to LLM
   def add_assistant_response(prompt_execution, jwt_token, tool_ids: [], generation_settings: {})
-    response_content = send_to_llm(jwt_token, tool_ids: tool_ids, generation_settings: generation_settings)
+    response_content = send_to_llm(prompt_execution, jwt_token, tool_ids: tool_ids, generation_settings: generation_settings)
     prompt_execution.update!(
-      llm_platform: llm_type(jwt_token),
+      llm_platform: resolve_llm_type(prompt_execution.llm_uuid, jwt_token),
       response: response_content
     )
     new_message = messages.create!(
@@ -100,19 +85,24 @@ class Chat < ApplicationRecord
       .map(&:prompt_navigator_prompt_execution)
   end
 
-  # Check if chat needs to be reset due to LLM or model change
-  def needs_reset?(new_llm_uuid, new_model)
-    llm_uuid != new_llm_uuid || model != new_model
-  end
-
   private
 
+  # Resolve the LLM type (e.g. "openai", "google") from a given llm_uuid
+  def resolve_llm_type(llm_uuid, jwt_token)
+    llm_options = LlmMetaClient::ServerResource.available_llm_options(jwt_token)
+    selected_llm = llm_options.find { |opt| opt[:uuid] == llm_uuid }
+    selected_llm&.dig(:llm_type) || "unknown"
+  end
+
   # Summarize the user's prompt into a short title via LLM (required by ChatManager::TitleGeneratable)
   def summarize_for_title(prompt_text, jwt_token)
+    latest_pe = ordered_by_descending_prompt_executions.first
+    return nil unless latest_pe&.llm_uuid && latest_pe&.model
+
     LlmMetaClient::ServerQuery.new.call(
       jwt_token,
-      llm_uuid,
-      model,
+      latest_pe.llm_uuid,
+      latest_pe.model,
       "No context available.",
       { role: "user", prompt: "Please summarize the following text into a short title (max 50 characters). Respond with only the title, nothing else: #{prompt_text}" }
     )
@@ -124,7 +114,10 @@ class Chat < ApplicationRecord
   end
 
   # Send messages to LLM and get response
-  def send_to_llm(jwt_token, tool_ids: [], generation_settings: {})
+  def send_to_llm(prompt_execution, jwt_token, tool_ids: [], generation_settings: {})
+    llm_uuid = prompt_execution.llm_uuid
+    model = prompt_execution.model
+
     # Get LLM options
     llm_options = LlmMetaClient::ServerResource.available_llm_options(jwt_token)
 

data/lib/generators/llm_meta_client/scaffold/templates/app/views/chats/create.turbo_stream.erb

@@ -75,6 +75,12 @@
           messageInput.dispatchEvent(event);
         }
 
+        // Update branch_from_uuid to the latest prompt execution
+        const branchField = document.getElementById('branch_from_uuid');
+        if (branchField) {
+          branchField.value = '<%%= @prompt_execution&.execution_id %>';
+        }
+
         // Scroll to bottom
         const chatMessages = document.getElementById('chat-messages');
         if (chatMessages) {

data/lib/generators/llm_meta_client/scaffold/templates/app/views/chats/update.turbo_stream.erb

@@ -68,6 +68,12 @@
           messageInput.dispatchEvent(event);
         }
 
+        // Update branch_from_uuid to the latest prompt execution
+        const branchField = document.getElementById('branch_from_uuid');
+        if (branchField) {
+          branchField.value = '<%%= @prompt_execution&.execution_id %>';
+        }
+
         // Scroll to bottom
         const chatMessages = document.getElementById('chat-messages');
         if (chatMessages) {

data/lib/generators/llm_meta_client/scaffold/templates/db/migrate/create_chats.rb

@@ -4,8 +4,6 @@ class CreateChats < ActiveRecord::Migration[8.1]
       t.references :user, null: true, foreign_key: true
       t.string :uuid, null: false
       t.string :title
-      t.string :llm_uuid
-      t.string :model
 
       t.timestamps
     end

data/lib/generators/llm_meta_client/scaffold/templates/db/migrate/migrate_llm_uuid_to_prompt_executions.rb

@@ -0,0 +1,7 @@
+class MigrateLlmUuidToPromptExecutions < ActiveRecord::Migration[8.1]
+  def change
+    add_column :prompt_navigator_prompt_executions, :llm_uuid, :string unless column_exists?(:prompt_navigator_prompt_executions, :llm_uuid)
+    remove_column :chats, :llm_uuid, :string if column_exists?(:chats, :llm_uuid)
+    remove_column :chats, :model, :string if column_exists?(:chats, :model)
+  end
+end

data/lib/llm_meta_client/server_resource.rb

@@ -117,7 +117,7 @@ module LlmMetaClient
       def ollama_options
         ollama_list = llms.filter { it["family"] == "ollama" }
         raise LlmMetaClient::Exceptions::OllamaUnavailableError if ollama_list.empty?
-        ollama_list
+        ollama_list.each { it["llm_type"] ||= "ollama" }
       end
 
       # Builds normalized option hashes from an array of prompts by slicing common keys

data/lib/llm_meta_client/version.rb

@@ -1,3 +1,3 @@
 module LlmMetaClient
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm_meta_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - dhq_boiler
@@ -130,6 +130,7 @@ files:
 - lib/generators/llm_meta_client/scaffold/templates/config/initializers/llm_service.rb
 - lib/generators/llm_meta_client/scaffold/templates/db/migrate/create_chats.rb
 - lib/generators/llm_meta_client/scaffold/templates/db/migrate/create_messages.rb
+- lib/generators/llm_meta_client/scaffold/templates/db/migrate/migrate_llm_uuid_to_prompt_executions.rb
 - lib/llm_meta_client.rb
 - lib/llm_meta_client/chat_manageable.rb
 - lib/llm_meta_client/engine.rb