diff --git a/.github/workflows/test-invoke-pip-skip.yml b/.github/workflows/test-invoke-pip-skip.yml index c2347e5ce3..d4c9d9fc00 100644 --- a/.github/workflows/test-invoke-pip-skip.yml +++ b/.github/workflows/test-invoke-pip-skip.yml @@ -6,7 +6,6 @@ on: - '!pyproject.toml' - '!invokeai/**' - 'invokeai/frontend/web/**' - - '!invokeai/frontend/web/dist/**' merge_group: workflow_dispatch: diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml index 30ed05379c..c5e4d10bfd 100644 --- a/.github/workflows/test-invoke-pip.yml +++ b/.github/workflows/test-invoke-pip.yml @@ -7,13 +7,11 @@ on: - 'pyproject.toml' - 'invokeai/**' - '!invokeai/frontend/web/**' - - 'invokeai/frontend/web/dist/**' pull_request: paths: - 'pyproject.toml' - 'invokeai/**' - '!invokeai/frontend/web/**' - - 'invokeai/frontend/web/dist/**' types: - 'ready_for_review' - 'opened' diff --git a/invokeai/backend/model_management/convert_ckpt_to_diffusers.py b/invokeai/backend/model_management/convert_ckpt_to_diffusers.py index a6c4c1fb4c..5f18bdf355 100644 --- a/invokeai/backend/model_management/convert_ckpt_to_diffusers.py +++ b/invokeai/backend/model_management/convert_ckpt_to_diffusers.py @@ -378,16 +378,26 @@ def convert_ldm_unet_checkpoint(checkpoint, config, path=None, extract_ema=False for key in keys: if key.startswith("model.diffusion_model"): flat_ema_key = "model_ema." + "".join(key.split(".")[1:]) - unet_state_dict[key.replace(unet_key, "")] = checkpoint.pop( - flat_ema_key - ) + flat_ema_key_alt = "model_ema." + "".join(key.split(".")[2:]) + if flat_ema_key in checkpoint: + unet_state_dict[key.replace(unet_key, "")] = checkpoint.pop( + flat_ema_key + ) + elif flat_ema_key_alt in checkpoint: + unet_state_dict[key.replace(unet_key, "")] = checkpoint.pop( + flat_ema_key_alt + ) + else: + unet_state_dict[key.replace(unet_key, "")] = checkpoint.pop( + key + ) else: print( " | Extracting only the non-EMA weights (usually better for fine-tuning)" ) for key in keys: - if key.startswith(unet_key): + if key.startswith("model.diffusion_model") and key in checkpoint: unet_state_dict[key.replace(unet_key, "")] = checkpoint.pop(key) new_checkpoint = {} diff --git a/invokeai/frontend/web/public/locales/ar.json b/invokeai/frontend/web/public/locales/ar.json index 671341e9ab..e5168da4a8 100644 --- a/invokeai/frontend/web/public/locales/ar.json +++ b/invokeai/frontend/web/public/locales/ar.json @@ -8,7 +8,6 @@ "darkTheme": "داكن", "lightTheme": "فاتح", "greenTheme": "أخضر", - "text2img": "نص إلى صورة", "img2img": "صورة إلى صورة", "unifiedCanvas": "لوحة موحدة", "nodes": "عقد", diff --git a/invokeai/frontend/web/public/locales/de.json b/invokeai/frontend/web/public/locales/de.json index 29155a83c6..deeef34194 100644 --- a/invokeai/frontend/web/public/locales/de.json +++ b/invokeai/frontend/web/public/locales/de.json @@ -7,7 +7,6 @@ "darkTheme": "Dunkel", "lightTheme": "Hell", "greenTheme": "Grün", - "text2img": "Text zu Bild", "img2img": "Bild zu Bild", "nodes": "Knoten", "langGerman": "Deutsch", diff --git a/invokeai/frontend/web/public/locales/es.json b/invokeai/frontend/web/public/locales/es.json index ad3fdaf3ed..9c2b6bf983 100644 --- a/invokeai/frontend/web/public/locales/es.json +++ b/invokeai/frontend/web/public/locales/es.json @@ -8,7 +8,6 @@ "darkTheme": "Oscuro", "lightTheme": "Claro", "greenTheme": "Verde", - "text2img": "Texto a Imagen", "img2img": "Imagen a Imagen", "unifiedCanvas": "Lienzo Unificado", "nodes": "Nodos", @@ -70,7 +69,11 @@ "langHebrew": "Hebreo", "pinOptionsPanel": "Pin del panel de opciones", "loading": "Cargando", - "loadingInvokeAI": "Cargando invocar a la IA" + "loadingInvokeAI": "Cargando invocar a la IA", + "postprocessing": "Tratamiento posterior", + "txt2img": "De texto a imagen", + "accept": "Aceptar", + "cancel": "Cancelar" }, "gallery": { "generations": "Generaciones", @@ -404,7 +407,8 @@ "none": "ninguno", "pickModelType": "Elige el tipo de modelo", "v2_768": "v2 (768px)", - "addDifference": "Añadir una diferencia" + "addDifference": "Añadir una diferencia", + "scanForModels": "Buscar modelos" }, "parameters": { "images": "Imágenes", @@ -574,7 +578,7 @@ "autoSaveToGallery": "Guardar automáticamente en galería", "saveBoxRegionOnly": "Guardar solo región dentro de la caja", "limitStrokesToBox": "Limitar trazos a la caja", - "showCanvasDebugInfo": "Mostrar información de depuración de lienzo", + "showCanvasDebugInfo": "Mostrar la información adicional del lienzo", "clearCanvasHistory": "Limpiar historial de lienzo", "clearHistory": "Limpiar historial", "clearCanvasHistoryMessage": "Limpiar el historial de lienzo también restablece completamente el lienzo unificado. Esto incluye todo el historial de deshacer/rehacer, las imágenes en el área de preparación y la capa base del lienzo.", diff --git a/invokeai/frontend/web/public/locales/fr.json b/invokeai/frontend/web/public/locales/fr.json index 472c437702..cf215d7d06 100644 --- a/invokeai/frontend/web/public/locales/fr.json +++ b/invokeai/frontend/web/public/locales/fr.json @@ -8,7 +8,6 @@ "darkTheme": "Sombre", "lightTheme": "Clair", "greenTheme": "Vert", - "text2img": "Texte en image", "img2img": "Image en image", "unifiedCanvas": "Canvas unifié", "nodes": "Nœuds", @@ -47,7 +46,19 @@ "statusLoadingModel": "Chargement du modèle", "statusModelChanged": "Modèle changé", "discordLabel": "Discord", - "githubLabel": "Github" + "githubLabel": "Github", + "accept": "Accepter", + "statusMergingModels": "Mélange des modèles", + "loadingInvokeAI": "Chargement de Invoke AI", + "cancel": "Annuler", + "langEnglish": "Anglais", + "statusConvertingModel": "Conversion du modèle", + "statusModelConverted": "Modèle converti", + "loading": "Chargement", + "pinOptionsPanel": "Épingler la page d'options", + "statusMergedModels": "Modèles mélangés", + "txt2img": "Texte vers image", + "postprocessing": "Post-Traitement" }, "gallery": { "generations": "Générations", @@ -518,5 +529,15 @@ "betaDarkenOutside": "Assombrir à l'extérieur", "betaLimitToBox": "Limiter à la boîte", "betaPreserveMasked": "Conserver masqué" + }, + "accessibility": { + "uploadImage": "Charger une image", + "reset": "Réinitialiser", + "nextImage": "Image suivante", + "previousImage": "Image précédente", + "useThisParameter": "Utiliser ce paramètre", + "zoomIn": "Zoom avant", + "zoomOut": "Zoom arrière", + "showOptionsPanel": "Montrer la page d'options" } } diff --git a/invokeai/frontend/web/public/locales/he.json b/invokeai/frontend/web/public/locales/he.json index 1e760b8edb..c9b4ff3b17 100644 --- a/invokeai/frontend/web/public/locales/he.json +++ b/invokeai/frontend/web/public/locales/he.json @@ -125,7 +125,6 @@ "langSimplifiedChinese": "סינית", "langUkranian": "אוקראינית", "langSpanish": "ספרדית", - "text2img": "טקסט לתמונה", "img2img": "תמונה לתמונה", "unifiedCanvas": "קנבס מאוחד", "nodes": "צמתים", diff --git a/invokeai/frontend/web/public/locales/it.json b/invokeai/frontend/web/public/locales/it.json index 61aa5c6a08..7df34173df 100644 --- a/invokeai/frontend/web/public/locales/it.json +++ b/invokeai/frontend/web/public/locales/it.json @@ -8,7 +8,6 @@ "darkTheme": "Scuro", "lightTheme": "Chiaro", "greenTheme": "Verde", - "text2img": "Testo a Immagine", "img2img": "Immagine a Immagine", "unifiedCanvas": "Tela unificata", "nodes": "Nodi", @@ -70,7 +69,11 @@ "loading": "Caricamento in corso", "oceanTheme": "Oceano", "langHebrew": "Ebraico", - "loadingInvokeAI": "Caricamento Invoke AI" + "loadingInvokeAI": "Caricamento Invoke AI", + "postprocessing": "Post Elaborazione", + "txt2img": "Testo a Immagine", + "accept": "Accetta", + "cancel": "Annulla" }, "gallery": { "generations": "Generazioni", @@ -404,7 +407,8 @@ "v2_768": "v2 (768px)", "none": "niente", "addDifference": "Aggiungi differenza", - "pickModelType": "Scegli il tipo di modello" + "pickModelType": "Scegli il tipo di modello", + "scanForModels": "Cerca modelli" }, "parameters": { "images": "Immagini", @@ -574,7 +578,7 @@ "autoSaveToGallery": "Salvataggio automatico nella Galleria", "saveBoxRegionOnly": "Salva solo l'area di selezione", "limitStrokesToBox": "Limita i tratti all'area di selezione", - "showCanvasDebugInfo": "Mostra informazioni di debug della Tela", + "showCanvasDebugInfo": "Mostra ulteriori informazioni sulla Tela", "clearCanvasHistory": "Cancella cronologia Tela", "clearHistory": "Cancella la cronologia", "clearCanvasHistoryMessage": "La cancellazione della cronologia della tela lascia intatta la tela corrente, ma cancella in modo irreversibile la cronologia degli annullamenti e dei ripristini.", @@ -612,7 +616,7 @@ "copyMetadataJson": "Copia i metadati JSON", "exitViewer": "Esci dal visualizzatore", "zoomIn": "Zoom avanti", - "zoomOut": "Zoom Indietro", + "zoomOut": "Zoom indietro", "rotateCounterClockwise": "Ruotare in senso antiorario", "rotateClockwise": "Ruotare in senso orario", "flipHorizontally": "Capovolgi orizzontalmente", diff --git a/invokeai/frontend/web/public/locales/ko.json b/invokeai/frontend/web/public/locales/ko.json index 888cdc9925..47cde5fec3 100644 --- a/invokeai/frontend/web/public/locales/ko.json +++ b/invokeai/frontend/web/public/locales/ko.json @@ -11,7 +11,6 @@ "langArabic": "العربية", "langEnglish": "English", "langDutch": "Nederlands", - "text2img": "텍스트->이미지", "unifiedCanvas": "통합 캔버스", "langFrench": "Français", "langGerman": "Deutsch", diff --git a/invokeai/frontend/web/public/locales/nl.json b/invokeai/frontend/web/public/locales/nl.json index c06eae06a6..70b836dbc1 100644 --- a/invokeai/frontend/web/public/locales/nl.json +++ b/invokeai/frontend/web/public/locales/nl.json @@ -8,7 +8,6 @@ "darkTheme": "Donker", "lightTheme": "Licht", "greenTheme": "Groen", - "text2img": "Tekst naar afbeelding", "img2img": "Afbeelding naar afbeelding", "unifiedCanvas": "Centraal canvas", "nodes": "Knooppunten", diff --git a/invokeai/frontend/web/public/locales/pl.json b/invokeai/frontend/web/public/locales/pl.json index 7736b27943..246271658a 100644 --- a/invokeai/frontend/web/public/locales/pl.json +++ b/invokeai/frontend/web/public/locales/pl.json @@ -8,7 +8,6 @@ "darkTheme": "Ciemny", "lightTheme": "Jasny", "greenTheme": "Zielony", - "text2img": "Tekst na obraz", "img2img": "Obraz na obraz", "unifiedCanvas": "Tryb uniwersalny", "nodes": "Węzły", diff --git a/invokeai/frontend/web/public/locales/pt.json b/invokeai/frontend/web/public/locales/pt.json index 6e26b9ea56..6d19e3ad92 100644 --- a/invokeai/frontend/web/public/locales/pt.json +++ b/invokeai/frontend/web/public/locales/pt.json @@ -20,7 +20,6 @@ "langSpanish": "Espanhol", "langRussian": "Русский", "langUkranian": "Украї́нська", - "text2img": "Texto para Imagem", "img2img": "Imagem para Imagem", "unifiedCanvas": "Tela Unificada", "nodes": "Nós", diff --git a/invokeai/frontend/web/public/locales/pt_BR.json b/invokeai/frontend/web/public/locales/pt_BR.json index 18b7ab57e1..e77ef14719 100644 --- a/invokeai/frontend/web/public/locales/pt_BR.json +++ b/invokeai/frontend/web/public/locales/pt_BR.json @@ -8,7 +8,6 @@ "darkTheme": "Noite", "lightTheme": "Dia", "greenTheme": "Verde", - "text2img": "Texto Para Imagem", "img2img": "Imagem Para Imagem", "unifiedCanvas": "Tela Unificada", "nodes": "Nódulos", diff --git a/invokeai/frontend/web/public/locales/ru.json b/invokeai/frontend/web/public/locales/ru.json index d4178119e4..0280341dee 100644 --- a/invokeai/frontend/web/public/locales/ru.json +++ b/invokeai/frontend/web/public/locales/ru.json @@ -8,7 +8,6 @@ "darkTheme": "Темная", "lightTheme": "Светлая", "greenTheme": "Зеленая", - "text2img": "Изображение из текста (text2img)", "img2img": "Изображение в изображение (img2img)", "unifiedCanvas": "Универсальный холст", "nodes": "Ноды", diff --git a/invokeai/frontend/web/public/locales/uk.json b/invokeai/frontend/web/public/locales/uk.json index fbcc5014df..044cea64a4 100644 --- a/invokeai/frontend/web/public/locales/uk.json +++ b/invokeai/frontend/web/public/locales/uk.json @@ -8,7 +8,6 @@ "darkTheme": "Темна", "lightTheme": "Світла", "greenTheme": "Зелена", - "text2img": "Зображення із тексту (text2img)", "img2img": "Зображення із зображення (img2img)", "unifiedCanvas": "Універсальне полотно", "nodes": "Вузли", diff --git a/invokeai/frontend/web/public/locales/zh_CN.json b/invokeai/frontend/web/public/locales/zh_CN.json index 701933052e..b23ac8cc99 100644 --- a/invokeai/frontend/web/public/locales/zh_CN.json +++ b/invokeai/frontend/web/public/locales/zh_CN.json @@ -8,7 +8,6 @@ "darkTheme": "暗色", "lightTheme": "亮色", "greenTheme": "绿色", - "text2img": "文字到图像", "img2img": "图像到图像", "unifiedCanvas": "统一画布", "nodes": "节点", diff --git a/invokeai/frontend/web/public/locales/zh_Hant.json b/invokeai/frontend/web/public/locales/zh_Hant.json index af7b0cf328..98b4882018 100644 --- a/invokeai/frontend/web/public/locales/zh_Hant.json +++ b/invokeai/frontend/web/public/locales/zh_Hant.json @@ -33,7 +33,6 @@ "langBrPortuguese": "巴西葡萄牙語", "langRussian": "俄語", "langSpanish": "西班牙語", - "text2img": "文字到圖像", "unifiedCanvas": "統一畫布" } }