Commit db7063e
Improve core ergonomics: runtime client, deps, media safety, model dedup
A focused, non-breaking pass over four first-principles issues surfaced by
a design review. (Streaming and tool-calling are intentionally deferred to
separate follow-up PRs.)
1. Runtime-selectable client (`AnyClient`)
`LLMClient::materialize` is generic, so the trait is not object-safe and
`Box<dyn LLMClient>` is impossible. Add `AnyClient` — an enum over the
concrete clients that itself implements `LLMClient` — plus a `Provider`
enum, `from_env_for`, an env-autodetecting `from_env`, and
`From<ConcreteClient>` impls. Gives a single `Clone + Send + Sync` type for
picking a provider at runtime.
2. Dependency / feature hygiene + schema-only build
- Move `chrono` to `dev-dependencies` (only examples/tests used it) so it
leaves the public dependency closure entirely.
- Make `base64` optional.
- Gate the networked stack (`utils`, `media`, `openai_compatible`, the
`reqwest`-backed `HttpError` variant, media `from_bytes`) behind an
internal `_client` feature that the provider features enable.
- `default-features = false, features = ["derive"]` now compiles with no
`tokio`/`reqwest` — a dependency-light, schema-only build that still
exposes the derive macro, `SchemaType`, `Instructor`, and `LLMClient`.
3. Media is never silently dropped
The default `materialize_with_media` used to ignore media for clients
without media support. It now forwards to `materialize` only when no media
is given and otherwise returns `RStructorError::Unsupported` (new variant).
All four built-in clients already override it, so their behavior is
unchanged.
4. De-duplicate the per-provider `Model` enums
Add the internal `define_model_enum!` macro that generates each provider's
`Model` enum plus `as_str`, `from_string`, `FromStr`, `From<&str>` and
`From<String>`. Replaces ~60 lines of identical boilerplate in each of the
four backends with a single declaration; behavior and string identifiers
are unchanged.
Adds tests for the media default and `AnyClient`; verified across the full
feature matrix (default, schema-only, and each single provider),
`clippy --all-targets`, doctests (0 ignored), and the non-network suites.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>1 parent 54ae9b2 commit db7063e
14 files changed
Lines changed: 785 additions & 526 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
63 | | - | |
| 62 | + | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | 66 | | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
72 | 72 | | |
73 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
74 | 84 | | |
75 | 85 | | |
76 | 86 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
82 | 101 | | |
83 | 102 | | |
84 | 103 | | |
| |||
313 | 332 | | |
314 | 333 | | |
315 | 334 | | |
316 | | - | |
| 335 | + | |
317 | 336 | | |
318 | 337 | | |
319 | 338 | | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
320 | 348 | | |
321 | 349 | | |
322 | 350 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
| 19 | + | |
| 20 | + | |
85 | 21 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
123 | 63 | | |
124 | 64 | | |
125 | 65 | | |
| |||
0 commit comments