UI: show model card in Conversation screen
This commit is contained in:
parent
9769467723
commit
434933f5b3
|
|
@ -33,6 +33,7 @@ import androidx.compose.material.icons.filled.Send
|
||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
import androidx.compose.material3.CircularProgressIndicator
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
|
import androidx.compose.material3.HorizontalDivider
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
|
@ -60,6 +61,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
|
||||||
import androidx.lifecycle.Lifecycle
|
import androidx.lifecycle.Lifecycle
|
||||||
import androidx.lifecycle.LifecycleEventObserver
|
import androidx.lifecycle.LifecycleEventObserver
|
||||||
import androidx.lifecycle.compose.LocalLifecycleOwner
|
import androidx.lifecycle.compose.LocalLifecycleOwner
|
||||||
|
import com.example.llama.revamp.data.model.ModelInfo
|
||||||
import com.example.llama.revamp.engine.InferenceEngine
|
import com.example.llama.revamp.engine.InferenceEngine
|
||||||
import com.example.llama.revamp.ui.components.PerformanceAppScaffold
|
import com.example.llama.revamp.ui.components.PerformanceAppScaffold
|
||||||
import com.example.llama.revamp.viewmodel.ConversationViewModel
|
import com.example.llama.revamp.viewmodel.ConversationViewModel
|
||||||
|
|
@ -128,7 +130,9 @@ fun ConversationScreen(
|
||||||
.padding(paddingValues)
|
.padding(paddingValues)
|
||||||
) {
|
) {
|
||||||
// System prompt display (collapsible)
|
// System prompt display (collapsible)
|
||||||
AnimatedSystemPrompt(selectedModel?.name, systemPrompt)
|
selectedModel?.let {
|
||||||
|
ModelCardWithSystemPrompt(it, systemPrompt)
|
||||||
|
}
|
||||||
|
|
||||||
// Messages list
|
// Messages list
|
||||||
Box(
|
Box(
|
||||||
|
|
@ -159,24 +163,52 @@ fun ConversationScreen(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun AnimatedSystemPrompt(
|
private fun ModelCardWithSystemPrompt(
|
||||||
modelName: String?, // TODO-han.yin: add model name into this card, on top of system prompt!
|
selectedModel: ModelInfo,
|
||||||
systemPrompt: String?
|
systemPrompt: String?
|
||||||
) {
|
) {
|
||||||
var expanded by remember { mutableStateOf(false) }
|
var expanded by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
if (!systemPrompt.isNullOrBlank()) {
|
Card(
|
||||||
Card(
|
modifier = Modifier
|
||||||
modifier = Modifier
|
.fillMaxWidth()
|
||||||
.fillMaxWidth()
|
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
onClick = {
|
||||||
onClick = {
|
expanded = !expanded
|
||||||
expanded = !expanded
|
}
|
||||||
}
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(16.dp)
|
||||||
) {
|
) {
|
||||||
Column(
|
// Show model info first
|
||||||
modifier = Modifier.padding(16.dp)
|
Text(
|
||||||
) {
|
text = selectedModel.name,
|
||||||
|
style = MaterialTheme.typography.titleMedium
|
||||||
|
)
|
||||||
|
|
||||||
|
Text(
|
||||||
|
text = "${selectedModel.parameters ?: ""} ${selectedModel.quantization ?: ""} • ${selectedModel.formattedSize}",
|
||||||
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
)
|
||||||
|
|
||||||
|
if (selectedModel.contextLength != null) {
|
||||||
|
Text(
|
||||||
|
text = "Context: ${selectedModel.contextLength}",
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add divider between model info and system prompt
|
||||||
|
if (!systemPrompt.isNullOrBlank()) {
|
||||||
|
HorizontalDivider(
|
||||||
|
modifier = Modifier.padding(vertical = 8.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only show system prompt section if one exists
|
||||||
|
if (!systemPrompt.isNullOrBlank()) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue