Horde NSFW implementation | Patch 1 (#115)

ShiftHackZ · web-flow · commit 912d9cfb20e5 · 2024-02-07T12:26:13.000+02:00
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/mappers/ImageToImagePayloadMappers.kt b/data/src/main/java/com/shifthackz/aisdv1/data/mappers/ImageToImagePayloadMappers.kt
@@ -28,7 +28,7 @@ fun ImageToImagePayload.mapToRequest(): ImageToImageRequest = with(this) {
 fun ImageToImagePayload.mapToHordeRequest(): HordeGenerationAsyncRequest = with(this) {
     HordeGenerationAsyncRequest(
         prompt = prompt,
-        nsfw = false,
+        nsfw = nsfw,
         sourceProcessing = "img2img",
         sourceImage = base64Image,
         params = HordeGenerationAsyncRequest.Params(
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/mappers/TextToImagePayloadMappers.kt b/data/src/main/java/com/shifthackz/aisdv1/data/mappers/TextToImagePayloadMappers.kt
@@ -27,7 +27,7 @@ fun TextToImagePayload.mapToRequest(): TextToImageRequest = with(this) {
 fun TextToImagePayload.mapToHordeRequest(): HordeGenerationAsyncRequest = with(this) {
     HordeGenerationAsyncRequest(
         prompt = prompt,
-        nsfw = false,
+        nsfw = nsfw,
         sourceProcessing = null,
         sourceImage = null,
         params = HordeGenerationAsyncRequest.Params(
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/ImageToImagePayload.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/ImageToImagePayload.kt
@@ -14,4 +14,5 @@ data class ImageToImagePayload(
     val subSeed: String,
     val subSeedStrength: Float,
     val sampler: String,
+    val nsfw: Boolean,
 )
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/TextToImagePayload.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/TextToImagePayload.kt
@@ -12,4 +12,5 @@ data class TextToImagePayload(
     val subSeed: String,
     val subSeedStrength: Float,
     val sampler: String,
+    val nsfw: Boolean,
 )
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviState.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviState.kt
@@ -22,6 +22,7 @@ abstract class GenerationMviState : MviState {
     abstract val availableSamplers: List<String>
     abstract val widthValidationError: UiText?
     abstract val heightValidationError: UiText?
+    abstract val nsfw: Boolean
     abstract val generateButtonEnabled: Boolean
 
     open val hasValidationErrors: Boolean
@@ -45,6 +46,7 @@ abstract class GenerationMviState : MviState {
         availableSamplers: List<String> = this.availableSamplers,
         widthValidationError: UiText? = this.widthValidationError,
         heightValidationError: UiText? = this.heightValidationError,
+        nsfw: Boolean = this.nsfw,
         generateButtonEnabled: Boolean = this.generateButtonEnabled,
     ): GenerationMviState = this
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviViewModel.kt
@@ -154,6 +154,10 @@ abstract class GenerationMviViewModel<S : GenerationMviState, E : MviEffect>(
         .copyState(selectedSampler = value)
         .let(::setGenerationState)
 
+    fun updateNsfw(value: Boolean) = currentState
+        .copyState(nsfw = value)
+        .let(::setGenerationState)
+
     private fun setGenerationState(state: GenerationMviState) = runCatching {
         setState(state as? S ?: currentState)
     }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageContract.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageContract.kt
@@ -34,6 +34,7 @@ data class ImageToImageState(
     override val availableSamplers: List<String> = emptyList(),
     override val widthValidationError: UiText? = null,
     override val heightValidationError: UiText? = null,
+    override val nsfw: Boolean = false,
     override val generateButtonEnabled: Boolean = true,
 ) : GenerationMviState() {
 
@@ -73,6 +74,7 @@ data class ImageToImageState(
         availableSamplers: List<String>,
         widthValidationError: UiText?,
         heightValidationError: UiText?,
+        nsfw: Boolean,
         generateButtonEnabled: Boolean
     ): GenerationMviState = copy(
         mode = mode,
@@ -92,6 +94,7 @@ data class ImageToImageState(
         availableSamplers = availableSamplers,
         widthValidationError = widthValidationError,
         heightValidationError = heightValidationError,
+        nsfw = nsfw,
         generateButtonEnabled = generateButtonEnabled,
     )
 
@@ -118,5 +121,6 @@ fun ImageToImageState.mapToPayload(): ImageToImagePayload = with(this) {
         subSeed = subSeed.trim(),
         subSeedStrength = subSeedStrength,
         sampler = selectedSampler,
+        nsfw = if (mode == GenerationInputMode.HORDE) nsfw else false,
     )
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageScreen.kt
@@ -94,6 +94,7 @@ class ImageToImageScreen(
             onSubSeedUpdated = viewModel::updateSubSeed,
             onSubSeedStrengthUpdated = viewModel::updateSubSeedStrength,
             onSamplerUpdated = viewModel::updateSampler,
+            onNsfwUpdated = viewModel::updateNsfw,
             onGenerateClicked = viewModel::generate,
             onChangeConfigurationClicked = launchServerSetup,
             onSaveGeneratedImage = viewModel::saveGeneratedResult,
@@ -129,6 +130,7 @@ private fun ScreenContent(
     onSubSeedUpdated: (String) -> Unit = {},
     onSubSeedStrengthUpdated: (Float) -> Unit = {},
     onSamplerUpdated: (String) -> Unit = {},
+    onNsfwUpdated: (Boolean) -> Unit = {},
     onGenerateClicked: () -> Unit = {},
     onChangeConfigurationClicked: () -> Unit = {},
     onSaveGeneratedImage: (AiGenerationResult) -> Unit = {},
@@ -190,6 +192,7 @@ private fun ScreenContent(
                             onSubSeedUpdated = onSubSeedUpdated,
                             onSubSeedStrengthUpdated = onSubSeedStrengthUpdated,
                             onSamplerUpdated = onSamplerUpdated,
+                            onNsfwUpdated = onNsfwUpdated,
                             widthValidationError = state.widthValidationError,
                             heightValidationError = state.heightValidationError,
                             afterSlidersSection = {
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageViewModel.kt
@@ -110,10 +110,6 @@ class ImageToImageViewModel(
     fun generate() {
         when (currentState.imageState) {
             is ImageToImageState.ImageState.Image -> {
-//                if (!currentState.generateButtonEnabled) {
-//                    setActiveDialog(ImageToImageState.Modal.NoSdAiCoins)
-//                    return
-//                }
                 !Single
                     .just((currentState.imageState as ImageToImageState.ImageState.Image).bitmap)
                     .doOnSubscribe { setActiveDialog(ImageToImageState.Modal.Communicating()) }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageContract.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageContract.kt
@@ -31,6 +31,7 @@ data class TextToImageState(
     override val availableSamplers: List<String> = emptyList(),
     override val widthValidationError: UiText? = null,
     override val heightValidationError: UiText? = null,
+    override val nsfw: Boolean = false,
     override val generateButtonEnabled: Boolean = true,
 ) : GenerationMviState() {
 
@@ -64,6 +65,7 @@ data class TextToImageState(
         availableSamplers: List<String>,
         widthValidationError: UiText?,
         heightValidationError: UiText?,
+        nsfw: Boolean,
         generateButtonEnabled: Boolean
     ): GenerationMviState = copy(
         mode = mode,
@@ -83,6 +85,7 @@ data class TextToImageState(
         availableSamplers = availableSamplers,
         widthValidationError = widthValidationError,
         heightValidationError = heightValidationError,
+        nsfw = nsfw,
         generateButtonEnabled = generateButtonEnabled,
     )
 }
@@ -100,6 +103,7 @@ fun TextToImageState.mapToPayload(): TextToImagePayload = with(this) {
         subSeed = subSeed.trim(),
         subSeedStrength = subSeedStrength,
         sampler = selectedSampler,
+        nsfw = if (mode == GenerationInputMode.HORDE) nsfw else false,
     )
 }
 
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageScreen.kt
@@ -64,6 +64,7 @@ class TextToImageScreen(
             onSubSeedUpdated = viewModel::updateSubSeed,
             onSubSeedStrengthUpdated = viewModel::updateSubSeedStrength,
             onSamplerUpdated = viewModel::updateSampler,
+            onNsfwUpdated = viewModel::updateNsfw,
             onGenerateClicked = viewModel::generate,
             onSaveGeneratedImage = viewModel::saveGeneratedResult,
             onViewGeneratedImage = launchGalleryDetail,
@@ -93,6 +94,7 @@ private fun ScreenContent(
     onSubSeedUpdated: (String) -> Unit = {},
     onSubSeedStrengthUpdated: (Float) -> Unit = {},
     onSamplerUpdated: (String) -> Unit = {},
+    onNsfwUpdated: (Boolean) -> Unit = {},
     onGenerateClicked: () -> Unit = {},
     onSaveGeneratedImage: (AiGenerationResult) -> Unit = {},
     onViewGeneratedImage: (Long) -> Unit = {},
@@ -142,6 +144,7 @@ private fun ScreenContent(
                         onSubSeedUpdated = onSubSeedUpdated,
                         onSubSeedStrengthUpdated = onSubSeedStrengthUpdated,
                         onSamplerUpdated = onSamplerUpdated,
+                        onNsfwUpdated = onNsfwUpdated,
                         widthValidationError = state.widthValidationError,
                         heightValidationError = state.heightValidationError,
                     )
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/input/GenerationInputForm.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/input/GenerationInputForm.kt
@@ -13,6 +13,7 @@ import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Slider
+import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TextField
@@ -71,6 +72,7 @@ fun GenerationInputForm(
     onSubSeedUpdated: (String) -> Unit = {},
     onSubSeedStrengthUpdated: (Float) -> Unit = {},
     onSamplerUpdated: (String) -> Unit = {},
+    onNsfwUpdated: (Boolean) -> Unit = {},
     widthValidationError: UiText? = null,
     heightValidationError: UiText? = null,
     afterSlidersSection: @Composable () -> Unit = {},
@@ -191,6 +193,21 @@ fun GenerationInputForm(
                         label = { Text(stringResource(id = R.string.hint_seed)) },
                         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
                     )
+                    if (state.mode == GenerationInputMode.HORDE) Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 8.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Switch(
+                            checked = state.nsfw,
+                            onCheckedChange = onNsfwUpdated,
+                        )
+                        Text(
+                            modifier = Modifier.padding(horizontal = 8.dp),
+                            text = stringResource(id = R.string.hint_nsfw),
+                        )
+                    }
                     if (state.mode == GenerationInputMode.AUTOMATIC1111) TextField(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -291,6 +308,7 @@ private fun GenerationInputFormAutomaticPreview() {
             override val availableSamplers: List<String> = listOf("Euler a")
             override val widthValidationError: UiText? = null
             override val heightValidationError: UiText? = null
+            override val nsfw: Boolean = false
             override val generateButtonEnabled: Boolean = true
         },
     )
@@ -318,6 +336,7 @@ private fun GenerationInputFormAutomaticWithOptionsPreview() {
             override val availableSamplers: List<String> = listOf("Euler a")
             override val widthValidationError: UiText? = null
             override val heightValidationError: UiText? = null
+            override val nsfw: Boolean = false
             override val generateButtonEnabled: Boolean = true
         },
     )
@@ -345,6 +364,7 @@ private fun GenerationInputFormHordePreview() {
             override val availableSamplers: List<String> = listOf("Euler a")
             override val widthValidationError: UiText? = null
             override val heightValidationError: UiText? = null
+            override val nsfw: Boolean = false
             override val generateButtonEnabled: Boolean = true
         },
     )
@@ -372,6 +392,7 @@ private fun GenerationInputFormHordeWithOptionsPreview() {
             override val availableSamplers: List<String> = listOf("Euler a")
             override val widthValidationError: UiText? = null
             override val heightValidationError: UiText? = null
+            override val nsfw: Boolean = false
             override val generateButtonEnabled: Boolean = true
         },
     )
diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml
@@ -54,6 +54,7 @@
     <string name="hint_restore_faces">Yüzleri Düzelt</string>
     <string name="hint_seed">Başlangıç Noktası (Seed)</string>
     <string name="hint_sub_seed">Varyasyon Noktası (Variation seed)</string>
+    <string name="hint_nsfw">İzin vermek NSFW</string>
     <string name="hint_sub_seed_strength">Varyasyon Yoğunluğu: %1$s</string>
     <string name="hint_denoising_strength">Gürültü Arındırma Yoğunluğu: %1$s</string>
     <string name="hint_server_url">Sunucu URL\'i</string>
diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml
@@ -54,6 +54,7 @@
     <string name="hint_restore_faces">Відновлення обличч</string>
     <string name="hint_seed">Seed ідентифікатор</string>
     <string name="hint_sub_seed">Seed варіації</string>
+    <string name="hint_nsfw">Дозволити NSFW</string>
     <string name="hint_sub_seed_strength">Коефіцієнт варіації: %1$s</string>
     <string name="hint_denoising_strength">Коефіцієнт шумозаглушення: %1$s</string>
     <string name="hint_server_url">URL-адреса сервера</string>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="hint_restore_faces">Restore faces</string>
     <string name="hint_seed">Seed</string>
     <string name="hint_sub_seed">Variation seed</string>
+    <string name="hint_nsfw">Allow NSFW</string>
     <string name="hint_sub_seed_strength">Variation strength: %1$s</string>
     <string name="hint_denoising_strength">Denoising Strength: %1$s</string>
     <string name="hint_server_url">Server URL</string>

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ data class ImageToImagePayload(`
`14`	`14`	`val subSeed: String,`
`15`	`15`	`val subSeedStrength: Float,`
`16`	`16`	`val sampler: String,`
	`17`	`+ val nsfw: Boolean,`
`17`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ data class TextToImagePayload(`
`12`	`12`	`val subSeed: String,`
`13`	`13`	`val subSeedStrength: Float,`
`14`	`14`	`val sampler: String,`
	`15`	`+ val nsfw: Boolean,`
`15`	`16`	`)`