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 +4 -4
- data/lib/bitfab/baml.rb +30 -1
- data/lib/bitfab/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a2da54e66bb7c733936d5e0bcf3c246b8c43720fd4308b83e93c598f89687b61
|
|
4
|
+
data.tar.gz: 8322413fa1c57f0401a3feeca2c42d961871fdc9efce176f18923b8df77de90a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
|
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,
|
data/lib/bitfab/version.rb
CHANGED