Skip to content

Byok phase 2 (requires agent pr #1541) #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasperblues merged 1 commit into from
Mar 30, 2026
Merged

Byok phase 2 (requires agent pr #1541) #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,23 @@
<version>0.2.1-SNAPSHOT</version>
</dependency>

<!-- Spring AI client libraries for BYOK — OpenAI (no starter, which requires API key at startup) -->
<!-- Embabel BYOK factory classes (bring-your-own-key, no Spring Boot starters) -->
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-openai</artifactId>
<version>${spring-ai.version}</version>
<groupId>com.embabel.agent</groupId>
<artifactId>embabel-agent-openai</artifactId>
<version>${embabel-agent.version}</version>
</dependency>

<!-- Local ONNX embedding model -->
<dependency>
<groupId>com.embabel.agent</groupId>
<artifactId>embabel-agent-starter-onnx</artifactId>
<artifactId>embabel-agent-anthropic-autoconfigure</artifactId>
<version>${embabel-agent.version}</version>
</dependency>

<!-- Spring AI client libraries for BYOK (no embabel starters — those require API keys at startup) -->
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-anthropic</artifactId>
<version>${spring-ai.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-mistral-ai</artifactId>
<version>${spring-ai.version}</version>
</dependency>
<!-- Local ONNX embedding model -->
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-deepseek</artifactId>
<version>${spring-ai.version}</version>
<groupId>com.embabel.agent</groupId>
<artifactId>embabel-agent-starter-onnx</artifactId>
<version>${embabel-agent.version}</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/embabel/hub/integrations/UserLlmResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class UserLlmResolver(
* The server-wide default provider, or null for pure BYOK deployments.
* Priority: explicit config > auto-detect from env vars > null (no keys).
*/
val serverProvider: LlmProvider? = guideProperties.defaultProvider ?: detectProvider()
val serverProvider: LlmProvider? = guideProperties.defaultProvider ?: detectServerProvider()

init {
if (serverProvider != null) {
Expand Down Expand Up @@ -100,7 +100,7 @@ class UserLlmResolver(
* Auto-detect which provider to use based on which API key env vars are set.
* Returns the first provider whose key is present, or null if none found.
*/
fun detectProvider(): LlmProvider? {
fun detectServerProvider(): LlmProvider? {
for ((provider, envKey) in PROVIDER_ENV_KEYS) {
if (!System.getenv(envKey).isNullOrBlank()) {
return provider
Expand Down
138 changes: 25 additions & 113 deletions src/main/kotlin/com/embabel/hub/integrations/UserModelFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
package com.embabel.hub.integrations

import com.embabel.agent.api.models.DeepSeekModels
import com.embabel.agent.api.models.MistralAiModels
import com.embabel.agent.api.models.OpenAiModels
import com.embabel.agent.config.models.anthropic.AnthropicModelFactory
import com.embabel.agent.openai.OpenAiCompatibleModelFactory
import com.embabel.agent.spi.InvalidApiKeyException
import com.embabel.agent.spi.LlmService
import com.embabel.agent.spi.support.springai.SpringAiLlmService
import com.embabel.common.ai.model.PricingModel
import org.slf4j.LoggerFactory
import org.springframework.ai.anthropic.AnthropicChatModel
import org.springframework.ai.anthropic.AnthropicChatOptions
import org.springframework.ai.anthropic.api.AnthropicApi
import org.springframework.ai.deepseek.DeepSeekChatModel
import org.springframework.ai.deepseek.DeepSeekChatOptions
import org.springframework.ai.deepseek.api.DeepSeekApi
import org.springframework.ai.mistralai.MistralAiChatModel
import org.springframework.ai.mistralai.MistralAiChatOptions
import org.springframework.ai.mistralai.api.MistralAiApi
import org.springframework.ai.model.tool.ToolCallingManager
import org.springframework.ai.openai.OpenAiChatModel
import org.springframework.ai.openai.OpenAiChatOptions
import org.springframework.ai.openai.api.OpenAiApi
import org.springframework.stereotype.Service
import java.time.Duration
import java.time.Instant
Expand Down Expand Up @@ -63,22 +56,19 @@ class UserModelFactory(
*/
fun validateKey(provider: LlmProvider, apiKey: String): String? {
return try {
val model = provider.validationModel
val service = createLlmService(provider, model, apiKey)
val chatModel = (service as SpringAiLlmService).chatModel
chatModel.call("Hi")
when (provider) {
LlmProvider.OPENAI -> OpenAiCompatibleModelFactory.openAi(apiKey).buildValidated()
LlmProvider.ANTHROPIC -> AnthropicModelFactory(apiKey = apiKey).buildValidated()
LlmProvider.MISTRAL -> OpenAiCompatibleModelFactory.mistral(apiKey).buildValidated()
LlmProvider.DEEPSEEK -> OpenAiCompatibleModelFactory.deepSeek(apiKey).buildValidated()
}
null
} catch (e: InvalidApiKeyException) {
logger.debug("API key validation failed for {}: {}", provider, e.message)
"Invalid API key"
} catch (e: Exception) {
val message = e.cause?.message ?: e.message ?: "Unknown error"
logger.debug("API key validation failed for {}: {}", provider, message)
when {
message.contains("401") || message.contains("unauthorized", ignoreCase = true) ||
message.contains("invalid", ignoreCase = true) && message.contains("key", ignoreCase = true) ->
"Invalid API key"
message.contains("403") || message.contains("forbidden", ignoreCase = true) ->
"API key lacks required permissions"
else -> "Could not validate key: $message"
}
logger.debug("API key validation failed for {}: {}", provider, e.message)
"Could not validate key: ${e.message}"
}
}

Expand All @@ -100,92 +90,14 @@ class UserModelFactory(

private fun createLlmService(provider: LlmProvider, model: String, apiKey: String): LlmService<*> {
return when (provider) {
LlmProvider.OPENAI -> createOpenAiService(model, apiKey)
LlmProvider.ANTHROPIC -> createAnthropicService(model, apiKey)
LlmProvider.MISTRAL -> createMistralService(model, apiKey)
LlmProvider.DEEPSEEK -> createDeepSeekService(model, apiKey)
LlmProvider.OPENAI -> OpenAiCompatibleModelFactory(null, apiKey, null, null)
.openAiCompatibleLlm(model, PricingModel.ALL_YOU_CAN_EAT, OpenAiModels.PROVIDER, null)
LlmProvider.ANTHROPIC -> AnthropicModelFactory(apiKey = apiKey).build(model)
LlmProvider.MISTRAL -> OpenAiCompatibleModelFactory("https://api.mistral.ai/v1", apiKey, null, null)
.openAiCompatibleLlm(model, PricingModel.ALL_YOU_CAN_EAT, MistralAiModels.PROVIDER, null)
LlmProvider.DEEPSEEK -> OpenAiCompatibleModelFactory("https://api.deepseek.com", apiKey, null, null)
.openAiCompatibleLlm(model, PricingModel.ALL_YOU_CAN_EAT, DeepSeekModels.PROVIDER, null)
}
}

private fun createOpenAiService(model: String, apiKey: String): SpringAiLlmService {
val api = OpenAiApi.Builder()
.apiKey(apiKey)
.build()
val chatModel = OpenAiChatModel.builder()
.openAiApi(api)
.toolCallingManager(ToolCallingManager.builder().build())
.defaultOptions(
OpenAiChatOptions.builder()
.model(model)
.build()
)
.build()
return SpringAiLlmService(
name = model,
provider = "openai",
chatModel = chatModel,
)
}

private fun createAnthropicService(model: String, apiKey: String): SpringAiLlmService {
val api = AnthropicApi.builder()
.apiKey(apiKey)
.build()
val chatModel = AnthropicChatModel.builder()
.anthropicApi(api)
.toolCallingManager(ToolCallingManager.builder().build())
.defaultOptions(
AnthropicChatOptions.builder()
.model(model)
.maxTokens(4096)
.build()
)
.build()
return SpringAiLlmService(
name = model,
provider = "anthropic",
chatModel = chatModel,
)
}

private fun createMistralService(model: String, apiKey: String): SpringAiLlmService {
val api = MistralAiApi.builder()
.apiKey(apiKey)
.build()
val chatModel = MistralAiChatModel.builder()
.mistralAiApi(api)
.toolCallingManager(ToolCallingManager.builder().build())
.defaultOptions(
MistralAiChatOptions.builder()
.model(model)
.build()
)
.build()
return SpringAiLlmService(
name = model,
provider = "mistralai",
chatModel = chatModel,
)
}

private fun createDeepSeekService(model: String, apiKey: String): SpringAiLlmService {
val api = DeepSeekApi.builder()
.apiKey(apiKey)
.build()
val chatModel = DeepSeekChatModel.builder()
.deepSeekApi(api)
.toolCallingManager(ToolCallingManager.builder().build())
.defaultOptions(
DeepSeekChatOptions.builder()
.model(model)
.build()
)
.build()
return SpringAiLlmService(
name = model,
provider = "deepseek",
chatModel = chatModel,
)
}

}
Loading