bitfab 0.64.7 → 0.64.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f867438c2e7008a72787a1bf61ad853c22964587223e98b73827dfbc0546675
-  data.tar.gz: 87130f50d01f7150a5fca9134c5aa444ad31884efbed998aeb3e575d4759d3c4
+  metadata.gz: 6999d067c0ee15b7098bd4a432de082c0993b403178de77fd3a71c00ec6d1558
+  data.tar.gz: 5fe41dfe83313ca0413369680a25aaf09244a25dd40944b7bb0bc035267e7cfd
 SHA512:
-  metadata.gz: 71bf77c48e836cf432734391762cd0fcfa3f0f38efa7451919dc982a00b8d8f2332b34e5b08d980d044d778f8db2fc8ddacf2f88f754d061637b51452fe56e49
-  data.tar.gz: 364a28104d7c944b78bae89c93dacf459240cb877197ff9c4fca25f8d98cac82ddc9b8c418e9e208d6d0152e093789665fff7eba6ee177e8ab132c757ec3f8c8
+  metadata.gz: 691bf9d5734641198986549b3888d0b488374a21fc58daf80d6afe2e19a803b6f8e76ccc7974cd4abe6969993ff6655a515384f73aeaa4e26a4044af6bc93f7d
+  data.tar.gz: bd9a1aa20a2fcf7937daacb44022e1f6b4211bda69f145e075c5ad16c408417e5571f948016901118be5cb211d094c11d7c349f4dca6ecf82ba7d011a6aeca26

data/lib/bitfab/labels.rb

@@ -14,8 +14,8 @@ module Bitfab
       @http_client = http_client
     end
 
-    def save(label:, annotation:, trace_id: nil, original_trace_id: nil, attempt: nil,
-      confidence: nil, experiment_id: nil, assertion_id: nil, evidence: EVIDENCE_UNSET, test_run_id: nil)
+    def save(label:, annotation:, assertion_id:, trace_id: nil, original_trace_id: nil, attempt: nil,
+      confidence: nil, experiment_id: nil, evidence: EVIDENCE_UNSET, test_run_id: nil)
       experiment_id = Bitfab.resolve_experiment_id(experiment_id, test_run_id)
       update = label_target(trace_id:, original_trace_id:, attempt:, assertion_id:)
       update["label"] = label
@@ -27,6 +27,7 @@ module Bitfab
 
     def save_all(labels, experiment_id: nil, test_run_id: nil)
       experiment_id = Bitfab.resolve_experiment_id(experiment_id, test_run_id)
+      require_assertion_ids(labels)
       payload = {"labels" => labels}
       unless experiment_id.nil?
         payload["experimentId"] = experiment_id
@@ -35,7 +36,7 @@ module Bitfab
       @http_client.request(LABELS_PATH, payload)["labels"]
     end
 
-    def skip(trace_id: nil, original_trace_id: nil, attempt: nil, experiment_id: nil, assertion_id: nil,
+    def skip(assertion_id:, trace_id: nil, original_trace_id: nil, attempt: nil, experiment_id: nil,
       test_run_id: nil, annotation: nil)
       experiment_id = Bitfab.resolve_experiment_id(experiment_id, test_run_id)
       update = label_target(trace_id:, original_trace_id:, attempt:, assertion_id:).merge("skip" => true)
@@ -49,16 +50,15 @@ module Bitfab
       save_all([update.merge("archive" => true)], experiment_id:).first
     end
 
-    def save_human(label:, annotation:, trace_id:, confidence: nil, assertion_id: nil,
-      evidence: EVIDENCE_UNSET)
-      update = {"traceId" => trace_id, "label" => label, "annotation" => annotation}
-      update["assertionId"] = assertion_id unless assertion_id.nil?
+    def save_human(label:, annotation:, trace_id:, assertion_id:, confidence: nil, evidence: EVIDENCE_UNSET)
+      update = {"traceId" => trace_id, "assertionId" => assertion_id, "label" => label, "annotation" => annotation}
       update["confidence"] = confidence unless confidence.nil?
       update["evidence"] = evidence unless evidence.equal?(EVIDENCE_UNSET)
       save_human_all([update]).first
     end
 
     def save_human_all(labels)
+      require_human_assertion_ids(labels)
       @http_client.request(HUMAN_LABELS_PATH, {"labels" => labels})["labels"]
     end
 
@@ -83,6 +83,35 @@ module Bitfab
 
     private
 
+    def require_assertion_ids(labels)
+      unscoped = labels.reject do |entry|
+        entry_value(entry, "archive") == true || !blank?(entry_value(entry, "assertionId"))
+      end
+      return if unscoped.empty?
+
+      targets = unscoped.map { |entry| entry_value(entry, "traceId") || entry_value(entry, "originalTraceId") }
+      raise ArgumentError, "Agent verdicts must name an assertion: #{targets.join(", ")}. " \
+        "Pass the assertion_id of the assertion each verdict scores to labels.save, save_all, and skip. " \
+        "Only archive may omit it, to clear an old whole-trace verdict."
+    end
+
+    def require_human_assertion_ids(labels)
+      unscoped = labels.select { |entry| blank?(entry_value(entry, "assertionId")) }
+      return if unscoped.empty?
+
+      targets = unscoped.map { |entry| entry_value(entry, "traceId") }
+      raise ArgumentError, "Human verdicts must name an assertion: #{targets.join(", ")}. " \
+        "Pass the assertion_id of the assertion each verdict scores to labels.save_human and save_human_all."
+    end
+
+    def entry_value(entry, key)
+      entry.key?(key) ? entry[key] : entry[key.to_sym]
+    end
+
+    def blank?(value)
+      value.nil? || value.to_s.empty?
+    end
+
     def label_target(trace_id:, original_trace_id:, attempt:, assertion_id:)
       if trace_id.nil? == original_trace_id.nil?
         raise ArgumentError, "Pass exactly one of trace_id or original_trace_id. " \

data/lib/bitfab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitfab
-  VERSION = "0.64.7"
+  VERSION = "0.64.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.64.7
+  version: 0.64.8
 platform: ruby
 authors:
 - Harvest Team