Extra sub seed paramaters (#45)

* Implement extra seed parameters

* Added automatic migration

* Handle persistent SQL defaults

* Added translations

Author: ShiftHackZ

core/ui/src/main/java/com/shifthackz/aisdv1/core/viewmodel/MviViewModel.kt

@@ -2,17 +2,20 @@
 
 package com.shifthackz.aisdv1.core.viewmodel
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.shifthackz.aisdv1.core.ui.BuildConfig
 import com.shifthackz.aisdv1.core.ui.MviEffect
 import com.shifthackz.aisdv1.core.ui.MviState
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 
 abstract class MviViewModel<S : MviState, E : MviEffect> : ViewModel() {
@@ -33,6 +36,9 @@ abstract class MviViewModel<S : MviState, E : MviEffect> : ViewModel() {
     abstract val emptyState: S
 
     open fun setState(state: S) {
+        if (BuildConfig.DEBUG) {
+            Log.d(this::class.simpleName, "NEW STATE : $state")
+        }
         mutableState.tryEmit(state)
     }
 

data/src/main/java/com/shifthackz/aisdv1/data/mappers/AiGenerationResultMappers.kt

@@ -23,6 +23,9 @@ fun AiGenerationResult.mapDomainToEntity(): GenerationResultEntity = with(this)
         restoreFaces = restoreFaces,
         sampler = sampler,
         seed = seed,
+        subSeed = subSeed,
+        subSeedStrength = subSeedStrength,
+        denoisingStrength = denoisingStrength,
     )
 }
 //endregion
@@ -47,6 +50,9 @@ fun GenerationResultEntity.mapEntityToDomain(): AiGenerationResult = with(this)
         restoreFaces = restoreFaces,
         sampler = sampler,
         seed = seed,
+        subSeed = subSeed,
+        subSeedStrength = subSeedStrength,
+        denoisingStrength = denoisingStrength,
     )
 }
 //endregion

data/src/main/java/com/shifthackz/aisdv1/data/mappers/ImageToImagePayloadMappers.kt

@@ -4,7 +4,7 @@ import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import com.shifthackz.aisdv1.domain.entity.ImageToImagePayload
 import com.shifthackz.aisdv1.network.request.ImageToImageRequest
 import com.shifthackz.aisdv1.network.response.SdGenerationResponse
-import java.util.*
+import java.util.Date
 
 fun ImageToImagePayload.mapToRequest(): ImageToImageRequest = with(this) {
     ImageToImageRequest(
@@ -18,6 +18,8 @@ fun ImageToImagePayload.mapToRequest(): ImageToImageRequest = with(this) {
         height = height,
         restoreFaces = restoreFaces,
         seed = seed.trim().ifEmpty { null },
+        subSeed = subSeed.trim().ifEmpty { null },
+        subSeedStrength = subSeedStrength,
         samplerIndex = sampler,
     )
 }
@@ -30,6 +32,7 @@ fun Pair<ImageToImagePayload, SdGenerationResponse>.mapToAiGenResult(): AiGenera
             inputImage = payload.base64Image,
             createdAt = Date(),
             type = AiGenerationResult.Type.IMAGE_TO_IMAGE,
+            denoisingStrength = payload.denoisingStrength,
             prompt = payload.prompt,
             negativePrompt = payload.negativePrompt,
             width = payload.width,
@@ -38,8 +41,10 @@ fun Pair<ImageToImagePayload, SdGenerationResponse>.mapToAiGenResult(): AiGenera
             cfgScale = payload.cfgScale,
             restoreFaces = payload.restoreFaces,
             sampler = payload.sampler,
-            seed = if (payload.seed.trim().isNotEmpty()) payload.seed else mapSeedFromRemote(
-                response.info
-            ),
+            seed = if (payload.seed.trim().isNotEmpty()) payload.seed
+            else mapSeedFromRemote(response.info),
+            subSeed = if (payload.subSeed.trim().isNotEmpty()) payload.subSeed
+            else mapSubSeedFromRemote(response.info),
+            subSeedStrength = payload.subSeedStrength,
         )
     }

data/src/main/java/com/shifthackz/aisdv1/data/mappers/ResponseParamsMapper.kt

@@ -0,0 +1,23 @@
+package com.shifthackz.aisdv1.data.mappers
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.shifthackz.aisdv1.core.common.log.errorLog
+import com.shifthackz.aisdv1.network.response.SdGenerationResponse
+
+fun mapSeedFromRemote(infoString: String): String = parseInfo(infoString).fold(
+    onFailure = { "" },
+    onSuccess = { "${it.seed}" }
+)
+
+fun mapSubSeedFromRemote(infoString: String): String = parseInfo(infoString).fold(
+    onFailure = { "" },
+    onSuccess = { "${it.subSeed}" }
+)
+
+private fun parseInfo(infoString: String) = runCatching {
+    return@runCatching Gson().fromJson<SdGenerationResponse.Info>(
+        infoString,
+        object : TypeToken<SdGenerationResponse.Info>() {}.type
+    )
+}.onFailure { errorLog("::parseInfo", it) }

