feat(gateway): ai provider

- move default base url to interface
tddworks · Aug 25, 2024 · ebbad1c · ebbad1c
1 parent 66da2b3
commit ebbad1c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/openai-client/openai-client-core/src/commonMain/kotlin/com/tddworks/openai/api/OpenAI.kt b/openai-client/openai-client-core/src/commonMain/kotlin/com/tddworks/openai/api/OpenAI.kt
@@ -13,7 +13,7 @@ import com.tddworks.openai.api.legacy.completions.api.internal.DefaultCompletion
 
 interface OpenAI : Chat, Images, Completions {
     companion object {
-        const val BASE_URL = "api.openai.com"
+        const val BASE_URL = "https://api.openai.com"
 
         fun create(config: OpenAIConfig): OpenAI {
             val requester = HttpRequester.default(

diff --git a/openai-gateway/openai-gateway-core/src/commonMain/kotlin/com/tddworks/azure/api/AzureAI.kt b/openai-gateway/openai-gateway-core/src/commonMain/kotlin/com/tddworks/azure/api/AzureAI.kt
@@ -26,14 +26,10 @@ import kotlinx.serialization.ExperimentalSerializationApi
 
 data class AzureAIProviderConfig(
     override val apiKey: () -> String,
-    override val baseUrl: () -> String = { DEFAULT_BASE_URL },
+    override val baseUrl: () -> String = { AzureChatApi.BASE_URL },
     val deploymentId: () -> String,
     val apiVersion: () -> String,
-) : OpenAIProviderConfig {
-    companion object {
-        const val DEFAULT_BASE_URL = "https://YOUR_RESOURCE_NAME.openai.azure.com"
-    }
-}
+) : OpenAIProviderConfig
 
 fun OpenAIProviderConfig.Companion.azure(
     apiKey: () -> String,
@@ -103,6 +99,11 @@ class AzureChatApi(
     private val requester: HttpRequester,
     private val chatCompletionPath: String = CHAT_COMPLETIONS_PATH
 ) : Chat {
+
+    companion object {
+        const val BASE_URL = "https://YOUR_RESOURCE_NAME.openai.azure.com"
+    }
+
     override suspend fun chatCompletions(request: ChatCompletionRequest): ChatCompletion {
         return requester.performRequest<ChatCompletion> {
             method = HttpMethod.Post

diff --git a/...mmonMain/kotlin/com/tddworks/openai/gateway/api/internal/AnthropicOpenAIProviderConfig.kt b/...mmonMain/kotlin/com/tddworks/openai/gateway/api/internal/AnthropicOpenAIProviderConfig.kt
@@ -1,18 +1,14 @@
 package com.tddworks.openai.gateway.api.internal
 
+import com.tddworks.anthropic.api.Anthropic
 import com.tddworks.anthropic.api.AnthropicConfig
 import com.tddworks.openai.gateway.api.OpenAIProviderConfig
 
 class AnthropicOpenAIProviderConfig(
-    val anthropicVersion: () -> String = { "2023-06-01" },
+    val anthropicVersion: () -> String = { Anthropic.ANTHROPIC_VERSION },
     override val apiKey: () -> String,
-    override val baseUrl: () -> String = { DEFAULT_BASE_URL }
-) : OpenAIProviderConfig {
-    companion object {
-        const val DEFAULT_BASE_URL = "https://api.anthropic.com"
-        const val DEFAULT_ANTHROPIC_VERSION = "2023-06-01"
-    }
-}
+    override val baseUrl: () -> String = { Anthropic.BASE_URL }
+) : OpenAIProviderConfig
 
 fun AnthropicOpenAIProviderConfig.toAnthropicOpenAIConfig() =
     AnthropicConfig(
@@ -23,6 +19,6 @@ fun AnthropicOpenAIProviderConfig.toAnthropicOpenAIConfig() =
 
 fun OpenAIProviderConfig.Companion.anthropic(
     apiKey: () -> String,
-    baseUrl: () -> String = { AnthropicOpenAIProviderConfig.DEFAULT_BASE_URL },
-    anthropicVersion: () -> String = { AnthropicOpenAIProviderConfig.DEFAULT_ANTHROPIC_VERSION }
+    baseUrl: () -> String = { Anthropic.BASE_URL },
+    anthropicVersion: () -> String = { Anthropic.ANTHROPIC_VERSION }
 ) = AnthropicOpenAIProviderConfig(anthropicVersion, apiKey, baseUrl)
diff --git a/...commonMain/kotlin/com/tddworks/openai/gateway/api/internal/DefaultOpenAIProviderConfig.kt b/...commonMain/kotlin/com/tddworks/openai/gateway/api/internal/DefaultOpenAIProviderConfig.kt
@@ -1,20 +1,17 @@
 package com.tddworks.openai.gateway.api.internal
 
+import com.tddworks.openai.api.OpenAI
 import com.tddworks.openai.api.OpenAIConfig
 import com.tddworks.openai.gateway.api.OpenAIProviderConfig
 
 data class DefaultOpenAIProviderConfig(
     override val apiKey: () -> String,
-    override val baseUrl: () -> String = { DEFAULT_BASE_URL }
-) : OpenAIProviderConfig {
-    companion object {
-        const val DEFAULT_BASE_URL = "https://api.openai.com"
-    }
-}
+    override val baseUrl: () -> String = { OpenAI.BASE_URL }
+) : OpenAIProviderConfig
 
 fun OpenAIProviderConfig.toOpenAIConfig() = OpenAIConfig(apiKey, baseUrl)
 
 fun OpenAIProviderConfig.Companion.default(
     apiKey: () -> String,
-    baseUrl: () -> String = { DefaultOpenAIProviderConfig.DEFAULT_BASE_URL }
+    baseUrl: () -> String = { OpenAI.BASE_URL }
 ) = DefaultOpenAIProviderConfig(apiKey, baseUrl)