Merge pull request #47 from Taewan-P/feat/ollama-support

Add Ollama Support
Taewan-P · Oct 6, 2024 · ad02c0a · ad02c0a
2 parents ff53645 + 642b13e
commit ad02c0a
Show file tree

Hide file tree

Showing 30 changed files with 547 additions and 84 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.android.hilt)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.auto.license)
@@ -51,9 +52,9 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.13" // Make sure to update this when Kotlin version is updated
-    }
+//    composeOptions {
+//        kotlinCompilerExtensionVersion = "1.5.13" // Make sure to update this when Kotlin version is updated
+//    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/ModelConstants.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/ModelConstants.kt
@@ -7,14 +7,17 @@ object ModelConstants {
     val openaiModels = linkedSetOf("gpt-4o", "gpt-4-turbo", "gpt-4", "gpt-3.5-turbo")
     val anthropicModels = linkedSetOf("claude-3-5-sonnet-20240620", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307")
     val googleModels = linkedSetOf("gemini-1.5-pro-latest", "gemini-1.5-flash-latest", "gemini-1.0-pro")
-    const val OPENAI_API_URL = "https://api.openai.com"
-    const val ANTHROPIC_API_URL = "https://api.anthropic.com"
+    val ollamaModels = linkedSetOf<String>()
+
+    const val OPENAI_API_URL = "https://api.openai.com/v1/"
+    const val ANTHROPIC_API_URL = "https://api.anthropic.com/"
     const val GOOGLE_API_URL = "https://generativelanguage.googleapis.com"
 
     fun getDefaultAPIUrl(apiType: ApiType) = when (apiType) {
         ApiType.OPENAI -> OPENAI_API_URL
         ApiType.ANTHROPIC -> ANTHROPIC_API_URL
         ApiType.GOOGLE -> GOOGLE_API_URL
+        ApiType.OLLAMA -> ""
     }
 
     const val ANTHROPIC_MAXIMUM_TOKEN = 4096

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/datastore/SettingDataSourceImpl.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/datastore/SettingDataSourceImpl.kt
@@ -20,37 +20,44 @@ class SettingDataSourceImpl @Inject constructor(
     private val apiStatusMap = mapOf(
         ApiType.OPENAI to booleanPreferencesKey("openai_status"),
         ApiType.ANTHROPIC to booleanPreferencesKey("anthropic_status"),
-        ApiType.GOOGLE to booleanPreferencesKey("google_status")
+        ApiType.GOOGLE to booleanPreferencesKey("google_status"),
+        ApiType.OLLAMA to booleanPreferencesKey("ollama_status")
     )
     private val apiUrlMap = mapOf(
         ApiType.OPENAI to stringPreferencesKey("openai_url"),
         ApiType.ANTHROPIC to stringPreferencesKey("anthropic_url"),
-        ApiType.GOOGLE to stringPreferencesKey("google_url")
+        ApiType.GOOGLE to stringPreferencesKey("google_url"),
+        ApiType.OLLAMA to stringPreferencesKey("ollama_url")
     )
     private val apiTokenMap = mapOf(
         ApiType.OPENAI to stringPreferencesKey("openai_token"),
         ApiType.ANTHROPIC to stringPreferencesKey("anthropic_token"),
-        ApiType.GOOGLE to stringPreferencesKey("google_token")
+        ApiType.GOOGLE to stringPreferencesKey("google_token"),
+        ApiType.OLLAMA to stringPreferencesKey("ollama_token")
     )
     private val apiModelMap = mapOf(
         ApiType.OPENAI to stringPreferencesKey("openai_model"),
         ApiType.ANTHROPIC to stringPreferencesKey("anthropic_model"),
-        ApiType.GOOGLE to stringPreferencesKey("google_model")
+        ApiType.GOOGLE to stringPreferencesKey("google_model"),
+        ApiType.OLLAMA to stringPreferencesKey("ollama_model")
     )
     private val apiTemperatureMap = mapOf(
         ApiType.OPENAI to floatPreferencesKey("openai_temperature"),
         ApiType.ANTHROPIC to floatPreferencesKey("anthropic_temperature"),
-        ApiType.GOOGLE to floatPreferencesKey("google_temperature")
+        ApiType.GOOGLE to floatPreferencesKey("google_temperature"),
+        ApiType.OLLAMA to floatPreferencesKey("ollama_temperature")
     )
     private val apiTopPMap = mapOf(
         ApiType.OPENAI to floatPreferencesKey("openai_top_p"),
         ApiType.ANTHROPIC to floatPreferencesKey("anthropic_top_p"),
-        ApiType.GOOGLE to floatPreferencesKey("google_top_p")
+        ApiType.GOOGLE to floatPreferencesKey("google_top_p"),
+        ApiType.OLLAMA to floatPreferencesKey("ollama_top_p")
     )
     private val apiSystemPromptMap = mapOf(
         ApiType.OPENAI to stringPreferencesKey("openai_system_prompt"),
         ApiType.ANTHROPIC to stringPreferencesKey("anthropic_system_prompt"),
-        ApiType.GOOGLE to stringPreferencesKey("google_system_prompt")
+        ApiType.GOOGLE to stringPreferencesKey("google_system_prompt"),
+        ApiType.OLLAMA to stringPreferencesKey("ollama_system_prompt")
     )
     private val dynamicThemeKey = intPreferencesKey("dynamic_mode")
     private val themeModeKey = intPreferencesKey("theme_mode")

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/model/ApiType.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/model/ApiType.kt
@@ -3,5 +3,6 @@ package dev.chungjungsoo.gptmobile.data.model
 enum class ApiType {
     OPENAI,
     ANTHROPIC,
-    GOOGLE
+    GOOGLE,
+    OLLAMA
 }
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/network/AnthropicAPIImpl.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/network/AnthropicAPIImpl.kt
@@ -48,7 +48,7 @@ class AnthropicAPIImpl @Inject constructor(
 
         val builder = HttpRequestBuilder().apply {
             method = HttpMethod.Post
-            url("$apiUrl/v1/messages")
+            if (apiUrl.endsWith("/")) url("${apiUrl}v1/messages") else url("$apiUrl/v1/messages")
             contentType(ContentType.Application.Json)
             setBody(body)
             accept(ContentType.Text.EventStream)

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepository.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepository.kt
@@ -10,6 +10,7 @@ interface ChatRepository {
     suspend fun completeOpenAIChat(question: Message, history: List<Message>): Flow<ApiState>
     suspend fun completeAnthropicChat(question: Message, history: List<Message>): Flow<ApiState>
     suspend fun completeGoogleChat(question: Message, history: List<Message>): Flow<ApiState>
+    suspend fun completeOllamaChat(question: Message, history: List<Message>): Flow<ApiState>
     suspend fun fetchChatList(): List<ChatRoom>
     suspend fun fetchMessages(chatId: Int): List<Message>
     suspend fun updateChatTitle(chatRoom: ChatRoom, title: String)

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepositoryImpl.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepositoryImpl.kt
@@ -46,6 +46,7 @@ class ChatRepositoryImpl @Inject constructor(
 
     private lateinit var openAI: OpenAI
     private lateinit var google: GenerativeModel
+    private lateinit var ollama: OpenAI
 
     override suspend fun completeOpenAIChat(question: Message, history: List<Message>): Flow<ApiState> {
         val platform = checkNotNull(settingRepository.fetchPlatforms().firstOrNull { it.name == ApiType.OPENAI })
@@ -63,7 +64,7 @@ class ChatRepositoryImpl @Inject constructor(
         )
 
         return openAI.chatCompletions(chatCompletionRequest)
-            .map<ChatCompletionChunk, ApiState> { chunk -> ApiState.Success(chunk.choices[0].delta.content ?: "") }
+            .map<ChatCompletionChunk, ApiState> { chunk -> ApiState.Success(chunk.choices[0].delta?.content ?: "") }
             .catch { throwable -> emit(ApiState.Error(throwable.message ?: "Unknown error")) }
             .onStart { emit(ApiState.Loading) }
             .onCompletion { emit(ApiState.Done) }
@@ -125,6 +126,28 @@ class ChatRepositoryImpl @Inject constructor(
             .onCompletion { emit(ApiState.Done) }
     }
 
+    override suspend fun completeOllamaChat(question: Message, history: List<Message>): Flow<ApiState> {
+        val platform = checkNotNull(settingRepository.fetchPlatforms().firstOrNull { it.name == ApiType.OLLAMA })
+        ollama = OpenAI(platform.token ?: "", host = OpenAIHost(baseUrl = "${platform.apiUrl}v1/"))
+
+        val generatedMessages = messageToOpenAIMessage(history + listOf(question))
+        val generatedMessageWithPrompt = listOf(
+            ChatMessage(role = ChatRole.System, content = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT)
+        ) + generatedMessages
+        val chatCompletionRequest = ChatCompletionRequest(
+            model = ModelId(platform.model ?: ""),
+            messages = generatedMessageWithPrompt,
+            temperature = platform.temperature?.toDouble(),
+            topP = platform.topP?.toDouble()
+        )
+
+        return ollama.chatCompletions(chatCompletionRequest)
+            .map<ChatCompletionChunk, ApiState> { chunk -> ApiState.Success(chunk.choices[0].delta?.content ?: "") }
+            .catch { throwable -> emit(ApiState.Error(throwable.message ?: "Unknown error")) }
+            .onStart { emit(ApiState.Loading) }
+            .onCompletion { emit(ApiState.Done) }
+    }
+
     override suspend fun fetchChatList(): List<ChatRoom> = chatRoomDao.getChatRooms()
 
     override suspend fun fetchMessages(chatId: Int): List<Message> = messageDao.loadMessages(chatId)

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/SettingRepositoryImpl.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/SettingRepositoryImpl.kt
@@ -19,6 +19,7 @@ class SettingRepositoryImpl @Inject constructor(
             ApiType.OPENAI -> settingDataSource.getAPIUrl(apiType) ?: ModelConstants.OPENAI_API_URL
             ApiType.ANTHROPIC -> settingDataSource.getAPIUrl(apiType) ?: ModelConstants.ANTHROPIC_API_URL
             ApiType.GOOGLE -> settingDataSource.getAPIUrl(apiType) ?: ModelConstants.GOOGLE_API_URL
+            ApiType.OLLAMA -> settingDataSource.getAPIUrl(apiType) ?: ""
         }
         val token = settingDataSource.getToken(apiType)
         val model = settingDataSource.getModel(apiType)
@@ -28,11 +29,12 @@ class SettingRepositoryImpl @Inject constructor(
             ApiType.OPENAI -> settingDataSource.getSystemPrompt(ApiType.OPENAI) ?: ModelConstants.OPENAI_PROMPT
             ApiType.ANTHROPIC -> settingDataSource.getSystemPrompt(ApiType.ANTHROPIC) ?: ModelConstants.DEFAULT_PROMPT
             ApiType.GOOGLE -> settingDataSource.getSystemPrompt(ApiType.GOOGLE) ?: ModelConstants.DEFAULT_PROMPT
+            ApiType.OLLAMA -> settingDataSource.getSystemPrompt(ApiType.OLLAMA) ?: ModelConstants.DEFAULT_PROMPT
         }
 
         Platform(
             name = apiType,
-            enabled = status ?: false,
+            enabled = status == true,
             apiUrl = apiUrl,
             token = token,
             model = model,

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/common/NavigationGraph.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/common/NavigationGraph.kt
@@ -24,6 +24,7 @@ import dev.chungjungsoo.gptmobile.presentation.ui.setting.SettingScreen
 import dev.chungjungsoo.gptmobile.presentation.ui.setting.SettingViewModel
 import dev.chungjungsoo.gptmobile.presentation.ui.setup.SelectModelScreen
 import dev.chungjungsoo.gptmobile.presentation.ui.setup.SelectPlatformScreen
+import dev.chungjungsoo.gptmobile.presentation.ui.setup.SetupAPIUrlScreen
 import dev.chungjungsoo.gptmobile.presentation.ui.setup.SetupCompleteScreen
 import dev.chungjungsoo.gptmobile.presentation.ui.setup.SetupViewModel
 import dev.chungjungsoo.gptmobile.presentation.ui.setup.TokenInputScreen
@@ -117,6 +118,31 @@ fun NavGraphBuilder.setupNavigation(
                 onBackAction = { navController.navigateUp() }
             )
         }
+        composable(route = Route.OLLAMA_MODEL_SELECT) {
+            val parentEntry = remember(it) {
+                navController.getBackStackEntry(Route.SETUP_ROUTE)
+            }
+            val setupViewModel: SetupViewModel = hiltViewModel(parentEntry)
+            SelectModelScreen(
+                setupViewModel = setupViewModel,
+                currentRoute = Route.OLLAMA_MODEL_SELECT,
+                platformType = ApiType.OLLAMA,
+                onNavigate = { route -> navController.navigate(route) },
+                onBackAction = { navController.navigateUp() }
+            )
+        }
+        composable(route = Route.OLLAMA_API_ADDRESS) {
+            val parentEntry = remember(it) {
+                navController.getBackStackEntry(Route.SETUP_ROUTE)
+            }
+            val setupViewModel: SetupViewModel = hiltViewModel(parentEntry)
+            SetupAPIUrlScreen(
+                setupViewModel = setupViewModel,
+                currentRoute = Route.OLLAMA_API_ADDRESS,
+                onNavigate = { route -> navController.navigate(route) },
+                onBackAction = { navController.navigateUp() }
+            )
+        }
         composable(route = Route.SETUP_COMPLETE) {
             val parentEntry = remember(it) {
                 navController.getBackStackEntry(Route.SETUP_ROUTE)
@@ -188,6 +214,7 @@ fun NavGraphBuilder.settingNavigation(navController: NavHostController) {
                         ApiType.OPENAI -> navController.navigate(Route.OPENAI_SETTINGS)
                         ApiType.ANTHROPIC -> navController.navigate(Route.ANTHROPIC_SETTINGS)
                         ApiType.GOOGLE -> navController.navigate(Route.GOOGLE_SETTINGS)
+                        ApiType.OLLAMA -> navController.navigate(Route.OLLAMA_SETTINGS)
                     }
                 },
                 onNavigateToAboutPage = { navController.navigate(Route.ABOUT_PAGE) }
@@ -223,6 +250,16 @@ fun NavGraphBuilder.settingNavigation(navController: NavHostController) {
                 apiType = ApiType.GOOGLE
             ) { navController.navigateUp() }
         }
+        composable(Route.OLLAMA_SETTINGS) {
+            val parentEntry = remember(it) {
+                navController.getBackStackEntry(Route.SETTING_ROUTE)
+            }
+            val settingViewModel: SettingViewModel = hiltViewModel(parentEntry)
+            PlatformSettingScreen(
+                settingViewModel = settingViewModel,
+                apiType = ApiType.OLLAMA
+            ) { navController.navigateUp() }
+        }
         composable(Route.ABOUT_PAGE) {
             AboutScreen(
                 onNavigationClick = { navController.navigateUp() },

diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/common/Route.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/common/Route.kt
@@ -10,6 +10,8 @@ object Route {
     const val OPENAI_MODEL_SELECT = "openai_model_select"
     const val ANTHROPIC_MODEL_SELECT = "anthropic_model_select"
     const val GOOGLE_MODEL_SELECT = "google_model_select"
+    const val OLLAMA_MODEL_SELECT = "ollama_model_select"
+    const val OLLAMA_API_ADDRESS = "ollama_api_address"
     const val SETUP_COMPLETE = "setup_complete"
 
     const val CHAT_LIST = "chat_list"
@@ -20,6 +22,7 @@ object Route {
     const val OPENAI_SETTINGS = "openai_settings"
     const val ANTHROPIC_SETTINGS = "anthropic_settings"
     const val GOOGLE_SETTINGS = "google_settings"
+    const val OLLAMA_SETTINGS = "ollama_settings"
     const val ABOUT_PAGE = "about"
     const val LICENSE = "license"
 }
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatScreen.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatScreen.kt
@@ -81,13 +81,18 @@ fun ChatScreen(
     val messages by chatViewModel.messages.collectManagedState()
     val question by chatViewModel.question.collectManagedState()
     val appEnabledPlatforms by chatViewModel.enabledPlatformsInApp.collectManagedState()
+
     val openaiLoadingState by chatViewModel.openaiLoadingState.collectManagedState()
     val anthropicLoadingState by chatViewModel.anthropicLoadingState.collectManagedState()
     val googleLoadingState by chatViewModel.googleLoadingState.collectManagedState()
+    val ollamaLoadingState by chatViewModel.ollamaLoadingState.collectManagedState()
+
     val userMessage by chatViewModel.userMessage.collectManagedState()
+
     val openAIMessage by chatViewModel.openAIMessage.collectManagedState()
     val anthropicMessage by chatViewModel.anthropicMessage.collectManagedState()
     val googleMessage by chatViewModel.googleMessage.collectManagedState()
+    val ollamaMessage by chatViewModel.ollamaMessage.collectManagedState()
 
     val canUseChat = (chatViewModel.enabledPlatformsInChat.toSet() - appEnabledPlatforms.toSet()).isEmpty()
     val groupedMessages = remember(messages) { groupMessages(messages) }
@@ -205,12 +210,14 @@ fun ChatScreen(
                                 ApiType.OPENAI -> openAIMessage
                                 ApiType.ANTHROPIC -> anthropicMessage
                                 ApiType.GOOGLE -> googleMessage
+                                ApiType.OLLAMA -> ollamaMessage
                             }
 
                             val loadingState = when (apiType) {
                                 ApiType.OPENAI -> openaiLoadingState
                                 ApiType.ANTHROPIC -> anthropicLoadingState
                                 ApiType.GOOGLE -> googleLoadingState
+                                ApiType.OLLAMA -> ollamaLoadingState
                             }
 
                             OpponentChatBubble(
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ package dev.chungjungsoo.gptmobile.data.model @@
     enum class ApiType {
         OPENAI,
         ANTHROPIC,
-        GOOGLE
+        GOOGLE,
+        OLLAMA
     }