make image import script work with python3.9; cleanup wheel creator

installer/create_installer.sh

@@ -46,6 +46,7 @@ if [[ $(python -c 'from importlib.util import find_spec; print(find_spec("build"
     pip install --user build
 fi
 
+rm -r ../build
 python -m build --wheel --outdir dist/ ../.
 
 # ----------------------

invokeai/frontend/install/import_images.py

@@ -60,7 +60,7 @@ class Config:
     thumbnail_path = None
 
     def find_and_load(self):
-        """find the yaml config file and load"""
+        """Find the yaml config file and load"""
         root = app_config.root_path
         if not self.confirm_and_load(os.path.abspath(root)):
             print("\r\nSpecify custom database and outputs paths:")
@@ -70,7 +70,7 @@ class Config:
         self.thumbnail_path = os.path.join(self.outputs_path, "thumbnails")
 
     def confirm_and_load(self, invoke_root):
-        """Validates a yaml path exists, confirms the user wants to use it and loads config."""
+        """Validate a yaml path exists, confirms the user wants to use it and loads config."""
         yaml_path = os.path.join(invoke_root, self.YAML_FILENAME)
         if os.path.exists(yaml_path):
             db_dir, outdir = self.load_paths_from_yaml(yaml_path)
@@ -337,33 +337,24 @@ class InvokeAIMetadataParser:
 
     def map_scheduler(self, old_scheduler):
         """Convert the legacy sampler names to matching 3.0 schedulers"""
+
+        # this was more elegant as a case statement, but that's not available in python 3.9
         if old_scheduler is None:
             return None
-
-        match (old_scheduler):
-            case "ddim":
-                return "ddim"
-            case "plms":
-                return "pnmd"
-            case "k_lms":
-                return "lms"
-            case "k_dpm_2":
-                return "kdpm_2"
-            case "k_dpm_2_a":
-                return "kdpm_2_a"
-            case "dpmpp_2":
-                return "dpmpp_2s"
-            case "k_dpmpp_2":
-                return "dpmpp_2m"
-            case "k_dpmpp_2_a":
-                return None  # invalid, in 2.3.x, selecting this sample would just fallback to last run or plms if new session
-            case "k_euler":
-                return "euler"
-            case "k_euler_a":
-                return "euler_a"
-            case "k_heun":
-                return "heun"
-        return None
+        scheduler_map = dict(
+            ddim="ddim",
+            plms="pnmd",
+            k_lms="lms",
+            k_dpm_2="kdpm_2",
+            k_dpm_2_a="kdpm_2_a",
+            dpmpp_2="dpmpp_2s",
+            k_dpmpp_2="dpmpp_2m",
+            k_dpmpp_2_a=None,  # invalid, in 2.3.x, selecting this sample would just fallback to last run or plms if new session
+            k_euler="euler",
+            k_euler_a="euler_a",
+            k_heun="heun",
+        )
+        return scheduler_map.get(old_scheduler)
 
     def split_prompt(self, raw_prompt: str):
         """Split the unified prompt strings by extracting all negative prompt blocks out into the negative prompt."""
@@ -524,27 +515,27 @@ class MediaImportProcessor:
                 "5) Create/add to board named 'IMPORT' with a the original file app_version appended (.e.g IMPORT_2.2.5)."
             )
             input_option = input("Specify desired board option: ")
-            match (input_option):
-                case "1":
-                    if len(board_names) < 1:
-                        print("\r\nThere are no existing board names to choose from. Select another option!")
-                        continue
-                    board_name = self.select_item_from_list(
-                        board_names, "board name", True, "Cancel, go back and choose a different board option."
-                    )
-                    if board_name is not None:
+            # This was more elegant as a case statement, but not supported in python 3.9
+            if input_option == "1":
+                if len(board_names) < 1:
+                    print("\r\nThere are no existing board names to choose from. Select another option!")
+                    continue
+                board_name = self.select_item_from_list(
+                    board_names, "board name", True, "Cancel, go back and choose a different board option."
+                )
+                if board_name is not None:
+                    return board_name
+            elif input_option == "2":
+                while True:
+                    board_name = input("Specify new/existing board name: ")
+                    if board_name:
                         return board_name
-                case "2":
-                    while True:
-                        board_name = input("Specify new/existing board name: ")
-                        if board_name:
-                            return board_name
-                case "3":
-                    return "IMPORT"
-                case "4":
-                    return f"IMPORT_{timestamp_string}"
-                case "5":
-                    return "IMPORT_APPVERSION"
+            elif input_option == "3":
+                return "IMPORT"
+            elif input_option == "4":
+                return f"IMPORT_{timestamp_string}"
+            elif input_option == "5":
+                return "IMPORT_APPVERSION"
 
     def select_item_from_list(self, items, entity_name, allow_cancel, cancel_string):
         """A general function to render a list of items to select in the console, prompt the user for a selection and ensure a valid entry is selected."""

invokeai/frontend/web/dist/assets/ThemeLocaleProvider-90f0fcd3.css

@@ -1,4 +1,4 @@
-@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-cyrillic-ext-wght-normal-848492d3.woff2) format("woff2-variations");unicode-range:U+0460-052F,U+1C80-1C88,U+20B4,U+2DE0-2DFF,U+A640-A69F,U+FE2E-FE2F}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-cyrillic-wght-normal-262a1054.woff2) format("woff2-variations");unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-greek-ext-wght-normal-fe977ddb.woff2) format("woff2-variations");unicode-range:U+1F00-1FFF}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-greek-wght-normal-89b4a3fe.woff2) format("woff2-variations");unicode-range:U+0370-03FF}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-vietnamese-wght-normal-ac4e131c.woff2) format("woff2-variations");unicode-range:U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-latin-ext-wght-normal-45606f83.woff2) format("woff2-variations");unicode-range:U+0100-02AF,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-latin-wght-normal-450f3ba4.woff2) format("woff2-variations");unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD}/*! 
+@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-cyrillic-ext-wght-normal-848492d3.woff2) format("woff2-variations");unicode-range:U+0460-052F,U+1C80-1C88,U+20B4,U+2DE0-2DFF,U+A640-A69F,U+FE2E-FE2F}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-cyrillic-wght-normal-262a1054.woff2) format("woff2-variations");unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-greek-ext-wght-normal-fe977ddb.woff2) format("woff2-variations");unicode-range:U+1F00-1FFF}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-greek-wght-normal-89b4a3fe.woff2) format("woff2-variations");unicode-range:U+0370-03FF}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-vietnamese-wght-normal-ac4e131c.woff2) format("woff2-variations");unicode-range:U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-latin-ext-wght-normal-45606f83.woff2) format("woff2-variations");unicode-range:U+0100-02AF,U+0304,U+0308,U+0329,U+1E00-1E9F,U+1EF2-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:Inter Variable;font-style:normal;font-display:swap;font-weight:100 900;src:url(./inter-latin-wght-normal-450f3ba4.woff2) format("woff2-variations");unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD}/*! 
 * OverlayScrollbars
 * Version: 2.2.1
 * 

invokeai/frontend/web/dist/index.html

@@ -12,7 +12,7 @@
         margin: 0;
       }
     </style>
-    <script type="module" crossorigin src="./assets/index-2c171c8f.js"></script>
+    <script type="module" crossorigin src="./assets/index-3a52d467.js"></script>
   </head>
 
   <body dir="ltr">

invokeai/frontend/web/dist/locales/en.json

@@ -19,7 +19,7 @@
         "toggleAutoscroll": "Toggle autoscroll",
         "toggleLogViewer": "Toggle Log Viewer",
         "showGallery": "Show Gallery",
-        "showOptionsPanel": "Show Options Panel",
+        "showOptionsPanel": "Show Side Panel",
         "menu": "Menu"
     },
     "common": {
@@ -52,7 +52,7 @@
         "img2img": "Image To Image",
         "unifiedCanvas": "Unified Canvas",
         "linear": "Linear",
-        "nodes": "Node Editor",
+        "nodes": "Workflow Editor",
         "batch": "Batch Manager",
         "modelManager": "Model Manager",
         "postprocessing": "Post Processing",
@@ -95,7 +95,6 @@
         "statusModelConverted": "Model Converted",
         "statusMergingModels": "Merging Models",
         "statusMergedModels": "Models Merged",
-        "pinOptionsPanel": "Pin Options Panel",
         "loading": "Loading",
         "loadingInvokeAI": "Loading Invoke AI",
         "random": "Random",
@@ -116,7 +115,6 @@
         "maintainAspectRatio": "Maintain Aspect Ratio",
         "autoSwitchNewImages": "Auto-Switch to New Images",
         "singleColumnLayout": "Single Column Layout",
-        "pinGallery": "Pin Gallery",
         "allImagesLoaded": "All Images Loaded",
         "loadMore": "Load More",
         "noImagesInGallery": "No Images to Display",
@@ -133,6 +131,7 @@
         "generalHotkeys": "General Hotkeys",
         "galleryHotkeys": "Gallery Hotkeys",
         "unifiedCanvasHotkeys": "Unified Canvas Hotkeys",
+        "nodesHotkeys": "Nodes Hotkeys",
         "invoke": {
             "title": "Invoke",
             "desc": "Generate an image"
@@ -332,6 +331,10 @@
         "acceptStagingImage": {
             "title": "Accept Staging Image",
             "desc": "Accept Current Staging Area Image"
+        },
+        "addNodes": {
+            "title": "Add Nodes",
+            "desc": "Opens the add node menu"
         }
     },
     "modelManager": {
@@ -503,13 +506,15 @@
         "hiresStrength": "High Res Strength",
         "imageFit": "Fit Initial Image To Output Size",
         "codeformerFidelity": "Fidelity",
+        "compositingSettingsHeader": "Compositing Settings",
         "maskAdjustmentsHeader": "Mask Adjustments",
-        "maskBlur": "Mask Blur",
-        "maskBlurMethod": "Mask Blur Method",
-        "seamSize": "Seam Size",
-        "seamBlur": "Seam Blur",
-        "seamStrength": "Seam Strength",
-        "seamSteps": "Seam Steps",
+        "maskBlur": "Blur",
+        "maskBlurMethod": "Blur Method",
+        "coherencePassHeader": "Coherence Pass",
+        "coherenceSteps": "Steps",
+        "coherenceStrength": "Strength",
+        "seamLowThreshold": "Low",
+        "seamHighThreshold": "High",
         "scaleBeforeProcessing": "Scale Before Processing",
         "scaledWidth": "Scaled W",
         "scaledHeight": "Scaled H",
@@ -565,10 +570,11 @@
         "useSlidersForAll": "Use Sliders For All Options",
         "showProgressInViewer": "Show Progress Images in Viewer",
         "antialiasProgressImages": "Antialias Progress Images",
+        "autoChangeDimensions": "Update W/H To Model Defaults On Change",
         "resetWebUI": "Reset Web UI",
         "resetWebUIDesc1": "Resetting the web UI only resets the browser's local cache of your images and remembered settings. It does not delete any images from disk.",
         "resetWebUIDesc2": "If images aren't showing up in the gallery or something else isn't working, please try resetting before submitting an issue on GitHub.",
-        "resetComplete": "Web UI has been reset. Refresh the page to reload.",
+        "resetComplete": "Web UI has been reset.",
         "consoleLogLevel": "Log Level",
         "shouldLogToConsole": "Console Logging",
         "developer": "Developer",
@@ -708,14 +714,16 @@
     "ui": {
         "showProgressImages": "Show Progress Images",
         "hideProgressImages": "Hide Progress Images",
-        "swapSizes": "Swap Sizes"
+        "swapSizes": "Swap Sizes",
+        "lockRatio": "Lock Ratio"
     },
     "nodes": {
-        "reloadSchema": "Reload Schema",
-        "saveGraph": "Save Graph",
-        "loadGraph": "Load Graph (saved from Node Editor) (Do not copy-paste metadata)",
-        "clearGraph": "Clear Graph",
-        "clearGraphDesc": "Are you sure you want to clear all nodes?",
+        "reloadNodeTemplates": "Reload Node Templates",
+        "downloadWorkflow": "Download Workflow JSON",
+        "loadWorkflow": "Load Workflow",
+        "resetWorkflow": "Reset Workflow",
+        "resetWorkflowDesc": "Are you sure you want to reset this workflow?",
+        "resetWorkflowDesc2": "Resetting the workflow will clear all nodes, edges and workflow details.",
         "zoomInNodes": "Zoom In",
         "zoomOutNodes": "Zoom Out",
         "fitViewportNodes": "Fit View",

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "3.0.2post1"
+__version__ = "3.1.0rc1"