fix: scope provider model keys and pin async credentials
This commit is contained in:
1 parent
58dc904c98
commit
558c0dcdd5
8 files changed
+166
-55
No files matched your search
+17
-11
@@ -295,7 +295,7 @@ public class OpenAiCompatibleProvider {
|
||||
if (fallbackKey != null && !fallbackKey.isBlank()) keys.add(fallbackKey.trim());
|
||||
addEnvironmentKeys(keys, providerId, environment);
|
||||
if (providerCode != null && !providerCode.isBlank() && !providerCode.equals(providerId)) addEnvironmentKeys(keys, providerCode, environment);
|
||||
return new ProviderConfig(providerId, keys.stream().distinct().toList(), baseUrl, cursor);
|
||||
return new ProviderConfig(providerId, providerCode, keys.stream().distinct().toList(), baseUrl, cursor);
|
||||
}
|
||||
|
||||
private void addEnvironmentKeys(List<String> keys, String alias, org.springframework.core.env.Environment environment) {
|
||||
@@ -304,7 +304,7 @@ public class OpenAiCompatibleProvider {
|
||||
if (configured != null && !configured.isBlank()) for (String key : configured.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
}
|
||||
|
||||
private record ProviderConfig(String alias, List<String> apiKeys, String baseUrl, AtomicInteger cursor) {
|
||||
private record ProviderConfig(String alias, String providerCode, List<String> apiKeys, String baseUrl, AtomicInteger cursor) {
|
||||
private boolean hasKey() { return !apiKeys.isEmpty(); }
|
||||
private boolean hasKey(String routeId, String upstreamModel, org.springframework.core.env.Environment environment) {
|
||||
return !apiKeys.isEmpty() || !routeKeys(routeId, upstreamModel, environment).isEmpty();
|
||||
@@ -322,19 +322,25 @@ public class OpenAiCompatibleProvider {
|
||||
|
||||
private List<String> routeKeys(String routeId, String upstreamModel, org.springframework.core.env.Environment environment) {
|
||||
if (environment == null) return List.of();
|
||||
for (String prefix : List.of("MOYI_UPSTREAM_API_KEYS_ROUTE_", "MOYI_UPSTREAM_API_KEYS_MODEL_")) {
|
||||
if (prefix.startsWith("MOYI_UPSTREAM_API_KEYS_ROUTE_") && (routeId == null || routeId.isBlank())) continue;
|
||||
String selector = prefix.endsWith("MODEL_") ? upstreamModel : routeId;
|
||||
if (selector == null || selector.isBlank()) continue;
|
||||
String value = environment.getProperty(prefix + normalize(selector));
|
||||
if (value == null || value.isBlank()) continue;
|
||||
List<String> keys = new ArrayList<>();
|
||||
for (String key : value.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
if (!keys.isEmpty()) return keys.stream().distinct().toList();
|
||||
if (routeId != null && !routeId.isBlank()) {
|
||||
String value = environment.getProperty("MOYI_UPSTREAM_API_KEYS_ROUTE_" + normalize(routeId));
|
||||
if (value != null && !value.isBlank()) return parseKeys(value);
|
||||
}
|
||||
if (upstreamModel != null && !upstreamModel.isBlank()) {
|
||||
String scopedName = "MOYI_UPSTREAM_API_KEYS_MODEL_" + normalize(providerCode) + "_" + normalize(upstreamModel);
|
||||
String value = environment.getProperty(scopedName);
|
||||
if (value == null || value.isBlank()) return List.of();
|
||||
return parseKeys(value);
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private static List<String> parseKeys(String value) {
|
||||
List<String> keys = new ArrayList<>();
|
||||
for (String key : value.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
return keys.stream().distinct().toList();
|
||||
}
|
||||
|
||||
private static String normalize(String value) {
|
||||
return String.valueOf(value == null ? "" : value).toUpperCase(java.util.Locale.ROOT).replaceAll("[^A-Z0-9]", "_");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user