feat(gateway): introduce OpenAIProviderConfig

tddworks · Aug 21, 2024 · 7738891 · 7738891
1 parent 9a6e1ad
commit 7738891
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 22 deletions.
diff --git a/...ai/gateway/api/AnthropicOpenAIProvider.kt → ...y/api/internal/AnthropicOpenAIProvider.kt b/...ai/gateway/api/AnthropicOpenAIProvider.kt → ...y/api/internal/AnthropicOpenAIProvider.kt
@@ -1,4 +1,4 @@
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import com.tddworks.anthropic.api.Anthropic
 import com.tddworks.anthropic.api.AnthropicModel
@@ -7,7 +7,7 @@ import com.tddworks.anthropic.api.messages.api.*
 import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.legacy.completions.api.Completion
 import com.tddworks.openai.api.legacy.completions.api.CompletionRequest
-import com.tddworks.openai.gateway.api.internal.AnthropicOpenAIProviderConfig
+import com.tddworks.openai.gateway.api.OpenAIProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.transform

diff --git a/...enai/gateway/api/DefaultOpenAIProvider.kt → ...way/api/internal/DefaultOpenAIProvider.kt b/...enai/gateway/api/DefaultOpenAIProvider.kt → ...way/api/internal/DefaultOpenAIProvider.kt
@@ -1,17 +1,17 @@
 @file:OptIn(ExperimentalSerializationApi::class)
 
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import com.tddworks.openai.api.OpenAI
-import com.tddworks.openai.api.OpenAIConfig
 import com.tddworks.openai.api.chat.api.ChatCompletion
 import com.tddworks.openai.api.chat.api.ChatCompletionChunk
 import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.chat.api.OpenAIModel
 import com.tddworks.openai.api.chat.api.OpenAIModel.Companion.availableModels
 import com.tddworks.openai.api.legacy.completions.api.Completion
 import com.tddworks.openai.api.legacy.completions.api.CompletionRequest
-import com.tddworks.openai.gateway.api.internal.toOpenAIConfig
+import com.tddworks.openai.gateway.api.OpenAIProvider
+import com.tddworks.openai.gateway.api.OpenAIProviderConfig
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.ExperimentalSerializationApi
 

diff --git a/...penai/gateway/api/OllamaOpenAIProvider.kt → ...eway/api/internal/OllamaOpenAIProvider.kt b/...penai/gateway/api/OllamaOpenAIProvider.kt → ...eway/api/internal/OllamaOpenAIProvider.kt
@@ -1,4 +1,4 @@
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import com.tddworks.ollama.api.Ollama
 import com.tddworks.ollama.api.OllamaModel
@@ -10,7 +10,7 @@ import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.chat.api.OpenAIModel
 import com.tddworks.openai.api.legacy.completions.api.Completion
 import com.tddworks.openai.api.legacy.completions.api.CompletionRequest
-import com.tddworks.openai.gateway.api.internal.OllamaOpenAIProviderConfig
+import com.tddworks.openai.gateway.api.OpenAIProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.transform
 import kotlinx.serialization.ExperimentalSerializationApi

diff --git a/...-gateway/openai-gateway-core/src/commonMain/kotlin/com/tddworks/openai/gateway/di/Koin.kt b/...-gateway/openai-gateway-core/src/commonMain/kotlin/com/tddworks/openai/gateway/di/Koin.kt
@@ -2,11 +2,10 @@ package com.tddworks.openai.gateway.di
 
 import com.tddworks.anthropic.di.anthropicModules
 import com.tddworks.di.commonModule
-import com.tddworks.di.getInstance
 import com.tddworks.ollama.di.ollamaModules
 import com.tddworks.openai.di.openAIModules
-import com.tddworks.openai.gateway.api.AnthropicOpenAIProvider
-import com.tddworks.openai.gateway.api.OllamaOpenAIProvider
+import com.tddworks.openai.gateway.api.internal.AnthropicOpenAIProvider
+import com.tddworks.openai.gateway.api.internal.OllamaOpenAIProvider
 import com.tddworks.openai.gateway.api.OpenAIGateway
 import com.tddworks.openai.gateway.api.OpenAIProvider
 import com.tddworks.openai.gateway.api.internal.*

diff --git a/...ateway/api/AnthropicOpenAIProviderTest.kt → ...i/internal/AnthropicOpenAIProviderTest.kt b/...ateway/api/AnthropicOpenAIProviderTest.kt → ...i/internal/AnthropicOpenAIProviderTest.kt
@@ -1,4 +1,4 @@
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import app.cash.turbine.test
 import com.tddworks.anthropic.api.Anthropic
@@ -7,7 +7,7 @@ import com.tddworks.anthropic.api.messages.api.*
 import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.chat.api.OpenAIModel
 import com.tddworks.openai.api.legacy.completions.api.CompletionRequest
-import com.tddworks.openai.gateway.api.internal.AnthropicOpenAIProviderConfig
+import com.tddworks.openai.gateway.api.OpenAIProvider
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...i/gateway/api/DefaultOpenAIGatewayTest.kt → .../api/internal/DefaultOpenAIGatewayTest.kt b/...i/gateway/api/DefaultOpenAIGatewayTest.kt → .../api/internal/DefaultOpenAIGatewayTest.kt
@@ -1,12 +1,12 @@
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import app.cash.turbine.test
 import com.tddworks.ollama.api.OllamaModel
 import com.tddworks.openai.api.chat.api.ChatCompletion
 import com.tddworks.openai.api.chat.api.ChatCompletionChunk
 import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.chat.api.OpenAIModel
-import com.tddworks.openai.gateway.api.internal.DefaultOpenAIGateway
+import com.tddworks.openai.gateway.api.OpenAIProvider
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.ExperimentalSerializationApi

diff --git a/.../gateway/api/DefaultOpenAIProviderTest.kt → ...api/internal/DefaultOpenAIProviderTest.kt b/.../gateway/api/DefaultOpenAIProviderTest.kt → ...api/internal/DefaultOpenAIProviderTest.kt
@@ -1,4 +1,4 @@
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import app.cash.turbine.test
 import com.tddworks.ollama.api.OllamaModel
@@ -9,7 +9,8 @@ import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.chat.api.OpenAIModel
 import com.tddworks.openai.api.legacy.completions.api.Completion
 import com.tddworks.openai.api.legacy.completions.api.CompletionRequest
-import com.tddworks.openai.gateway.api.internal.default
+import com.tddworks.openai.gateway.api.OpenAIProvider
+import com.tddworks.openai.gateway.api.OpenAIProviderConfig
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/...i/gateway/api/OllamaOpenAIProviderTest.kt → .../api/internal/OllamaOpenAIProviderTest.kt b/...i/gateway/api/OllamaOpenAIProviderTest.kt → .../api/internal/OllamaOpenAIProviderTest.kt
@@ -1,4 +1,4 @@
-package com.tddworks.openai.gateway.api
+package com.tddworks.openai.gateway.api.internal
 
 import app.cash.turbine.test
 import com.tddworks.ollama.api.Ollama
@@ -9,17 +9,13 @@ import com.tddworks.ollama.api.generate.OllamaGenerateResponse
 import com.tddworks.openai.api.chat.api.ChatCompletionRequest
 import com.tddworks.openai.api.chat.api.OpenAIModel
 import com.tddworks.openai.api.legacy.completions.api.CompletionRequest
-import com.tddworks.openai.gateway.api.internal.OllamaOpenAIProviderConfig
+import com.tddworks.openai.gateway.api.OpenAIProvider
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.ExperimentalSerializationApi
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.InjectMocks
-import org.mockito.Mock
-import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever