bitfab 0.76.2 → 0.76.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c5942fdb14d1fbffd77e851fdef0ca8352b3815b236ce984733732ddefae688f
4
- data.tar.gz: b94626cada8efc2b017c471f0b9ebd977c6f42d0c70fe83945547ee0d826f7eb
3
+ metadata.gz: a2da54e66bb7c733936d5e0bcf3c246b8c43720fd4308b83e93c598f89687b61
4
+ data.tar.gz: 8322413fa1c57f0401a3feeca2c42d961871fdc9efce176f18923b8df77de90a
5
5
  SHA512:
6
- metadata.gz: 133fb765afdd0a9441e4e894019e96992ec2dff1dbbb84ca6e8b07e7750612f27c6f9dc0851ba0eb31502d989b3d5778e4839cc55d14ab3b11042aa9c70c837d
7
- data.tar.gz: 3dd647921a6fa3799f4a3574476776e4b7a9743028d1adca7ae55530050950b7267fd5f569679ef67593bb0a6a6732c25adc7ee901a303fd7dfdc3b0f618079f
6
+ metadata.gz: e1743870b005f51773426b79a2d9b59aede0c538b7995a828330a7e861453b218e9f416e9ec91bdc9f4ff0b918a26301c4329cdb1bbf40ef802bfe0f486ca771
7
+ data.tar.gz: e093fecad48969e92d68127a7c9a291c6e0e16b9be65fd165f4f3716854c654fe9339aa73d58e5e0d08202f0cadecee731a10a8658c8875aa770e891f750bde5
data/lib/bitfab/baml.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "json"
4
+ require "uri"
4
5
 
5
6
  module Bitfab
6
7
  module BAML
@@ -120,6 +121,34 @@ module Bitfab
120
121
  nil
121
122
  end
122
123
 
124
+ MODEL_IN_URL = %r{/models?/([^/:?]+)}
125
+
126
+ def response_body(call)
127
+ body = call&.http_response&.body&.json
128
+ body.is_a?(Hash) ? body : {}
129
+ rescue
130
+ {}
131
+ end
132
+
133
+ def model_from_url(url)
134
+ match = url.is_a?(String) ? url.match(MODEL_IN_URL) : nil
135
+ match && URI.decode_www_form_component(match[1])
136
+ rescue
137
+ match&.[](1)
138
+ end
139
+
140
+ def present_string(value)
141
+ (value.is_a?(String) && !value.empty?) ? value : nil
142
+ end
143
+
144
+ def model_of(call, body)
145
+ response = response_body(call)
146
+ present_string(body["model"]) ||
147
+ present_string(response["model"]) ||
148
+ present_string(response["modelVersion"]) ||
149
+ model_from_url(call&.http_request&.url)
150
+ end
151
+
123
152
  def enrich_span(collector)
124
153
  log = collector.last
125
154
  calls = log&.calls || []
@@ -137,7 +166,7 @@ module Bitfab
137
166
  usage = collector.usage
138
167
  metadata = {
139
168
  provider: call&.provider,
140
- model: body["model"] || call&.http_request&.url&.match(%r{/models/([^/:]+)})&.[](1),
169
+ model: model_of(call, body),
141
170
  inputTokens: usage&.input_tokens || call&.usage&.input_tokens,
142
171
  outputTokens: usage&.output_tokens || call&.usage&.output_tokens,
143
172
  cachedInputTokens: usage&.cached_input_tokens || call&.usage&.cached_input_tokens,
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Bitfab
4
- VERSION = "0.76.2"
4
+ VERSION = "0.76.3"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bitfab
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.76.2
4
+ version: 0.76.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Harvest Team