Migrate main screens of media sample to Material3 except settings

.github/workflows/android_test.yml

@@ -18,7 +18,7 @@ jobs:
       TERM: dumb
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
@@ -29,7 +29,7 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17

.github/workflows/build.yml

@@ -19,18 +19,18 @@ jobs:
     timeout-minutes: 40
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Unit Tests
         uses: gradle/gradle-build-action@v3
@@ -55,18 +55,18 @@ jobs:
     timeout-minutes: 40
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Unit Tests
         uses: gradle/gradle-build-action@v3
@@ -93,18 +93,18 @@ jobs:
     timeout-minutes: 40
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Unit Tests 2
         uses: gradle/gradle-build-action@v3
@@ -134,18 +134,18 @@ jobs:
       TERM: dumb
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Compile tests
         uses: gradle/gradle-build-action@v3
@@ -160,18 +160,18 @@ jobs:
     timeout-minutes: 40
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3

.github/workflows/build_nightly.yml

@@ -11,15 +11,15 @@ jobs:
     timeout-minutes: 40
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17

.github/workflows/fixup.yml

@@ -9,18 +9,18 @@ jobs:
     timeout-minutes: 40
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Reformat
         uses: gradle/gradle-build-action@v3

.github/workflows/macrobenchmark.yml

@@ -11,15 +11,15 @@ jobs:
       TERM: dumb
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17

.github/workflows/publish-docs.yml

@@ -13,15 +13,15 @@ jobs:
       TERM: dumb
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           lfs: 'true'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17

ai/sample/core/build.gradle.kts

@@ -26,7 +26,7 @@ android {
     compileSdk = 36
 
     defaultConfig {
-        minSdk = 21
+        minSdk = 23
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -117,6 +117,8 @@ dependencies {
     implementation(projects.datalayer.grpc)
     ksp(libs.dagger.hiltandroidcompiler)
 
+    implementation(libs.grpc.stub)
+
     implementation(platform(libs.compose.bom))
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines.core)

ai/sample/core/src/main/java/com/google/android/horologist/ai/core/InferenceService.kt

@@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.stateIn
@@ -77,7 +78,7 @@ class InferenceService
                 }
             }
 
-        suspend fun submit(prompt: Prompt): Response {
+        suspend fun submit(prompt: Prompt): ResponseBundle {
             val currentModel = connectedModel.value ?: throw Exception("No model selected")
 
             val (_, service) = models.value?.first { it.first.modelsList.find { it.modelId == currentModel } != null }
@@ -91,11 +92,31 @@ class InferenceService
             )
         }
 
+        suspend fun submitStream(prompt: Prompt): Flow<Response> {
+            val currentModel = connectedModel.value ?: throw Exception("No model selected")
+
+            val (_, service) = models.value?.first { it.first.modelsList.find { it.modelId == currentModel } != null }
+                ?: throw Exception("Service missing")
+
+            return service.answerPromptWithStream(
+                promptRequest {
+                    this.prompt = prompt
+                    this.modelId = currentModel
+                },
+            )
+        }
+
         fun selectModel(modelId: ModelId) {
             connectedModel.value = modelId
         }
 
         fun clearModel() {
             connectedModel.value = null
         }
+
+        suspend fun currentKnownModels(): List<ModelId> {
+            return models.filterNotNull().first().flatMap {
+                it.first.modelsList.map { it.modelId }
+            }
+        }
     }

ai/sample/core/src/main/java/com/google/android/horologist/ai/core/binder/BinderInferenceService.kt

@@ -19,8 +19,13 @@ package com.google.android.horologist.ai.core.binder
 import com.google.android.horologist.ai.core.InferenceServiceGrpcKt
 import com.google.android.horologist.ai.core.PromptRequest
 import com.google.android.horologist.ai.core.Response
+import com.google.android.horologist.ai.core.ResponseBundle
 import com.google.android.horologist.ai.core.ServiceInfo
 import com.google.protobuf.Empty
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
 
 class BinderInferenceService(
     val stub: InferenceServiceGrpcKt.InferenceServiceCoroutineStub,
@@ -37,7 +42,13 @@ class BinderInferenceService(
         }
     }
 
-    override suspend fun answerPrompt(request: PromptRequest): Response {
+    override suspend fun answerPrompt(request: PromptRequest): ResponseBundle {
         return stub.answerPrompt(request)
     }
+
+    override fun answerPromptWithStream(request: PromptRequest): Flow<Response> {
+        return flow {
+            emitAll(answerPrompt(request).responsesList.asFlow())
+        }
+    }
 }

ai/sample/core/src/main/java/com/google/android/horologist/ai/core/binder/BinderInferenceServiceRegistry.kt

@@ -46,4 +46,7 @@ class BinderInferenceServiceRegistry(
             )
         }
     }
+
+    override val priority: Int
+        get() = 1
 }

ai/sample/core/src/main/java/com/google/android/horologist/ai/core/datalayer/DataLayerInferenceService.kt

@@ -20,13 +20,18 @@ import com.google.android.gms.wearable.Node
 import com.google.android.horologist.ai.core.InferenceServiceGrpcKt
 import com.google.android.horologist.ai.core.PromptRequest
 import com.google.android.horologist.ai.core.Response
+import com.google.android.horologist.ai.core.ResponseBundle
 import com.google.android.horologist.ai.core.ServiceInfo
 import com.google.android.horologist.ai.core.copy
 import com.google.android.horologist.data.TargetNodeId
 import com.google.android.horologist.data.WearDataLayerRegistry
 import com.google.android.horologist.datalayer.grpc.GrpcExtensions.grpcClient
 import com.google.protobuf.Empty
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
 
 class DataLayerInferenceService(
     dataLayerRegistry: WearDataLayerRegistry,
@@ -46,7 +51,13 @@ class DataLayerInferenceService(
         }
     }
 
-    override suspend fun answerPrompt(request: PromptRequest): Response {
+    override suspend fun answerPrompt(request: PromptRequest): ResponseBundle {
         return proxy.answerPrompt(request)
     }
+
+    override fun answerPromptWithStream(request: PromptRequest): Flow<Response> {
+        return flow {
+            emitAll(answerPrompt(request).responsesList.asFlow())
+        }
+    }
 }

ai/sample/core/src/main/java/com/google/android/horologist/ai/core/datalayer/DataLayerInferenceServiceRegistry.kt

@@ -32,14 +32,12 @@ class DataLayerInferenceServiceRegistry(
     override fun models(): Flow<List<InferenceServiceGrpcKt.InferenceServiceCoroutineImplBase>> {
         return flow {
             val allCapabilities = dataLayerRegistry.capabilityClient.getAllCapabilities(CapabilityClient.FILTER_ALL).await()
-            println("Capabilties")
             allCapabilities.forEach { (key, list) ->
                 println(key)
                 list.nodes.forEach {
                     println(it.id + " " + it.displayName + " " + it.isNearby)
                 }
             }
-            println("End")
 
             val capabilities = dataLayerRegistry.capabilityClient.getCapability(
                 CAPABILITY_INFERENCE_SERVICE,
@@ -54,6 +52,9 @@ class DataLayerInferenceServiceRegistry(
         }
     }
 
+    override val priority: Int
+        get() = 2
+
     companion object {
         val CAPABILITY_INFERENCE_SERVICE = "InferenceService"
     }