Interactive progress updating.

AustinShalit · AustinShalit · commit ac8c7695b49d · 2020-01-24T11:41:02.000-05:00
diff --git a/db-data-test-util/src/main/kotlin/edu/wpi/axon/dbdata/TestUtil.kt b/db-data-test-util/src/main/kotlin/edu/wpi/axon/dbdata/TestUtil.kt
@@ -31,38 +31,38 @@ fun Random.nextTrainingScriptProgress(): TrainingScriptProgress =
     }
 
 fun Random.nextJob() = Job(
-    RandomStringUtils.randomAlphanumeric(10),
-    nextTrainingScriptProgress(),
-    RandomStringUtils.randomAlphanumeric(10),
-    RandomStringUtils.randomAlphanumeric(10),
-    nextDataset(),
-    Optimizer.Adam(
-        nextDouble(),
-        nextDouble(),
-        nextDouble(),
-        nextDouble(),
-        nextBoolean()
-    ),
-    Loss.SparseCategoricalCrossentropy,
-    setOf(
-        RandomStringUtils.randomAlphanumeric(10),
-        RandomStringUtils.randomAlphanumeric(10)
-    ),
-    nextInt(),
-    Model.Sequential(
-        RandomStringUtils.randomAlphanumeric(10),
-        (1..3).map { nextInt(128) },
-        setOf(
-            Layer.Dense(RandomStringUtils.randomAlphanumeric(10), null, 10).trainable(),
-            Layer.Conv2D(
+        name = RandomStringUtils.randomAlphanumeric(10),
+        status = nextTrainingScriptProgress(),
+        userOldModelPath = RandomStringUtils.randomAlphanumeric(10),
+        userNewModelName = RandomStringUtils.randomAlphanumeric(10),
+        userDataset = nextDataset(),
+        userOptimizer = Optimizer.Adam(
+                nextDouble(),
+                nextDouble(),
+                nextDouble(),
+                nextDouble(),
+                nextBoolean()
+        ),
+        userLoss = Loss.SparseCategoricalCrossentropy,
+        userMetrics = setOf(
                 RandomStringUtils.randomAlphanumeric(10),
-                null,
-                9,
-                SerializableTuple2II(3, 3),
-                Activation.SoftMax
-            ).trainable(),
-            Layer.AveragePooling2D(RandomStringUtils.randomAlphanumeric(10), null).untrainable()
-        )
-    ),
-    nextBoolean()
+                RandomStringUtils.randomAlphanumeric(10)
+        ),
+        userEpochs = nextInt(),
+        userModel = Model.Sequential(
+                RandomStringUtils.randomAlphanumeric(10),
+                (1..3).map { nextInt(128) },
+                setOf(
+                        Layer.Dense(RandomStringUtils.randomAlphanumeric(10), null, 10).trainable(),
+                        Layer.Conv2D(
+                                RandomStringUtils.randomAlphanumeric(10),
+                                null,
+                                9,
+                                SerializableTuple2II(3, 3),
+                                Activation.SoftMax
+                        ).trainable(),
+                        Layer.AveragePooling2D(RandomStringUtils.randomAlphanumeric(10), null).untrainable()
+                )
+        ),
+        generateDebugComments = nextBoolean()
 )
diff --git a/db/src/main/kotlin/edu/wpi/axon/db/JobDb.kt b/db/src/main/kotlin/edu/wpi/axon/db/JobDb.kt
@@ -51,42 +51,62 @@ internal object Jobs : IntIdTable() {
     }
 }
 
