@@ -57,19 +57,12 @@ fn writeInput(w: *std.Io.Writer, msg: types.Message) !void {
5757 }
5858
5959 fn writeTools(w: *std.Io.Writer, a: std.mem.Allocator, tools_json: []const u8) !void {
60- if (tools_json.len == 0) return;
61- const root = std.json.parseFromSliceLeaky(Value, a, tools_json, .{}) catch return;
62- if (root != .array) return;
60+ const tools = api.parseTools(a, tools_json) orelse return;
6361 try w.writeAll(",\"tools\":[");
64- for (root.array.items, 0..) |tool, i| {
62+ for (tools, 0..) |tool, i| {
6563 if (i > 0) try w.writeByte(',');
66- const obj = tool.object;
67- try w.writeAll("{\"type\":\"function\",\"name\":");
68- try json.writeString(w, obj.get("name").?.string);
69- try w.writeAll(",\"description\":");
70- try json.writeString(w, obj.get("description").?.string);
71- try w.writeAll(",\"parameters\":");
72- try std.json.Stringify.value(obj.get("parameters").?, .{}, w);
64+ try w.writeAll("{\"type\":\"function\",");
65+ try api.writeToolBody(w, tool.object, "parameters");
7366 try w.writeByte('}');
7467 }
7568 try w.writeByte(']');
@@ -110,22 +103,11 @@ fn buildBody(req: api.Request) ![]u8 {
110103 }
111104
112105 fn buildUrl(a: std.mem.Allocator, base: []const u8) ![]u8 {
113- return std.fmt.allocPrint(a, "{s}/responses", .{std.mem.trimEnd(u8, base, "/")});
106+ return api.buildUrl(a, base, "/responses");
114107 }
115108
116109 fn headers(a: std.mem.Allocator, req: api.Request, auth: []const u8) ![]http.Header {
117- var list: std.ArrayList(http.Header) = .empty;
118- errdefer list.deinit(a);
119- try list.append(a, .{ .name = "Content-Type", .value = "application/json" });
120- try list.append(a, .{ .name = "Accept", .value = "text/event-stream" });
121- if (auth.len > 0) try list.append(a, .{ .name = "Authorization", .value = auth });
122- for (req.model.headers) |kv| try list.append(a, .{ .name = kv[0], .value = kv[1] });
123- if (req.session_id) |sid| {
124- if (req.model.session_header) |name| {
125- if (sid.len > 0) try list.append(a, .{ .name = name, .value = sid });
126- }
127- }
128- return list.toOwnedSlice(a);
110+ return api.headers(a, req, &.{.{ "Authorization", auth }});
129111 }
130112
131113 // ---- streaming state ------------------------------------------------------
@@ -166,43 +148,14 @@ fn streamIndex(obj: std.json.ObjectMap, fallback: usize) usize {
166148 };
167149 }
168150
169-fn num(v: Value) u64 {
170- return switch (v) {
171- .integer => |n| @intCast(@max(n, 0)),
172- .float => |f| @intFromFloat(@max(f, 0)),
173- else => 0,
174- };
175-}
176-
177-fn numField(obj: std.json.ObjectMap, key: []const u8) u64 {
178- return num(obj.get(key) orelse return 0);
179-}
180-
181-fn stringField(obj: std.json.ObjectMap, key: []const u8) ?[]const u8 {
182- const v = obj.get(key) orelse return null;
183- return switch (v) {
184- .string => |s| if (s.len > 0) s else null,
185- else => null,
186- };
187-}
188-
189-fn applyCost(model: *const types.Model, u: *types.Usage) void {
190- const m = 1_000_000.0;
191- u.cost_input = @as(f64, @floatFromInt(u.input)) * model.cost_input / m;
192- u.cost_output = @as(f64, @floatFromInt(u.output)) * model.cost_output / m;
193- u.cost_cache_read = @as(f64, @floatFromInt(u.cache_read)) * model.cost_cache_read / m;
194- u.cost_cache_write = 0;
195- u.cost_total = u.cost_input + u.cost_output + u.cost_cache_read + u.cost_cache_write;
196-}
197-
198151 fn handle(st: *State, obj: std.json.ObjectMap) !void {
199- const event_type = stringField(obj, "type") orelse "";
152+ const event_type = api.stringField(obj, "type") orelse "";
200153
201154 if (std.mem.eql(u8, event_type, "error")) {
202- const message = stringField(obj, "message") orelse blk: {
155+ const message = api.stringField(obj, "message") orelse blk: {
203156 const e = obj.get("error") orelse break :blk "stream: provider error";
204157 break :blk switch (e) {
205- .object => |o| stringField(o, "message") orelse "stream: provider error",
158+ .object => |o| api.stringField(o, "message") orelse "stream: provider error",
206159 else => "stream: provider error",
207160 };
208161 };
@@ -213,7 +166,7 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
213166 if (std.mem.eql(u8, event_type, "response.created")) {
214167 if (obj.get("response")) |resp| {
215168 if (resp == .object and st.msg.response_id == null) {
216- if (stringField(resp.object, "id")) |id| {
169+ if (api.stringField(resp.object, "id")) |id| {
217170 st.msg.response_id = try st.req.pers.dupe(u8, id);
218171 }
219172 }
@@ -224,12 +177,12 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
224177 if (std.mem.eql(u8, event_type, "response.output_item.added")) {
225178 const item = obj.get("item") orelse return;
226179 if (item != .object) return;
227- if (!std.mem.eql(u8, stringField(item.object, "type") orelse "", "function_call")) return;
180+ if (!std.mem.eql(u8, api.stringField(item.object, "type") orelse "", "function_call")) return;
228181 const index = streamIndex(obj, st.calls.items.len);
229182 try grow(st, index + 1);
230183 const call = &st.calls.items[index];
231- if (stringField(item.object, "call_id")) |id| call.id = try st.req.pers.dupe(u8, id);
232- if (stringField(item.object, "name")) |name| call.name = try st.req.pers.dupe(u8, name);
184+ if (api.stringField(item.object, "call_id")) |id| call.id = try st.req.pers.dupe(u8, id);
185+ if (api.stringField(item.object, "name")) |name| call.name = try st.req.pers.dupe(u8, name);
233186 if (!call.started and call.name.len > 0) {
234187 call.started = true;
235188 st.sink.emit(.{ .tool_start = call.name });
@@ -240,7 +193,7 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
240193 if (std.mem.eql(u8, event_type, "response.output_text.delta") or
241194 std.mem.eql(u8, event_type, "response.refusal.delta"))
242195 {
243- if (stringField(obj, "delta")) |s| {
196+ if (api.stringField(obj, "delta")) |s| {
244197 try st.text.appendSlice(st.req.pers, s);
245198 st.sink.emit(.{ .text = s });
246199 }
@@ -250,7 +203,7 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
250203 if (std.mem.eql(u8, event_type, "response.reasoning_summary_text.delta") or
251204 std.mem.eql(u8, event_type, "response.reasoning_text.delta"))
252205 {
253- if (stringField(obj, "delta")) |s| {
206+ if (api.stringField(obj, "delta")) |s| {
254207 try st.reasoning.appendSlice(st.req.pers, s);
255208 st.sink.emit(.{ .reasoning = s });
256209 }
@@ -260,7 +213,7 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
260213 if (std.mem.eql(u8, event_type, "response.function_call_arguments.delta")) {
261214 const index = streamIndex(obj, st.calls.items.len);
262215 if (index < st.calls.items.len) {
263- if (stringField(obj, "delta")) |s| try st.calls.items[index].args.appendSlice(st.req.pers, s);
216+ if (api.stringField(obj, "delta")) |s| try st.calls.items[index].args.appendSlice(st.req.pers, s);
264217 }
265218 return;
266219 }
@@ -268,7 +221,7 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
268221 if (std.mem.eql(u8, event_type, "response.function_call_arguments.done")) {
269222 const index = streamIndex(obj, st.calls.items.len);
270223 if (index < st.calls.items.len) {
271- if (stringField(obj, "arguments")) |s| {
224+ if (api.stringField(obj, "arguments")) |s| {
272225 st.calls.items[index].args.clearRetainingCapacity();
273226 try st.calls.items[index].args.appendSlice(st.req.pers, s);
274227 }
@@ -279,18 +232,18 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
279232 if (std.mem.eql(u8, event_type, "response.output_item.done")) {
280233 const item = obj.get("item") orelse return;
281234 if (item != .object) return;
282- if (!std.mem.eql(u8, stringField(item.object, "type") orelse "", "function_call")) return;
235+ if (!std.mem.eql(u8, api.stringField(item.object, "type") orelse "", "function_call")) return;
283236 const index = streamIndex(obj, st.calls.items.len);
284237 if (index >= st.calls.items.len) return;
285238 const call = &st.calls.items[index];
286- if (stringField(item.object, "call_id")) |id| call.id = try st.req.pers.dupe(u8, id);
287- if (stringField(item.object, "name")) |name| call.name = try st.req.pers.dupe(u8, name);
239+ if (api.stringField(item.object, "call_id")) |id| call.id = try st.req.pers.dupe(u8, id);
240+ if (api.stringField(item.object, "name")) |name| call.name = try st.req.pers.dupe(u8, name);
288241 if (!call.started and call.name.len > 0) {
289242 call.started = true;
290243 st.sink.emit(.{ .tool_start = call.name });
291244 }
292245 if (call.args.items.len == 0) {
293- if (stringField(item.object, "arguments")) |s| try call.args.appendSlice(st.req.pers, s);
246+ if (api.stringField(item.object, "arguments")) |s| try call.args.appendSlice(st.req.pers, s);
294247 }
295248 return;
296249 }
@@ -300,19 +253,19 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
300253 {
301254 const resp = obj.get("response") orelse return;
302255 if (resp != .object) return;
303- if (stringField(resp.object, "status")) |s| st.status = try st.req.pers.dupe(u8, s);
256+ if (api.stringField(resp.object, "status")) |s| st.status = try st.req.pers.dupe(u8, s);
304257 if (resp.object.get("incomplete_details")) |details| {
305258 if (details == .object) {
306- if (stringField(details.object, "reason")) |r| st.incomplete = try st.req.pers.dupe(u8, r);
259+ if (api.stringField(details.object, "reason")) |r| st.incomplete = try st.req.pers.dupe(u8, r);
307260 }
308261 }
309262 if (resp.object.get("usage")) |usage| {
310263 if (usage == .object) {
311- st.tokens_in = numField(usage.object, "input_tokens");
312- st.tokens_out = numField(usage.object, "output_tokens");
313- st.tokens_total = numField(usage.object, "total_tokens");
264+ st.tokens_in = api.numField(usage.object, "input_tokens");
265+ st.tokens_out = api.numField(usage.object, "output_tokens");
266+ st.tokens_total = api.numField(usage.object, "total_tokens");
314267 if (usage.object.get("input_tokens_details")) |d| {
315- if (d == .object) st.cache_read = numField(d.object, "cached_tokens");
268+ if (d == .object) st.cache_read = api.numField(d.object, "cached_tokens");
316269 }
317270 }
318271 }
@@ -324,7 +277,7 @@ fn handle(st: *State, obj: std.json.ObjectMap) !void {
324277 if (resp != .object) return;
325278 const err = resp.object.get("error") orelse return;
326279 const message = switch (err) {
327- .object => |o| stringField(o, "message") orelse "response failed",
280+ .object => |o| api.stringField(o, "message") orelse "response failed",
328281 else => "response failed",
329282 };
330283 if (st.stream_error == null) st.stream_error = try st.req.pers.dupe(u8, message);
@@ -374,7 +327,7 @@ fn finalize(st: *State) !void {
374327 usage.output = st.tokens_out;
375328 usage.cache_read = st.cache_read;
376329 usage.total_tokens = if (st.tokens_total > 0) st.tokens_total else st.tokens_in + st.tokens_out;
377- applyCost(st.req.model, &usage);
330+ api.applyCost(st.req.model, &usage);
378331 st.msg.usage = usage;
379332
380333 if (st.status) |status| {
@@ -416,28 +369,9 @@ pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!types.As
416369 const hdrs = headers(req.scratch, req, auth) catch return error.OutOfMemory;
417370
418371 var st = State{ .req = req, .sink = sink, .arena = &arena, .msg = &msg };
419- var err_body: ?[]const u8 = null;
420-
421- http.postSse(req.scratch, url, hdrs, body, .{ .ctx = &st, .onEvent = onData }, req.cancel, &err_body) catch |e| {
422- if (e == error.OutOfMemory) return error.OutOfMemory;
423- if (e == error.Aborted or req.cancel.load(.acquire)) {
424- msg.stop_reason = .aborted;
425- } else {
426- msg.stop_reason = .err;
427- const message = switch (e) {
428- error.HttpStatus => err_body orelse "provider returned an error status",
429- error.ReadFailed => "stream read failed",
430- else => "request failed",
431- };
432- msg.error_message = try req.pers.dupe(u8, message);
433- }
434- return msg;
435- };
436372
437- if (req.cancel.load(.acquire)) {
438- msg.stop_reason = .aborted;
439- return msg;
Cut short: this commit's diff is over 1000 lines.