xonecas.io
79113
Ma

mini-coding-agent / commit 03e2cfd

fix: upstream model.dev schema change

xonecas2026-10-17 03e2cfd36c7c3a73560302b7af13dffc72347fde parent 7724f98

1 file changed

src/models_dev.zig+41−6
@@ -38,7 +38,7 @@ fn wire(npm: []const u8) ?[]const u8 {
3838 const Effort = struct { type: []const u8 = "", values: []const []const u8 = &.{} };
3939 const Limit = struct { context: u64 = 0, output: u64 = 0 };
4040 const Cost = struct { input: f64 = 0, output: f64 = 0, cache_read: f64 = 0 };
41-const Package = struct { npm: []const u8 = "" };
41+const Package = struct { npm: []const u8 = "", api: []const u8 = "" };
4242
4343 const Model = struct {
4444 name: []const u8 = "",
@@ -58,19 +58,31 @@ const Provider = struct {
5858
5959 const File = std.json.ArrayHashMap(Provider);
6060
61+/// Wire directories a gateway inserts between its API root and the version
62+/// when it fronts several wires (`/openai/v1`, `/anthropic/v1`).
63+const wire_dirs = [_][]const u8{ "openai", "anthropic", "google" };
64+
6165 /// A parsed models.dev document. The provider listing and each model's wire,
6266 /// base URL and metadata all come from here.
6367 pub const Db = struct {
68+ a: std.mem.Allocator,
6469 file: File,
6570
6671 pub fn open(a: std.mem.Allocator) !Db {
67- return .{ .file = try std.json.parseFromSliceLeaky(File, a, raw, .{ .ignore_unknown_fields = true }) };
72+ return .{ .a = a, .file = try std.json.parseFromSliceLeaky(File, a, raw, .{ .ignore_unknown_fields = true }) };
6873 }
6974
75+ /// The provider's API root, where its model list lives. A provider's `api`
76+ /// is the base URL of its default wire; when it carries a wire directory
77+ /// the list sits one level up (`.../openai/v1` -> `.../v1`).
7078 pub fn baseUrl(self: Db, provider_id: []const u8) ?[]const u8 {
7179 const p = self.file.map.get(provider_id) orelse return null;
72- if (p.api.len == 0) return null;
73- return std.mem.trimEnd(u8, p.api, "/");
80+ const api = std.mem.trimEnd(u8, p.api, "/");
81+ if (api.len == 0) return null;
82+ const version_at = std.mem.lastIndexOfScalar(u8, api, '/') orelse return api;
83+ const root_at = std.mem.lastIndexOfScalar(u8, api[0..version_at], '/') orelse return api;
84+ if (!isWireDir(api[root_at + 1 .. version_at])) return api;
85+ return std.fmt.allocPrint(self.a, "{s}{s}", .{ api[0..root_at], api[version_at..] }) catch null;
7486 }
7587
7688 pub fn info(self: Db, provider_id: []const u8, model_id: []const u8) ?Info {
@@ -79,8 +91,8 @@ pub const Db = struct {
7991 const m = p.models.map.get(model_id) orelse return null;
8092 return .{
8193 .name = if (m.name.len > 0) m.name else model_id,
82- .api = wire(if (m.provider) |pkg| pkg.npm else p.npm) orelse return null,
83- .base_url = std.mem.trimEnd(u8, p.api, "/"),
94+ .api = wire(modelNpm(m, p)) orelse return null,
95+ .base_url = std.mem.trimEnd(u8, modelApi(m, p), "/"),
8496 .images = m.attachment,
8597 .reasoning = m.reasoning,
8698 .context = m.limit.context,
@@ -94,6 +106,29 @@ pub const Db = struct {
94106 }
95107 };
96108
109+fn isWireDir(seg: []const u8) bool {
110+ for (wire_dirs) |w| {
111+ if (std.mem.eql(u8, w, seg)) return true;
112+ }
113+ return false;
114+}
115+
116+/// A model's wire package overrides its provider's; a model override that only
117+/// names an `api` keeps the provider's wire.
118+fn modelNpm(m: Model, p: Provider) []const u8 {
119+ if (m.provider) |pkg| {
120+ if (pkg.npm.len > 0) return pkg.npm;
121+ }
122+ return p.npm;
123+}
124+
125+fn modelApi(m: Model, p: Provider) []const u8 {
126+ if (m.provider) |pkg| {
127+ if (pkg.api.len > 0) return pkg.api;
128+ }
129+ return p.api;
130+}
131+
97132 fn effortOf(m: Model) []const []const u8 {
98133 for (m.reasoning_options) |opt| {
99134 if (std.mem.eql(u8, opt.type, "effort")) return opt.values;