img2img random input (#79)

ShiftHackZ · web-flow · commit 143c3d488d29 · 2023-08-05T11:58:28.000+03:00
* img2img random image :: Patch 1

* img2img random image :: Patch 2
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ Stable Diffusion AI is an easy-to-use app that lets you quickly generate images
   - **Restore faces** option
   - ( Img2Img ONLY ) : Image selection from device gallery _(requires user permission)_
   - ( Img2Img ONLY ) : Capture input image from camera _(requires user permission)_
+  - ( Img2Img ONLY ) : Fetching random image for the input 
 - In-app Gallery, stored locally, contains all AI generated images
   - Displays generated images grid
   - Image detail view: Zoom, Pinch, Generation Info. 
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,6 +25,7 @@ android {
         versionCode 159
 
         buildConfigField "String", "CLOUD_AI_URL", "\"https://sdai.moroz.cc\""
+        buildConfigField "String", "IMAGE_CDN_URL", "\"https://random.imagecdn.app\""
         buildConfigField "String", "HORDE_AI_URL", "\"https://stablehorde.net\""
         buildConfigField "String", "HORDE_AI_SIGN_UP_URL", "\"https://stablehorde.net/register\""
         buildConfigField "String", "UPDATE_API_URL", "\"https://sdai.moroz.cc\""
diff --git a/app/src/main/java/com/shifthackz/aisdv1/app/di/ProvidersModule.kt b/app/src/main/java/com/shifthackz/aisdv1/app/di/ProvidersModule.kt
@@ -34,6 +34,7 @@ val providersModule = module {
             override val stableDiffusionAppApiUrl: String = BuildConfig.UPDATE_API_URL
             override val stableDiffusionCloudAiApiUrl: String = BuildConfig.CLOUD_AI_URL
             override val hordeApiUrl: String = BuildConfig.HORDE_AI_URL
+            override val imageCdnApiUrl: String = BuildConfig.IMAGE_CDN_URL
         }
     }
 
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/di/RemoteDataSourceModule.kt b/data/src/main/java/com/shifthackz/aisdv1/data/di/RemoteDataSourceModule.kt
@@ -10,6 +10,7 @@ import com.shifthackz.aisdv1.data.remote.FeatureFlagsRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.HordeGenerationRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.HordeStatusSource
 import com.shifthackz.aisdv1.data.remote.MotdRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.RandomImageRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.ServerConfigurationRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.StableDiffusionGenerationRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.StableDiffusionModelsRemoteDataSource
@@ -19,6 +20,7 @@ import com.shifthackz.aisdv1.domain.datasource.CoinDataSource
 import com.shifthackz.aisdv1.domain.datasource.FeatureFlagsDataSource
 import com.shifthackz.aisdv1.domain.datasource.HordeGenerationDataSource
 import com.shifthackz.aisdv1.domain.datasource.MotdDataSource
+import com.shifthackz.aisdv1.domain.datasource.RandomImageDataSource
 import com.shifthackz.aisdv1.domain.datasource.ServerConfigurationDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionGenerationDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionModelsDataSource
@@ -57,6 +59,7 @@ val remoteDataSourceModule = module {
     factoryOf(::CoinRemoteDateSource) bind CoinDataSource.Remote::class
     factoryOf(::MotdRemoteDataSource) bind MotdDataSource.Remote::class
     factoryOf(::FeatureFlagsRemoteDataSource) bind FeatureFlagsDataSource.Remote::class
+    factoryOf(::RandomImageRemoteDataSource) bind RandomImageDataSource.Remote::class
 
     factory<ServerConnectivityGateway> {
         val lambda: () -> Boolean = {
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/di/RepositoryModule.kt b/data/src/main/java/com/shifthackz/aisdv1/data/di/RepositoryModule.kt
@@ -6,6 +6,7 @@ import com.shifthackz.aisdv1.data.repository.FeatureFlagsRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.GenerationResultRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.HordeGenerationRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.MotdRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.RandomImageRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.ServerConfigurationRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.StableDiffusionGenerationRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.StableDiffusionModelsRepositoryImpl
@@ -16,6 +17,7 @@ import com.shifthackz.aisdv1.domain.repository.FeatureFlagsRepository
 import com.shifthackz.aisdv1.domain.repository.GenerationResultRepository
 import com.shifthackz.aisdv1.domain.repository.HordeGenerationRepository
 import com.shifthackz.aisdv1.domain.repository.MotdRepository
+import com.shifthackz.aisdv1.domain.repository.RandomImageRepository
 import com.shifthackz.aisdv1.domain.repository.ServerConfigurationRepository
 import com.shifthackz.aisdv1.domain.repository.StableDiffusionGenerationRepository
 import com.shifthackz.aisdv1.domain.repository.StableDiffusionModelsRepository
@@ -35,4 +37,5 @@ val repositoryModule = module {
     factoryOf(::CoinRepositoryImpl) bind CoinRepository::class
     factoryOf(::MotdRepositoryImpl) bind MotdRepository::class
     factoryOf(::FeatureFlagsRepositoryImpl) bind FeatureFlagsRepository::class
+    factoryOf(::RandomImageRepositoryImpl) bind RandomImageRepository::class
 }
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/MotdRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/MotdRemoteDataSource.kt
@@ -5,7 +5,7 @@ import com.shifthackz.aisdv1.domain.datasource.MotdDataSource
 import com.shifthackz.aisdv1.network.api.sdai.MotdRestApi
 import com.shifthackz.aisdv1.network.response.MotdResponse
 
-class MotdRemoteDataSource(
+internal class MotdRemoteDataSource(
     private val api: MotdRestApi,
 ) : MotdDataSource.Remote {
 
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/RandomImageRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/RandomImageRemoteDataSource.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.data.remote
+
+import com.shifthackz.aisdv1.domain.datasource.RandomImageDataSource
+import com.shifthackz.aisdv1.network.api.imagecdn.ImageCdnRestApi
+
+internal class RandomImageRemoteDataSource(
+    private val api: ImageCdnRestApi,
+) : RandomImageDataSource.Remote {
+
+    override fun fetch() = api.fetchRandomImage()
+}
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/repository/RandomImageRepositoryImpl.kt b/data/src/main/java/com/shifthackz/aisdv1/data/repository/RandomImageRepositoryImpl.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.data.repository
+
+import com.shifthackz.aisdv1.domain.datasource.RandomImageDataSource
+import com.shifthackz.aisdv1.domain.repository.RandomImageRepository
+
+internal class RandomImageRepositoryImpl(
+    private val remoteDataSource: RandomImageDataSource.Remote,
+) : RandomImageRepository {
+
+    override fun fetchAndGet() = remoteDataSource.fetch()
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/datasource/RandomImageDataSource.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/datasource/RandomImageDataSource.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.domain.datasource
+
+import android.graphics.Bitmap
+import io.reactivex.rxjava3.core.Single
+
+sealed interface RandomImageDataSource {
+
+    interface Remote : RandomImageDataSource {
+        fun fetch(): Single<Bitmap>
+    }
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/di/DomainModule.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/di/DomainModule.kt
@@ -30,6 +30,8 @@ import com.shifthackz.aisdv1.domain.usecase.generation.GetGenerationResultPagedU
 import com.shifthackz.aisdv1.domain.usecase.generation.GetGenerationResultPagedUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.generation.GetGenerationResultUseCase
 import com.shifthackz.aisdv1.domain.usecase.generation.GetGenerationResultUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.generation.GetRandomImageUseCase
+import com.shifthackz.aisdv1.domain.usecase.generation.GetRandomImageUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.generation.ImageToImageUseCase
 import com.shifthackz.aisdv1.domain.usecase.generation.ImageToImageUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.generation.ObserveHordeProcessStatusUseCase
@@ -85,6 +87,7 @@ internal val useCasesModule = module {
     factoryOf(::ObserveHordeProcessStatusUseCaseImpl) bind ObserveHordeProcessStatusUseCase::class
     factoryOf(::GetMediaStoreInfoUseCaseImpl) bind GetMediaStoreInfoUseCase::class
     factoryOf(::GetFeatureFlagsUseCaseImpl) bind GetFeatureFlagsUseCase::class
+    factoryOf(::GetRandomImageUseCaseImpl) bind GetRandomImageUseCase::class
 }
 
 internal val debugModule = module {
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/repository/RandomImageRepository.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/repository/RandomImageRepository.kt
@@ -0,0 +1,8 @@
+package com.shifthackz.aisdv1.domain.repository
+
+import android.graphics.Bitmap
+import io.reactivex.rxjava3.core.Single
+
+interface RandomImageRepository {
+    fun fetchAndGet(): Single<Bitmap>
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/generation/GetRandomImageUseCase.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/generation/GetRandomImageUseCase.kt
@@ -0,0 +1,8 @@
+package com.shifthackz.aisdv1.domain.usecase.generation
+
+import android.graphics.Bitmap
+import io.reactivex.rxjava3.core.Single
+
+interface GetRandomImageUseCase {
+    operator fun invoke(): Single<Bitmap>
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/generation/GetRandomImageUseCaseImpl.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/generation/GetRandomImageUseCaseImpl.kt
@@ -0,0 +1,10 @@
+package com.shifthackz.aisdv1.domain.usecase.generation
+
+import com.shifthackz.aisdv1.domain.repository.RandomImageRepository
+
+class GetRandomImageUseCaseImpl(
+    private val randomImageRepository: RandomImageRepository,
+) : GetRandomImageUseCase {
+
+    override fun invoke() = randomImageRepository.fetchAndGet()
+}
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/api/imagecdn/ImageCdnRestApi.kt b/network/src/main/java/com/shifthackz/aisdv1/network/api/imagecdn/ImageCdnRestApi.kt
@@ -0,0 +1,18 @@
+package com.shifthackz.aisdv1.network.api.imagecdn
+
+import android.graphics.Bitmap
+import io.reactivex.rxjava3.core.Single
+import okhttp3.ResponseBody
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface ImageCdnRestApi {
+
+    fun fetchRandomImage(): Single<Bitmap>
+
+    interface RawApi {
+
+        @GET("/{size}/{size}")
+        fun fetchRandomImage(@Path("size") size: String): Single<ResponseBody>
+    }
+}
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/api/imagecdn/ImageCdnRestApiImpl.kt b/network/src/main/java/com/shifthackz/aisdv1/network/api/imagecdn/ImageCdnRestApiImpl.kt
@@ -0,0 +1,23 @@
+package com.shifthackz.aisdv1.network.api.imagecdn
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import io.reactivex.rxjava3.core.Single
+import kotlin.random.Random
+
+class ImageCdnRestApiImpl(private val rawApi: ImageCdnRestApi.RawApi) : ImageCdnRestApi {
+
+    override fun fetchRandomImage(): Single<Bitmap> = Random
+        .nextInt(MIN, MAX + 1)
+        .let(Int::toString)
+        .let(rawApi::fetchRandomImage)
+        .map { body ->
+            val bytes = body.bytes()
+            BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
+        }
+
+    companion object {
+        private const val MIN = 400
+        private const val MAX = 700
+    }
+}
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/di/NetworkModule.kt b/network/src/main/java/com/shifthackz/aisdv1/network/di/NetworkModule.kt
@@ -4,6 +4,8 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi
 import com.shifthackz.aisdv1.network.api.horde.HordeRestApi
+import com.shifthackz.aisdv1.network.api.imagecdn.ImageCdnRestApi
+import com.shifthackz.aisdv1.network.api.imagecdn.ImageCdnRestApiImpl
 import com.shifthackz.aisdv1.network.api.sdai.AppUpdateRestApi
 import com.shifthackz.aisdv1.network.api.sdai.CoinsRestApi
 import com.shifthackz.aisdv1.network.api.sdai.FeatureFlagsRestApi
@@ -21,6 +23,8 @@ import com.shifthackz.aisdv1.network.qualifiers.NetworkInterceptors
 import com.shifthackz.aisdv1.network.qualifiers.RetrofitCallAdapters
 import com.shifthackz.aisdv1.network.qualifiers.RetrofitConverterFactories
 import okhttp3.OkHttpClient
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
 import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
@@ -31,7 +35,7 @@ private const val HTTP_TIMEOUT = 10L
 
 val networkModule = module {
 
-    single<Gson> { GsonBuilder().create() }
+    single<Gson> { GsonBuilder().setLenient().create() }
 
     single { RestAuthenticator(get()) }
 
@@ -126,6 +130,14 @@ val networkModule = module {
             .create(HordeRestApi::class.java)
     }
 
+    single {
+        get<Retrofit.Builder>()
+            .withBaseUrl(get<ApiUrlProvider>().imageCdnApiUrl)
+            .create(ImageCdnRestApi.RawApi::class.java)
+    }
+
+    singleOf(::ImageCdnRestApiImpl) bind ImageCdnRestApi::class
+
     factory {params ->
         ConnectivityMonitor(params.get())
     }
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/qualifiers/ApiUrlProvider.kt b/network/src/main/java/com/shifthackz/aisdv1/network/qualifiers/ApiUrlProvider.kt
@@ -5,4 +5,5 @@ interface ApiUrlProvider {
     val stableDiffusionAppApiUrl: String
     val stableDiffusionCloudAiApiUrl: String
     val hordeApiUrl: String
+    val imageCdnApiUrl: String
 }
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
@@ -48,6 +48,7 @@ data class ImageToImageState(
 
     sealed interface Modal {
         object None : Modal
+        object LoadingRandomImage : Modal
         data class Communicating(val hordeProcessStatus: HordeProcessStatus? = null) : Modal
         object NoSdAiCoins : Modal
         object PromptBottomSheet : Modal
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
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
diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml
diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ val providersModule = module {`
`34`	`34`	`override val stableDiffusionAppApiUrl: String = BuildConfig.UPDATE_API_URL`
`35`	`35`	`override val stableDiffusionCloudAiApiUrl: String = BuildConfig.CLOUD_AI_URL`
`36`	`36`	`override val hordeApiUrl: String = BuildConfig.HORDE_AI_URL`
	`37`	`+ override val imageCdnApiUrl: String = BuildConfig.IMAGE_CDN_URL`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`