refactor(app): stable default workflows, workflow saving and loading fixes

invokeai/app/api/routers/workflows.py

@@ -19,6 +19,7 @@
     WorkflowRecordWithThumbnailDTO,
     WorkflowWithoutID,
 )
+from invokeai.app.services.workflow_thumbnails.workflow_thumbnails_common import WorkflowThumbnailFileNotFoundException
 
 IMAGE_MAX_AGE = 31536000
 workflows_router = APIRouter(prefix="/v1/workflows", tags=["workflows"])
@@ -65,7 +66,11 @@ async def delete_workflow(
     workflow_id: str = Path(description="The workflow to delete"),
 ) -> None:
     """Deletes a workflow"""
-    ApiDependencies.invoker.services.workflow_thumbnails.delete(workflow_id)
+    try:
+        ApiDependencies.invoker.services.workflow_thumbnails.delete(workflow_id)
+    except WorkflowThumbnailFileNotFoundException:
+        # It's OK if the workflow has no thumbnail file. We can still delete the workflow.
+        pass
     ApiDependencies.invoker.services.workflow_records.delete(workflow_id)
 
 

invokeai/app/services/invocation_services.py

@@ -32,7 +32,7 @@
     from invokeai.app.services.session_queue.session_queue_base import SessionQueueBase
     from invokeai.app.services.urls.urls_base import UrlServiceBase
     from invokeai.app.services.workflow_records.workflow_records_base import WorkflowRecordsStorageBase
-    from invokeai.app.services.workflow_thumbnails.workflow_thumbnails_common import WorkflowThumbnailServiceBase
+    from invokeai.app.services.workflow_thumbnails.workflow_thumbnails_base import WorkflowThumbnailServiceBase
     from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningFieldData
 
 

invokeai/app/services/workflow_records/default_workflows/ESRGAN Upscaling with Canny ControlNet.json

@@ -1,4 +1,5 @@
 {
+  "id": "default_686bb1d0-d086-4c70-9fa3-2f600b922023",
   "name": "ESRGAN Upscaling with Canny ControlNet",
   "author": "InvokeAI",
   "description": "Sample workflow for using Upscaling with ControlNet with SD1.5",

invokeai/app/services/workflow_records/default_workflows/FLUX Image to Image.json

@@ -1,4 +1,5 @@
 {
+  "id": "default_cbf0e034-7b54-4b2c-b670-3b1e2e4b4a88",
   "name": "FLUX Image to Image",
   "author": "InvokeAI",
   "description": "A simple image-to-image workflow using a FLUX dev model. ",

invokeai/app/services/workflow_records/default_workflows/Face Detailer with IP-Adapter & Canny (See Note in Details).json

@@ -1,4 +1,5 @@
 {
+  "id": "default_dec5a2e9-f59c-40d9-8869-a056751d79b8",
   "name": "Face Detailer with IP-Adapter & Canny (See Note in Details)",
   "author": "kosmoskatten",
   "description": "A workflow to add detail to and improve faces. This workflow is most effective when used with a model that creates realistic outputs. ",
@@ -1445,4 +1446,4 @@
       "targetHandle": "vae"
     }
   ]
-}
+}

invokeai/app/services/workflow_records/default_workflows/Flux Text to Image.json

@@ -1,4 +1,5 @@
 {
+  "id": "default_444fe292-896b-44fd-bfc6-c0b5d220fffc",
   "name": "FLUX Text to Image",
   "author": "InvokeAI",
   "description": "A simple text-to-image workflow using FLUX dev or schnell models.",

invokeai/app/services/workflow_records/default_workflows/Multi ControlNet (Canny & Depth).json

@@ -1,4 +1,5 @@
 {
+  "id": "default_2d05e719-a6b9-4e64-9310-b875d3b2f9d2",
   "name": "Multi ControlNet (Canny & Depth)",
   "author": "InvokeAI",
   "description": "A sample workflow using canny & depth ControlNets to guide the generation process. ",
@@ -1014,4 +1015,4 @@
       "targetHandle": "image_resolution"
     }
   ]
-}
+}

invokeai/app/services/workflow_records/default_workflows/MultiDiffusion SD1.5.json

@@ -1,4 +1,5 @@
 {
+  "id": "default_f96e794f-eb3e-4d01-a960-9b4e43402bcf",
   "name": "MultiDiffusion SD1.5",
   "author": "Invoke",
   "description": "A workflow to upscale an input image with tiled upscaling, using SD1.5 based models.",
@@ -52,7 +53,6 @@
     "version": "3.0.0",
     "category": "default"
   },
-  "id": "e5b5fb01-8906-463a-963a-402dbc42f79b",
   "nodes": [
     {
       "id": "33fe76a0-5efd-4482-a7f0-e2abf1223dc2",
@@ -1427,4 +1427,4 @@
       "targetHandle": "noise"
     }
   ]
-}
+}

invokeai/app/services/workflow_records/default_workflows/MultiDiffusion SDXL.json

@@ -1,4 +1,5 @@
 {
+  "id": "default_35658541-6d41-4a20-8ec5-4bf2561faed0",
   "name": "MultiDiffusion SDXL",
   "author": "Invoke",
   "description": "A workflow to upscale an input image with tiled upscaling, using SDXL based models.",
@@ -56,7 +57,6 @@
     "version": "3.0.0",
     "category": "default"
   },
-  "id": "dd607062-9e1b-48b9-89ad-9762cdfbb8f4",
   "nodes": [
     {
       "id": "71a116e1-c631-48b3-923d-acea4753b887",
@@ -1642,4 +1642,4 @@
       "targetHandle": "noise"
     }
   ]
-}
+}

invokeai/app/services/workflow_records/default_workflows/Prompt from File.json

@@ -1,4 +1,5 @@
 {
+  "id": "default_d7a1c60f-ca2f-4f90-9e33-75a826ca6d8f",
   "name": "Prompt from File",
   "author": "InvokeAI",
   "description": "Sample workflow using Prompt from File node",

invokeai/app/services/workflow_records/default_workflows/README.md

@@ -3,6 +3,7 @@
 Workflows placed in this directory will be synced to the `workflow_library` as
 _default workflows_ on app startup.
 
+- Default workflows must have an id that starts with "default\_". The ID must be retained when the workflow is updated. You may need to do this manually.
 - Default workflows are not editable by users. If they are loaded and saved,
   they will save as a copy of the default workflow.
 - Default workflows must have the `meta.category` property set to `"default"`.