data/src/main/java/com/shifthackz/aisdv1/data/mappers/SeedMapper.kt

@@ -4,7 +4,7 @@ import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import com.shifthackz.aisdv1.domain.entity.TextToImagePayload
 import com.shifthackz.aisdv1.network.request.TextToImageRequest
 import com.shifthackz.aisdv1.network.response.SdGenerationResponse
-import java.util.*
+import java.util.Date
 
 fun TextToImagePayload.mapToRequest(): TextToImageRequest = with(this) {
     TextToImageRequest(
@@ -16,6 +16,8 @@ fun TextToImagePayload.mapToRequest(): TextToImageRequest = with(this) {
         height = height,
         restoreFaces = restoreFaces,
         seed = seed.trim().ifEmpty { null },
+        subSeed = subSeed.trim().ifEmpty { null },
+        subSeedStrength = subSeedStrength,
         samplerIndex = sampler,
     )
 }
@@ -28,6 +30,7 @@ fun Pair<TextToImagePayload, SdGenerationResponse>.mapToAiGenResult(): AiGenerat
             inputImage = "",
             createdAt = Date(),
             type = AiGenerationResult.Type.TEXT_TO_IMAGE,
+            denoisingStrength = 0f,
             prompt = payload.prompt,
             negativePrompt = payload.negativePrompt,
             width = payload.width,
@@ -36,8 +39,10 @@ fun Pair<TextToImagePayload, SdGenerationResponse>.mapToAiGenResult(): AiGenerat
             cfgScale = payload.cfgScale,
             restoreFaces = payload.restoreFaces,
             sampler = payload.sampler,
-            seed = if (payload.seed.trim().isNotEmpty()) payload.seed else mapSeedFromRemote(
-                response.info
-            ),
+            seed = if (payload.seed.trim().isNotEmpty()) payload.seed
+            else mapSeedFromRemote(response.info),
+            subSeed = if (payload.subSeed.trim().isNotEmpty()) payload.subSeed
+            else mapSubSeedFromRemote(response.info),
+            subSeedStrength = payload.subSeedStrength,
         )
     }

data/src/main/java/com/shifthackz/aisdv1/data/mappers/TextToImagePayloadMappers.kt

@@ -4,7 +4,7 @@ import com.shifthackz.aisdv1.demo.serialize.DemoDataSerializer
 import com.shifthackz.aisdv1.domain.demo.ImageToImageDemo
 import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import com.shifthackz.aisdv1.domain.entity.ImageToImagePayload
-import java.util.*
+import java.util.Date
 
 internal class ImageToImageDemoImpl(
     override val demoDataSerializer: DemoDataSerializer,
@@ -25,6 +25,9 @@ internal class ImageToImageDemoImpl(
         restoreFaces = input.restoreFaces,
         sampler = input.sampler,
         seed = System.currentTimeMillis().toString(),
+        subSeed = System.currentTimeMillis().toString(),
+        subSeedStrength = 0f,
+        denoisingStrength = 0f,
     )
 
     override fun getDemoBase64(payload: ImageToImagePayload) = execute(payload)

demo/src/main/java/com/shifthackz/aisdv1/demo/ImageToImageDemoImpl.kt

@@ -4,7 +4,7 @@ import com.shifthackz.aisdv1.demo.serialize.DemoDataSerializer
 import com.shifthackz.aisdv1.domain.demo.TextToImageDemo
 import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import com.shifthackz.aisdv1.domain.entity.TextToImagePayload
-import java.util.*
+import java.util.Date
 
 internal class TextToImageDemoImpl(
     override val demoDataSerializer: DemoDataSerializer,
@@ -25,6 +25,9 @@ internal class TextToImageDemoImpl(
         restoreFaces = input.restoreFaces,
         sampler = input.sampler,
         seed = System.currentTimeMillis().toString(),
+        subSeed = System.currentTimeMillis().toString(),
+        subSeedStrength = 0f,
+        denoisingStrength = 0f,
     )
 
     override fun getDemoBase64(payload: TextToImagePayload) = execute(payload)

demo/src/main/java/com/shifthackz/aisdv1/demo/TextToImageDemoImpl.kt

@@ -1,6 +1,6 @@
 package com.shifthackz.aisdv1.domain.entity
 
-import java.util.*
+import java.util.Date
 
 data class AiGenerationResult(
     val id: Long,
@@ -17,6 +17,9 @@ data class AiGenerationResult(
     val restoreFaces: Boolean,
     val sampler: String,
     val seed: String,
+    val subSeed: String,
+    val subSeedStrength: Float,
+    val denoisingStrength: Float,
 ) {
     enum class Type(val key: String) {
         TEXT_TO_IMAGE("txt2img"),

domain/src/main/java/com/shifthackz/aisdv1/domain/entity/AiGenerationResult.kt

@@ -11,5 +11,7 @@ data class ImageToImagePayload(
     val height: Int,
     val restoreFaces: Boolean,
     val seed: String,
+    val subSeed: String,
+    val subSeedStrength: Float,
     val sampler: String,
-)
+)