Skip to content
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

allow empty textFieldPrompt token customModel #175

Merged
merged 7 commits into from
Jan 31, 2025
Merged

allow empty textFieldPrompt token customModel #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbbf43a
allow empty textFieldPrompt token customModel
rhjdvsgsgks Jan 26, 2025
cf778ed
fix on customSelected
rhjdvsgsgks Jan 26, 2025
509cbff
also skip isNotBlank in SettingViewModel
rhjdvsgsgks Jan 26, 2025
a99604a
fix empty string on token
rhjdvsgsgks Jan 26, 2025
af26176
missing bracket
rhjdvsgsgks Jan 26, 2025
ac4ff78
disable system prompt only if user set it to empty explicitly
rhjdvsgsgks Jan 26, 2025
1ba50d8
if null use default prompt
rhjdvsgsgks Jan 26, 2025
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
21 changes: 13 additions & 8 deletions app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/repository/ChatRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ class ChatRepositoryImpl @Inject constructor(
openAI = OpenAI(platform.token ?: "", host = OpenAIHost(baseUrl = platform.apiUrl))

val generatedMessages = messageToOpenAICompatibleMessage(ApiType.OPENAI, history + listOf(question))
val prompt = platform.systemPrompt ?: ModelConstants.OPENAI_PROMPT
val generatedMessageWithPrompt = listOf(
ChatMessage(role = ChatRole.System, content = platform.systemPrompt ?: ModelConstants.OPENAI_PROMPT)
ChatMessage(role = ChatRole.System, content = prompt)
) + generatedMessages
val chatCompletionRequest = ChatCompletionRequest(
model = ModelId(platform.model ?: ""),
messages = generatedMessageWithPrompt,
messages = if (prompt.isEmpty()) generatedMessages else generatedMessageWithPrompt, //disable system prompt only if user set it to empty explicitly
temperature = platform.temperature?.toDouble(),
topP = platform.topP?.toDouble()
)
Expand All @@ -79,11 +80,12 @@ class ChatRepositoryImpl @Inject constructor(
anthropic.setAPIUrl(platform.apiUrl)

val generatedMessages = messageToAnthropicMessage(history + listOf(question))
val prompt = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT
val messageRequest = MessageRequest(
model = platform.model ?: "",
messages = generatedMessages,
maxTokens = ModelConstants.ANTHROPIC_MAXIMUM_TOKEN,
systemPrompt = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT,
systemPrompt = if (prompt.isEmpty()) null else prompt,
stream = true,
temperature = platform.temperature,
topP = platform.topP
Expand All @@ -108,10 +110,11 @@ class ChatRepositoryImpl @Inject constructor(
temperature = platform.temperature
topP = platform.topP
}
val prompt = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT
google = GenerativeModel(
modelName = platform.model ?: "",
apiKey = platform.token ?: "",
systemInstruction = content { text(platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT) },
systemInstruction = if (prompt.isEmpty()) null else content { text(prompt) },
generationConfig = config,
safetySettings = listOf(
SafetySetting(HarmCategory.DANGEROUS_CONTENT, BlockThreshold.ONLY_HIGH),
Expand All @@ -134,12 +137,13 @@ class ChatRepositoryImpl @Inject constructor(
groq = OpenAI(platform.token ?: "", host = OpenAIHost(baseUrl = platform.apiUrl))

val generatedMessages = messageToOpenAICompatibleMessage(ApiType.GROQ, history + listOf(question))
val prompt = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT
val generatedMessageWithPrompt = listOf(
ChatMessage(role = ChatRole.System, content = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT)
ChatMessage(role = ChatRole.System, content = prompt)
) + generatedMessages
val chatCompletionRequest = ChatCompletionRequest(
model = ModelId(platform.model ?: ""),
messages = generatedMessageWithPrompt,
messages = if (prompt.isEmpty()) generatedMessages else generatedMessageWithPrompt,
temperature = platform.temperature?.toDouble(),
topP = platform.topP?.toDouble()
)
Expand All @@ -156,12 +160,13 @@ class ChatRepositoryImpl @Inject constructor(
ollama = OpenAI(platform.token ?: "", host = OpenAIHost(baseUrl = "${platform.apiUrl}v1/"))

val generatedMessages = messageToOpenAICompatibleMessage(ApiType.OLLAMA, history + listOf(question))
val prompt = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT
val generatedMessageWithPrompt = listOf(
ChatMessage(role = ChatRole.System, content = platform.systemPrompt ?: ModelConstants.DEFAULT_PROMPT)
ChatMessage(role = ChatRole.System, content = prompt)
) + generatedMessages
val chatCompletionRequest = ChatCompletionRequest(
model = ModelId(platform.model ?: ""),
messages = generatedMessageWithPrompt,
messages = if (prompt.isEmpty()) generatedMessages else generatedMessageWithPrompt,
temperature = platform.temperature?.toDouble(),
topP = platform.topP?.toDouble()
)
Expand Down
4 changes: 1 addition & 3 deletions .../main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setting/PlatformSettingDialogs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ private fun APIKeyDialog(
onDismissRequest = onDismissRequest,
confirmButton = {
TextButton(
enabled = token.isNotBlank(),
onClick = { onConfirmRequest(token) }
) {
Text(stringResource(R.string.confirm))
Expand Down Expand Up @@ -359,7 +358,7 @@ private fun ModelDialog(
onDismissRequest = onDismissRequest,
confirmButton = {
TextButton(
enabled = if (customSelected) customModel.isNotBlank() else model.isNotBlank(),
enabled = customSelected || model.isNotBlank(),
onClick = {
if (customSelected) {
onConfirmRequest(customModel)
Expand Down Expand Up @@ -567,7 +566,6 @@ private fun SystemPromptDialog(
onDismissRequest = onDismissRequest,
confirmButton = {
TextButton(
enabled = textFieldPrompt.isNotBlank(),
onClick = { onConfirmRequest(textFieldPrompt) }
) {
Text(stringResource(R.string.confirm))
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setting/PlatformSettingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fun PlatformSettingScreen(
SettingItem(
modifier = Modifier.height(64.dp),
title = stringResource(R.string.api_key),
description = token?.let { stringResource(R.string.token_set, it[0]) } ?: stringResource(R.string.token_not_set),
description = if (token.isNullOrEmpty()) stringResource(R.string.token_not_set) else stringResource(R.string.token_set, token[0]),
enabled = enabled,
onItemClick = settingViewModel::openApiTokenDialog,
showTrailingIcon = false,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setting/SettingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class SettingViewModel @Inject constructor(
if (index >= 0) {
_platformState.update {
it.mapIndexed { i, p ->
if (index == i && token.isNotBlank()) {
if (index == i) {
p.copy(token = token)
} else {
p
Expand Down Expand Up @@ -144,7 +144,7 @@ class SettingViewModel @Inject constructor(
if (index >= 0) {
_platformState.update {
it.mapIndexed { i, p ->
if (index == i && prompt.isNotBlank()) {
if (index == i) {
p.copy(systemPrompt = prompt)
} else {
p
Expand Down
Loading