From b6cc8f0c016d24d9fe4502ae7b5d5abc53369a6c Mon Sep 17 00:00:00 2001
From: Han Yin <han.yin@arm.com>
Date: Mon, 14 Apr 2025 13:25:30 -0700
Subject: [PATCH] DI: abstract the protocol of SystemPromptRepository; update
 AppModule

---
 .../data/repository/SystemPromptRepository.kt | 29 +++++++++++--------
 .../com/example/llama/revamp/di/AppModule.kt  |  5 ++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/SystemPromptRepository.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/SystemPromptRepository.kt
index 394e349f31..edc79d74e0 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/SystemPromptRepository.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/SystemPromptRepository.kt
@@ -13,15 +13,24 @@ import javax.inject.Singleton
 /**
  * Repository for managing system prompts.
  */
+interface SystemPromptRepository {
+    fun getPresetPrompts(): Flow<List<SystemPrompt>>
+    fun getRecentPrompts(): Flow<List<SystemPrompt>>
+    suspend fun savePromptToRecents(prompt: SystemPrompt)
+    suspend fun saveCustomPrompt(content: String): SystemPrompt
+    suspend fun deletePrompt(id: String)
+    suspend fun deleteAllPrompts()
+}
+
 @Singleton
-class SystemPromptRepository @Inject constructor(
+class SystemPromptRepositoryImpl @Inject constructor(
     private val systemPromptDao: SystemPromptDao,
-) {
+) : SystemPromptRepository {
 
     /**
      * Get all preset prompts.
      */
-    fun getPresetPrompts(): Flow<List<SystemPrompt>> {
+    override fun getPresetPrompts(): Flow<List<SystemPrompt>> {
         // For now, we'll just return the static list since we don't store presets in the database
         return kotlinx.coroutines.flow.flowOf(SystemPrompt.STUB_PRESETS)
     }
@@ -29,7 +38,7 @@ class SystemPromptRepository @Inject constructor(
     /**
      * Get recent prompts from the database.
      */
-    fun getRecentPrompts(): Flow<List<SystemPrompt>> {
+    override fun getRecentPrompts(): Flow<List<SystemPrompt>> {
         return systemPromptDao.getRecentPrompts(MAX_RECENT_PROMPTS)
             .map { entities ->
                 entities.map { it.toDomainModel() }
@@ -40,7 +49,7 @@ class SystemPromptRepository @Inject constructor(
      * Save a prompt to the recents list.
      * If it's already in recents, just update the timestamp.
      */
-    suspend fun savePromptToRecents(prompt: SystemPrompt) {
+    override suspend fun savePromptToRecents(prompt: SystemPrompt) {
         // Check if this prompt already exists
         val existingPrompt = systemPromptDao.getPromptById(prompt.id)
 
@@ -59,7 +68,7 @@ class SystemPromptRepository @Inject constructor(
     /**
      * Create and save a custom prompt.
      */
-    suspend fun saveCustomPrompt(content: String): SystemPrompt {
+    override suspend fun saveCustomPrompt(content: String): SystemPrompt {
         val customPrompt = SystemPrompt.Custom(
             id = UUID.randomUUID().toString(),
             content = content
@@ -94,16 +103,12 @@ class SystemPromptRepository @Inject constructor(
     /**
      * Delete a prompt by ID.
      */
-    suspend fun deletePrompt(id: String) {
-        systemPromptDao.deletePromptById(id)
-    }
+    override suspend fun deletePrompt(id: String) = systemPromptDao.deletePromptById(id)
 
     /**
      * Delete all prompts.
      */
-    suspend fun deleteAllPrompts() {
-        systemPromptDao.deleteAllPrompts()
-    }
+    override suspend fun deleteAllPrompts() = systemPromptDao.deleteAllPrompts()
 
     companion object {
         // Maximum number of recent prompts to keep
diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/di/AppModule.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/di/AppModule.kt
index da1b1306a4..5045c89383 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/di/AppModule.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/di/AppModule.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import com.example.llama.revamp.data.local.AppDatabase
 import com.example.llama.revamp.data.repository.ModelRepository
 import com.example.llama.revamp.data.repository.ModelRepositoryImpl
+import com.example.llama.revamp.data.repository.SystemPromptRepository
+import com.example.llama.revamp.data.repository.SystemPromptRepositoryImpl
 import com.example.llama.revamp.engine.InferenceEngine
 import com.example.llama.revamp.monitoring.PerformanceMonitor
 import dagger.Binds
@@ -21,6 +23,9 @@ abstract class AppModule {
     @Binds
     abstract fun bindsModelsRepository(impl: ModelRepositoryImpl): ModelRepository
 
+    @Binds
+    abstract fun bindsSystemPromptRepository(impl: SystemPromptRepositoryImpl): SystemPromptRepository
+
     companion object {
         @Provides
         @Singleton