+typealias JobCallback = (Job) -> Unit
+
 class JobDb(private val database: Database) {
+
+    private val observers = mutableListOf<JobCallback>()
+
     init {
         transaction(database) {
             SchemaUtils.create(Jobs)
         }
     }
 
-    fun create(job: Job): Int? = transaction(database) {
-        Jobs.insertAndGetId { row ->
-            row[name] = job.name
-            row[status] = job.status.serialize()
-            row[userOldModelPath] = job.userOldModelPath
-            row[userNewModelName] = job.userNewModelName
-            row[userDataset] = job.userDataset.serialize()
-            row[userOptimizer] = job.userOptimizer.serialize()
-            row[userLoss] = job.userLoss.serialize()
-            row[userMetrics] = klaxon.toJsonString(job.userMetrics)
-            row[userEpochs] = job.userEpochs
-            row[userModel] = job.userModel.serialize()
-            row[generateDebugComments] = job.generateDebugComments
-        }.value
+    fun subscribe(onUpdate: JobCallback) {
+        observers.add(onUpdate)
+    }
+
+    fun create(job: Job): Job {
+        val newId = transaction(database) {
+            Jobs.insertAndGetId { row ->
+                row[name] = job.name
+                row[status] = job.status.serialize()
+                row[userOldModelPath] = job.userOldModelPath
+                row[userNewModelName] = job.userNewModelName
+                row[userDataset] = job.userDataset.serialize()
+                row[userOptimizer] = job.userOptimizer.serialize()
+                row[userLoss] = job.userLoss.serialize()
+                row[userMetrics] = klaxon.toJsonString(job.userMetrics)
+                row[userEpochs] = job.userEpochs
+                row[userModel] = job.userModel.serialize()
+                row[generateDebugComments] = job.generateDebugComments
+            }.value
+        }
+
+        val newJob = job.copy(id = newId)
+        observers.forEach { it(newJob) }
+
+        return newJob
     }
 
-    fun update(job: Job): Int? = transaction(database) {
-        Jobs.update({ Jobs.id eq job.id }) {
-            it[name] = job.name
-            it[status] = job.status.serialize()
-            it[userOldModelPath] = job.userOldModelPath
-            it[userNewModelName] = job.userNewModelName
-            it[userDataset] = job.userDataset.serialize()
-            it[userOptimizer] = job.userOptimizer.serialize()
-            it[userLoss] = job.userLoss.serialize()
-            it[userMetrics] = klaxon.toJsonString(job.userMetrics)
-            it[userEpochs] = job.userEpochs
-            it[generateDebugComments] = job.generateDebugComments
+    fun update(job: Job) {
+        transaction(database) {
+            Jobs.update({ Jobs.id eq job.id }) {
+                it[name] = job.name
+                it[status] = job.status.serialize()
+                it[userOldModelPath] = job.userOldModelPath
+                it[userNewModelName] = job.userNewModelName
+                it[userDataset] = job.userDataset.serialize()
+                it[userOptimizer] = job.userOptimizer.serialize()
+                it[userLoss] = job.userLoss.serialize()
+                it[userMetrics] = klaxon.toJsonString(job.userMetrics)
+                it[userEpochs] = job.userEpochs
+                it[generateDebugComments] = job.generateDebugComments
+            }
         }
+
+        observers.forEach { it(job) }
     }
 
     fun count(): Int = transaction(database) {
@@ -111,9 +131,11 @@ class JobDb(private val database: Database) {
             .firstOrNull()
     }
 
-    fun remove(id: Int): Int? = transaction(database) {
-        Jobs.deleteWhere { Jobs.id eq id }
-    }
+    fun remove(job: Job) {
+        transaction(database) {
+            Jobs.deleteWhere { Jobs.id eq job.id }
+        }
 
-    fun remove(job: Job): Int? = remove(job.id)
+        observers.forEach { it(job) }
+    }
 }
diff --git a/db/src/test/kotlin/edu/wpi/axon/db/JobDbTest.kt b/db/src/test/kotlin/edu/wpi/axon/db/JobDbTest.kt
@@ -3,7 +3,6 @@ package edu.wpi.axon.db
 import edu.wpi.axon.dbdata.nextJob
 import io.kotlintest.matchers.collections.shouldContainExactly
 import io.kotlintest.matchers.nulls.shouldBeNull
-import io.kotlintest.matchers.nulls.shouldNotBeNull
 import io.kotlintest.shouldBe
 import java.io.File
 import java.nio.file.Paths
@@ -21,23 +20,21 @@ internal class JobDbTest {
         val db = createDb(tempDir)
         val job = Random.nextJob()
 
-        val id = db.create(job)
-        id.shouldNotBeNull()
+        val newJob = db.create(job)
 
         transaction {
             Jobs.select { Jobs.name eq job.name }
                 .map { Jobs.toDomain(it) }
-                .shouldContainExactly(job.copy(id = id))
+                .shouldContainExactly(newJob)
         }
     }
 
     @Test
     fun `update test`(@TempDir tempDir: File) {
         val db = createDb(tempDir)
-        val id = db.create(Random.nextJob())
-        val job = db.getById(id!!)
+        val job = db.create(Random.nextJob())
 
-        job!!.name = "Test"
+        job.name = "Test"
         db.update(job)
 
         transaction {
@@ -52,9 +49,9 @@ internal class JobDbTest {
         val db = createDb(tempDir)
         val job = Random.nextJob()
 
-        val id = db.create(job)!!
+        val newJob = db.create(job)
 
-        db.findByName(job.name).shouldBe(job.copy(id = id))
+        db.findByName(job.name).shouldBe(newJob)
     }
 
     @Test
@@ -73,9 +70,9 @@ internal class JobDbTest {
         val db = createDb(tempDir)
         val job = Random.nextJob()
 
-        val id = db.create(job)!!
+        val newJob = db.create(job)
 
-        db.remove(id).shouldBe(id)
+        db.remove(newJob)
         db.findByName(job.name).shouldBeNull()
     }
 
diff --git a/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/FrontendKoinModules.kt b/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/FrontendKoinModules.kt
@@ -6,7 +6,6 @@ import edu.wpi.axon.aws.findAxonS3Bucket
 import edu.wpi.axon.aws.preferences.LocalPreferencesManager
 import edu.wpi.axon.aws.preferences.PreferencesManager
 import edu.wpi.axon.db.JobDb
-import edu.wpi.axon.ui.service.JobProvider
 import java.nio.file.Paths
 import org.jetbrains.exposed.sql.Database
 import org.koin.core.qualifier.named
@@ -24,8 +23,6 @@ fun defaultFrontendModule() = module {
         )
     }
 
-    single { JobProvider(get()) }
-
     single {
         val boundBucketName = get<String?>(named(axonBucketName))
         if (boundBucketName != null) {
diff --git a/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/MainLayout.kt b/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/MainLayout.kt
@@ -15,6 +15,7 @@ import com.vaadin.flow.component.UI
 import com.vaadin.flow.component.applayout.AppLayout
 import com.vaadin.flow.component.icon.VaadinIcon
 import com.vaadin.flow.component.orderedlayout.FlexComponent
+import com.vaadin.flow.component.page.Push
 import com.vaadin.flow.router.RouterLink
 import com.vaadin.flow.server.PWA
 import com.vaadin.flow.theme.Theme
@@ -27,6 +28,7 @@ import kotlin.reflect.KClass
 /**
  * The main layout of the application.
  */
+@Push
 @Theme(value = Lumo::class)
 @PWA(name = "Axon", shortName = "axon")
 class MainLayout : AppLayout() {
diff --git a/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/WebAppListener.kt b/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/WebAppListener.kt
@@ -65,7 +65,7 @@ class WebAppListener : ServletContextListener, KoinComponent {
         // TODO: Encapsulate this somewhere better
         fun loadModel(modelName: String): Pair<Model, String> {
             val localModelPath =
-                Paths.get("/home/salmon/Documents/Axon/training/src/test/resources/edu/wpi/axon/training/$modelName")
+                Paths.get("/Users/austinshalit/git/Axon/training/src/test/resources/edu/wpi/axon/training/$modelName")
                     .toString()
             val layers =
                 ModelLoaderFactory().createModeLoader(localModelPath).load(File(localModelPath))
diff --git a/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/service/JobProvider.kt b/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/service/JobProvider.kt
@@ -1,14 +1,27 @@
 package edu.wpi.axon.ui.service
 
+import com.vaadin.flow.component.UI
 import com.vaadin.flow.data.provider.AbstractBackEndDataProvider
 import com.vaadin.flow.data.provider.Query
 import edu.wpi.axon.db.JobDb
 import edu.wpi.axon.dbdata.Job
+import edu.wpi.axon.ui.view.HasNotifications
 import java.util.stream.Stream
+import org.koin.core.KoinComponent
+import org.koin.core.inject
 
-class JobProvider(
-    private val jobs: JobDb
-) : AbstractBackEndDataProvider<Job, Void>() {
+class JobProvider : AbstractBackEndDataProvider<Job, Void>(), KoinComponent, HasNotifications {
+
+    private val jobs: JobDb by inject()
+
+    init {
+        val ui = UI.getCurrent()
+        jobs.subscribe {
+            ui.access {
+                refreshItem(it)
+            }
+        }
+    }
 
     override fun sizeInBackEnd(query: Query<Job, Void>?): Int {
         return jobs.count()
diff --git a/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/view/jobs/JobsView.kt b/ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/view/jobs/JobsView.kt
@@ -34,7 +34,7 @@ import org.koin.core.inject
 class JobsView : KComposite(), HasUrlParameter<Int>, AfterNavigationObserver, EntityView<Job>,
     KoinComponent {
 
-    private val dataProvider by inject<JobProvider>()
+    private val dataProvider = JobProvider()
     private val jobDb by inject<JobDb>()
 
     override val entityName: String
