completion-kit 0.26.2 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693a2c9c76ea04ca616b00a76556f2aeee15c38ca6290ef968d2b9c83eb23e83
-  data.tar.gz: 6baf88740c80fe3102fff0f5d934f66357e74b62f3ac8da07b0c1d0069a3911d
+  metadata.gz: c296e624ff4313d1e4f4804cf902cce88ac7e5eee95deccefec8ff69241ff89d
+  data.tar.gz: 6f0c48e6efaa5fd65c23e07656687de56031f6c3634593d1a44cf9b40b560c11
 SHA512:
-  metadata.gz: 3e5d34d55848f1480b01a5459025936c3d27e18f4b907a1dc98ca4081510dcbbe247fcdc88f05721a7452bf0d4adc0d78270c9ff08a9fba57dd616fc6b2c254b
-  data.tar.gz: 4d12110ac0998d0f4640c89854f39ce2bdee3eae205910a4bc4a583eeda25ed1a2ac886d89da3cc185b6d4d42773d799101545c0c12ef56bd5b7cfc910bef106
+  metadata.gz: b4d0c20a2c591456cb9d7def96f8bd01ea143b66c3cbb678a10e6a68c5310e40a6bf8b69cc547b3c5e802905b31e4b741dcff5c2a6fb110d652ceb363a03548b
+  data.tar.gz: 58a03c4e699a33193dfe2cfaed23a3913cd0b1b2819a79beaca2559d38016c0c131e0cf0817b97a9c50651dc92a717d0146986d015065f588327cc63d075c7dc

data/app/assets/javascripts/completion_kit/application.js

@@ -290,6 +290,30 @@ document.addEventListener("change", function(e) {
   }
 });
 
