Please remove these - it'll just confuse a rebase and it does not really add any concrete value :)

If we want a generic trait here let's make it such, rather than an anonymous function

// Note how we can enforce this trait to implement other traits to make it
// compatible, and avoid having to manually implement PartialEq here
trait ApiKeyProvider: Send + Sync + PartialEq + Debug {
     fn get(): String;
}

Then use as such, it's much cleaner, e.g.

pub api_key_provider: Option<dyn ApiKeyProvider>

Might also make sense to not use an Arc here at all, as it's an upstream constraint you're enforcing? Have your trait engage with an arc instead (hold it, own it) :)

--

Another way we could do this btw is to replace the api_key with an enum, e.g.

enum ModelApiKey {
   Provider(dyn ApiKeyProvider);
   Env(string);
}

Not strictly necessary for this hack though

Updated to a trait with arc