completion-kit 0.27.0 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0fa2b7edcc463d34ce7dbed34a522119f840778bd75fa9912124069564420dd
-  data.tar.gz: 16e1aa2310b4efd26c67fcf70ac55dedb0bd760e97201f41bdb9c73f98247070
+  metadata.gz: 7f8fdeef847d7243a665b86e111343d0255ac2eb56ba6538c56c21871de04d1c
+  data.tar.gz: 58911d7d679a943284eacaaca586c6ad375efdf674aa1604f9895ca971f80c2e
 SHA512:
-  metadata.gz: '0572479a9194f494f34f4982c563dc5b3ffae3c1e430c0b39786ea05a6eac15359d7f51946810c8208bf60eb43274554b152d981b492d9fe9a04a01c7c8cb23b'
-  data.tar.gz: 931853452dac7e901d2e8eed066011c7f428aed7290d68d86787b0c029a9d4f7e0e1b0888ed2adefe015093a6f423487b433731e6a4826ac9dcf5ca255943e62
+  metadata.gz: fd44b864ef07239759b9211cf24dac1aad601d30bd1b92068e5e2952571e338decb85be400464c1c3a947f40040c14aeea74384512594290f79dbfddbed19555
+  data.tar.gz: ad879e8ebc9f77dab47592f23b3bf0a6ae7eb101e11dc07e43a1ed7b67caa19fde109b3dcc20ab445c3a0c4daebb843b442b1de69ec9e433a3fe5da9d7d5c661

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

@@ -25,10 +25,16 @@ 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.to_h)
+            if new_prompt.valid?
+              CompletionKit::ApplicationRecord.transaction do
+                new_prompt.save!
+                new_prompt.publish!
+              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,18 @@ 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.to_h)
+        if new_prompt.valid?
+          CompletionKit::ApplicationRecord.transaction do
+            new_prompt.save!
+            new_prompt.publish!
+          end
+          redirect_to prompt_path(new_prompt), notice: "Saved as #{new_prompt.version_label}."
+        else
+          @prompt.assign_attributes(prompt_params.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/models/concerns/completion_kit/taggable.rb

@@ -7,18 +7,42 @@ module CompletionKit
                           class_name: "CompletionKit::Tagging",
                           dependent: :destroy
       has_many :tags, through: :taggings, class_name: "CompletionKit::Tag"
+
+      validate :assigned_tag_names_are_valid, if: -> { @tag_names_assigned }
+      after_save :sync_assigned_tags, if: -> { @tag_names_assigned }
     end
 
     def tag_names
+      return @assigned_tag_names if @tag_names_assigned
+
       tags.pluck(:name)
     end
 
     def tag_names=(names)
-      resolved = Array(names)
+      @tag_names_assigned = true
+      @assigned_tag_names = Array(names)
         .map { |n| n.to_s.strip.downcase }
         .reject(&:blank?)
         .uniq
-      self.tags = resolved.map { |name| CompletionKit::Tag.find_or_create_by!(name: name) }
+    end
+
+    private
+
+    def assigned_tag_names_are_valid
+      @assigned_tag_names.each do |name|
+        next if CompletionKit::Tag.exists?(name: name)
+
+        probe = CompletionKit::Tag.new(name: name)
+        next if probe.valid?
+
+        errors.add(:base, "Tag \"#{name}\" is not allowed: #{probe.errors[:name].to_sentence}")
+      end
+    end
+
+    def sync_assigned_tags
+      self.tags = @assigned_tag_names.map { |name| CompletionKit::Tag.find_or_create_by!(name: name) }
+      @tag_names_assigned = false
+      @assigned_tag_names = nil
     end
   end
 end

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/app/views/completion_kit/tags/_picker.html.erb

@@ -2,15 +2,21 @@
   <% label_text = local_assigns[:label].presence || "#{param_namespace.to_s.titleize} tags" %>
   <%= label_tag "#{param_namespace}_tags", label_text, class: "ck-label" %>
   <% all_tags = CompletionKit::Tag.order(:name) %>
-  <% selected_ids = (record.persisted? || record.tags.loaded?) ? record.tags.map(&:id) : [] %>
+  <% selected_names = record.tag_names %>
   <div class="ck-tag-picker">
     <% all_tags.each do |tag| %>
-      <% checked = selected_ids.include?(tag.id) %>
+      <% checked = selected_names.include?(tag.name) %>
       <label class="tag-mark" style="--mark-color: var(--tag-<%= tag.color %>);">
         <%= check_box_tag "#{param_namespace}[tag_names][]", tag.name, checked, class: "ck-visually-hidden", "aria-label": "Tag: #{tag.name}" %>
         <span aria-hidden="true"><%= tag.name %></span>
       </label>
     <% end %>
+    <% (selected_names - all_tags.map(&:name)).each do |pending_name| %>
+      <label class="tag-mark" style="--mark-color: var(--ck-muted);">
+        <%= check_box_tag "#{param_namespace}[tag_names][]", pending_name, true, class: "ck-visually-hidden", "aria-label": "Tag: #{pending_name}" %>
+        <span aria-hidden="true"><%= pending_name %></span>
+      </label>
+    <% end %>
     <%= text_field_tag "#{param_namespace}[tag_names][]", "",
           id: "#{param_namespace}_tags",
           class: "ck-tag-picker__input",

data/lib/completion_kit/version.rb

@@ -1,3 +1,3 @@
 module CompletionKit
-  VERSION = "0.27.0"
+  VERSION = "0.27.2"
 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.2
 platform: ruby
 authors:
 - Damien Bastin