+function ckApplyProviderFields(scope) {
+  if (!scope) return;
+  var select = scope.querySelector("[data-ck-provider-select]");
+  if (!select) return;
+  var provider = select.value;
+  scope.querySelectorAll("[data-ck-provider-field]").forEach(function(field) {
+    var wanted = (field.getAttribute("data-ck-provider-field") || "").split(",");
+    field.hidden = wanted.indexOf(provider) === -1;
+  });
+}
+
+document.addEventListener("turbo:load", function() {
+  document.querySelectorAll("[data-ck-provider-select]").forEach(function(select) {
+    ckApplyProviderFields(select.closest("form") || document);
+  });
+});
+
+document.addEventListener("change", function(e) {
+  var target = e.target;
+  if (target && target.matches && target.matches("[data-ck-provider-select]")) {
+    ckApplyProviderFields(target.closest("form") || document);
+  }
+});
+
 document.addEventListener("click", function(e) {
   var btn = e.target.closest("[data-ck-apply]");
   if (!btn) return;
@@ -378,3 +402,51 @@ document.addEventListener("keydown", function(e) {
   else if (e.key === "Enter" || e.key === " ") { e.preventDefault(); if (options[idx]) ckSelectChoose(sel, options[idx]); }
   else if (e.key === "Escape") { e.preventDefault(); ckSelectClose(sel); trigger.focus(); }
 });
+
+function ckConfirmModal(message, formEl, submitter) {
+  var dialog = document.getElementById("ck-confirm-modal");
+  if (!dialog || typeof dialog.showModal !== "function") {
+    return Promise.resolve(window.confirm(message));
+  }
+  var messageEl = dialog.querySelector("#ck-confirm-message");
+  var acceptBtn = dialog.querySelector("[data-ck-confirm-accept]");
+  var cancelBtn = dialog.querySelector("[data-ck-confirm-cancel]");
+  if (messageEl) messageEl.textContent = message || "Are you sure?";
+  var label = (submitter && submitter.getAttribute("data-ck-confirm-label")) || "Confirm";
+  var tone = (submitter && submitter.getAttribute("data-ck-confirm-tone")) || "";
+  if (acceptBtn) {
+    acceptBtn.textContent = label;
+    acceptBtn.className = "ck-button " + (tone === "danger" ? "ck-button--danger" : "ck-button--primary");
+  }
+  return new Promise(function(resolve) {
+    function onClose() {
+      dialog.removeEventListener("close", onClose);
+      acceptBtn.removeEventListener("click", onAccept);
+      cancelBtn.removeEventListener("click", onCancel);
+      dialog.removeEventListener("click", onBackdrop);
+      resolve(dialog.returnValue === "accept");
+    }
+    function onAccept() { dialog.close("accept"); }
+    function onCancel() { dialog.close("cancel"); }
+    function onBackdrop(e) { if (e.target === dialog) dialog.close("cancel"); }
+    dialog.addEventListener("close", onClose);
+    acceptBtn.addEventListener("click", onAccept);
+    cancelBtn.addEventListener("click", onCancel);
+    dialog.addEventListener("click", onBackdrop);
+    dialog.returnValue = "";
+    dialog.showModal();
+    var focusTarget = (tone === "danger" ? cancelBtn : acceptBtn);
+    if (focusTarget) focusTarget.focus();
+  });
+}
+
+function ckInstallConfirm() {
+  if (!window.Turbo) return;
+  if (Turbo.config && Turbo.config.forms) {
+    Turbo.config.forms.confirm = ckConfirmModal;
+  } else if (typeof Turbo.setConfirmMethod === "function") {
+    Turbo.setConfirmMethod(ckConfirmModal);
+  }
+}
+document.addEventListener("turbo:load", ckInstallConfirm);
+ckInstallConfirm();

data/app/assets/stylesheets/completion_kit/application.css

@@ -2259,16 +2259,19 @@ label.ck-checkbox[hidden] {
   outline-offset: 2px;
 }
 
-.ck-delete-action {
-  margin-top: 1rem;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: 0.5rem;
+.ck-icon-btn:disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
 }
 
-.ck-delete-action .ck-field-hint {
-  margin: 0;
+.ck-icon-btn:disabled:hover {
+  background: none;
+  border-color: transparent;
+  color: var(--ck-dim);
+}
+
+.ck-delete-form {
+  display: contents;
 }
 
 .ck-icon-btn--spinning svg {
@@ -2723,6 +2726,17 @@ select.ck-input {
   backdrop-filter: blur(4px);
 }
 
+.ck-modal--sm {
+  max-width: min(92vw, 440px);
+}
+
+.ck-confirm__message {
+  margin: 0;
+  color: var(--ck-muted);
+  font-size: 0.95rem;
+  line-height: 1.55;
+}
+
 .ck-modal[open] {
   animation: ck-modal-in 0.18s ease-out;
 }

data/app/helpers/completion_kit/application_helper.rb

@@ -29,6 +29,21 @@ module CompletionKit
       "#{base} #{styles}"
     end
 
+    def ck_delete_trigger(form_id:, label:, confirm: nil, disabled: false, title: nil)
+      content_tag(
+        :button,
+        type: "submit",
+        form: (disabled ? nil : form_id),
+        class: "ck-icon-btn",
+        title: title || label,
+        "aria-label": label,
+        disabled: disabled,
+        data: (disabled ? {} : {turbo_confirm: confirm, ck_confirm_label: "Delete", ck_confirm_tone: "danger"})
+      ) do
+        heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true"
+      end
+    end
+
     def ck_badge_classes(kind)
       case kind.to_s
       when "high"

data/app/models/completion_kit/provider_credential.rb

@@ -26,7 +26,6 @@ module CompletionKit
     validates :provider, presence: true, inclusion: { in: PROVIDERS }
     validates :provider, tenant_scoped_uniqueness: true
     validates :api_endpoint, presence: true, if: :azure_foundry?
-    validates :api_version, presence: true, if: :azure_foundry?
     validate :api_endpoint_not_internal
 
     after_save :enqueue_discovery

data/app/services/completion_kit/azure_foundry_client.rb

@@ -49,7 +49,7 @@ module CompletionKit
       return [] unless configured?
       return [] unless ProviderEndpoint.safe?(api_endpoint)
 
-      response = build_connection(azure_base_url).get("/openai/deployments?api-version=#{api_version}") do |req|
+      response = build_connection(azure_base_url).get(models_path) do |req|
         req.headers["api-key"] = api_key
       end
       return [] unless response.success?
@@ -67,7 +67,6 @@ module CompletionKit
       errors = []
       errors << "Azure endpoint is not configured" if api_endpoint.blank?
       errors << "Azure API key is not configured" if api_key.blank?
-      errors << "Azure api-version is not configured" if api_version.blank?
       errors
     end
 
@@ -89,12 +88,21 @@ module CompletionKit
       api_endpoint.to_s.strip.delete_suffix("/")
     end
 
+    def v1_mode?
+      api_version.blank?
+    end
+
+    def models_path
+      v1_mode? ? "/openai/v1/models" : "/openai/deployments?api-version=#{api_version}"
+    end
+
     def post_chat(model:, prompt:, max_tokens:, temperature:)
       body = { messages: [{ role: "user", content: prompt }], max_tokens: max_tokens }
+      body[:model] = model if v1_mode?
       body[:temperature] = temperature unless temperature.nil?
 
       build_connection(azure_base_url, timeout: 30, open_timeout: 5).post do |req|
-        req.url "/openai/deployments/#{model}/chat/completions?api-version=#{api_version}"
+        req.url(v1_mode? ? "/openai/v1/chat/completions" : "/openai/deployments/#{model}/chat/completions?api-version=#{api_version}")
         req.headers["Content-Type"] = "application/json"
         req.headers["api-key"] = api_key
         req.body = body.to_json

data/app/services/completion_kit/model_discovery_service.rb

@@ -133,7 +133,7 @@ module CompletionKit
     def custom_endpoint_404_message
       message = "No OpenAI-compatible model list was found at #{custom_endpoint_host}/v1/models (404). Check that the base URL is correct."
       return message unless azure_custom_host?
-      "#{message} This looks like an Azure endpoint; add it with the Azure AI Foundry provider, which uses an api-version and an api-key header."
+      "#{message} This looks like an Azure endpoint; add it with the Azure AI Foundry provider."
     end
 
     def with_detail(message, detail)
@@ -155,22 +155,31 @@ module CompletionKit
 
     def fetch_azure_foundry_models
       raise DiscoveryError, "An Azure endpoint URL is required." if @api_endpoint.blank?
-      raise DiscoveryError, "An Azure api-version is required." if @api_version.blank?
 
-      response = fetch_connection(azure_base_url).get("/openai/deployments?api-version=#{@api_version}") do |req|
+      response = fetch_connection(azure_base_url).get(azure_models_path) do |req|
         req.headers["api-key"] = @api_key
       end
       raise DiscoveryError, azure_error_message(response) unless response.success?
       JSON.parse(response.body).fetch("data", []).map { |e| { id: e["id"], display_name: e["id"] } }
     end
 
+    def azure_v1_mode?
+      @api_version.blank?
+    end
+
+    def azure_models_path
+      azure_v1_mode? ? "/openai/v1/models" : "/openai/deployments?api-version=#{@api_version}"
+    end
+
     def azure_base_url
       @api_endpoint.to_s.strip.delete_suffix("/")
     end
 
     def azure_error_message(response)
       detail = extract_provider_error_message(response.body)
-      with_detail("Azure did not return a deployments list at /openai/deployments (#{response.status}). Check the endpoint base URL and api-version.", detail)
+      hint = azure_v1_mode? ? "Check the endpoint base URL." : "Check the endpoint base URL and api-version."
+      path = azure_v1_mode? ? "/openai/v1/models" : "/openai/deployments"
+      with_detail("Azure did not return a model list at #{path} (#{response.status}). #{hint}", detail)
     end
 
     def reconcile(discovered)
@@ -428,11 +437,13 @@ module CompletionKit
         f.request :retry, max: 1, interval: 0.5
         f.adapter Faraday.default_adapter
       end
+      body = { messages: [{ role: "user", content: input }], max_tokens: max_tokens }
+      body[:model] = model_id if azure_v1_mode?
       conn.post do |req|
-        req.url "/openai/deployments/#{model_id}/chat/completions?api-version=#{@api_version}"
+        req.url(azure_v1_mode? ? "/openai/v1/chat/completions" : "/openai/deployments/#{model_id}/chat/completions?api-version=#{@api_version}")
         req.headers["Content-Type"] = "application/json"
         req.headers["api-key"] = @api_key
-        req.body = { messages: [{ role: "user", content: input }], max_tokens: max_tokens }.to_json
+        req.body = body.to_json
       end
     end
   end

data/app/views/completion_kit/datasets/_form.html.erb

@@ -1,3 +1,11 @@
+<% if dataset.persisted? %>
+  <% dataset_delete_id = "ck_delete_dataset_#{dataset.id}" %>
+  <% runs_n = dataset.runs.count %>
+  <% responses_n = CompletionKit::Response.where(run_id: dataset.runs.select(:id)).count %>
+  <% dataset_delete_confirm = runs_n.zero? ?
+       "Delete \"#{dataset.name}\"? It has no runs." :
+       "Delete \"#{dataset.name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews) that used this dataset." %>
+<% end %>
 <%= form_with(model: dataset, local: true) do |form| %>
   <% if dataset.errors.any? %>
     <div class="ck-flash ck-flash--alert" role="alert">
@@ -31,6 +39,9 @@
     <%= render "completion_kit/tags/picker", record: dataset, param_namespace: :dataset %>
 
     <div class="ck-actions">
+      <% if dataset.persisted? %>
+        <%= ck_delete_trigger(form_id: dataset_delete_id, label: "Delete dataset", confirm: dataset_delete_confirm) %>
+      <% end %>
       <%= link_to "Cancel", datasets_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(dataset.persisted? ? "Save dataset" : "Create dataset", class: ck_button_classes(:dark)) %>
     </div>
@@ -66,12 +77,5 @@ ckDatasetHeaderPreview();
 <% end %>
 
 <% if dataset.persisted? %>
-  <% runs_n = dataset.runs.count %>
-  <% responses_n = CompletionKit::Response.where(run_id: dataset.runs.select(:id)).count %>
-  <% confirm = if runs_n.zero?
-       "Delete \"#{dataset.name}\"? It has no runs."
-     else
-       "Delete \"#{dataset.name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews) that used this dataset."
-     end %>
-  <%= render "completion_kit/shared/delete_action", path: dataset_path(dataset), label: "Delete dataset", confirm: confirm %>
+  <%= render "completion_kit/shared/delete_form", form_id: dataset_delete_id, path: dataset_path(dataset) %>
 <% end %>

data/app/views/completion_kit/metric_groups/_form.html.erb

@@ -1,3 +1,10 @@
+<% if metric_group.persisted? %>
+  <% metric_group_delete_id = "ck_delete_metric_group_#{metric_group.id}" %>
+  <% members_n = metric_group.metrics.count %>
+  <% metric_group_delete_confirm = members_n.zero? ?
+       "Delete \"#{metric_group.name}\"? It has no members." :
+       "Delete \"#{metric_group.name}\"? Removes this grouping. #{pluralize(members_n, 'member metric')} #{members_n == 1 ? 'is' : 'are'} kept." %>
+<% end %>
 <%= form_with(model: metric_group, url: metric_group.persisted? ? metric_group_path(metric_group) : metric_groups_path, local: true) do |form| %>
   <% name_error = metric_group.errors[:name].first %>
 
@@ -80,6 +87,9 @@
     </script>
 
     <div class="ck-actions">
+      <% if metric_group.persisted? %>
+        <%= ck_delete_trigger(form_id: metric_group_delete_id, label: "Delete metric group", confirm: metric_group_delete_confirm) %>
+      <% end %>
       <%= link_to "Cancel", metrics_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(metric_group.persisted? ? "Save metric group" : "Create metric group", class: ck_button_classes(:dark)) %>
     </div>
@@ -87,9 +97,5 @@
 <% end %>
 
 <% if metric_group.persisted? %>
-  <% members_n = metric_group.metrics.count %>
-  <% confirm = members_n.zero? ?
-       "Delete \"#{metric_group.name}\"? It has no members." :
-       "Delete \"#{metric_group.name}\"? Removes this grouping. #{pluralize(members_n, 'member metric')} #{members_n == 1 ? 'is' : 'are'} kept." %>
-  <%= render "completion_kit/shared/delete_action", path: metric_group_path(metric_group), label: "Delete metric group", confirm: confirm %>
+  <%= render "completion_kit/shared/delete_form", form_id: metric_group_delete_id, path: metric_group_path(metric_group) %>
 <% end %>

data/app/views/completion_kit/metrics/_form.html.erb

@@ -3,6 +3,58 @@
 <% suggestion_bands = suggestion ? Array(suggestion.rubric_bands).each_with_object({}) { |b, h| h[b["stars"].to_i] = b["description"].to_s } : {} %>
 <% suggested_instruction = suggestion&.instruction.to_s %>
 <% instruction_changed = suggestion && suggested_instruction.present? && suggested_instruction != metric.instruction.to_s %>
+<% if metric.persisted? %>
+  <% metric_delete_id = "ck_delete_metric_#{metric.id}" %>
+  <% groups_n = metric.metric_groups.count %>
+  <% reviews_n = metric.reviews.count %>
+  <% parts = [] %>
+  <% parts << "in #{pluralize(groups_n, 'metric group')} (removed from each)" if groups_n > 0 %>
+  <% parts << "scored in #{pluralize(reviews_n, 'review')} (scores kept, link cleared)" if reviews_n > 0 %>
+  <% metric_delete_confirm = parts.empty? ? "Delete \"#{metric.name}\"? It's not in use." : "Delete \"#{metric.name}\"? It's #{parts.to_sentence}." %>
+<% end %>
+
+<% if edit_draft %>
+  <% pub = local_assigns[:published_metric_version] %>
+  <% draft_instr_changed = pub && pub.instruction.to_s != edit_draft.instruction.to_s %>
+  <% draft_rubric_changed = pub && pub.rubric_bands != edit_draft.rubric_bands %>
+  <div class="ck-suggestion-banner" role="status">
+    <div class="ck-suggestion-banner__body">
+      <p class="ck-kicker">Draft pending</p>
+      <p class="ck-meta-copy">The form below shows your unpublished draft. Publish to replace the live<%= " instruction" if draft_instr_changed %><%= " and" if draft_instr_changed && draft_rubric_changed %><%= " rubric" if draft_rubric_changed %> for future runs, or keep editing.</p>
+    </div>
+    <div class="ck-suggestion-banner__actions">
+      <%= button_to "Discard draft", dismiss_suggestion_metric_path(metric, draft_id: edit_draft.id, back_to: "edit"),
+            method: :delete, form_class: "inline-block",
+            class: ck_button_classes(:light, variant: :outline),
+            data: { turbo_confirm: "Drop this draft?", ck_confirm_label: "Discard", ck_confirm_tone: "danger" } %>
+      <%= button_to "Publish this version", publish_draft_metric_path(metric, draft_id: edit_draft.id),
+            method: :post, form_class: "inline-block",
+            class: ck_button_classes(:dark) %>
+    </div>
+  </div>
+<% end %>
+
+<% if suggestion %>
+  <div class="ck-suggestion-banner" role="status">
+    <div class="ck-suggestion-banner__body">
+      <p class="ck-kicker ck-kicker--icon"><%= heroicon_tag "sparkles", variant: :outline, class: "ck-magic-icon", "aria-hidden": "true" %>Proposed changes</p>
+      <p class="ck-meta-copy">Based on human reviews, here are some proposed changes to the metric.</p>
+    </div>
+    <div class="ck-suggestion-banner__actions">
+      <%= button_to suggest_variants_metric_path(metric, back_to: "edit"),
+            method: :post, form_class: "inline-block", class: "ck-icon-btn",
+            title: "Try again", "aria-label": "Try again",
+            data: { turbo_confirm: "Replace these changes with fresh ones from the model?" } do %><%= heroicon_tag "arrow-path", variant: :outline, size: 16, "aria-hidden": "true" %><% end %>
+      <%= button_to dismiss_suggestion_metric_path(metric, draft_id: suggestion.id, back_to: "edit"),
+            method: :delete, form_class: "inline-block", class: "ck-icon-btn",
+            title: "Discard these changes", "aria-label": "Discard",
+            data: { turbo_confirm: "Drop these changes?", ck_confirm_label: "Discard", ck_confirm_tone: "danger" } do %><%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %><% end %>
+      <%= button_to "Apply all", publish_draft_metric_path(metric, draft_id: suggestion.id),
+            method: :post, form_class: "inline-block",
+            class: ck_button_classes(:dark) %>
+    </div>
+  </div>
+<% end %>
 
 <%= form_with(model: metric, local: true) do |form| %>
   <% if metric.errors.any? %>
@@ -16,49 +68,6 @@
     </div>
   <% end %>
 
-  <% if edit_draft %>
-    <% pub = local_assigns[:published_metric_version] %>
-    <% draft_instr_changed = pub && pub.instruction.to_s != edit_draft.instruction.to_s %>
-    <% draft_rubric_changed = pub && pub.rubric_bands != edit_draft.rubric_bands %>
-    <div class="ck-suggestion-banner" role="status">
-      <div class="ck-suggestion-banner__body">
-        <p class="ck-kicker">Draft pending</p>
-        <p class="ck-meta-copy">The form below shows your unpublished draft. Publish to replace the live<%= " instruction" if draft_instr_changed %><%= " and" if draft_instr_changed && draft_rubric_changed %><%= " rubric" if draft_rubric_changed %> for future runs, or keep editing.</p>
-      </div>
-      <div class="ck-suggestion-banner__actions">
-        <%= button_to "Discard draft", dismiss_suggestion_metric_path(metric, draft_id: edit_draft.id, back_to: "edit"),
-              method: :delete, form_class: "inline-block",
-              class: ck_button_classes(:light, variant: :outline),
-              data: { turbo_confirm: "Drop this draft?" } %>
-        <%= button_to "Publish this version", publish_draft_metric_path(metric, draft_id: edit_draft.id),
-              method: :post, form_class: "inline-block",
-              class: ck_button_classes(:dark) %>
-      </div>
-    </div>
-  <% end %>
-
-  <% if suggestion %>
-    <div class="ck-suggestion-banner" role="status">
-      <div class="ck-suggestion-banner__body">
-        <p class="ck-kicker ck-kicker--icon"><%= heroicon_tag "sparkles", variant: :outline, class: "ck-magic-icon", "aria-hidden": "true" %>Proposed changes</p>
-        <p class="ck-meta-copy">Based on human reviews, here are some proposed changes to the metric.</p>
-      </div>
-      <div class="ck-suggestion-banner__actions">
-        <%= button_to suggest_variants_metric_path(metric, back_to: "edit"),
-              method: :post, form_class: "inline-block", class: "ck-icon-btn",
-              title: "Try again", "aria-label": "Try again",
-              data: { turbo_confirm: "Replace these changes with fresh ones from the model?" } do %><%= heroicon_tag "arrow-path", variant: :outline, size: 16, "aria-hidden": "true" %><% end %>
-        <%= button_to dismiss_suggestion_metric_path(metric, draft_id: suggestion.id, back_to: "edit"),
-              method: :delete, form_class: "inline-block", class: "ck-icon-btn",
-              title: "Discard these changes", "aria-label": "Discard",
-              data: { turbo_confirm: "Drop these changes?" } do %><%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %><% end %>
-        <%= button_to "Apply all", publish_draft_metric_path(metric, draft_id: suggestion.id),
-              method: :post, form_class: "inline-block",
-              class: ck_button_classes(:dark) %>
-      </div>
-    </div>
-  <% end %>
-
   <div class="ck-card ck-form-card">
     <div class="ck-field">
       <%= form.label :name, "Metric name", class: "ck-label" %>
@@ -254,6 +263,9 @@
     <%= render "completion_kit/tags/picker", record: metric, param_namespace: :metric %>
 
     <div class="ck-actions">
+      <% if metric.persisted? %>
+        <%= ck_delete_trigger(form_id: metric_delete_id, label: "Delete metric", confirm: metric_delete_confirm) %>
+      <% end %>
       <%= link_to "Cancel", metrics_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(metric.persisted? ? "Save metric" : "Create metric", class: ck_button_classes(:dark)) %>
     </div>
@@ -261,11 +273,5 @@
 <% end %>
 
 <% if metric.persisted? %>
-  <% groups_n = metric.metric_groups.count %>
-  <% reviews_n = metric.reviews.count %>
-  <% parts = [] %>
-  <% parts << "in #{pluralize(groups_n, 'metric group')} (removed from each)" if groups_n > 0 %>
-  <% parts << "scored in #{pluralize(reviews_n, 'review')} (scores kept, link cleared)" if reviews_n > 0 %>
-  <% confirm = parts.empty? ? "Delete \"#{metric.name}\"? It's not in use." : "Delete \"#{metric.name}\"? It's #{parts.to_sentence}." %>
-  <%= render "completion_kit/shared/delete_action", path: metric_path(metric), label: "Delete metric", confirm: confirm %>
+  <%= render "completion_kit/shared/delete_form", form_id: metric_delete_id, path: metric_path(metric) %>
 <% end %>

data/app/views/completion_kit/prompts/_form.html.erb

@@ -1,3 +1,11 @@
+<% if prompt.persisted? %>
+  <% prompt_delete_id = "ck_delete_prompt_#{prompt.id}" %>
+  <% runs_n = prompt.runs.count %>
+  <% responses_n = prompt.responses.count %>
+  <% prompt_delete_confirm = runs_n.zero? ?
+       "Delete \"#{prompt.display_name}\"? This version has no runs." :
+       "Delete \"#{prompt.display_name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews). Other versions of this prompt are untouched." %>
+<% end %>
 <%= form_with(model: prompt, local: true) do |form| %>
   <% if prompt.errors.any? %>
     <div class="ck-flash ck-flash--alert" role="alert">
@@ -58,6 +66,9 @@
     <%= render "completion_kit/tags/picker", record: prompt, param_namespace: :prompt %>
 
     <div class="ck-actions">
+      <% if prompt.persisted? %>
+        <%= ck_delete_trigger(form_id: prompt_delete_id, label: "Delete prompt", confirm: prompt_delete_confirm) %>
+      <% end %>
       <%= link_to "Cancel", prompts_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(prompt.persisted? ? "Save prompt" : "Create prompt", class: ck_button_classes(:dark), disabled: available.empty?) %>
     </div>
@@ -65,12 +76,5 @@
 <% end %>
 
 <% if prompt.persisted? %>
-  <% runs_n = prompt.runs.count %>
-  <% responses_n = prompt.responses.count %>
-  <% confirm = if runs_n.zero?
-       "Delete \"#{prompt.display_name}\"? This version has no runs."
-     else
-       "Delete \"#{prompt.display_name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews). Other versions of this prompt are untouched."
-     end %>
-  <%= render "completion_kit/shared/delete_action", path: prompt_path(prompt), label: "Delete prompt", confirm: confirm %>
+  <%= render "completion_kit/shared/delete_form", form_id: prompt_delete_id, path: prompt_path(prompt) %>
 <% end %>

data/app/views/completion_kit/provider_credentials/_form.html.erb

@@ -1,3 +1,8 @@
+<% if provider_credential.persisted? %>
+  <% pc_delete_id = "ck_delete_provider_#{provider_credential.id}" %>
+  <% pc_delete_blocked = provider_credential.in_use? %>
+  <% pc_delete_confirm = "Delete the #{provider_credential.display_provider} provider and its discovered models? This can't be undone." %>
+<% end %>
 <%= form_with(model: provider_credential, local: true) do |form| %>
   <% if provider_credential.errors.any? %>
     <div class="ck-flash ck-flash--alert" role="alert">
@@ -13,7 +18,7 @@
   <div class="ck-card ck-form-card">
     <div class="ck-field">
       <%= form.label :provider, class: "ck-label" %>
-      <%= form.select :provider, CompletionKit::ProviderCredential::PROVIDERS.map { |p| [CompletionKit::ProviderCredential::PROVIDER_LABELS[p] || p.titleize, p] }, {}, { class: "ck-input" } %>
+      <%= form.select :provider, CompletionKit::ProviderCredential::PROVIDERS.map { |p| [CompletionKit::ProviderCredential::PROVIDER_LABELS[p] || p.titleize, p] }, {}, { class: "ck-input", data: { ck_provider_select: true } } %>
     </div>
 
     <div class="ck-field">
@@ -28,26 +33,29 @@
       <%= ck_field_error(form, :api_endpoint) %>
     </div>
 
-    <div class="ck-field">
+    <div class="ck-field" data-ck-provider-field="azure_foundry"<%= provider_credential.azure_foundry? ? "" : " hidden" %>>
       <%= form.label :api_version, "API version", class: "ck-label" %>
-      <%= form.text_field :api_version, class: "ck-input", placeholder: "Only needed for Azure AI Foundry (e.g. 2024-10-21)", **ck_field_aria(form, :api_version) %>
+      <%= form.text_field :api_version, class: "ck-input", placeholder: "e.g. 2024-10-21", **ck_field_aria(form, :api_version) %>
       <%= ck_field_error(form, :api_version) %>
+      <p class="ck-field-hint">Optional. Leave blank to use Azure's v1 API, or set a dated version for the legacy API (which also lists your deployments during discovery).</p>
     </div>
 
     <div class="ck-actions">
+      <% if provider_credential.persisted? %>
+        <%= ck_delete_trigger(form_id: pc_delete_id, label: "Delete provider", confirm: pc_delete_confirm, disabled: pc_delete_blocked, title: (pc_delete_blocked ? provider_credential.in_use_message : "Delete provider")) %>
+      <% end %>
       <%= link_to "Cancel", provider_credentials_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(provider_credential.persisted? ? "Save provider" : "Create provider", class: ck_button_classes(:dark)) %>
     </div>
+    <% if provider_credential.persisted? && pc_delete_blocked %>
+      <p class="ck-field-hint"><%= provider_credential.in_use_message %></p>
+    <% end %>
 
   </div>
 <% end %>
 
-<% if provider_credential.persisted? %>
-  <%= render "completion_kit/shared/delete_action",
-        path: provider_credential_path(provider_credential),
-        label: "Delete provider",
-        confirm: "Delete the #{provider_credential.display_provider} provider and its discovered models? This can't be undone.",
-        blocked_reason: (provider_credential.in_use_message if provider_credential.in_use?) %>
+<% if provider_credential.persisted? && !pc_delete_blocked %>
+  <%= render "completion_kit/shared/delete_form", form_id: pc_delete_id, path: provider_credential_path(provider_credential) %>
 <% end %>
 
 <% if provider_credential.persisted? %>

data/app/views/completion_kit/runs/_actions.html.erb

@@ -1,6 +1,6 @@
 <div class="ck-actions" id="run_actions">
   <% running = run.status == "running" %>
-  <%= button_to run_path(run), method: :delete, form_class: "inline-block", class: "ck-icon-btn", title: "Delete run", "aria-label": "Delete run", disabled: running, data: { turbo_confirm: "Delete this run and all its responses?" } do %><%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %><% end %>
+  <%= button_to run_path(run), method: :delete, form_class: "inline-block", class: "ck-icon-btn", title: "Delete run", "aria-label": "Delete run", disabled: running, data: { turbo_confirm: "Delete this run and all its responses?", ck_confirm_label: "Delete", ck_confirm_tone: "danger" } do %><%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %><% end %>
   <% if running %>
     <%= link_to "Edit", edit_run_path(run), class: ck_button_classes(:light, variant: :outline) + " disabled", "aria-disabled": "true", tabindex: "-1" %>
   <% else %>

data/app/views/completion_kit/shared/_delete_form.html.erb

@@ -0,0 +1,2 @@
+<%# locals: (form_id:, path:) %>
+<%= form_with url: path, method: :delete, id: form_id, class: "ck-delete-form" do %><% end %>

data/app/views/completion_kit/tags/_form.html.erb

@@ -1,3 +1,10 @@
+<% if tag.persisted? %>
+  <% tag_delete_id = "ck_delete_tag_#{tag.id}" %>
+  <% applied_n = tag.taggings.count %>
+  <% tag_delete_confirm = applied_n.zero? ?
+       "Delete \"#{tag.name}\"? It's not currently applied to anything." :
+       "Delete \"#{tag.name}\"? It's currently applied to #{pluralize(applied_n, 'item')}. They'll lose this tag." %>
+<% end %>
 <%= form_with(model: tag, local: true) do |form| %>
   <div class="ck-card ck-form-card">
     <% name_error = tag.errors[:name].first %>
@@ -17,6 +24,9 @@
     </div>
 
 <div class="ck-actions">
+      <% if tag.persisted? %>
+        <%= ck_delete_trigger(form_id: tag_delete_id, label: "Delete tag", confirm: tag_delete_confirm) %>
+      <% end %>
       <%= link_to "Cancel", tags_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(tag.persisted? ? "Save tag" : "Create tag", class: ck_button_classes(:dark)) %>
     </div>
@@ -24,11 +34,5 @@
 <% end %>
 
 <% if tag.persisted? %>
-  <% applied_n = tag.taggings.count %>
-  <% confirm = if applied_n.zero?
-       "Delete \"#{tag.name}\"? It's not currently applied to anything."
-     else
-       "Delete \"#{tag.name}\"? It's currently applied to #{pluralize(applied_n, 'item')}. They'll lose this tag."
-     end %>
-  <%= render "completion_kit/shared/delete_action", path: tag_path(tag), label: "Delete tag", confirm: confirm %>
+  <%= render "completion_kit/shared/delete_form", form_id: tag_delete_id, path: tag_path(tag) %>
 <% end %>

data/app/views/layouts/completion_kit/application.html.erb

@@ -60,5 +60,22 @@
     <%= yield %>
     </div>
   </main>
+
+  <dialog id="ck-confirm-modal" class="ck-modal ck-modal--sm" role="alertdialog" aria-labelledby="ck-confirm-title" aria-describedby="ck-confirm-message">
+    <article class="ck-modal__panel" tabindex="-1">
+      <header class="ck-modal__header">
+        <div class="ck-modal__heading">
+          <h2 class="ck-modal__title" id="ck-confirm-title">Please confirm</h2>
+        </div>
+      </header>
+      <div class="ck-modal__body">
+        <p class="ck-confirm__message" id="ck-confirm-message"></p>
+      </div>
+      <div class="ck-modal__footer">
+        <button type="button" class="<%= ck_button_classes(:light, variant: :outline) %>" data-ck-confirm-cancel>Cancel</button>
+        <button type="button" class="<%= ck_button_classes(:dark) %>" data-ck-confirm-accept>Confirm</button>
+      </div>
+    </article>
+  </dialog>
 </body>
 </html>

data/lib/completion_kit/version.rb

@@ -1,3 +1,3 @@
 module CompletionKit
-  VERSION = "0.26.2"
+  VERSION = "0.26.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completion-kit
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.4
 platform: ruby
 authors:
 - Damien Bastin
@@ -421,7 +421,7 @@ files:
 - app/views/completion_kit/runs/new.html.erb
 - app/views/completion_kit/runs/show.html.erb
 - app/views/completion_kit/shared/_branded_select.html.erb
-- app/views/completion_kit/shared/_delete_action.html.erb
+- app/views/completion_kit/shared/_delete_form.html.erb
 - app/views/completion_kit/shared/_settings_nav.html.erb
 - app/views/completion_kit/suggestions/_scoreboard.html.erb
 - app/views/completion_kit/suggestions/_state.html.erb

data/app/views/completion_kit/shared/_delete_action.html.erb

@@ -1,18 +0,0 @@
-<%# locals: (path:, label:, confirm:, blocked_reason: nil) %>
-<div class="ck-delete-action">
-  <% if blocked_reason.present? %>
-    <button type="button" class="<%= ck_button_classes(:red, variant: :outline) %>" disabled aria-disabled="true">
-      <%= heroicon_tag "trash", variant: :outline, size: 15, "aria-hidden": "true" %>
-      <%= label %>
-    </button>
-    <p class="ck-field-hint"><%= blocked_reason %></p>
-  <% else %>
-    <%= button_to path, method: :delete,
-          form_class: "inline-block",
-          class: ck_button_classes(:red, variant: :outline),
-          data: { turbo_confirm: confirm } do %>
-      <%= heroicon_tag "trash", variant: :outline, size: 15, "aria-hidden": "true" %>
-      <%= label %>
-    <% end %>
-  <% end %>
-</div>