New version 0.6.0 (#7)

* new version 0.6.0

* added missing proguard rules

* ktlint issues

Author: ferranpons

composeApp/proguard-rules.pro

@@ -99,3 +99,24 @@
 -dontwarn javax.swing.SwingUtilities
 -dontwarn javax.swing.Timer
 -dontwarn org.slf4j.impl.StaticLoggerBinder
+
+# Ktor & Kamel related
+-keep class io.ktor.utils.io.core.CloseableJVMKt { *; }
+-dontwarn io.ktor.utils.io.core.CloseableJVMKt
+
+# Ktor Java HTTP Client Engine related (if you use it explicitly or a library does)
+# These are needed if your minSdk is below 26 and Ktor attempts to use the Java 11+ HTTP client
+-keep class java.net.http.HttpHeaders { *; }
+-keep class java.net.http.WebSocketHandshakeException { *; }
+-dontwarn java.net.http.**
+
+# General Ktor rules (often helpful)
+-keep class io.ktor.** { *; }
+-keepnames class io.ktor.**
+-dontwarn io.ktor.**
+
+# Kamel (if not covered by general Ktor rules, add more specific ones if needed)
+-keep class io.kamel.core.** { *; }
+-keepnames class io.kamel.core.**
+-dontwarn io.kamel.core.**
+

library/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.llamatik.library"
-version = "0.5.0"
+version = "0.6.0"
 
 // Choose ONE min iOS version and use it everywhere
 val minIos = "16.6"
@@ -183,6 +183,7 @@ kotlin {
                 implementation(compose.foundation)
                 implementation(compose.components.resources)
                 resources.srcDir("src/commonMain/resources")
+                resources.exclude("**/*.gguf")
             }
         }
         val commonTest by getting {
@@ -235,7 +236,7 @@ publishing {
             from(components["kotlin"])
             groupId = "com.llamatik.library"
             artifactId = "llamatik"
-            version = "0.5.0"
+            version = "0.6.0"
         }
     }
 

shared/src/commonMain/kotlin/com/llamatik/app/feature/chatbot/utils/VectorStore.kt

@@ -61,13 +61,50 @@ fun tidyAnswer(s: String): String = s
 
 // --- Query keyword extraction & filtering ---
 private val STOPWORDS = setOf(
-    "the","a","an","and","or","of","to","for","in","on","at","by","is","are","was","were",
-    "be","with","as","that","this","it","from","your","you","we","our","us","can","could",
-    "should","would","how","what","why","when","where","which","who","whom"
+    "the",
+    "a",
+    "an",
+    "and",
+    "or",
+    "of",
+    "to",
+    "for",
+    "in",
+    "on",
+    "at",
+    "by",
+    "is",
+    "are",
+    "was",
+    "were",
+    "be",
+    "with",
+    "as",
+    "that",
+    "this",
+    "it",
+    "from",
+    "your",
+    "you",
+    "we",
+    "our",
+    "us",
+    "can",
+    "could",
+    "should",
+    "would",
+    "how",
+    "what",
+    "why",
+    "when",
+    "where",
+    "which",
+    "who",
+    "whom"
 )
 
 fun extractKeywords(s: String, minLen: Int = 3): Set<String> =
-    Regex("[A-Za-z0-9][A-Za-z0-9_-]{${minLen-1},}")
+    Regex("[A-Za-z0-9][A-Za-z0-9_-]{${minLen - 1},}")
         .findAll(s.lowercase())
         .map { it.value }
         .filterNot { it in STOPWORDS }
@@ -85,11 +122,14 @@ fun metaString(meta: Map<String, kotlinx.serialization.json.JsonElement>?, key:
 
 // --- Cosine over List<Float> returning Double (good for MMR math) ---
 fun cosineD(a: List<Float>, b: List<Float>): Double {
-    var dot = 0.0; var na = 0.0; var nb = 0.0
+    var dot = 0.0;
+    var na = 0.0;
+    var nb = 0.0
     val n = minOf(a.size, b.size)
     var i = 0
     while (i < n) {
-        val x = a[i].toDouble(); val y = b[i].toDouble()
+        val x = a[i].toDouble();
+        val y = b[i].toDouble()
         dot += x * y; na += x * x; nb += y * y
         i++
     }
@@ -120,7 +160,9 @@ fun mmr(
                 cosineD(c.item.vector, s.item.vector)
             }
             val score = lambda * rel - (1 - lambda) * div
-            if (score > bestScore) { bestScore = score; bestIdx = i }
+            if (score > bestScore) {
+                bestScore = score; bestIdx = i
+            }
         }
         selected += remaining.removeAt(bestIdx)
     }

