Skip to content

Commit fcfa64f

Browse files
authored
Merge pull request #121 from Taewan-P/fix/aicore-license
Remove AICore feature due to license issue
2 parents 1fffb59 + 16c4ca0 commit fcfa64f

File tree

6 files changed

+3
-39
lines changed

6 files changed

+3
-39
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ android {
1717
applicationId = "dev.chungjungsoo.gptmobile"
1818
minSdk = 31
1919
targetSdk = 35
20-
versionCode = 12
21-
versionName = "0.6.0"
20+
versionCode = 13
21+
versionName = "0.6.1"
2222

2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424
vectorDrawables {
@@ -71,9 +71,6 @@ dependencies {
7171
implementation(libs.androidx.ui.tooling.preview)
7272
implementation(libs.androidx.material3)
7373

74-
// AI Edge SDK
75-
implementation(libs.ai.core)
76-
7774
// SplashScreen
7875
implementation(libs.splashscreen)
7976

app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepository.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ interface ChatRepository {
1515
suspend fun fetchChatList(): List<ChatRoom>
1616
suspend fun fetchMessages(chatId: Int): List<Message>
1717
fun generateDefaultChatTitle(messages: List<Message>): String?
18-
fun generateAIChatTitle(messages: List<Message>): Flow<ApiState>
1918
suspend fun updateChatTitle(chatRoom: ChatRoom, title: String)
2019
suspend fun saveChat(chatRoom: ChatRoom, messages: List<Message>): ChatRoom
2120
suspend fun deleteChats(chatRooms: List<ChatRoom>)

app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepositoryImpl.kt

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import dev.chungjungsoo.gptmobile.data.network.AnthropicAPI
3434
import javax.inject.Inject
3535
import kotlinx.coroutines.flow.Flow
3636
import kotlinx.coroutines.flow.catch
37-
import kotlinx.coroutines.flow.flow
3837
import kotlinx.coroutines.flow.map
3938
import kotlinx.coroutines.flow.onCompletion
4039
import kotlinx.coroutines.flow.onStart
@@ -180,33 +179,6 @@ class ChatRepositoryImpl @Inject constructor(
180179

181180
override fun generateDefaultChatTitle(messages: List<Message>): String? = messages.sortedBy { it.createdAt }.firstOrNull { it.platformType == null }?.content?.replace('\n', ' ')?.take(50)
182181

183-
override fun generateAIChatTitle(messages: List<Message>): Flow<ApiState> {
184-
if (messages.isEmpty()) {
185-
return flow { "Untitled Chat" }
186-
}
187-
188-
val generationConfig = com.google.ai.edge.aicore.generationConfig {
189-
context = appContext // required
190-
temperature = 1f
191-
maxOutputTokens = 25
192-
}
193-
val model = com.google.ai.edge.aicore.GenerativeModel(generationConfig = generationConfig)
194-
195-
var request = ModelConstants.CHAT_TITLE_GENERATE_PROMPT
196-
messages.sortedBy { it.createdAt }.forEach { message ->
197-
request += when (message.platformType) {
198-
null -> "User: ${message.content}\n\n"
199-
else -> "Assistant: ${message.content}\n\n"
200-
}
201-
}
202-
203-
return model.generateContentStream(request)
204-
.map<com.google.ai.edge.aicore.GenerateContentResponse, ApiState> { response -> ApiState.Success(response.text ?: "") }
205-
.catch { throwable -> emit(ApiState.Error("Cannot process this request at the moment.")) }
206-
.onStart { emit(ApiState.Loading) }
207-
.onCompletion { emit(ApiState.Done) }
208-
}
209-
210182
override suspend fun updateChatTitle(chatRoom: ChatRoom, title: String) {
211183
chatRoomDao.editChatRoom(chatRoom.copy(title = title.replace('\n', ' ').take(50)))
212184
}

app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ fun ChatScreen(
300300
if (isChatTitleDialogOpen) {
301301
ChatTitleDialog(
302302
initialTitle = chatRoom.title,
303-
aiCoreModeEnabled = canEnableAICoreMode,
303+
aiCoreModeEnabled = false,
304304
aiGeneratedResult = geminiNano.content,
305305
isAICoreLoading = geminiNanoLoadingState == ChatViewModel.LoadingState.Loading,
306306
onDefaultTitleMode = chatViewModel::generateDefaultChatTitle,

app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatViewModel.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ class ChatViewModel @Inject constructor(
164164
viewModelScope.launch {
165165
_geminiNanoLoadingState.update { LoadingState.Loading }
166166
_geminiNanoMessage.update { it.copy(content = "") }
167-
val chatFlow = chatRepository.generateAIChatTitle(_messages.value)
168-
chatFlow.collect { chunk -> geminiNanoFlow.emit(chunk) }
169167
}
170168
}
171169

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[versions]
2-
aicore = "0.0.1-exp01"
32
agp = "8.7.2"
43
autoLicense = "11.2.2"
54
kotlin = "2.0.20"
@@ -41,7 +40,6 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
4140
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
4241
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
4342
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
44-
ai-core = { group = "com.google.ai.edge.aicore", name = "aicore", version.ref = "aicore"}
4543
auto-license-core = { group = "com.mikepenz", name = "aboutlibraries-core", version.ref = "autoLicense" }
4644
auto-license-ui = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "autoLicense" }
4745
compose-markdown = { group = "com.github.jeziellago", name = "compose-markdown", version.ref = "markdown" }

0 commit comments

Comments
 (0)