diff --git a/docs/img/invokeai_metadata.png b/docs/img/invokeai_metadata.png index bf15971e..77e45c0c 100644 Binary files a/docs/img/invokeai_metadata.png and b/docs/img/invokeai_metadata.png differ diff --git a/docs/img/invokeai_metadata_full.png b/docs/img/invokeai_metadata_full.png index 2747fd84..87b2e9cc 100644 Binary files a/docs/img/invokeai_metadata_full.png and b/docs/img/invokeai_metadata_full.png differ diff --git a/docs/img/invokeai_photomap_settings.png b/docs/img/invokeai_photomap_settings.png index 745f6a29..451dcc34 100644 Binary files a/docs/img/invokeai_photomap_settings.png and b/docs/img/invokeai_photomap_settings.png differ diff --git a/docs/img/photomap_invokeai.png b/docs/img/photomap_invokeai.png index a84403a6..4d85069b 100644 Binary files a/docs/img/photomap_invokeai.png and b/docs/img/photomap_invokeai.png differ diff --git a/docs/img/photomap_invokeai_overview.png b/docs/img/photomap_invokeai_overview.png index 2d981ea2..f395570c 100644 Binary files a/docs/img/photomap_invokeai_overview.png and b/docs/img/photomap_invokeai_overview.png differ diff --git a/docs/user-guide/invokeai-integration.md b/docs/user-guide/invokeai-integration.md index 6911f52b..7a92415c 100644 --- a/docs/user-guide/invokeai-integration.md +++ b/docs/user-guide/invokeai-integration.md @@ -169,30 +169,31 @@ parameters listed. --- -## Add, Append, Remix and Reference Images +## Send, Append, Remix and Recall When an InvokeAI backend is configured, up to four new buttons appear -in the metadata drawer when an InvokeAI backend is configure. Which -ones are available depends on the image that is currently selected. +in an **InvokeAI** section at the bottom of the metadata drawer: +**Send Image**, **Append Image**, **Remix** and **Recall**. Which ones +are available depends on the image that is currently selected. -### Use as Ref Image +### Send Image and Append Image Any image — generated by InvokeAI or not — can be sent to InvokeAI as a **reference image**. PhotoMapAI uploads the image bytes to your InvokeAI gallery (in the board you selected above) so you can -immediately drop it into a Reference Image / IP-Adapter / ControlNet -layer. This is the only button that appears for non-InvokeAI images, +immediately use it in a Reference Image / IP-Adapter / ControlNet +layer. These are the only buttons that appear for non-InvokeAI images, since there is no generation metadata to recall. Metadata drawer showing only the Use as -Ref Image button +class="img-hover-zoom" alt="Metadata drawer showing the Send Image +and Append Image buttons"> -The **Send Image** button will send the current image to InvokeAI, +The **Send Image** button sends the current image to InvokeAI, replacing any reference image that was currently set in the generation -parameters. In contrast, the **Append Image** button will send the -current image to InvokeAI, but add the image to the list of reference -images. +parameters. In contrast, the **Append Image** button adds the current +image to the end of the existing list of reference images, leaving any +images already there in place. If the image you have selected is one that InvokeAI has never seen, it will automatically be uploaded as an asset image to the board selected @@ -200,6 +201,13 @@ in the PhotoMapAI configuration dialogue. If you are working with an image that was generated by InvokeAI and is still in one of its galleries, then the image will be reused. +!!! note + PhotoMapAI probes the InvokeAI backend to find out which of these + operations it supports, and hides the buttons it cannot honour. + **Send Image**, **Remix** and **Recall** require InvokeAI 6.13.0 + or later; **Append Image** requires InvokeAI 6.13.5 or later. If a + button you expect is missing, upgrade InvokeAI. + By default, the selected image is used as a reference image for an image edit model or as an IP Adapter reference image. If you wish to use it in the InvokeAI Canvas as a raster image or controlnet, go into @@ -213,8 +221,8 @@ If the current image contains InvokeAI metadata, two new buttons will appear: Metadata drawer showing only the Use as -Ref Image button +class="img-hover-zoom" alt="Metadata drawer showing the Send Image, +Append Image, Remix and Recall buttons"> For images that contain InvokeAI generation metadata, **Remix** sends @@ -243,7 +251,8 @@ A few situations are not surfaced inline and are worth knowing about: - **Boards dropdown is empty or stuck on *Uncategorized*** — usually means authentication failed silently. If your InvokeAI is in multi-user mode, fill in the username and password and re-enter the URL to retrigger the probe. - **Recall / Remix succeeds but no image queues in InvokeAI** — switch to InvokeAI's browser tab. The recalled parameters land in the canvas/generation panel; you still have to press *Invoke* to start the queue. -- **Buttons stay greyed out for an InvokeAI-generated image** — the image was probably produced by an InvokeAI version PhotoMapAI does not yet recognise. Check the *Show full metadata* link at the bottom of the drawer to confirm the metadata is present, and please [open an issue](https://github.com/lstein/PhotoMapAI/issues) so we can add support for the new schema. +- **Remix / Recall buttons missing for an InvokeAI-generated image** — the image was probably produced by an InvokeAI version PhotoMapAI does not yet recognise (only **Send Image** and **Append Image** are shown in that case). Check the *View Metadata (JSON)* link at the bottom of the drawer to confirm the metadata is present, and please [open an issue](https://github.com/lstein/PhotoMapAI/issues) so we can add support for the new schema. +- **Append Image button missing** — the configured InvokeAI backend predates the append option (it shipped in InvokeAI 6.13.5). Upgrade InvokeAI to enable it. ### PhotoMapAI and InvokeAI on different machines @@ -253,4 +262,4 @@ The integration is designed for a single workstation but works across machines t 2. In PhotoMapAI's **InvokeAI Backend URL** field, use the LAN address or hostname of the InvokeAI machine, not `localhost` (for example `http://10.0.0.42:9090`). 3. The album path you configured in *Creating an InvokeAI Album* must be readable by the PhotoMapAI server. If InvokeAI's `outputs/images/` lives on the InvokeAI machine, mount it on the PhotoMapAI machine over SMB / NFS / SSHFS and point the album at the mount point. -The **Use as Ref Image** action uploads the image bytes over the wire and works regardless of where the file lives. **Recall** and **Remix** only send metadata, so they also work cross-machine — but the receiving InvokeAI server must have the same models, LoRAs, and embeddings installed for the recalled parameters to produce the expected result. +The **Send Image** and **Append Image** actions upload the image bytes over the wire and work regardless of where the file lives. **Recall** and **Remix** only send metadata, so they also work cross-machine — but the receiving InvokeAI server must have the same models, LoRAs, and embeddings installed for the recalled parameters to produce the expected result. diff --git a/photomap/frontend/templates/modules/settings.html b/photomap/frontend/templates/modules/settings.html index f51f0582..5e196a0c 100644 --- a/photomap/frontend/templates/modules/settings.html +++ b/photomap/frontend/templates/modules/settings.html @@ -216,8 +216,8 @@ " > URL of a running InvokeAI server to enable the - Recall, Remix, and Use as Ref Image - buttons in the metadata drawer. + Send Image, Append Image, Remix, and + Recall buttons in the metadata drawer. diff --git a/uv.lock b/uv.lock index 1d1bb1ca..0ab5a4f3 100644 --- a/uv.lock +++ b/uv.lock @@ -1727,7 +1727,7 @@ wheels = [ [[package]] name = "photomapai" -version = "1.1.0" +version = "1.2.0" source = { editable = "." } dependencies = [ { name = "clip-anytorch" },