shared/src/commonMain/kotlin/com/llamatik/app/feature/debugmenu/DebugMenuScreen.kt

@@ -142,26 +142,27 @@ class DebugMenuScreen : Screen {
                             )
                         },
                         colors = TopAppBarDefaults.mediumTopAppBarColors(
-                            containerColor = MaterialTheme.colorScheme.background
+                            containerColor = MaterialTheme.colorScheme.background,
                         ),
                         navigationIcon = {
                             IconButton(onClick = { onClose.invoke() }) {
                                 Icon(
                                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                                    contentDescription = "Go back"
+                                    contentDescription = "Go back",
                                 )
                             }
-                        }
+                        },
                     )
-                }
+                },
             ) {
                 val scrollState = rememberScrollState()
 
                 Column(
-                    modifier = Modifier
-                        .padding(it).padding(bottom = 46.dp)
-                        .background(MaterialTheme.colorScheme.background)
-                        .verticalScroll(scrollState)
+                    modifier =
+                        Modifier
+                            .padding(it).padding(bottom = 46.dp)
+                            .background(MaterialTheme.colorScheme.background)
+                            .verticalScroll(scrollState)
                 ) {
                     /*
                     Row(

shared/src/commonMain/kotlin/com/llamatik/app/feature/news/model/NewsModel.kt

@@ -11,4 +11,4 @@ class NewsModel(
     val image: String,
     val released: String,
     val modified: String?
-)
+)

shared/src/commonMain/kotlin/com/llamatik/app/feature/news/usecases/GetAllNewsUseCase.kt

@@ -6,9 +6,8 @@ import com.llamatik.app.feature.news.repositories.NewsFeedParser
 import com.llamatik.app.feature.news.repositories.NewsRepository
 
 class GetAllNewsUseCase(
-    private val newsRepository: NewsRepository
+    private val newsRepository: NewsRepository,
 ) : UseCase() {
-
     suspend fun invoke(): Result<List<FeedItem>> = runCatching {
         val news = newsRepository.getNews()
         return@runCatching NewsFeedParser().parse(news)

shared/src/commonMain/kotlin/com/llamatik/app/feature/news/viewmodel/FeedItemDetailViewModel.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.launch
 
 class FeedItemDetailViewModel(
     private var navigator: Navigator,
-    private val getAllNewsUseCase: GetAllNewsUseCase
+    private val getAllNewsUseCase: GetAllNewsUseCase,
 ) : ScreenModel {
     private val _state = MutableStateFlow(FeedItemDetailScreenState())
     val state = _state.asStateFlow()

shared/src/commonMain/kotlin/com/llamatik/app/feature/webview/WebViewScreen.kt

@@ -89,7 +89,7 @@ class WebViewScreen(
     */
     @Composable
     fun WebViewScreenLayout(
-        //viewModel: WebViewModel,
+        // viewModel: WebViewModel,
         localization: Localization,
         onClose: () -> Unit
     ) {

shared/src/commonMain/kotlin/com/llamatik/app/localization/Localization.kt

@@ -18,7 +18,6 @@ interface Localization {
     val previous: String
     val welcome: String
 
-
     val backLabel: String
     val topAppBarActionIconDescription: String
     val home: String
@@ -56,7 +55,6 @@ interface Localization {
 
     val feedItemTitle: String
 
-
     val loading: String
     val profileImageDescription: String
     val manuals: String

shared/src/commonMain/kotlin/com/llamatik/app/navigation/ChatBotTab.kt

@@ -11,7 +11,6 @@ import com.llamatik.app.feature.chatbot.ChatBotTabScreen
 import com.llamatik.app.ui.icon.LlamatikIcons
 
 internal object ChatBotTab : Tab {
-
     override val options: TabOptions
         @Composable
         get() {
@@ -21,7 +20,7 @@ internal object ChatBotTab : Tab {
                 TabOptions(
                     index = 2u,
                     title = "Llamatik AI",
-                    icon = icon
+                    icon = icon,
                 )
             }
         }