bitfab 0.64.15 → 0.64.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae38a6da8055dd696639f719a5fd0910e97818aee2f1ec0e74c0d918beb8a3a
-  data.tar.gz: 6004d03970985aa1381ef57ae4c7481195c50c904bc672677155b786e0f060f5
+  metadata.gz: 8a86045717d7c97884ea2005ef2e965cf02e53afcc57b4ae9681b5d75d64303f
+  data.tar.gz: 9f4903a7ad1771622b2608838667441d4d5ea8b3fcab14597f7af9a70b16882a
 SHA512:
-  metadata.gz: 6c7bc1dcf702f9d3c831df3a68a566c7186f352247bf7faa157d164237257874692d4334ade0da3ab90c3ec23293769a7610ed982527993173cd9c1d8622806e
-  data.tar.gz: 54fa2229794f023b7eaaae39be309c474a5e561baf55e7e63b2e2545c7279ec2859d6753e5a7658f69fd6c1a2bc40a6a13cc30202ccdca01fe8bba374e4cf51a
+  metadata.gz: 267f523ef41019703bc9c35c4c1c608d07583b7e1a50b4108ca7379cbf9d93dce08b057cccb723ca18504b794b7d460a4e0653cc1a64aee8476fb1c78a3fb862
+  data.tar.gz: 75a9dec7bf4ff1c8c8a2140f3ebd9a2a1fc04737ea691fc9560711fe035872d3990a31d2216a720e2da25581ec93988a60dadcf962854ff16a8bad078a3045a0

data/lib/bitfab/client.rb

@@ -37,7 +37,7 @@ module Bitfab
 
     attr_reader :service_url
 
-    attr_reader :datasets, :assertion_categories, :organization_members, :traces, :labels, :graders, :experiments
+    attr_reader :datasets, :assertion_categories, :organization_members, :traces, :spans, :labels, :graders, :experiments
 
     def initialize(api_key: nil, service_url: nil, capture_enabled: nil, enabled: nil, strict: false, simulation_plan: true, timeout: 120, trace_across_threads: nil, env_vars: nil, baml_client: nil, db_snapshot: nil)
       @db_snapshot = DbSnapshot.normalize_config(db_snapshot)
@@ -57,6 +57,7 @@ module Bitfab
       @assertion_categories = AssertionCategories.new(@http_client)
       @organization_members = OrganizationMembers.new(@http_client)
       @traces = Traces.new(@http_client)
+      @spans = Spans.new(@http_client)
       @labels = Labels.new(@http_client)
       @graders = Graders.new(@http_client)
       @experiments = Experiments.new(@http_client)
@@ -370,24 +371,28 @@ module Bitfab
     end
 
     # Fetch one persisted span without loading the full trace.
-    # Exactly one of id or name is required. Name lookups return the last
-    # matching span by default; occurrence also accepts "first" or a zero-based
-    # Integer index.
-    def get_trace_span(trace_id, id: nil, name: nil, occurrence: "last")
+    # Pass id alone, or name and/or type (llm, agent, function, guardrail,
+    # handoff, custom). Name and type lookups return the last matching span by
+    # default; occurrence also accepts "first" or a zero-based Integer index.
+    # Raises ArgumentError before sending for any other combination or an
+    # unknown type.
+    def get_trace_span(trace_id, id: nil, name: nil, type: nil, occurrence: "last")
       validate_trace_id(trace_id)
-      raise ArgumentError, "Provide exactly one of id or name" if id.nil? == name.nil?
+      has_position_selector = !name.nil? || !type.nil?
+      raise ArgumentError, "Provide id, or name and/or type" if id.nil? != has_position_selector
 
       validate_span_id(id) unless id.nil?
       if !name.nil? && (!name.is_a?(String) || name.empty?)
         raise ArgumentError, "name must be a non-empty string"
       end
+      validate_span_type!(type) unless type.nil?
 
       valid_occurrence = ["first", "last"].include?(occurrence) || (occurrence.is_a?(Integer) && occurrence >= 0)
       unless valid_occurrence
         raise ArgumentError, 'occurrence must be "first", "last", or a non-negative integer'
       end
 
-      @http_client.get_trace_span(trace_id, id:, name:, occurrence:)
+      @http_client.get_trace_span(trace_id, id:, name:, type:, occurrence:)
     end
 
     def get_span(span_id)

data/lib/bitfab/cloudReplay.py

@@ -2569,9 +2569,13 @@ def add_run_name(lines):
     lines.insert(named + 1, f"run-name: {json.dumps(RUN_NAME)}")
 
 
+def without_yaml_comment(line):
+    return re.sub(r"(^|\s)#.*", "", line)
+
+
 def replay_step_key(lines):
     for index, line in enumerate(lines):
-        if "--cloud-execute" not in line:
+        if "--cloud-execute" not in without_yaml_comment(line):
             continue
         for above in range(index, -1, -1):
             match = re.match(r"([ \t]*)(- +)?run[ \t]*:", lines[above])

data/lib/bitfab/http_client.rb

@@ -321,11 +321,11 @@ module Bitfab
       get("/api/sdk/externalSpans/#{span_id}#{query}", timeout: 30)
     end
 
-    def get_trace_span(trace_id, id: nil, name: nil, occurrence: "last")
+    def get_trace_span(trace_id, id: nil, name: nil, type: nil, occurrence: "last")
       query = if id
         {id:}
       else
-        {name:, occurrence: occurrence.to_s}
+        {name:, type: type&.to_s, occurrence: occurrence.to_s}.compact
       end
       encoded_trace_id = URI.encode_www_form_component(trace_id)
       get(

data/lib/bitfab/spans.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Bitfab
+  class Spans
+    def initialize(http_client)
+      @http_client = http_client
+    end
+
+    def list(trace_id, span_type: nil, span_name: nil, fields: nil, cursor: nil, limit: nil)
+      payload = {"traceId" => trace_id}
+      payload["spanType"] = span_type unless span_type.nil?
+      payload["spanName"] = span_name unless span_name.nil?
+      payload["fields"] = fields unless fields.nil?
+      payload["cursor"] = cursor unless cursor.nil?
+      payload["limit"] = limit unless limit.nil?
+      @http_client.request("/api/sdk/spans/list", payload)
+    end
+  end
+end

data/lib/bitfab/version.rb

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

data/lib/bitfab.rb

@@ -18,6 +18,7 @@ require_relative "bitfab/datasets"
 require_relative "bitfab/assertion_categories"
 require_relative "bitfab/organization_members"
 require_relative "bitfab/traces"
+require_relative "bitfab/spans"
 require_relative "bitfab/assertions"
 require_relative "bitfab/scenarios"
 require_relative "bitfab/labels"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.64.15
+  version: 0.64.17
 platform: ruby
 authors:
 - Harvest Team
@@ -197,6 +197,7 @@ files:
 - lib/bitfab/simulation_plan.rb
 - lib/bitfab/span_context.rb
 - lib/bitfab/span_origin.rb
+- lib/bitfab/spans.rb
 - lib/bitfab/subtree.rb
 - lib/bitfab/thread_propagation.rb
 - lib/bitfab/timestamp.rb