Merge VoidX3D PR #2497 — AI provider overhaul, performance optimization, lyrics fixes

app/src/main/java/com/theveloper/pixelplay/data/ai/AiHandler.kt

@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import java.security.MessageDigest
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -27,9 +28,9 @@ class AiHandler @Inject constructor(
     private val promptEngine: AiSystemPromptEngine,
     @AppScope private val appScope: CoroutineScope
 ) {
-    // Cooldown timer: Provider -> Expiry Timestamp
-    private val providerCooldowns = mutableMapOf<AiProvider, Long>()
-    private val COOLDOWN_DURATION_MS = 1000L * 60 * 5 // 5 minutes
+    // Cooldown timer: Provider -> Expiry Timestamp (thread-safe, auto-cleans expired)
+    private val providerCooldowns = ConcurrentHashMap<AiProvider, Long>()
+    private val COOLDOWN_DURATION_MS = 1000L * 60 * 2 // 2 minutes (was 5)
 
     // Cache TTL: 30 minutes — prevents stale results from being served indefinitely
     private val CACHE_TTL_MS = 1000L * 60 * 30
@@ -97,7 +98,13 @@ class AiHandler @Inject constructor(
         presencePenalty: Float,
         frequencyPenalty: Float,
     ): GenerationResult {
-        val client = clientFactory.createClient(provider, apiKey)
+        val client = if (provider.hasConfigurableUrl) {
+            val configuredUrl = preferencesRepo.getBaseUrl(provider).first()
+            if (configuredUrl.isNotBlank()) clientFactory.createClientWithUrl(provider, apiKey, configuredUrl)
+            else clientFactory.createClient(provider, apiKey)
+        } else {
+            clientFactory.createClient(provider, apiKey)
+        }
         val requestedModel = getModel(provider).ifBlank { client.getDefaultModel() }
 
         suspend fun callWithModel(model: String): String {
@@ -163,6 +170,16 @@ class AiHandler @Inject constructor(
         context: String = ""
     ): String {
         val params = getGenerationParams()
+        val effectiveMaxTokens = if (type == AiSystemPromptType.LYRICS) {
+            val estimatedInputChars = prompt.length
+            val estimatedOutputChars = estimatedInputChars * 2
+            val cjkRatio = prompt.count { it.code in 0x4E00..0x9FFF || it.code in 0x3040..0x30FF || it.code in 0xAC00..0xD7AF }.toFloat() / estimatedInputChars.coerceAtLeast(1)
+            val charsPerToken = (4f - cjkRatio * 3f).coerceIn(1f, 4f)
+            val estimatedOutputTokens = (estimatedOutputChars / charsPerToken).toInt().coerceAtLeast(4096)
+            estimatedOutputTokens.coerceAtMost(16384)
+        } else {
+            params.maxTokens
+        }
         val effectiveTemperature = if (params.temperature == 0.7f) {
             if (temperature == 0.7f) {
                 when (type) {
@@ -171,6 +188,7 @@ class AiHandler @Inject constructor(
                     AiSystemPromptType.TAGGING -> 0.4f
                     AiSystemPromptType.PLAYLIST, AiSystemPromptType.DAILY_MIX -> 0.6f
                     AiSystemPromptType.PERSONA -> 0.85f
+                    AiSystemPromptType.LYRICS -> 0.7f
                     AiSystemPromptType.GENERAL -> 0.7f
                 }
             } else temperature
@@ -191,9 +209,12 @@ class AiHandler @Inject constructor(
             }
         }
 
+        // Clean up expired cooldowns so stale entries never accumulate
+        val now = System.currentTimeMillis()
+        providerCooldowns.entries.removeIf { it.value < now }
+
         val providersToTry = com.theveloper.pixelplay.data.ai.provider.AiProviderSupport.buildProviderChain(userProvider)
         val failedProviders = mutableListOf<String>()
-        val now = System.currentTimeMillis()
 
         for (provider in providersToTry) {
             val cooldownExpiry = providerCooldowns[provider] ?: 0L
@@ -204,7 +225,7 @@ class AiHandler @Inject constructor(
 
             try {
                 val apiKey = getApiKey(provider)
-                if (apiKey.isBlank()) {
+                if (apiKey.isBlank() && provider.requiresApiKey) {
                     failedProviders.add("${provider.name}: no API key configured")
                     continue
                 }
@@ -220,7 +241,7 @@ class AiHandler @Inject constructor(
                     temperature = effectiveTemperature,
                     topP = params.topP,
                     topK = params.topK,
-                    maxTokens = params.maxTokens,
+                    maxTokens = effectiveMaxTokens,
                     presencePenalty = params.presencePenalty,
                     frequencyPenalty = params.frequencyPenalty,
                 )

app/src/main/java/com/theveloper/pixelplay/data/ai/AiResponseCleaner.kt

@@ -21,10 +21,27 @@ object AiResponseCleaner {
     }
 
     fun cleanTextResponse(raw: String): String {
-        return raw
+        var cleaned = raw
             .replace("```text", "")
             .replace("```", "")
             .trim()
+
+        // Remove conversational framing lines that AIs sometimes prepend
+        val framingPrefixes = listOf(
+            "Here is", "Here's", "Here are", "Sure", "Certainly",
+            "Of course", "I've", "I have", "The translated", "Translation:",
+            "Translated lyrics:", "Output:"
+        )
+        val framingPattern = framingPrefixes.joinToString("|") { Regex.escape(it) }
+        cleaned = cleaned.replace(Regex("^(?:$framingPattern).*\\n?", RegexOption.MULTILINE), "")
+
+        // Strip paired markdown formatting markers (**text** or __text__)
+        cleaned = cleaned
+            .replace(Regex("\\*\\*(.*?)\\*\\*"), "$1")
+            .replace(Regex("__(.*?)__"), "$1")
+            .trim()
+
+        return cleaned
     }
 
     fun extractJsonArray(text: String): String? {

app/src/main/java/com/theveloper/pixelplay/data/ai/AiSystemPromptEngine.kt

@@ -11,6 +11,7 @@ enum class AiSystemPromptType {
     MOOD_ANALYSIS,
     PERSONA,
     DAILY_MIX,
+    LYRICS,
     GENERAL
 }
 
@@ -182,6 +183,16 @@ class AiSystemPromptEngine @Inject constructor() {
                 $dailyMixPersonaPrompt
             """.trimIndent()
 
+            AiSystemPromptType.LYRICS -> """
+                <role>Song lyrics translator — you translate lyrics between languages while preserving structure.</role>
+                <strategy>
+                - Preserve ALL timestamps and line structure exactly.
+                - Output each original line followed by its translation on the next line.
+                - Never add explanations, labels, or formatting beyond the requested format.
+                - If the source is already in the target language, respond with: ALREADY_IN_TARGET_LANGUAGE
+                </strategy>
+            """.trimIndent()
+
             AiSystemPromptType.GENERAL -> """
                 <role>PixelPlayer Assistant — a knowledgeable music companion.</role>
                 <strategy>

app/src/main/java/com/theveloper/pixelplay/data/ai/provider/AiClientFactory.kt

@@ -16,47 +16,47 @@ class AiClientFactory @Inject constructor() {
      * @return AiClient instance
      */
     fun createClient(provider: AiProvider, apiKey: String): AiClient {
-        if (apiKey.isBlank()) {
+        if (apiKey.isBlank() && provider.requiresApiKey) {
             throw IllegalArgumentException("API Key cannot be blank for ${provider.displayName}")
         }
 
         return when (provider) {
             AiProvider.GEMINI -> GeminiAiClient(apiKey)
             AiProvider.DEEPSEEK -> GenericOpenAiClient(
                 apiKey = apiKey,
-                baseUrl = "https://api.deepseek.com",
+                baseUrl = "https://api.deepseek.com/v1",
                 defaultModelId = "deepseek-chat",
                 providerName = "DeepSeek"
             )
             AiProvider.GROQ -> GenericOpenAiClient(
                 apiKey = apiKey,
                 baseUrl = "https://api.groq.com/openai/v1",
-                defaultModelId = "llama-3.1-8b-instant",
+                defaultModelId = "llama-3.3-70b-versatile",
                 providerName = "Groq"
             )
             AiProvider.MISTRAL -> GenericOpenAiClient(
                 apiKey = apiKey,
                 baseUrl = "https://api.mistral.ai/v1",
-                defaultModelId = "mistral-large-latest",
+                defaultModelId = "mistral-large-2411",
                 providerName = "Mistral"
             )
             AiProvider.NVIDIA -> GenericOpenAiClient(
                 apiKey = apiKey,
                 baseUrl = "https://integrate.api.nvidia.com/v1",
-                defaultModelId = "meta/llama-3.1-8b-instruct",
+                defaultModelId = "nvidia/llama-3.1-nemotron-70b-instruct",
                 providerName = "NVIDIA NIM"
             )
             AiProvider.KIMI -> GenericOpenAiClient(
                 apiKey = apiKey,
                 baseUrl = "https://api.moonshot.cn/v1",
-                defaultModelId = "moonshot-v1-8k",
-                providerName = "Moonshot Kimi"
+                defaultModelId = "moonshot-v1-auto",
+                providerName = "Kimi"
             )
             AiProvider.GLM -> GenericOpenAiClient(
                 apiKey = apiKey,
                 baseUrl = "https://open.bigmodel.cn/api/paas/v4",
-                defaultModelId = "glm-4",
-                providerName = "Zhipu GLM"
+                defaultModelId = "glm-4-plus",
+                providerName = "GLM"
             )
             AiProvider.OPENAI -> GenericOpenAiClient(
                 apiKey = apiKey,
@@ -67,7 +67,7 @@ class AiClientFactory @Inject constructor() {
             AiProvider.OPENROUTER -> GenericOpenAiClient(
                 apiKey = apiKey,
                 baseUrl = "https://openrouter.ai/api/v1",
-                defaultModelId = "google/gemini-2.0-flash-lite-preview-02-05:free",
+                defaultModelId = "google/gemini-2.5-flash-preview-04-17:free",
                 providerName = "OpenRouter"
             )
             AiProvider.OLLAMA -> GenericOpenAiClient(

app/src/main/java/com/theveloper/pixelplay/data/ai/provider/AiProvider.kt

@@ -1,20 +1,22 @@
 package com.theveloper.pixelplay.data.ai.provider
 
-/**
- * Enum representing available AI providers
- */
-enum class AiProvider(val displayName: String, val requiresApiKey: Boolean, val hasConfigurableUrl: Boolean = false) {
-    GEMINI("Google Gemini", requiresApiKey = true),
-    DEEPSEEK("DeepSeek", requiresApiKey = true),
-    GROQ("Groq", requiresApiKey = true),
-    MISTRAL("Mistral", requiresApiKey = true),
-    NVIDIA("NVIDIA NIM", requiresApiKey = true),
-    KIMI("Kimi (Moonshot)", requiresApiKey = true),
-    GLM("Zhipu GLM", requiresApiKey = true),
-    OPENAI("OpenAI", requiresApiKey = true),
-    OPENROUTER("OpenRouter", requiresApiKey = true),
-    OLLAMA("Ollama", requiresApiKey = true),
-    CUSTOM("Custom Provider", requiresApiKey = true, hasConfigurableUrl = true);
+enum class AiProvider(
+    val displayName: String,
+    val requiresApiKey: Boolean,
+    val hasConfigurableUrl: Boolean = false,
+    val description: String = ""
+) {
+    GEMINI("Google Gemini", requiresApiKey = true, description = "Gemini 2.5 Pro/Flash — Google's latest multimodal models"),
+    DEEPSEEK("DeepSeek", requiresApiKey = true, description = "DeepSeek-V3 & R1 — competitive open-weight reasoning models"),
+    GROQ("Groq", requiresApiKey = true, description = "Llama 3, Mixtral, Gemma — ultra-fast LPU inference"),
+    MISTRAL("Mistral", requiresApiKey = true, description = "Mistral Large, Small, Codestral — efficient European models"),
+    NVIDIA("NVIDIA NIM", requiresApiKey = true, description = "NVIDIA-optimized Llama, Nemotron, and community models"),
+    KIMI("Kimi (Moonshot)", requiresApiKey = true, description = "Kimi k1.5 — long-context reasoning by Moonshot AI"),
+    GLM("Zhipu GLM", requiresApiKey = true, description = "GLM-4 — bilingual (Chinese/English) models by Zhipu AI"),
+    OPENAI("OpenAI", requiresApiKey = true, description = "GPT-4o, GPT-4.1, o3, o4-mini — industry-standard models"),
+    OPENROUTER("OpenRouter", requiresApiKey = true, description = "Single API for 300+ models across all major providers"),
+    OLLAMA("Ollama", requiresApiKey = true, hasConfigurableUrl = true, description = "Ollama-compatible API endpoint (configurable URL)"),
+    CUSTOM("Custom Provider", requiresApiKey = true, hasConfigurableUrl = true, description = "Any OpenAI-compatible API endpoint");
 
     companion object {
         fun fromString(value: String): AiProvider {

app/src/main/java/com/theveloper/pixelplay/data/repository/LyricsRepositoryImpl.kt

@@ -1014,8 +1014,8 @@ class LyricsRepositoryImpl @Inject constructor(
                     }
                 }
 
-                val cleanArtist = song.displayArtist.replace(Regex("[^a-zA-Z0-9]"), "_")
-                val cleanTitle = song.title.replace(Regex("[^a-zA-Z0-9]"), "_")
+                val cleanArtist = song.displayArtist.replace(Regex("[^\\p{L}\\p{N}]"), "_")
+                val cleanTitle = song.title.replace(Regex("[^\\p{L}\\p{N}]"), "_")
 
                 for (extension in LyricsImportSecurity.supportedFileExtensions()) {
                     val alternativeLyricsFile = File(directory, "${cleanArtist}_${cleanTitle}.$extension")

app/src/main/java/com/theveloper/pixelplay/data/repository/MusicRepository.kt

@@ -77,12 +77,6 @@ interface MusicRepository {
         storageFilter: com.theveloper.pixelplay.data.model.StorageFilter = com.theveloper.pixelplay.data.model.StorageFilter.ALL
     ): Flow<Int>
 
-    /**
-     * Returns the count of songs in the library.
-     * @return Flow emitting the current song count.
-     */
-    fun getSongCountFlow(): Flow<Int>
-
     /**
      * Returns the count of cloud songs in the library.
      */

app/src/main/java/com/theveloper/pixelplay/data/repository/MusicRepositoryImpl.kt

@@ -310,10 +310,6 @@ class MusicRepositoryImpl @Inject constructor(
         return songRepository.getFavoriteSongCountFlow(storageFilter)
     }
 
-    override fun getSongCountFlow(): Flow<Int> {
-        return musicDao.getSongCount().distinctUntilChanged()
-    }
-
     override fun getCloudSongCountFlow(): Flow<Int> {
         return musicDao.getCloudSongCount().distinctUntilChanged()
     }

app/src/main/java/com/theveloper/pixelplay/presentation/components/PlaylistCreationDialogs.kt

@@ -35,6 +35,7 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
@@ -301,6 +302,7 @@ private fun CreationModeCard(
 fun CreateAiPlaylistDialog(
     visible: Boolean,
     isGenerating: Boolean,
+    status: String?,
     error: String?,
     onDismiss: () -> Unit,
     onGenerate: (playlistName: String?, prompt: String, minLength: Int, maxLength: Int) -> Unit
@@ -328,6 +330,7 @@ fun CreateAiPlaylistDialog(
             ) {
                 CreateAiPlaylistContent(
                     isGenerating = isGenerating,
+                    status = status,
                     error = error,
                     onDismiss = onDismiss,
                     onGenerate = onGenerate
@@ -340,6 +343,7 @@ fun CreateAiPlaylistDialog(
 @Composable
 private fun CreateAiPlaylistContent(
     isGenerating: Boolean,
+    status: String?,
     error: String?,
     onDismiss: () -> Unit,
     onGenerate: (playlistName: String?, prompt: String, minLength: Int, maxLength: Int) -> Unit
@@ -525,6 +529,28 @@ private fun CreateAiPlaylistContent(
         ) {
             Spacer(modifier = Modifier.height(4.dp))
 
+            if (isGenerating && !status.isNullOrBlank()) {
+                Card(
+                    shape = RoundedCornerShape(16.dp),
+                    colors = CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = 0.7f)
+                    )
+                ) {
+                    Row(
+                        modifier = Modifier.padding(16.dp),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        LoadingIndicator(modifier = Modifier.size(20.dp))
+                        Spacer(modifier = Modifier.width(12.dp))
+                        Text(
+                            text = status,
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.onTertiaryContainer
+                        )
+                    }
+                }
+            }
+
             HeroAiCard()
 
             AiSectionCard(

app/src/main/java/com/theveloper/pixelplay/presentation/model/SettingsCategory.kt

@@ -10,6 +10,7 @@ import androidx.compose.material.icons.rounded.LibraryMusic
 import androidx.compose.material.icons.rounded.MusicNote
 import androidx.compose.material.icons.rounded.Palette
 import androidx.compose.material.icons.rounded.QueueMusic
+import androidx.compose.material.icons.rounded.Tune
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.theveloper.pixelplay.R
 
@@ -62,6 +63,12 @@ enum class SettingsCategory(
         subtitleRes = R.string.settings_category_ai_subtitle,
         iconRes = R.drawable.gemini_ai
     ),
+    GENERATION_PARAMETERS(
+        id = "generation_parameters",
+        titleRes = R.string.settings_category_generation_parameters_title,
+        subtitleRes = R.string.settings_category_generation_parameters_subtitle,
+        icon = Icons.Rounded.Tune
+    ),
     BACKUP_RESTORE(
         id = "backup_restore",
         titleRes = R.string.settings_category_backup_title,

app/src/main/java/com/theveloper/pixelplay/presentation/screens/AiUsageComponents.kt

@@ -179,6 +179,7 @@ private fun formatPromptType(type: String): String {
         "MOOD_ANALYSIS" -> "Analysis"
         "PERSONA" -> "Persona"
         "DAILY_MIX" -> "Daily Mix"
+        "LYRICS" -> "Lyrics"
         "GENERAL" -> "General"
         else -> type.lowercase().replaceFirstChar { it.uppercase() }
     }