Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion core/localization/src/androidMain/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -729,9 +729,16 @@
<string name="hint_mnn_profile_ios">Ein 512×512-Bild, PNDM, CFG 7,5, 1–50 Schritte. CPU oder Metal.</string>
<string name="hint_mnn_backend">MNN-Backend</string>
<string name="settings_usage_summary_models_mnn">MNN-Modelle</string>
<string name="local_catalog_loading">Modellkatalog wird geladen</string>
<string name="local_catalog_error_title">Modelle konnten nicht geladen werden</string>
<string name="local_catalog_error_body">Prüfe die Verbindung und versuche es erneut. Deine lokalen Modelle bleiben verfügbar.</string>
<string name="local_catalog_empty_title">Keine Modelle verfügbar</string>
<string name="local_catalog_empty_body">Versuche später, den Katalog erneut zu laden.</string>
<string name="download_all">Alle herunterladen</string>
<string name="download_cancel_all">Alle Downloads abbrechen</string>
<string name="download_switch_title">Downloads wechseln?</string>
<string name="download_switch_message">Ein anderer Anbieter lädt Modelle herunter. Beim Wechsel werden diese Downloads gestoppt und die Modelle dieses Anbieters geladen. Fertige Modelle bleiben erhalten.</string>
<string name="download_switch_confirm">Wechseln</string>
<string name="loading">Laden</string>
<string name="notification_download_finish_title">Download abgeschlossen 🤩</string>
<string name="notification_download_fail_title">Download fehlgeschlagen 😞</string>
</resources>
9 changes: 8 additions & 1 deletion core/localization/src/androidMain/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,16 @@
<string name="hint_mnn_profile_ios">Одно изображение 512×512, PNDM, CFG 7.5, 1–50 шагов. CPU или Metal.</string>
<string name="hint_mnn_backend">Движок MNN</string>
<string name="settings_usage_summary_models_mnn">Модели MNN</string>
<string name="local_catalog_loading">Загрузка каталога моделей</string>
<string name="local_catalog_error_title">Не удалось загрузить модели</string>
<string name="local_catalog_error_body">Проверьте подключение и повторите попытку. Локальные модели остаются доступны.</string>
<string name="local_catalog_empty_title">Нет доступных моделей</string>
<string name="local_catalog_empty_body">Попробуйте обновить каталог позже.</string>
<string name="download_all">Скачать все</string>
<string name="download_cancel_all">Отменить все загрузки</string>
<string name="download_switch_title">Переключить загрузки?</string>
<string name="download_switch_message">Сейчас загружаются модели другого провайдера. Переключение остановит их загрузку и запустит загрузку моделей этого провайдера. Готовые модели сохранятся.</string>
<string name="download_switch_confirm">Переключить</string>
<string name="loading">Загрузка</string>
<string name="notification_download_finish_title">Загрузка завершена 🤩</string>
<string name="notification_download_fail_title">Не удалось загрузить 😞</string>
</resources>
9 changes: 8 additions & 1 deletion core/localization/src/androidMain/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,16 @@
<string name="hint_mnn_profile_ios">Bir 512×512 görsel, PNDM, CFG 7.5, 1–50 adım. CPU veya Metal.</string>
<string name="hint_mnn_backend">MNN arka ucu</string>
<string name="settings_usage_summary_models_mnn">MNN modelleri</string>
<string name="local_catalog_loading">Model kataloğu yükleniyor</string>
<string name="local_catalog_error_title">Modeller yüklenemedi</string>
<string name="local_catalog_error_body">Bağlantınızı kontrol edip yeniden deneyin. Yerel modelleriniz kullanılabilir durumda.</string>
<string name="local_catalog_empty_title">Kullanılabilir model yok</string>
<string name="local_catalog_empty_body">Kataloğu daha sonra yeniden yenilemeyi deneyin.</string>
<string name="download_all">Tümünü indir</string>
<string name="download_cancel_all">Tüm indirmeleri iptal et</string>
<string name="download_switch_title">İndirmeler değiştirilsin mi?</string>
<string name="download_switch_message">Başka bir sağlayıcının modelleri indiriliyor. Değiştirmek bu indirmeleri durdurur ve bu sağlayıcının modellerini indirmeye başlar. Tamamlanan modeller korunur.</string>
<string name="download_switch_confirm">Değiştir</string>
<string name="loading">Yükleniyor</string>
<string name="notification_download_finish_title">İndirme tamamlandı 🤩</string>
<string name="notification_download_fail_title">İndirme başarısız 😞</string>
</resources>
9 changes: 8 additions & 1 deletion core/localization/src/androidMain/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,16 @@
<string name="hint_mnn_profile_ios">Одне зображення 512×512, PNDM, CFG 7.5, 1–50 кроків. CPU або Metal.</string>
<string name="hint_mnn_backend">Рушій MNN</string>
<string name="settings_usage_summary_models_mnn">Моделі MNN</string>
<string name="local_catalog_loading">Завантаження каталогу моделей</string>
<string name="local_catalog_error_title">Не вдалося завантажити моделі</string>
<string name="local_catalog_error_body">Перевірте з’єднання та спробуйте знову. Локальні моделі залишаються доступними.</string>
<string name="local_catalog_empty_title">Немає доступних моделей</string>
<string name="local_catalog_empty_body">Спробуйте оновити каталог пізніше.</string>
<string name="download_all">Завантажити всі</string>
<string name="download_cancel_all">Скасувати всі завантаження</string>
<string name="download_switch_title">Перемкнути завантаження?</string>
<string name="download_switch_message">Зараз завантажуються моделі іншого провайдера. Перемикання зупинить їх завантаження та почне завантаження моделей цього провайдера. Готові моделі збережуться.</string>
<string name="download_switch_confirm">Перемкнути</string>
<string name="loading">Завантаження</string>
<string name="notification_download_finish_title">Завантаження завершено 🤩</string>
<string name="notification_download_fail_title">Не вдалося завантажити 😞</string>
</resources>
9 changes: 8 additions & 1 deletion core/localization/src/androidMain/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -744,9 +744,16 @@
<string name="hint_mnn_profile_ios">单张512×512图像,PNDM,CFG 7.5,1–50步。CPU或Metal。</string>
<string name="hint_mnn_backend">MNN 后端</string>
<string name="settings_usage_summary_models_mnn">MNN 模型</string>
<string name="local_catalog_loading">正在加载模型目录</string>
<string name="local_catalog_error_title">无法加载模型</string>
<string name="local_catalog_error_body">请检查网络连接后重试。本地模型仍可使用。</string>
<string name="local_catalog_empty_title">暂无可用模型</string>
<string name="local_catalog_empty_body">请稍后重试刷新目录。</string>
<string name="download_all">全部下载</string>
<string name="download_cancel_all">取消全部下载</string>
<string name="download_switch_title">切换下载?</string>
<string name="download_switch_message">正在下载其他提供商的模型。切换将停止这些下载,并开始下载此提供商的模型。已完成的模型会保留。</string>
<string name="download_switch_confirm">切换</string>
<string name="loading">加载中</string>
<string name="notification_download_finish_title">下载完成 🤩</string>
<string name="notification_download_fail_title">下载失败 😞</string>
</resources>
9 changes: 8 additions & 1 deletion core/localization/src/androidMain/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -729,9 +729,16 @@
<string name="hint_mnn_profile_ios">One 512×512 image, PNDM, CFG 7.5, 1–50 steps. CPU or Metal.</string>
<string name="hint_mnn_backend">MNN backend</string>
<string name="settings_usage_summary_models_mnn">MNN models</string>
<string name="local_catalog_loading">Loading model catalog</string>
<string name="local_catalog_error_title">Unable to load models</string>
<string name="local_catalog_error_body">Check your connection and try again. Your local models remain available.</string>
<string name="local_catalog_empty_title">No models available</string>
<string name="local_catalog_empty_body">Try refreshing the catalog again later.</string>
<string name="download_all">Download all</string>
<string name="download_cancel_all">Cancel all downloads</string>
<string name="download_switch_title">Switch downloads?</string>
<string name="download_switch_message">Another provider is downloading models. Switching stops those downloads and starts this provider. Completed models are kept.</string>
<string name="download_switch_confirm">Switch</string>
<string name="loading">Loading</string>
<string name="notification_download_finish_title">Download complete 🤩</string>
<string name="notification_download_fail_title">Download failed 😞</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -26,47 +26,50 @@ internal class AndroidDownloadableModelFileStore(
*
* @author Dmitriy Moroz
*/
override fun isDownloaded(model: LocalAiModel): Boolean = try {
when (model.id) {
LocalAiModel.CustomMnn.id -> mnnModels.isDownloaded(model.id)


LocalAiModel.CustomOnnx.id,
LocalAiModel.CustomMediaPipe.id,
LocalAiModel.CustomSdxl.id,
LocalAiModel.CustomCoreMl.id,
LocalAiModel.CustomBonsai.id,
-> true

else -> when (model.type) {
LocalAiModel.Type.Mnn -> mnnModels.isDownloaded(model.id)
LocalAiModel.Type.ONNX -> {
val files = getLocalModelFiles(model.id).filter { it.isDirectory }
files.size == 4
}

LocalAiModel.Type.MediaPipe -> {
val files = getLocalModelFiles(model.id)
files.isNotEmpty()
}

LocalAiModel.Type.Sdxl -> {
val files = getLocalModelFiles(model.id)
files.isNotEmpty()
}

LocalAiModel.Type.CoreMl -> {
val files = getLocalModelFiles(model.id)
files.isNotEmpty()
}

LocalAiModel.Type.Bonsai -> {
getLocalModelDirectory(model.id).hasBonsaiModelLayout()
override fun isDownloaded(model: LocalAiModel): Boolean {
if (File(getLocalModelDirectory(model.id), ".download-in-progress").exists()) return false
return try {
when (model.id) {
LocalAiModel.CustomMnn.id -> mnnModels.isDownloaded(model.id)


LocalAiModel.CustomOnnx.id,
LocalAiModel.CustomMediaPipe.id,
LocalAiModel.CustomSdxl.id,
LocalAiModel.CustomCoreMl.id,
LocalAiModel.CustomBonsai.id,
-> true

else -> when (model.type) {
LocalAiModel.Type.Mnn -> mnnModels.isDownloaded(model.id)
LocalAiModel.Type.ONNX -> {
val files = getLocalModelFiles(model.id).filter { it.isDirectory }
files.size == 4
}

LocalAiModel.Type.MediaPipe -> {
val files = getLocalModelFiles(model.id)
files.isNotEmpty()
}

LocalAiModel.Type.Sdxl -> {
val files = getLocalModelFiles(model.id)
files.isNotEmpty()
}

LocalAiModel.Type.CoreMl -> {
val files = getLocalModelFiles(model.id)
files.isNotEmpty()
}

LocalAiModel.Type.Bonsai -> {
getLocalModelDirectory(model.id).hasBonsaiModelLayout()
}
}
}
} catch (_: Exception) {
false
}
} catch (_: Exception) {
false
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ internal class AndroidDownloadableModelFileDownloader(
}
val dir = File("${fileProviderDescriptor.localModelDirPath}/$id")
if (dir.exists()) dir.deleteRecursively()
dir.mkdirs()
check(dir.mkdirs()) { "Cannot create model directory" }
val pending = File(dir, ".download-in-progress")
check(pending.createNewFile()) { "Cannot mark incomplete model download" }

val destination = File(getDestinationPath(id, url))

Expand All @@ -102,6 +104,7 @@ internal class AndroidDownloadableModelFileDownloader(
complete.unzip()
complete.delete()
}
check(pending.delete()) { "Cannot finalize model download" }
emit(DownloadState.Complete(complete.path))
} catch (e: CancellationException) {
dir.deleteRecursively()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package com.shifthackz.aisdv1.data.local

import com.shifthackz.aisdv1.core.common.file.FileProviderDescriptor
import com.shifthackz.aisdv1.domain.entity.LocalAiModel
import io.mockk.every
import io.mockk.mockk
import java.io.File
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import org.junit.runners.Parameterized

/**
* Protects every legacy provider from treating interrupted app-owned payloads as installed models.
* @param type Provider whose complete layout is checked before and after activation.
* @author Dmitriy Moroz
*/
@RunWith(Parameterized::class)
class ModelDownloadMarkerTest(private val type: LocalAiModel.Type) {
@get:Rule
val folder = TemporaryFolder()

@Test
fun `given owned model directory, interrupted marker accompanies complete looking files, expected model unavailable`() {
// Given
val model = LocalAiModel("catalog", type, "Model", "1 GB", emptyList())
val directory = folder.newFolder(model.id)
listOf(
"transformer-packed-mflux",
"text_encoder-mlx-4bit",
"tokenizer",
"vae"
).forEach { File(directory, it).mkdirs() }
File(directory, ".download-in-progress").createNewFile()
val descriptor =
mockk<FileProviderDescriptor> { every { localModelDirPath } returns folder.root.path }
val store = AndroidDownloadableModelFileStore(descriptor, mockk(relaxed = true))
// When
val isDownloaded = store.isDownloaded(model)
// Then
assertFalse(isDownloaded)
assertTrue(directory.exists())
}

@Test
fun `given owned model directory, activation removes pending marker, expected completed layout becomes available`() {
// Given
val model = LocalAiModel("catalog", type, "Model", "1 GB", emptyList())
val directory = folder.newFolder(model.id)
listOf(
"transformer-packed-mflux",
"text_encoder-mlx-4bit",
"tokenizer",
"vae"
).forEach { File(directory, it).mkdirs() }
File(directory, "transformer-packed-mflux/quantization_config.json").writeText("{}")
if (type == LocalAiModel.Type.Bonsai) File(directory, "scheduler").mkdirs()
val pending = File(directory, ".download-in-progress").apply { createNewFile() }
val descriptor =
mockk<FileProviderDescriptor> { every { localModelDirPath } returns folder.root.path }
val store = AndroidDownloadableModelFileStore(descriptor, mockk(relaxed = true))
// When
pending.delete()
val isDownloaded = store.isDownloaded(model)
// Then
assertTrue(isDownloaded)
}

companion object {
/** Supplies providers that activate their downloads in the shared app-private model directory. */
@JvmStatic
@Parameterized.Parameters(name = "{0}")
fun providers() =
LocalAiModel.Type.entries.filterNot { it == LocalAiModel.Type.Mnn }.map { arrayOf(it) }
}
}
Loading
Loading