completion-kit 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0fa2b7edcc463d34ce7dbed34a522119f840778bd75fa9912124069564420dd
-  data.tar.gz: 16e1aa2310b4efd26c67fcf70ac55dedb0bd760e97201f41bdb9c73f98247070
+  metadata.gz: 38c7acaadacc7cb636ee99e3eb7e4c52f68b89ed57122487eb1591be99435716
+  data.tar.gz: 3e5f9c36019c6635ae41b913eea74607f3b8c9f21a511c5ccc3f9ff75422282d
 SHA512:
-  metadata.gz: '0572479a9194f494f34f4982c563dc5b3ffae3c1e430c0b39786ea05a6eac15359d7f51946810c8208bf60eb43274554b152d981b492d9fe9a04a01c7c8cb23b'
-  data.tar.gz: 931853452dac7e901d2e8eed066011c7f428aed7290d68d86787b0c029a9d4f7e0e1b0888ed2adefe015093a6f423487b433731e6a4826ac9dcf5ca255943e62
+  metadata.gz: 80adc55bde36fa3ac782c213c4786e677cd27d1b85bef81c14fbd89e05a82e229681866390c34d7f17cd9d6a153bcb93da705d63a87f7aede39dcb26929e3629
+  data.tar.gz: 533ef4f6c4b29791a66ce9169ab4c980a38838f5e3a5184d0b07cf0a4276ad0fd5990fae69616a2ea43421daebab1ca1ed2f246b4a310a506403db7548935981

data/app/controllers/completion_kit/api/v1/prompts_controller.rb

@@ -25,10 +25,17 @@ module CompletionKit
 
         def update
           if @prompt.runs.exists?
-            new_prompt = @prompt.clone_as_new_version(prompt_params.except(:tag_names).to_h)
-            new_prompt.publish!
-            new_prompt.update!(tag_names: prompt_params[:tag_names]) if prompt_params.key?(:tag_names)
-            render json: new_prompt.reload
+            new_prompt = @prompt.build_next_version(prompt_params.except(:tag_names).to_h)
+            if new_prompt.valid?
+              CompletionKit::ApplicationRecord.transaction do
+                new_prompt.save!
+                new_prompt.publish!
+                new_prompt.update!(tag_names: prompt_params[:tag_names]) if prompt_params.key?(:tag_names)
+              end
+              render json: new_prompt.reload
+            else
+              render_validation_errors(new_prompt)
+            end
           elsif @prompt.update(prompt_params)
             render json: @prompt
           else

data/app/controllers/completion_kit/prompts_controller.rb

@@ -33,10 +33,19 @@ module CompletionKit
     
     def update
       if @prompt.runs.exists?
-        new_prompt = @prompt.clone_as_new_version(prompt_params.except(:tag_names).to_h)
-        new_prompt.publish!
-        new_prompt.update!(tag_names: prompt_params[:tag_names]) if prompt_params.key?(:tag_names)
-        redirect_to prompt_path(new_prompt), notice: "Saved as #{new_prompt.version_label}."
+        new_prompt = @prompt.build_next_version(prompt_params.except(:tag_names).to_h)
+        if new_prompt.valid?
+          CompletionKit::ApplicationRecord.transaction do
+            new_prompt.save!
+            new_prompt.publish!
+            new_prompt.update!(tag_names: prompt_params[:tag_names]) if prompt_params.key?(:tag_names)
+          end
+          redirect_to prompt_path(new_prompt), notice: "Saved as #{new_prompt.version_label}."
+        else
+          @prompt.assign_attributes(prompt_params.except(:tag_names).to_h)
+          @prompt.errors.merge!(new_prompt.errors)
+          render :edit, status: :unprocessable_entity
+        end
       elsif @prompt.update(prompt_params)
         redirect_to prompt_path(@prompt), notice: "Prompt saved."
       else

data/app/models/completion_kit/prompt.rb

@@ -5,10 +5,12 @@ module CompletionKit
     has_many :runs, dependent: :destroy
     has_many :responses, through: :runs
 
+    attr_accessor :cloned_from_llm_model
+
     validates :name, presence: true
     validates :template, presence: true
     validates :llm_model, presence: true
-    validate :llm_model_usable_for_generation, if: :llm_model_changed?
+    validate :llm_model_usable_for_generation, if: :llm_model_newly_selected?
     validates :family_key, presence: true
     validates :version_number, presence: true, numericality: { only_integer: true, greater_than: 0 }
 
@@ -53,8 +55,8 @@ module CompletionKit
       self.class.where(family_key: family_key).order(version_number: :desc, created_at: :desc)
     end
 
-    def clone_as_new_version(overrides = {})
-      self.class.create!(
+    def build_next_version(overrides = {})
+      version = self.class.new(
         {
           name: name,
           description: description,
@@ -66,6 +68,14 @@ module CompletionKit
           published_at: nil
         }.merge(overrides.compact)
       )
+      version.cloned_from_llm_model = llm_model
+      version
+    end
+
+    def clone_as_new_version(overrides = {})
+      version = build_next_version(overrides)
+      version.save!
+      version
     end
 
     def publish!
@@ -87,9 +97,14 @@ module CompletionKit
 
     private
 
-    def llm_model_usable_for_generation
-      return if llm_model.blank?
+    def llm_model_newly_selected?
+      return false if llm_model.blank?
+      return llm_model != cloned_from_llm_model if new_record? && cloned_from_llm_model.present?
+
+      llm_model_changed?
+    end
 
+    def llm_model_usable_for_generation
       rows = Model.where(model_id: llm_model)
       return if rows.empty?
       return if rows.where(supports_generation: true, status: "active").exists?

data/app/services/completion_kit/promptfoo_importer.rb

@@ -27,6 +27,8 @@ module CompletionKit
         metrics = import_metrics(config)
         Result.new(ok: true, error: nil, prompts: prompts, dataset: dataset, metrics: metrics, providers: providers)
       end
+    rescue ActiveRecord::RecordInvalid => e
+      failure(e.record.errors.full_messages.to_sentence.presence || e.message)
     end
 
     private

data/app/views/completion_kit/responses/show.html.erb

@@ -79,7 +79,9 @@
   </div>
   <% if @response.status == "failed" %>
     <% err = @response.error_payload || {} %>
-    <div class="ck-code-scroll-wrap"><pre class="ck-code ck-code--error"><%= err[:provider]&.titleize %><%= " #{err[:status]}" if err[:status].present? %><%= "\n\n" if err[:provider].present? || err[:status].present? %><%= err[:message] %></pre></div>
+    <% head = [err[:provider]&.titleize, err[:status].presence].compact.join(" ").presence %>
+    <% error_text = [head, @response.error_message.presence].compact.join("\n\n").presence || "The provider returned no error detail." %>
+    <div class="ck-code-scroll-wrap"><pre class="ck-code ck-code--error"><%= error_text %></pre></div>
   <% else %>
     <div class="ck-code-scroll-wrap"><pre class="ck-code"><%= ck_format_maybe_json(@response.response_text) %></pre></div>
   <% end %>

data/lib/completion_kit/version.rb

@@ -1,3 +1,3 @@
 module CompletionKit
-  VERSION = "0.27.0"
+  VERSION = "0.27.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completion-kit
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Damien Bastin