chore(ui): add TODO for revising field type names

"Custom", "CustomCollection" and "CustomPolymorphic" are reserved field names.

installer/lib/installer.py

@@ -244,7 +244,7 @@ class InvokeAiInstance:
                 "numpy~=1.24.0",  # choose versions that won't be uninstalled during phase 2
                 "urllib3~=1.26.0",
                 "requests~=2.28.0",
-                "torch~=2.1.0",
+                "torch==2.1.0",
                 "torchmetrics==0.11.4",
                 "torchvision>=0.14.1",
                 "--force-reinstall",

invokeai/app/invocations/baseinvocation.py

@@ -8,7 +8,7 @@ from abc import ABC, abstractmethod
 from enum import Enum
 from inspect import signature
 from types import UnionType
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterable, Literal, Optional, Type, TypeVar, Union
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, ForwardRef, Iterable, Literal, Optional, Type, TypeVar, Union
 
 import semver
 from pydantic import BaseModel, ConfigDict, Field, RootModel, TypeAdapter, create_model
@@ -648,17 +648,40 @@ class _Model(BaseModel):
 # Get all pydantic model attrs, methods, etc
 RESERVED_PYDANTIC_FIELD_NAMES = {m[0] for m in inspect.getmembers(_Model())}
 
+RESERVED_INVOKEAI_FIELD_NAMES = {"Custom", "CustomCollection", "CustomPolymorphic"}
+
 
 def validate_fields(model_fields: dict[str, FieldInfo], model_type: str) -> None:
     """
     Validates the fields of an invocation or invocation output:
     - must not override any pydantic reserved fields
+    - must not end with "Collection" or "Polymorphic" as these are reserved for internal use
     - must be created via `InputField`, `OutputField`, or be an internal field defined in this file
     """
     for name, field in model_fields.items():
         if name in RESERVED_PYDANTIC_FIELD_NAMES:
             raise InvalidFieldError(f'Invalid field name "{name}" on "{model_type}" (reserved by pydantic)')
 
+        if not field.annotation:
+            raise InvalidFieldError(f'Invalid field type "{name}" on "{model_type}" (missing annotation)')
+
+        annotation_name = (
+            field.annotation.__forward_arg__ if isinstance(field.annotation, ForwardRef) else field.annotation.__name__
+        )
+
+        if annotation_name.endswith("Polymorphic"):
+            raise InvalidFieldError(
+                f'Invalid field type "{annotation_name}" for "{name}" on "{model_type}" (must not end in "Polymorphic")'
+            )
+
+        if annotation_name.endswith("Collection"):
+            raise InvalidFieldError(
+                f'Invalid field type "{annotation_name}" for "{name}" on "{model_type}" (must not end in "Collection")'
+            )
+
+        if annotation_name in RESERVED_INVOKEAI_FIELD_NAMES:
+            raise InvalidFieldError(f'Invalid field type "{annotation_name}" for "{name}" on "{model_type}" (reserved)')
+
         field_kind = (
             # _field_kind is defined via InputField(), OutputField() or by one of the internal fields defined in this file
             field.json_schema_extra.get("_field_kind", None) if field.json_schema_extra else None

invokeai/app/invocations/latent.py

@@ -706,7 +706,6 @@ class DenoiseLatentsInvocation(BaseInvocation):
             )
             with (
                 ExitStack() as exit_stack,
-                ModelPatcher.apply_lora_unet(unet_info.context.model, _lora_loader()),
                 ModelPatcher.apply_freeu(unet_info.context.model, self.unet.freeu_config),
                 set_seamless(unet_info.context.model, self.unet.seamless_axes),
                 unet_info as unet,

invokeai/frontend/web/dist/assets/ThemeLocaleProvider-37ef62a0.js

@@ -1,4 +1,4 @@
-import{I as s,ie as T,v as l,$ as A,ig as R,aa as V,ih as z,ii as j,ij as D,ik as F,il as G,im as W,io as K,az as H,ip as U,iq as Y}from"./index-2ad466e0.js";import{M as Z}from"./MantineProvider-1fe3e660.js";var P=String.raw,E=P`
+import{w as s,ie as T,v as l,_ as I,ig as R,aa as V,ih as z,ii as j,ij as D,ik as F,il as G,im as W,io as K,az as H,ip as U,iq as Y}from"./index-c553e366.js";import{M as Z}from"./MantineProvider-094ba0de.js";var P=String.raw,E=P`
   :root,
   :host {
     --chakra-vh: 100vh;
@@ -277,4 +277,4 @@ import{I as s,ie as T,v as l,$ as A,ig as R,aa as V,ih as z,ii as j,ij as D,ik a
       }
 
       ${E}
-    `}),g={light:"chakra-ui-light",dark:"chakra-ui-dark"};function Q(e={}){const{preventTransition:o=!0}=e,n={setDataset:r=>{const t=o?n.preventTransition():void 0;document.documentElement.dataset.theme=r,document.documentElement.style.colorScheme=r,t==null||t()},setClassName(r){document.body.classList.add(r?g.dark:g.light),document.body.classList.remove(r?g.light:g.dark)},query(){return window.matchMedia("(prefers-color-scheme: dark)")},getSystemTheme(r){var t;return((t=n.query().matches)!=null?t:r==="dark")?"dark":"light"},addListener(r){const t=n.query(),i=a=>{r(a.matches?"dark":"light")};return typeof t.addListener=="function"?t.addListener(i):t.addEventListener("change",i),()=>{typeof t.removeListener=="function"?t.removeListener(i):t.removeEventListener("change",i)}},preventTransition(){const r=document.createElement("style");return r.appendChild(document.createTextNode("*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}")),document.head.appendChild(r),()=>{window.getComputedStyle(document.body),requestAnimationFrame(()=>{requestAnimationFrame(()=>{document.head.removeChild(r)})})}}};return n}var X="chakra-ui-color-mode";function L(e){return{ssr:!1,type:"localStorage",get(o){if(!(globalThis!=null&&globalThis.document))return o;let n;try{n=localStorage.getItem(e)||o}catch{}return n||o},set(o){try{localStorage.setItem(e,o)}catch{}}}}var ee=L(X),M=()=>{};function S(e,o){return e.type==="cookie"&&e.ssr?e.get(o):o}function O(e){const{value:o,children:n,options:{useSystemColorMode:r,initialColorMode:t,disableTransitionOnChange:i}={},colorModeManager:a=ee}=e,d=t==="dark"?"dark":"light",[u,p]=l.useState(()=>S(a,d)),[y,b]=l.useState(()=>S(a)),{getSystemTheme:w,setClassName:k,setDataset:x,addListener:$}=l.useMemo(()=>Q({preventTransition:i}),[i]),v=t==="system"&&!u?y:u,c=l.useCallback(m=>{const f=m==="system"?w():m;p(f),k(f==="dark"),x(f),a.set(f)},[a,w,k,x]);A(()=>{t==="system"&&b(w())},[]),l.useEffect(()=>{const m=a.get();if(m){c(m);return}if(t==="system"){c("system");return}c(d)},[a,d,t,c]);const C=l.useCallback(()=>{c(v==="dark"?"light":"dark")},[v,c]);l.useEffect(()=>{if(r)return $(c)},[r,$,c]);const N=l.useMemo(()=>({colorMode:o??v,toggleColorMode:o?M:C,setColorMode:o?M:c,forced:o!==void 0}),[v,C,c,o]);return s.jsx(R.Provider,{value:N,children:n})}O.displayName="ColorModeProvider";var te=["borders","breakpoints","colors","components","config","direction","fonts","fontSizes","fontWeights","letterSpacings","lineHeights","radii","shadows","sizes","space","styles","transition","zIndices"];function re(e){return V(e)?te.every(o=>Object.prototype.hasOwnProperty.call(e,o)):!1}function h(e){return typeof e=="function"}function oe(...e){return o=>e.reduce((n,r)=>r(n),o)}var ne=e=>function(...n){let r=[...n],t=n[n.length-1];return re(t)&&r.length>1?r=r.slice(0,r.length-1):t=e,oe(...r.map(i=>a=>h(i)?i(a):ae(a,i)))(t)},ie=ne(j);function ae(...e){return z({},...e,_)}function _(e,o,n,r){if((h(e)||h(o))&&Object.prototype.hasOwnProperty.call(r,n))return(...t)=>{const i=h(e)?e(...t):e,a=h(o)?o(...t):o;return z({},i,a,_)}}var q=l.createContext({getDocument(){return document},getWindow(){return window}});q.displayName="EnvironmentContext";function I(e){const{children:o,environment:n,disabled:r}=e,t=l.useRef(null),i=l.useMemo(()=>n||{getDocument:()=>{var d,u;return(u=(d=t.current)==null?void 0:d.ownerDocument)!=null?u:document},getWindow:()=>{var d,u;return(u=(d=t.current)==null?void 0:d.ownerDocument.defaultView)!=null?u:window}},[n]),a=!r||!n;return s.jsxs(q.Provider,{value:i,children:[o,a&&s.jsx("span",{id:"__chakra_env",hidden:!0,ref:t})]})}I.displayName="EnvironmentProvider";var se=e=>{const{children:o,colorModeManager:n,portalZIndex:r,resetScope:t,resetCSS:i=!0,theme:a={},environment:d,cssVarsRoot:u,disableEnvironment:p,disableGlobalStyle:y}=e,b=s.jsx(I,{environment:d,disabled:p,children:o});return s.jsx(D,{theme:a,cssVarsRoot:u,children:s.jsxs(O,{colorModeManager:n,options:a.config,children:[i?s.jsx(J,{scope:t}):s.jsx(B,{}),!y&&s.jsx(F,{}),r?s.jsx(G,{zIndex:r,children:b}):b]})})},le=e=>function({children:n,theme:r=e,toastOptions:t,...i}){return s.jsxs(se,{theme:r,...i,children:[s.jsx(W,{value:t==null?void 0:t.defaultOptions,children:n}),s.jsx(K,{...t})]})},de=le(j);const ue=()=>l.useMemo(()=>({colorScheme:"dark",fontFamily:"'Inter Variable', sans-serif",components:{ScrollArea:{defaultProps:{scrollbarSize:10},styles:{scrollbar:{"&:hover":{backgroundColor:"var(--invokeai-colors-baseAlpha-300)"}},thumb:{backgroundColor:"var(--invokeai-colors-baseAlpha-300)"}}}}}),[]),ce=L("@@invokeai-color-mode");function me({children:e}){const{i18n:o}=H(),n=o.dir(),r=l.useMemo(()=>ie({...U,direction:n}),[n]);l.useEffect(()=>{document.body.dir=n},[n]);const t=ue();return s.jsx(Z,{theme:t,children:s.jsx(de,{theme:r,colorModeManager:ce,toastOptions:Y,children:e})})}const ve=l.memo(me);export{ve as default};
+    `}),g={light:"chakra-ui-light",dark:"chakra-ui-dark"};function Q(e={}){const{preventTransition:o=!0}=e,n={setDataset:r=>{const t=o?n.preventTransition():void 0;document.documentElement.dataset.theme=r,document.documentElement.style.colorScheme=r,t==null||t()},setClassName(r){document.body.classList.add(r?g.dark:g.light),document.body.classList.remove(r?g.light:g.dark)},query(){return window.matchMedia("(prefers-color-scheme: dark)")},getSystemTheme(r){var t;return((t=n.query().matches)!=null?t:r==="dark")?"dark":"light"},addListener(r){const t=n.query(),i=a=>{r(a.matches?"dark":"light")};return typeof t.addListener=="function"?t.addListener(i):t.addEventListener("change",i),()=>{typeof t.removeListener=="function"?t.removeListener(i):t.removeEventListener("change",i)}},preventTransition(){const r=document.createElement("style");return r.appendChild(document.createTextNode("*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}")),document.head.appendChild(r),()=>{window.getComputedStyle(document.body),requestAnimationFrame(()=>{requestAnimationFrame(()=>{document.head.removeChild(r)})})}}};return n}var X="chakra-ui-color-mode";function L(e){return{ssr:!1,type:"localStorage",get(o){if(!(globalThis!=null&&globalThis.document))return o;let n;try{n=localStorage.getItem(e)||o}catch{}return n||o},set(o){try{localStorage.setItem(e,o)}catch{}}}}var ee=L(X),M=()=>{};function S(e,o){return e.type==="cookie"&&e.ssr?e.get(o):o}function O(e){const{value:o,children:n,options:{useSystemColorMode:r,initialColorMode:t,disableTransitionOnChange:i}={},colorModeManager:a=ee}=e,d=t==="dark"?"dark":"light",[u,p]=l.useState(()=>S(a,d)),[y,b]=l.useState(()=>S(a)),{getSystemTheme:w,setClassName:k,setDataset:x,addListener:$}=l.useMemo(()=>Q({preventTransition:i}),[i]),v=t==="system"&&!u?y:u,c=l.useCallback(m=>{const f=m==="system"?w():m;p(f),k(f==="dark"),x(f),a.set(f)},[a,w,k,x]);I(()=>{t==="system"&&b(w())},[]),l.useEffect(()=>{const m=a.get();if(m){c(m);return}if(t==="system"){c("system");return}c(d)},[a,d,t,c]);const C=l.useCallback(()=>{c(v==="dark"?"light":"dark")},[v,c]);l.useEffect(()=>{if(r)return $(c)},[r,$,c]);const A=l.useMemo(()=>({colorMode:o??v,toggleColorMode:o?M:C,setColorMode:o?M:c,forced:o!==void 0}),[v,C,c,o]);return s.jsx(R.Provider,{value:A,children:n})}O.displayName="ColorModeProvider";var te=["borders","breakpoints","colors","components","config","direction","fonts","fontSizes","fontWeights","letterSpacings","lineHeights","radii","shadows","sizes","space","styles","transition","zIndices"];function re(e){return V(e)?te.every(o=>Object.prototype.hasOwnProperty.call(e,o)):!1}function h(e){return typeof e=="function"}function oe(...e){return o=>e.reduce((n,r)=>r(n),o)}var ne=e=>function(...n){let r=[...n],t=n[n.length-1];return re(t)&&r.length>1?r=r.slice(0,r.length-1):t=e,oe(...r.map(i=>a=>h(i)?i(a):ae(a,i)))(t)},ie=ne(j);function ae(...e){return z({},...e,_)}function _(e,o,n,r){if((h(e)||h(o))&&Object.prototype.hasOwnProperty.call(r,n))return(...t)=>{const i=h(e)?e(...t):e,a=h(o)?o(...t):o;return z({},i,a,_)}}var q=l.createContext({getDocument(){return document},getWindow(){return window}});q.displayName="EnvironmentContext";function N(e){const{children:o,environment:n,disabled:r}=e,t=l.useRef(null),i=l.useMemo(()=>n||{getDocument:()=>{var d,u;return(u=(d=t.current)==null?void 0:d.ownerDocument)!=null?u:document},getWindow:()=>{var d,u;return(u=(d=t.current)==null?void 0:d.ownerDocument.defaultView)!=null?u:window}},[n]),a=!r||!n;return s.jsxs(q.Provider,{value:i,children:[o,a&&s.jsx("span",{id:"__chakra_env",hidden:!0,ref:t})]})}N.displayName="EnvironmentProvider";var se=e=>{const{children:o,colorModeManager:n,portalZIndex:r,resetScope:t,resetCSS:i=!0,theme:a={},environment:d,cssVarsRoot:u,disableEnvironment:p,disableGlobalStyle:y}=e,b=s.jsx(N,{environment:d,disabled:p,children:o});return s.jsx(D,{theme:a,cssVarsRoot:u,children:s.jsxs(O,{colorModeManager:n,options:a.config,children:[i?s.jsx(J,{scope:t}):s.jsx(B,{}),!y&&s.jsx(F,{}),r?s.jsx(G,{zIndex:r,children:b}):b]})})},le=e=>function({children:n,theme:r=e,toastOptions:t,...i}){return s.jsxs(se,{theme:r,...i,children:[s.jsx(W,{value:t==null?void 0:t.defaultOptions,children:n}),s.jsx(K,{...t})]})},de=le(j);const ue=()=>l.useMemo(()=>({colorScheme:"dark",fontFamily:"'Inter Variable', sans-serif",components:{ScrollArea:{defaultProps:{scrollbarSize:10},styles:{scrollbar:{"&:hover":{backgroundColor:"var(--invokeai-colors-baseAlpha-300)"}},thumb:{backgroundColor:"var(--invokeai-colors-baseAlpha-300)"}}}}}),[]),ce=L("@@invokeai-color-mode");function me({children:e}){const{i18n:o}=H(),n=o.dir(),r=l.useMemo(()=>ie({...U,direction:n}),[n]);l.useEffect(()=>{document.body.dir=n},[n]);const t=ue();return s.jsx(Z,{theme:t,children:s.jsx(de,{theme:r,colorModeManager:ce,toastOptions:Y,children:e})})}const ve=l.memo(me);export{ve as default};

invokeai/frontend/web/dist/index.html

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

invokeai/frontend/web/public/locales/de.json

@@ -113,7 +113,14 @@
         "images": "Bilder",
         "copy": "Kopieren",
         "download": "Runterladen",
-        "setCurrentImage": "Setze aktuelle Bild"
+        "setCurrentImage": "Setze aktuelle Bild",
+        "featuresWillReset": "Wenn Sie dieses Bild löschen, werden diese Funktionen sofort zurückgesetzt.",
+        "deleteImageBin": "Gelöschte Bilder werden an den Papierkorb Ihres Betriebssystems gesendet.",
+        "unableToLoad": "Galerie kann nicht geladen werden",
+        "downloadSelection": "Auswahl herunterladen",
+        "currentlyInUse": "Dieses Bild wird derzeit in den folgenden Funktionen verwendet:",
+        "deleteImagePermanent": "Gelöschte Bilder können nicht wiederhergestellt werden.",
+        "autoAssignBoardOnClick": "Board per Klick automatisch zuweisen"
     },
     "hotkeys": {
         "keyboardShortcuts": "Tastenkürzel",
@@ -323,7 +330,8 @@
         },
         "nodesHotkeys": "Knoten Tastenkürzel",
         "addNodes": {
-            "title": "Knotenpunkt hinzufügen"
+            "title": "Knotenpunkt hinzufügen",
+            "desc": "Öffnet das Menü zum Hinzufügen von Knoten"
         }
     },
     "modelManager": {
@@ -429,7 +437,43 @@
         "customConfigFileLocation": "Benutzerdefinierte Konfiguration Datei Speicherort",
         "baseModel": "Basis Modell",
         "convertToDiffusers": "Konvertiere zu Diffusers",
-        "diffusersModels": "Diffusers"
+        "diffusersModels": "Diffusers",
+        "noCustomLocationProvided": "Kein benutzerdefinierter Standort angegeben",
+        "onnxModels": "Onnx",
+        "vaeRepoID": "VAE-Repo-ID",
+        "weightedSum": "Gewichtete Summe",
+        "syncModelsDesc": "Wenn Ihre Modelle nicht mit dem Backend synchronisiert sind, können Sie sie mit dieser Option aktualisieren. Dies ist im Allgemeinen praktisch, wenn Sie Ihre models.yaml-Datei manuell aktualisieren oder Modelle zum InvokeAI-Stammordner hinzufügen, nachdem die Anwendung gestartet wurde.",
+        "vae": "VAE",
+        "noModels": "Keine Modelle gefunden",
+        "statusConverting": "Konvertieren",
+        "sigmoid": "Sigmoid",
+        "predictionType": "Vorhersagetyp (für Stable Diffusion 2.x-Modelle und gelegentliche Stable Diffusion 1.x-Modelle)",
+        "selectModel": "Wählen Sie Modell aus",
+        "repo_id": "Repo-ID",
+        "modelSyncFailed": "Modellsynchronisierung fehlgeschlagen",
+        "quickAdd": "Schnell hinzufügen",
+        "simpleModelDesc": "Geben Sie einen Pfad zu einem lokalen Diffusers-Modell, einem lokalen Checkpoint-/Safetensors-Modell, einer HuggingFace-Repo-ID oder einer Checkpoint-/Diffusers-Modell-URL an.",
+        "modelDeleted": "Modell gelöscht",
+        "inpainting": "v1 Ausmalen",
+        "modelUpdateFailed": "Modellaktualisierung fehlgeschlagen",
+        "useCustomConfig": "Benutzerdefinierte Konfiguration verwenden",
+        "settings": "Einstellungen",
+        "modelConversionFailed": "Modellkonvertierung fehlgeschlagen",
+        "syncModels": "Modelle synchronisieren",
+        "mergedModelSaveLocation": "Speicherort",
+        "modelType": "Modelltyp",
+        "modelsMerged": "Modelle zusammengeführt",
+        "modelsMergeFailed": "Modellzusammenführung fehlgeschlagen",
+        "convertToDiffusersHelpText1": "Dieses Modell wird in das 🧨 Diffusers-Format konvertiert.",
+        "modelsSynced": "Modelle synchronisiert",
+        "vaePrecision": "VAE-Präzision",
+        "mergeModels": "Modelle zusammenführen",
+        "interpolationType": "Interpolationstyp",
+        "oliveModels": "Olives",
+        "variant": "Variante",
+        "loraModels": "LoRAs",
+        "modelDeleteFailed": "Modell konnte nicht gelöscht werden",
+        "mergedModelName": "Zusammengeführter Modellname"
     },
     "parameters": {
         "images": "Bilder",
@@ -716,7 +760,33 @@
         "saveControlImage": "Speichere Referenz Bild",
         "safe": "Speichern",
         "ipAdapterImageFallback": "Kein IP Adapter Bild ausgewählt",
-        "resetIPAdapterImage": "Zurücksetzen vom IP Adapter Bild"
+        "resetIPAdapterImage": "Zurücksetzen vom IP Adapter Bild",
+        "pidi": "PIDI",
+        "normalBae": "Normales BAE",
+        "mlsdDescription": "Minimalistischer Liniensegmentdetektor",
+        "openPoseDescription": "Schätzung der menschlichen Pose mit Openpose",
+        "control": "Kontrolle",
+        "coarse": "Coarse",
+        "crop": "Zuschneiden",
+        "pidiDescription": "PIDI-Bildverarbeitung",
+        "mediapipeFace": "Mediapipe Gesichter",
+        "mlsd": "M-LSD",
+        "controlMode": "Steuermodus",
+        "cannyDescription": "Canny Ecken Erkennung",
+        "lineart": "Lineart",
+        "lineartAnimeDescription": "Lineart-Verarbeitung im Anime-Stil",
+        "minConfidence": "Minimales Vertrauen",
+        "megaControl": "Mega-Kontrolle",
+        "autoConfigure": "Prozessor automatisch konfigurieren",
+        "normalBaeDescription": "Normale BAE-Verarbeitung",
+        "noneDescription": "Es wurde keine Verarbeitung angewendet",
+        "openPose": "Openpose",
+        "lineartAnime": "Lineart Anime",
+        "mediapipeFaceDescription": "Gesichtserkennung mit Mediapipe",
+        "canny": "Canny",
+        "hedDescription": "Ganzheitlich verschachtelte Kantenerkennung",
+        "scribble": "Scribble",
+        "maxFaces": "Maximal Anzahl Gesichter"
     },
     "queue": {
         "status": "Status",
@@ -758,7 +828,19 @@
         "enqueueing": "Stapel in der Warteschlange",
         "queueMaxExceeded": "Maximum von  {{max_queue_size}} Elementen erreicht, würde {{skip}} Elemente überspringen",
         "cancelBatchFailed": "Problem beim Abbruch vom Stapel",
-        "clearQueueAlertDialog2": "bist du sicher die Warteschlange zu leeren?"
+        "clearQueueAlertDialog2": "bist du sicher die Warteschlange zu leeren?",
+        "pruneSucceeded": "{{item_count}} abgeschlossene Elemente aus der Warteschlange entfernt",
+        "pauseSucceeded": "Prozessor angehalten",
+        "cancelFailed": "Problem beim Stornieren des Auftrags",
+        "pauseFailed": "Problem beim Anhalten des Prozessors",
+        "front": "Vorne",
+        "pruneTooltip": "Bereinigen Sie {{item_count}} abgeschlossene Aufträge",
+        "resumeFailed": "Problem beim wieder aufnehmen von Prozessor",
+        "pruneFailed": "Problem beim leeren der Warteschlange",
+        "pauseTooltip": "Pause von Prozessor",
+        "back": "Hinten",
+        "resumeSucceeded": "Prozessor wieder aufgenommen",
+        "resumeTooltip": "Prozessor wieder aufnehmen"
     },
     "metadata": {
         "negativePrompt": "Negativ Beschreibung",
@@ -773,7 +855,20 @@
         "noMetaData": "Keine Meta-Data gefunden",
         "width": "Breite",
         "createdBy": "Erstellt von",
-        "steps": "Schritte"
+        "steps": "Schritte",
+        "seamless": "Nahtlos",
+        "positivePrompt": "Positiver Prompt",
+        "generationMode": "Generierungsmodus",
+        "Threshold": "Noise Schwelle",
+        "seed": "Samen",
+        "perlin": "Perlin Noise",
+        "hiresFix": "Optimierung für hohe Auflösungen",
+        "initImage": "Erstes Bild",
+        "variations": "Samengewichtspaare",
+        "vae": "VAE",
+        "workflow": "Arbeitsablauf",
+        "scheduler": "Scheduler",
+        "noRecallParameters": "Es wurden keine Parameter zum Abrufen gefunden"
     },
     "popovers": {
         "noiseUseCPU": {
@@ -811,11 +906,68 @@
         "misses": "Cache Nötig",
         "hits": "Cache Treffer",
         "enable": "Aktivieren",
-        "clear": "Leeren"
+        "clear": "Leeren",
+        "maxCacheSize": "Maximale Cache Größe",
+        "cacheSize": "Cache Größe"
     },
     "embedding": {
         "noMatchingEmbedding": "Keine passenden Embeddings",
         "addEmbedding": "Embedding hinzufügen",
         "incompatibleModel": "Inkompatibles Basismodell:"
+    },
+    "nodes": {
+        "booleanPolymorphicDescription": "Eine Sammlung boolescher Werte.",
+        "colorFieldDescription": "Eine RGBA-Farbe.",
+        "conditioningCollection": "Konditionierungssammlung",
+        "addNode": "Knoten hinzufügen",
+        "conditioningCollectionDescription": "Konditionierung kann zwischen Knoten weitergegeben werden.",
+        "colorPolymorphic": "Farbpolymorph",
+        "colorCodeEdgesHelp": "Farbkodieren Sie Kanten entsprechend ihren verbundenen Feldern",
+        "animatedEdges": "Animierte Kanten",
+        "booleanCollectionDescription": "Eine Sammlung boolescher Werte.",
+        "colorField": "Farbe",
+        "collectionItem": "Objekt in Sammlung",
+        "animatedEdgesHelp": "Animieren Sie ausgewählte Kanten und Kanten, die mit ausgewählten Knoten verbunden sind",
+        "cannotDuplicateConnection": "Es können keine doppelten Verbindungen erstellt werden",
+        "booleanPolymorphic": "Boolesche Polymorphie",
+        "colorPolymorphicDescription": "Eine Sammlung von Farben.",
+        "clipFieldDescription": "Tokenizer- und text_encoder-Untermodelle.",
+        "clipField": "Clip",
+        "colorCollection": "Eine Sammlung von Farben.",
+        "boolean": "Boolesche Werte",
+        "currentImage": "Aktuelles Bild",
+        "booleanDescription": "Boolesche Werte sind wahr oder falsch.",
+        "collection": "Sammlung",
+        "cannotConnectInputToInput": "Eingang kann nicht mit Eingang verbunden werden",
+        "conditioningField": "Konditionierung",
+        "cannotConnectOutputToOutput": "Ausgang kann nicht mit Ausgang verbunden werden",
+        "booleanCollection": "Boolesche Werte Sammlung",
+        "cannotConnectToSelf": "Es kann keine Verbindung zu sich selbst hergestellt werden",
+        "colorCodeEdges": "Farbkodierte Kanten",
+        "addNodeToolTip": "Knoten hinzufügen (Umschalt+A, Leertaste)"
+    },
+    "hrf": {
+        "enableHrf": "Aktivieren Sie die Korrektur für hohe Auflösungen",
+        "upscaleMethod": "Vergrößerungsmethoden",
+        "enableHrfTooltip": "Generieren Sie mit einer niedrigeren Anfangsauflösung, skalieren Sie auf die Basisauflösung hoch und führen Sie dann Image-to-Image aus.",
+        "metadata": {
+            "strength": "Hochauflösender Fix Stärke",
+            "enabled": "Hochauflösender Fix aktiviert",
+            "method": "Hochauflösender Fix Methode"
+        },
+        "hrf": "Hochauflösender Fix",
+        "hrfStrength": "Hochauflösende Fix Stärke",
+        "strengthTooltip": "Niedrigere Werte führen zu weniger Details, wodurch potenzielle Artefakte reduziert werden können."
+    },
+    "models": {
+        "noMatchingModels": "Keine passenden Modelle",
+        "loading": "lade",
+        "noMatchingLoRAs": "Keine passenden LoRAs",
+        "noLoRAsAvailable": "Keine LoRAs verfügbar",
+        "noModelsAvailable": "Keine Modelle verfügbar",
+        "selectModel": "Wählen ein Modell aus",
+        "noRefinerModelsInstalled": "Keine SDXL Refiner-Modelle installiert",
+        "noLoRAsInstalled": "Keine LoRAs installiert",
+        "selectLoRA": "Wählen ein LoRA aus"
     }
 }

invokeai/frontend/web/src/features/gallery/components/ImageMetadataViewer/ImageMetadataActions.tsx

@@ -157,8 +157,6 @@ const ImageMetadataActions = (props: Props) => {
     return null;
   }
 
-  console.log(metadata);
-
   return (
     <>
       {metadata.created_by && (

invokeai/frontend/web/src/features/nodes/components/flow/AddNodePopover/AddNodePopover.tsx

@@ -57,7 +57,7 @@ const AddNodePopover = () => {
   const { t } = useTranslation();
 
   const fieldFilter = useAppSelector(
-    (state) => state.nodes.currentConnectionFieldType
+    (state) => state.nodes.connectionStartFieldType
   );
   const handleFilter = useAppSelector(
     (state) => state.nodes.connectionStartParams?.handleType
@@ -74,9 +74,13 @@ const AddNodePopover = () => {
 
             return some(handles, (handle) => {
               const sourceType =
-                handleFilter == 'source' ? fieldFilter : handle.type;
+                handleFilter == 'source'
+                  ? fieldFilter
+                  : handle.originalType ?? handle.type;
               const targetType =
-                handleFilter == 'target' ? fieldFilter : handle.type;
+                handleFilter == 'target'
+                  ? fieldFilter
+                  : handle.originalType ?? handle.type;
 
               return validateSourceAndTargetTypes(sourceType, targetType);
             });
@@ -111,7 +115,7 @@ const AddNodePopover = () => {
 
       data.sort((a, b) => a.label.localeCompare(b.label));
 
-      return { data, t };
+      return { data };
     },
     defaultSelectorOptions
   );

invokeai/frontend/web/src/features/nodes/components/flow/connectionLines/CustomConnectionLine.tsx

@@ -2,18 +2,17 @@ import { createSelector } from '@reduxjs/toolkit';
 import { stateSelector } from 'app/store/store';
 import { useAppSelector } from 'app/store/storeHooks';
 import { colorTokenToCssVar } from 'common/util/colorTokenToCssVar';
-import { FIELDS } from 'features/nodes/types/constants';
 import { memo } from 'react';
 import { ConnectionLineComponentProps, getBezierPath } from 'reactflow';
+import { getFieldColor } from '../edges/util/getEdgeColor';
 
 const selector = createSelector(stateSelector, ({ nodes }) => {
-  const { shouldAnimateEdges, currentConnectionFieldType, shouldColorEdges } =
+  const { shouldAnimateEdges, connectionStartFieldType, shouldColorEdges } =
     nodes;
 
-  const stroke =
-    currentConnectionFieldType && shouldColorEdges
-      ? colorTokenToCssVar(FIELDS[currentConnectionFieldType].color)
-      : colorTokenToCssVar('base.500');
+  const stroke = shouldColorEdges
+    ? getFieldColor(connectionStartFieldType)
+    : colorTokenToCssVar('base.500');
 
   let className = 'react-flow__custom_connection-path';
 

invokeai/frontend/web/src/features/nodes/components/flow/edges/util/getEdgeColor.ts

@@ -0,0 +1,12 @@
+import { colorTokenToCssVar } from 'common/util/colorTokenToCssVar';
+import { FIELDS } from 'features/nodes/types/constants';
+import { FieldType } from 'features/nodes/types/types';
+
+export const getFieldColor = (fieldType: FieldType | string | null): string => {
+  if (!fieldType) {
+    return colorTokenToCssVar('base.500');
+  }
+  const color = FIELDS[fieldType]?.color;
+
+  return color ? colorTokenToCssVar(color) : colorTokenToCssVar('base.500');
+};

invokeai/frontend/web/src/features/nodes/components/flow/edges/util/makeEdgeSelector.ts

@@ -2,8 +2,8 @@ import { createSelector } from '@reduxjs/toolkit';
 import { stateSelector } from 'app/store/store';
 import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions';
 import { colorTokenToCssVar } from 'common/util/colorTokenToCssVar';
-import { FIELDS } from 'features/nodes/types/constants';
 import { isInvocationNode } from 'features/nodes/types/types';
+import { getFieldColor } from './getEdgeColor';
 
 export const makeEdgeSelector = (
   source: string,
@@ -29,7 +29,7 @@ export const makeEdgeSelector = (
 
       const stroke =
         sourceType && nodes.shouldColorEdges
-          ? colorTokenToCssVar(FIELDS[sourceType].color)
+          ? getFieldColor(sourceType)
           : colorTokenToCssVar('base.500');
 
       return {

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/FieldHandle.tsx

@@ -1,11 +1,12 @@
 import { Tooltip } from '@chakra-ui/react';
 import { colorTokenToCssVar } from 'common/util/colorTokenToCssVar';
 import {
-  COLLECTION_TYPES,
-  FIELDS,
+  getIsCollection,
+  getIsPolymorphic,
+} from 'features/nodes/store/util/parseFieldType';
+import {
   HANDLE_TOOLTIP_OPEN_DELAY,
   MODEL_TYPES,
-  POLYMORPHIC_TYPES,
 } from 'features/nodes/types/constants';
 import {
   InputFieldTemplate,
@@ -13,6 +14,7 @@ import {
 } from 'features/nodes/types/types';
 import { CSSProperties, memo, useMemo } from 'react';
 import { Handle, HandleType, Position } from 'reactflow';
+import { getFieldColor } from '../../../edges/util/getEdgeColor';
 
 export const handleBaseStyles: CSSProperties = {
   position: 'absolute',
@@ -47,23 +49,21 @@ const FieldHandle = (props: FieldHandleProps) => {
     isConnectionStartField,
     connectionError,
   } = props;
-  const { name, type } = fieldTemplate;
-  const { color: typeColor, title } = FIELDS[type];
+  const { name } = fieldTemplate;
+  const type = fieldTemplate.originalType ?? fieldTemplate.type;
 
   const styles: CSSProperties = useMemo(() => {
-    const isCollectionType = COLLECTION_TYPES.includes(type);
-    const isPolymorphicType = POLYMORPHIC_TYPES.includes(type);
-    const isModelType = MODEL_TYPES.includes(type);
-    const color = colorTokenToCssVar(typeColor);
+    const isCollection = getIsCollection(fieldTemplate.type);
+    const isPolymorphic = getIsPolymorphic(fieldTemplate.type);
+    const isModelType = MODEL_TYPES.some((t) => t === type);
+    const color = getFieldColor(type);
     const s: CSSProperties = {
       backgroundColor:
-        isCollectionType || isPolymorphicType
-          ? 'var(--invokeai-colors-base-900)'
-          : color,
+        isCollection || isPolymorphic ? colorTokenToCssVar('base.900') : color,
       position: 'absolute',
       width: '1rem',
       height: '1rem',
-      borderWidth: isCollectionType || isPolymorphicType ? 4 : 0,
+      borderWidth: isCollection || isPolymorphic ? 4 : 0,
       borderStyle: 'solid',
       borderColor: color,
       borderRadius: isModelType ? 4 : '100%',
@@ -93,22 +93,19 @@ const FieldHandle = (props: FieldHandleProps) => {
     return s;
   }, [
     connectionError,
+    fieldTemplate.type,
     handleType,
     isConnectionInProgress,
     isConnectionStartField,
     type,
-    typeColor,
   ]);
 
   const tooltip = useMemo(() => {
-    if (isConnectionInProgress && isConnectionStartField) {
-      return title;
-    }
     if (isConnectionInProgress && connectionError) {
-      return connectionError ?? title;
+      return connectionError;
     }
-    return title;
-  }, [connectionError, isConnectionInProgress, isConnectionStartField, title]);
+    return type;
+  }, [connectionError, isConnectionInProgress, type]);
 
   return (
     <Tooltip

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/FieldTooltipContent.tsx

@@ -1,7 +1,6 @@
 import { Flex, Text } from '@chakra-ui/react';
 import { useFieldData } from 'features/nodes/hooks/useFieldData';
 import { useFieldTemplate } from 'features/nodes/hooks/useFieldTemplate';
-import { FIELDS } from 'features/nodes/types/constants';
 import {
   isInputFieldTemplate,
   isInputFieldValue,
@@ -9,7 +8,6 @@ import {
 import { startCase } from 'lodash-es';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-
 interface Props {
   nodeId: string;
   fieldName: string;
@@ -49,7 +47,7 @@ const FieldTooltipContent = ({ nodeId, fieldName, kind }: Props) => {
           {fieldTemplate.description}
         </Text>
       )}
-      {fieldTemplate && <Text>Type: {FIELDS[fieldTemplate.type].title}</Text>}
+      {fieldTemplate && <Text>Type: {fieldTemplate.originalType}</Text>}
       {isInputTemplate && <Text>Input: {startCase(fieldTemplate.input)}</Text>}
     </Flex>
   );

invokeai/frontend/web/src/features/nodes/hooks/useAnyOrDirectInputFieldNames.ts

@@ -4,11 +4,9 @@ import { useAppSelector } from 'app/store/storeHooks';
 import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions';
 import { map } from 'lodash-es';
 import { useMemo } from 'react';
+import { getIsPolymorphic } from '../store/util/parseFieldType';
+import { TYPES_WITH_INPUT_COMPONENTS } from '../types/constants';
 import { isInvocationNode } from '../types/types';
-import {
-  POLYMORPHIC_TYPES,
-  TYPES_WITH_INPUT_COMPONENTS,
-} from '../types/constants';
 import { getSortedFilteredFieldNames } from '../util/getSortedFilteredFieldNames';
 
 export const useAnyOrDirectInputFieldNames = (nodeId: string) => {
@@ -28,7 +26,7 @@ export const useAnyOrDirectInputFieldNames = (nodeId: string) => {
           const fields = map(nodeTemplate.inputs).filter(
             (field) =>
               (['any', 'direct'].includes(field.input) ||
-                POLYMORPHIC_TYPES.includes(field.type)) &&
+                getIsPolymorphic(field.type)) &&
               TYPES_WITH_INPUT_COMPONENTS.includes(field.type)
           );
           return getSortedFilteredFieldNames(fields);

invokeai/frontend/web/src/features/nodes/hooks/useConnectionInputFieldNames.ts

@@ -4,10 +4,8 @@ import { useAppSelector } from 'app/store/storeHooks';
 import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions';
 import { map } from 'lodash-es';
 import { useMemo } from 'react';
-import {
-  POLYMORPHIC_TYPES,
-  TYPES_WITH_INPUT_COMPONENTS,
-} from '../types/constants';
+import { getIsPolymorphic } from '../store/util/parseFieldType';
+import { TYPES_WITH_INPUT_COMPONENTS } from '../types/constants';
 import { isInvocationNode } from '../types/types';
 import { getSortedFilteredFieldNames } from '../util/getSortedFilteredFieldNames';
 
@@ -29,8 +27,7 @@ export const useConnectionInputFieldNames = (nodeId: string) => {
           // get the visible fields
           const fields = map(nodeTemplate.inputs).filter(
             (field) =>
-              (field.input === 'connection' &&
-                !POLYMORPHIC_TYPES.includes(field.type)) ||
+              (field.input === 'connection' && !getIsPolymorphic(field.type)) ||
               !TYPES_WITH_INPUT_COMPONENTS.includes(field.type)
           );
 

invokeai/frontend/web/src/features/nodes/hooks/useConnectionState.ts

@@ -8,7 +8,7 @@ import { useFieldType } from './useFieldType.ts';
 const selectIsConnectionInProgress = createSelector(
   stateSelector,
   ({ nodes }) =>
-    nodes.currentConnectionFieldType !== null &&
+    nodes.connectionStartFieldType !== null &&
     nodes.connectionStartParams !== null
 );
 

invokeai/frontend/web/src/features/nodes/hooks/useFieldType.ts.ts

@@ -20,7 +20,8 @@ export const useFieldType = (
           if (!isInvocationNode(node)) {
             return;
           }
-          return node?.data[KIND_MAP[kind]][fieldName]?.type;
+          const field = node.data[KIND_MAP[kind]][fieldName];
+          return field?.originalType ?? field?.type;
         },
         defaultSelectorOptions
       ),

invokeai/frontend/web/src/features/nodes/hooks/useIsValidConnection.ts

@@ -34,10 +34,10 @@ export const useIsValidConnection = () => {
         return false;
       }
 
-      const sourceType = sourceNode.data.outputs[sourceHandle]?.type;
-      const targetType = targetNode.data.inputs[targetHandle]?.type;
+      const sourceField = sourceNode.data.outputs[sourceHandle];
+      const targetField = targetNode.data.inputs[targetHandle];
 
-      if (!sourceType || !targetType) {
+      if (!sourceField || !targetField) {
         // something has gone terribly awry
         return false;
       }
@@ -70,12 +70,18 @@ export const useIsValidConnection = () => {
           return edge.target === target && edge.targetHandle === targetHandle;
         }) &&
         // except CollectionItem inputs can have multiples
-        targetType !== 'CollectionItem'
+        targetField.type !== 'CollectionItem'
       ) {
         return false;
       }
 
-      if (!validateSourceAndTargetTypes(sourceType, targetType)) {
+      // Must use the originalType here if it exists
+      if (
+        !validateSourceAndTargetTypes(
+          sourceField?.originalType ?? sourceField.type,
+          targetField?.originalType ?? targetField.type
+        )
+      ) {
         return false;
       }
 

invokeai/frontend/web/src/features/nodes/store/nodesPersistDenylist.ts

@@ -6,7 +6,7 @@ import { NodesState } from './types';
 export const nodesPersistDenylist: (keyof NodesState)[] = [
   'nodeTemplates',
   'connectionStartParams',
-  'currentConnectionFieldType',
+  'connectionStartFieldType',
   'selectedNodes',
   'selectedEdges',
   'isReady',

invokeai/frontend/web/src/features/nodes/store/nodesSlice.ts

@@ -93,7 +93,7 @@ export const initialNodesState: NodesState = {
   nodeTemplates: {},
   isReady: false,
   connectionStartParams: null,
-  currentConnectionFieldType: null,
+  connectionStartFieldType: null,
   connectionMade: false,
   modifyingEdge: false,
   addNewNodePosition: null,
@@ -203,7 +203,7 @@ const nodesSlice = createSlice({
           nodeId &&
           handleId &&
           handleType &&
-          state.currentConnectionFieldType
+          state.connectionStartFieldType
         ) {
           const newConnection = findConnectionToValidHandle(
             node,
@@ -212,7 +212,7 @@ const nodesSlice = createSlice({
             nodeId,
             handleId,
             handleType,
-            state.currentConnectionFieldType
+            state.connectionStartFieldType
           );
           if (newConnection) {
             state.edges = addEdge(
@@ -224,7 +224,7 @@ const nodesSlice = createSlice({
       }
 
       state.connectionStartParams = null;
-      state.currentConnectionFieldType = null;
+      state.connectionStartFieldType = null;
     },
     edgeChangeStarted: (state) => {
       state.modifyingEdge = true;
@@ -258,10 +258,11 @@ const nodesSlice = createSlice({
         handleType === 'source'
           ? node.data.outputs[handleId]
           : node.data.inputs[handleId];
-      state.currentConnectionFieldType = field?.type ?? null;
+      state.connectionStartFieldType =
+        field?.originalType ?? field?.type ?? null;
     },
     connectionMade: (state, action: PayloadAction<Connection>) => {
-      const fieldType = state.currentConnectionFieldType;
+      const fieldType = state.connectionStartFieldType;
       if (!fieldType) {
         return;
       }
@@ -286,7 +287,7 @@ const nodesSlice = createSlice({
               nodeId &&
               handleId &&
               handleType &&
-              state.currentConnectionFieldType
+              state.connectionStartFieldType
             ) {
               const newConnection = findConnectionToValidHandle(
                 mouseOverNode,
@@ -295,7 +296,7 @@ const nodesSlice = createSlice({
                 nodeId,
                 handleId,
                 handleType,
-                state.currentConnectionFieldType
+                state.connectionStartFieldType
               );
               if (newConnection) {
                 state.edges = addEdge(
@@ -306,14 +307,14 @@ const nodesSlice = createSlice({
             }
           }
           state.connectionStartParams = null;
-          state.currentConnectionFieldType = null;
+          state.connectionStartFieldType = null;
         } else {
           state.addNewNodePosition = action.payload.cursorPosition;
           state.isAddNodePopoverOpen = true;
         }
       } else {
         state.connectionStartParams = null;
-        state.currentConnectionFieldType = null;
+        state.connectionStartFieldType = null;
       }
       state.modifyingEdge = false;
     },
@@ -942,7 +943,7 @@ const nodesSlice = createSlice({
 
       //Make sure these get reset if we close the popover and haven't selected a node
       state.connectionStartParams = null;
-      state.currentConnectionFieldType = null;
+      state.connectionStartFieldType = null;
     },
     addNodePopoverToggled: (state) => {
       state.isAddNodePopoverOpen = !state.isAddNodePopoverOpen;

invokeai/frontend/web/src/features/nodes/store/types.ts

@@ -21,7 +21,7 @@ export type NodesState = {
   edges: Edge<InvocationEdgeExtra>[];
   nodeTemplates: Record<string, InvocationTemplate>;
   connectionStartParams: OnConnectStartParams | null;
-  currentConnectionFieldType: FieldType | null;
+  connectionStartFieldType: FieldType | string | null;
   connectionMade: boolean;
   modifyingEdge: boolean;
   shouldShowFieldTypeLegend: boolean;

invokeai/frontend/web/src/features/nodes/store/util/buildNodeData.ts

@@ -94,6 +94,7 @@ export const buildNodeData = (
         name: outputName,
         type: outputTemplate.type,
         fieldKind: 'output',
+        originalType: outputTemplate.originalType,
       };
 
       outputsAccumulator[outputName] = outputFieldValue;

invokeai/frontend/web/src/features/nodes/store/util/findConnectionToValidHandle.ts

@@ -12,7 +12,7 @@ import { getIsGraphAcyclic } from './getIsGraphAcyclic';
 const isValidConnection = (
   edges: Edge[],
   handleCurrentType: HandleType,
-  handleCurrentFieldType: FieldType,
+  handleCurrentFieldType: FieldType | string,
   node: Node,
   handle: InputFieldValue | OutputFieldValue
 ) => {
@@ -35,7 +35,12 @@ const isValidConnection = (
     }
   }
 
-  if (!validateSourceAndTargetTypes(handleCurrentFieldType, handle.type)) {
+  if (
+    !validateSourceAndTargetTypes(
+      handleCurrentFieldType,
+      handle.originalType ?? handle.type
+    )
+  ) {
     isValidConnection = false;
   }
 
@@ -49,7 +54,7 @@ export const findConnectionToValidHandle = (
   handleCurrentNodeId: string,
   handleCurrentName: string,
   handleCurrentType: HandleType,
-  handleCurrentFieldType: FieldType
+  handleCurrentFieldType: FieldType | string
 ): Connection | null => {
   if (node.id === handleCurrentNodeId) {
     return null;

invokeai/frontend/web/src/features/nodes/store/util/makeIsConnectionValidSelector.ts

@@ -1,9 +1,9 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { stateSelector } from 'app/store/store';
-import { getIsGraphAcyclic } from './getIsGraphAcyclic';
 import { FieldType } from 'features/nodes/types/types';
 import i18n from 'i18next';
 import { HandleType } from 'reactflow';
+import { getIsGraphAcyclic } from './getIsGraphAcyclic';
 import { validateSourceAndTargetTypes } from './validateSourceAndTargetTypes';
 
 /**
@@ -15,17 +15,17 @@ export const makeConnectionErrorSelector = (
   nodeId: string,
   fieldName: string,
   handleType: HandleType,
-  fieldType?: FieldType
+  fieldType?: FieldType | string
 ) => {
   return createSelector(stateSelector, (state) => {
     if (!fieldType) {
       return i18n.t('nodes.noFieldType');
     }
 
-    const { currentConnectionFieldType, connectionStartParams, nodes, edges } =
+    const { connectionStartFieldType, connectionStartParams, nodes, edges } =
       state.nodes;
 
-    if (!connectionStartParams || !currentConnectionFieldType) {
+    if (!connectionStartParams || !connectionStartFieldType) {
       return i18n.t('nodes.noConnectionInProgress');
     }
 
@@ -40,9 +40,9 @@ export const makeConnectionErrorSelector = (
     }
 
     const targetType =
-      handleType === 'target' ? fieldType : currentConnectionFieldType;
+      handleType === 'target' ? fieldType : connectionStartFieldType;
     const sourceType =
-      handleType === 'source' ? fieldType : currentConnectionFieldType;
+      handleType === 'source' ? fieldType : connectionStartFieldType;
 
     if (nodeId === connectionNodeId) {
       return i18n.t('nodes.cannotConnectToSelf');

invokeai/frontend/web/src/features/nodes/store/util/parseFieldType.ts

@@ -0,0 +1,14 @@
+import { FieldType } from 'features/nodes/types/types';
+
+export const getIsPolymorphic = (type: FieldType | string): boolean =>
+  type.endsWith('Polymorphic');
+
+export const getIsCollection = (type: FieldType | string): boolean =>
+  type.endsWith('Collection');
+
+export const getBaseType = (type: FieldType | string): FieldType | string =>
+  getIsPolymorphic(type)
+    ? type.replace(/Polymorphic$/, '')
+    : getIsCollection(type)
+    ? type.replace(/Collection$/, '')
+    : type;

invokeai/frontend/web/src/features/nodes/store/util/validateSourceAndTargetTypes.ts

@@ -1,18 +1,32 @@
-import {
-  COLLECTION_MAP,
-  COLLECTION_TYPES,
-  POLYMORPHIC_TO_SINGLE_MAP,
-  POLYMORPHIC_TYPES,
-} from 'features/nodes/types/constants';
 import { FieldType } from 'features/nodes/types/types';
+import {
+  getBaseType,
+  getIsCollection,
+  getIsPolymorphic,
+} from './parseFieldType';
 
+/**
+ * Validates that the source and target types are compatible for a connection.
+ * @param sourceType The type of the source field. Must be the originalType if it exists.
+ * @param targetType The type of the target field. Must be the originalType if it exists.
+ * @returns True if the connection is valid, false otherwise.
+ */
 export const validateSourceAndTargetTypes = (
-  sourceType: FieldType,
-  targetType: FieldType
+  sourceType: FieldType | string,
+  targetType: FieldType | string
 ) => {
+  const isSourcePolymorphic = getIsPolymorphic(sourceType);
+  const isSourceCollection = getIsCollection(sourceType);
+  const sourceBaseType = getBaseType(sourceType);
+
+  const isTargetPolymorphic = getIsPolymorphic(targetType);
+  const isTargetCollection = getIsCollection(targetType);
+  const targetBaseType = getBaseType(targetType);
+
   // TODO: There's a bug with Collect -> Iterate nodes:
   // https://github.com/invoke-ai/InvokeAI/issues/3956
   // Once this is resolved, we can remove this check.
+  // Note that 'Collection' here is a field type, not node type.
   if (sourceType === 'Collection' && targetType === 'Collection') {
     return false;
   }
@@ -31,37 +45,21 @@ export const validateSourceAndTargetTypes = (
    */
 
   const isCollectionItemToNonCollection =
-    sourceType === 'CollectionItem' && !COLLECTION_TYPES.includes(targetType);
+    sourceType === 'CollectionItem' && !isTargetCollection;
 
   const isNonCollectionToCollectionItem =
     targetType === 'CollectionItem' &&
-    !COLLECTION_TYPES.includes(sourceType) &&
-    !POLYMORPHIC_TYPES.includes(sourceType);
+    !isSourceCollection &&
+    !isSourcePolymorphic;
 
   const isAnythingToPolymorphicOfSameBaseType =
-    POLYMORPHIC_TYPES.includes(targetType) &&
-    (() => {
-      if (!POLYMORPHIC_TYPES.includes(targetType)) {
-        return false;
-      }
-      const baseType =
-        POLYMORPHIC_TO_SINGLE_MAP[
-          targetType as keyof typeof POLYMORPHIC_TO_SINGLE_MAP
-        ];
-
-      const collectionType =
-        COLLECTION_MAP[baseType as keyof typeof COLLECTION_MAP];
-
-      return sourceType === baseType || sourceType === collectionType;
-    })();
+    isTargetPolymorphic && sourceBaseType === targetBaseType;
 
   const isGenericCollectionToAnyCollectionOrPolymorphic =
-    sourceType === 'Collection' &&
-    (COLLECTION_TYPES.includes(targetType) ||
-      POLYMORPHIC_TYPES.includes(targetType));
+    sourceType === 'Collection' && (isTargetCollection || isTargetPolymorphic);
 
   const isCollectionToGenericCollection =
-    targetType === 'Collection' && COLLECTION_TYPES.includes(sourceType);
+    targetType === 'Collection' && isSourceCollection;
 
   const isIntToFloat = sourceType === 'integer' && targetType === 'float';
 
@@ -71,6 +69,7 @@ export const validateSourceAndTargetTypes = (
 
   const isTargetAnyType = targetType === 'Any';
 
+  // One of these must be true for the connection to be valid
   return (
     isCollectionItemToNonCollection ||
     isNonCollectionToCollectionItem ||

invokeai/frontend/web/src/features/nodes/types/constants.ts

@@ -20,38 +20,6 @@ export const KIND_MAP = {
   output: 'outputs' as const,
 };
 
-export const COLLECTION_TYPES: FieldType[] = [
-  'Collection',
-  'IntegerCollection',
-  'BooleanCollection',
-  'FloatCollection',
-  'StringCollection',
-  'ImageCollection',
-  'LatentsCollection',
-  'ConditioningCollection',
-  'ControlCollection',
-  'ColorCollection',
-  'T2IAdapterCollection',
-  'IPAdapterCollection',
-  'MetadataItemCollection',
-  'MetadataCollection',
-];
-
-export const POLYMORPHIC_TYPES: FieldType[] = [
-  'IntegerPolymorphic',
-  'BooleanPolymorphic',
-  'FloatPolymorphic',
-  'StringPolymorphic',
-  'ImagePolymorphic',
-  'LatentsPolymorphic',
-  'ConditioningPolymorphic',
-  'ControlPolymorphic',
-  'ColorPolymorphic',
-  'T2IAdapterPolymorphic',
-  'IPAdapterPolymorphic',
-  'MetadataItemPolymorphic',
-];
-
 export const MODEL_TYPES: FieldType[] = [
   'IPAdapterModelField',
   'ControlNetModelField',
@@ -68,6 +36,26 @@ export const MODEL_TYPES: FieldType[] = [
   'IPAdapterModelField',
 ];
 
+/**
+ * TODO: Revise the field type naming scheme
+ *
+ * Unfortunately, due to inconsistent naming of types, we need to keep the below map objects/callbacks.
+ *
+ * Problems:
+ * - some types do not use the word "Field" in their name, e.g. "Scheduler"
+ * - primitive types use all-lowercase names, e.g. "integer"
+ * - collection and polymorphic types do not use the word "Field"
+ *
+ * If these inconsistencies were resolved, we could remove these mappings and use simple string
+ * parsing/manipulation to handle field types.
+ *
+ * It would make some of the parsing logic simpler and reduce the maintenance overhead of adding new
+ * "official" field types.
+ *
+ * This will require migration logic for workflows to update their field types. Workflows *do* have a
+ * version attached to them, so this shouldn't be too difficult.
+ */
+
 export const COLLECTION_MAP: FieldTypeMapWithNumber = {
   integer: 'IntegerCollection',
   boolean: 'BooleanCollection',
@@ -83,6 +71,7 @@ export const COLLECTION_MAP: FieldTypeMapWithNumber = {
   IPAdapterField: 'IPAdapterCollection',
   MetadataItemField: 'MetadataItemCollection',
   MetadataField: 'MetadataCollection',
+  Custom: 'CustomCollection',
 };
 export const isCollectionItemType = (
   itemType: string | undefined
@@ -103,6 +92,7 @@ export const SINGLE_TO_POLYMORPHIC_MAP: FieldTypeMapWithNumber = {
   T2IAdapterField: 'T2IAdapterPolymorphic',
   IPAdapterField: 'IPAdapterPolymorphic',
   MetadataItemField: 'MetadataItemPolymorphic',
+  Custom: 'CustomPolymorphic',
 };
 
 export const POLYMORPHIC_TO_SINGLE_MAP: FieldTypeMap = {
@@ -118,6 +108,7 @@ export const POLYMORPHIC_TO_SINGLE_MAP: FieldTypeMap = {
   T2IAdapterPolymorphic: 'T2IAdapterField',
   IPAdapterPolymorphic: 'IPAdapterField',
   MetadataItemPolymorphic: 'MetadataItemField',
+  CustomPolymorphic: 'Custom',
 };
 
 export const TYPES_WITH_INPUT_COMPONENTS: FieldType[] = [
@@ -150,12 +141,27 @@ export const isPolymorphicItemType = (
 ): itemType is keyof typeof SINGLE_TO_POLYMORPHIC_MAP =>
   Boolean(itemType && itemType in SINGLE_TO_POLYMORPHIC_MAP);
 
-export const FIELDS: Record<FieldType, FieldUIConfig> = {
+export const FIELDS: Record<FieldType | string, FieldUIConfig> = {
   Any: {
     color: 'gray.500',
     description: 'Any field type is accepted.',
     title: 'Any',
   },
+  Custom: {
+    color: 'gray.500',
+    description: 'A custom field, provided by an external node.',
+    title: 'Custom',
+  },
+  CustomCollection: {
+    color: 'gray.500',
+    description: 'A custom field collection, provided by an external node.',
+    title: 'Custom Collection',
+  },
+  CustomPolymorphic: {
+    color: 'gray.500',
+    description: 'A custom field polymorphic, provided by an external node.',
+    title: 'Custom Polymorphic',
+  },
   MetadataField: {
     color: 'gray.500',
     description: 'A metadata dict.',

invokeai/frontend/web/src/features/nodes/types/types.ts

@@ -133,6 +133,9 @@ export const zFieldType = z.enum([
   'UNetField',
   'VaeField',
   'VaeModelField',
+  'Custom',
+  'CustomCollection',
+  'CustomPolymorphic',
 ]);
 
 export type FieldType = z.infer<typeof zFieldType>;
@@ -143,7 +146,7 @@ export type FieldTypeMapWithNumber = {
 
 export const zReservedFieldType = z.enum([
   'WorkflowField',
-  'IsIntermediate',
+  'IsIntermediate', // this is technically a reserved field type!
   'MetadataField',
 ]);
 
@@ -163,6 +166,7 @@ export const zFieldValueBase = z.object({
   id: z.string().trim().min(1),
   name: z.string().trim().min(1),
   type: zFieldType,
+  originalType: z.string().optional(),
 });
 export type FieldValueBase = z.infer<typeof zFieldValueBase>;
 
@@ -190,6 +194,7 @@ export type OutputFieldTemplate = {
   type: FieldType;
   title: string;
   description: string;
+  originalType?: string; // used for custom types
 } & _OutputField;
 
 export const zInputFieldValueBase = zFieldValueBase.extend({
@@ -789,6 +794,21 @@ export const zAnyInputFieldValue = zInputFieldValueBase.extend({
   value: z.any().optional(),
 });
 
+export const zCustomInputFieldValue = zInputFieldValueBase.extend({
+  type: z.literal('Custom'),
+  value: z.any().optional(),
+});
+
+export const zCustomCollectionInputFieldValue = zInputFieldValueBase.extend({
+  type: z.literal('CustomCollection'),
+  value: z.array(z.any()).optional(),
+});
+
+export const zCustomPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+  type: z.literal('CustomPolymorphic'),
+  value: z.union([z.any(), z.array(z.any())]).optional(),
+});
+
 export const zInputFieldValue = z.discriminatedUnion('type', [
   zAnyInputFieldValue,
   zBoardInputFieldValue,
@@ -846,6 +866,9 @@ export const zInputFieldValue = z.discriminatedUnion('type', [
   zMetadataItemPolymorphicInputFieldValue,
   zMetadataInputFieldValue,
   zMetadataCollectionInputFieldValue,
+  zCustomInputFieldValue,
+  zCustomCollectionInputFieldValue,
+  zCustomPolymorphicInputFieldValue,
 ]);
 
 export type InputFieldValue = z.infer<typeof zInputFieldValue>;
@@ -856,6 +879,7 @@ export type InputFieldTemplateBase = {
   description: string;
   required: boolean;
   fieldKind: 'input';
+  originalType?: string; // used for custom types
 } & _InputField;
 
 export type AnyInputFieldTemplate = InputFieldTemplateBase & {
@@ -863,6 +887,21 @@ export type AnyInputFieldTemplate = InputFieldTemplateBase & {
   default: undefined;
 };
 
+export type CustomInputFieldTemplate = InputFieldTemplateBase & {
+  type: 'Custom';
+  default: undefined;
+};
+
+export type CustomCollectionInputFieldTemplate = InputFieldTemplateBase & {
+  type: 'CustomCollection';
+  default: [];
+};
+
+export type CustomPolymorphicInputFieldTemplate = InputFieldTemplateBase & {
+  type: 'CustomPolymorphic';
+  default: undefined;
+};
+
 export type IntegerInputFieldTemplate = InputFieldTemplateBase & {
   type: 'integer';
   default: number;
@@ -1259,7 +1298,10 @@ export type InputFieldTemplate =
   | MetadataItemCollectionInputFieldTemplate
   | MetadataInputFieldTemplate
   | MetadataItemPolymorphicInputFieldTemplate
-  | MetadataCollectionInputFieldTemplate;
+  | MetadataCollectionInputFieldTemplate
+  | CustomInputFieldTemplate
+  | CustomCollectionInputFieldTemplate
+  | CustomPolymorphicInputFieldTemplate;
 
 export const isInputFieldValue = (
   field?: InputFieldValue | OutputFieldValue

invokeai/frontend/web/src/features/nodes/util/fieldTemplateBuilders.ts

@@ -8,9 +8,9 @@ import {
 } from 'lodash-es';
 import { OpenAPIV3_1 } from 'openapi-types';
 import { ControlField } from 'services/api/types';
+import { getIsPolymorphic } from '../store/util/parseFieldType';
 import {
   COLLECTION_MAP,
-  POLYMORPHIC_TYPES,
   SINGLE_TO_POLYMORPHIC_MAP,
   isCollectionItemType,
   isPolymorphicItemType,
@@ -35,6 +35,9 @@ import {
   ControlInputFieldTemplate,
   ControlNetModelInputFieldTemplate,
   ControlPolymorphicInputFieldTemplate,
+  CustomCollectionInputFieldTemplate,
+  CustomInputFieldTemplate,
+  CustomPolymorphicInputFieldTemplate,
   DenoiseMaskInputFieldTemplate,
   EnumInputFieldTemplate,
   FieldType,
@@ -84,6 +87,7 @@ import {
   VaeInputFieldTemplate,
   VaeModelInputFieldTemplate,
   isArraySchemaObject,
+  isFieldType,
   isNonArraySchemaObject,
   isRefObject,
   isSchemaObject,
@@ -981,9 +985,45 @@ const buildSchedulerInputFieldTemplate = ({
   return template;
 };
 
+const buildCustomCollectionInputFieldTemplate = ({
+  baseField,
+}: BuildInputFieldArg): CustomCollectionInputFieldTemplate => {
+  const template: CustomCollectionInputFieldTemplate = {
+    ...baseField,
+    type: 'CustomCollection',
+    default: [],
+  };
+
+  return template;
+};
+
+const buildCustomPolymorphicInputFieldTemplate = ({
+  baseField,
+}: BuildInputFieldArg): CustomPolymorphicInputFieldTemplate => {
+  const template: CustomPolymorphicInputFieldTemplate = {
+    ...baseField,
+    type: 'CustomPolymorphic',
+    default: undefined,
+  };
+
+  return template;
+};
+
+const buildCustomInputFieldTemplate = ({
+  baseField,
+}: BuildInputFieldArg): CustomInputFieldTemplate => {
+  const template: CustomInputFieldTemplate = {
+    ...baseField,
+    type: 'Custom',
+    default: undefined,
+  };
+
+  return template;
+};
+
 export const getFieldType = (
   schemaObject: OpenAPIV3_1SchemaOrRef
-): string | undefined => {
+): { type: string; originalType: string } | undefined => {
   if (isSchemaObject(schemaObject)) {
     if (!schemaObject.type) {
       // if schemaObject has no type, then it should have one of allOf, anyOf, oneOf
@@ -991,7 +1031,17 @@ export const getFieldType = (
       if (schemaObject.allOf) {
         const allOf = schemaObject.allOf;
         if (allOf && allOf[0] && isRefObject(allOf[0])) {
-          return refObjectToSchemaName(allOf[0]);
+          // This is a single ref type
+          const originalType = refObjectToSchemaName(allOf[0]);
+
+          if (!originalType) {
+            // something has gone terribly awry
+            return;
+          }
+          return {
+            type: isFieldType(originalType) ? originalType : 'Custom',
+            originalType,
+          };
         }
       } else if (schemaObject.anyOf) {
         // ignore null types
@@ -1004,8 +1054,17 @@ export const getFieldType = (
           return true;
         });
         if (anyOf.length === 1) {
+          // This is a single ref type
           if (isRefObject(anyOf[0])) {
-            return refObjectToSchemaName(anyOf[0]);
+            const originalType = refObjectToSchemaName(anyOf[0]);
+            if (!originalType) {
+              return;
+            }
+
+            return {
+              type: isFieldType(originalType) ? originalType : 'Custom',
+              originalType,
+            };
           } else if (isSchemaObject(anyOf[0])) {
             return getFieldType(anyOf[0]);
           }
@@ -1051,16 +1110,29 @@ export const getFieldType = (
             secondType = second.type;
           }
         }
-        if (firstType === secondType && isPolymorphicItemType(firstType)) {
-          return SINGLE_TO_POLYMORPHIC_MAP[firstType];
+        if (firstType === secondType) {
+          if (isPolymorphicItemType(firstType)) {
+            // Known polymorphic field type
+            const originalType = SINGLE_TO_POLYMORPHIC_MAP[firstType];
+            if (!originalType) {
+              return;
+            }
+            return { type: originalType, originalType };
+          }
+
+          // else custom polymorphic
+          return {
+            type: 'CustomPolymorphic',
+            originalType: `${firstType}Polymorphic`,
+          };
         }
       }
     } else if (schemaObject.enum) {
-      return 'enum';
+      return { type: 'enum', originalType: 'enum' };
     } else if (schemaObject.type) {
       if (schemaObject.type === 'number') {
         // floats are "number" in OpenAPI, while ints are "integer" - we need to distinguish them
-        return 'float';
+        return { type: 'float', originalType: 'float' };
       } else if (schemaObject.type === 'array') {
         const itemType = isSchemaObject(schemaObject.items)
           ? schemaObject.items.type
@@ -1072,16 +1144,39 @@ export const getFieldType = (
         }
 
         if (isCollectionItemType(itemType)) {
-          return COLLECTION_MAP[itemType];
+          // known collection field type
+          const originalType = COLLECTION_MAP[itemType];
+          if (!originalType) {
+            return;
+          }
+          return { type: originalType, originalType };
         }
 
-        return;
-      } else if (!isArray(schemaObject.type)) {
-        return schemaObject.type;
+        return {
+          type: 'CustomCollection',
+          originalType: `${itemType}Collection`,
+        };
+      } else if (
+        !isArray(schemaObject.type) &&
+        schemaObject.type !== 'null' && // 'null' is not valid
+        schemaObject.type !== 'object' // 'object' is not valid
+      ) {
+        const originalType = schemaObject.type;
+        return { type: originalType, originalType };
       }
+      // else ignore
+      return;
     }
   } else if (isRefObject(schemaObject)) {
-    return refObjectToSchemaName(schemaObject);
+    const originalType = refObjectToSchemaName(schemaObject);
+    if (!originalType) {
+      return;
+    }
+
+    return {
+      type: isFieldType(originalType) ? originalType : 'Custom',
+      originalType,
+    };
   }
   return;
 };
@@ -1145,13 +1240,11 @@ const TEMPLATE_BUILDER_MAP: {
   UNetField: buildUNetInputFieldTemplate,
   VaeField: buildVaeInputFieldTemplate,
   VaeModelField: buildVaeModelInputFieldTemplate,
+  Custom: buildCustomInputFieldTemplate,
+  CustomCollection: buildCustomCollectionInputFieldTemplate,
+  CustomPolymorphic: buildCustomPolymorphicInputFieldTemplate,
 };
 
-const isTemplatedFieldType = (
-  fieldType: string | undefined
-): fieldType is keyof typeof TEMPLATE_BUILDER_MAP =>
-  Boolean(fieldType && fieldType in TEMPLATE_BUILDER_MAP);
-
 /**
  * Builds an input field from an invocation schema property.
  * @param fieldSchema The schema object
@@ -1161,7 +1254,8 @@ export const buildInputFieldTemplate = (
   nodeSchema: InvocationSchemaObject,
   fieldSchema: InvocationFieldSchema,
   name: string,
-  fieldType: FieldType
+  fieldType: FieldType,
+  originalType: string
 ) => {
   const {
     input,
@@ -1175,7 +1269,7 @@ export const buildInputFieldTemplate = (
 
   const extra = {
     // TODO: Can we support polymorphic inputs in the UI?
-    input: POLYMORPHIC_TYPES.includes(fieldType) ? 'connection' : input,
+    input: getIsPolymorphic(fieldType) ? 'connection' : input,
     ui_hidden,
     ui_component,
     ui_type,
@@ -1183,6 +1277,7 @@ export const buildInputFieldTemplate = (
     ui_order,
     ui_choice_labels,
     item_default,
+    originalType,
   };
 
   const baseField = {
@@ -1193,10 +1288,6 @@ export const buildInputFieldTemplate = (
     ...extra,
   };
 
-  if (!isTemplatedFieldType(fieldType)) {
-    return;
-  }
-
   const builder = TEMPLATE_BUILDER_MAP[fieldType];
 
   if (!builder) {

invokeai/frontend/web/src/features/nodes/util/fieldValueBuilders.ts

@@ -60,6 +60,9 @@ const FIELD_VALUE_FALLBACK_MAP: {
   UNetField: undefined,
   VaeField: undefined,
   VaeModelField: undefined,
+  Custom: undefined,
+  CustomCollection: [],
+  CustomPolymorphic: undefined,
 };
 
 export const buildInputFieldValue = (
@@ -76,10 +79,9 @@ export const buildInputFieldValue = (
     type: template.type,
     label: '',
     fieldKind: 'input',
+    originalType: template.originalType,
+    value: template.default ?? FIELD_VALUE_FALLBACK_MAP[template.type],
   } as InputFieldValue;
 
-  fieldValue.value =
-    template.default ?? FIELD_VALUE_FALLBACK_MAP[template.type];
-
   return fieldValue;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearImageToImageGraph.ts

@@ -329,7 +329,7 @@ export const buildLinearImageToImageGraph = (
       strength,
       init_image: initialImage.imageName,
     },
-    IMAGE_TO_LATENTS
+    LATENTS_TO_IMAGE
   );
 
   // Add Seamless To Graph

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts

@@ -350,7 +350,7 @@ export const buildLinearSDXLImageToImageGraph = (
       positive_style_prompt: positiveStylePrompt,
       negative_style_prompt: negativeStylePrompt,
     },
-    IMAGE_TO_LATENTS
+    LATENTS_TO_IMAGE
   );
 
   // Add Seamless To Graph

invokeai/frontend/web/src/features/nodes/util/parseSchema.ts

@@ -103,14 +103,15 @@ export const parseSchema = (
           return inputsAccumulator;
         }
 
-        const fieldType = property.ui_type ?? getFieldType(property);
+        const fieldTypeResult = property.ui_type
+          ? { type: property.ui_type, originalType: property.ui_type }
+          : getFieldType(property);
 
-        if (!fieldType) {
+        if (!fieldTypeResult) {
           logger('nodes').warn(
             {
               node: type,
               fieldName: propertyName,
-              fieldType,
               field: parseify(property),
             },
             'Missing input field type'
@@ -118,6 +119,9 @@ export const parseSchema = (
           return inputsAccumulator;
         }
 
+        // stash this for custom types
+        const { type: fieldType, originalType } = fieldTypeResult;
+
         if (fieldType === 'WorkflowField') {
           withWorkflow = true;
           return inputsAccumulator;
@@ -136,6 +140,18 @@ export const parseSchema = (
           return inputsAccumulator;
         }
 
+        if (!isFieldType(originalType)) {
+          logger('nodes').debug(
+            {
+              node: type,
+              fieldName: propertyName,
+              fieldType,
+              field: parseify(property),
+            },
+            `Fallback handling for unknown input field type: ${fieldType}`
+          );
+        }
+
         if (!isFieldType(fieldType)) {
           logger('nodes').warn(
             {
@@ -144,7 +160,7 @@ export const parseSchema = (
               fieldType,
               field: parseify(property),
             },
-            `Skipping unknown input field type: ${fieldType}`
+            `Unable to parse field type: ${fieldType}`
           );
           return inputsAccumulator;
         }
@@ -153,7 +169,8 @@ export const parseSchema = (
           schema,
           property,
           propertyName,
-          fieldType
+          fieldType,
+          originalType
         );
 
         if (!field) {
@@ -162,6 +179,7 @@ export const parseSchema = (
               node: type,
               fieldName: propertyName,
               fieldType,
+              originalType,
               field: parseify(property),
             },
             'Skipping input field with no template'
@@ -220,12 +238,46 @@ export const parseSchema = (
           return outputsAccumulator;
         }
 
-        const fieldType = property.ui_type ?? getFieldType(property);
+        const fieldTypeResult = property.ui_type
+          ? { type: property.ui_type, originalType: property.ui_type }
+          : getFieldType(property);
+
+        if (!fieldTypeResult) {
+          logger('nodes').warn(
+            {
+              node: type,
+              fieldName: propertyName,
+              field: parseify(property),
+            },
+            'Missing output field type'
+          );
+          return outputsAccumulator;
+        }
+
+        const { type: fieldType, originalType } = fieldTypeResult;
+
+        if (!isFieldType(fieldType)) {
+          logger('nodes').debug(
+            {
+              node: type,
+              fieldName: propertyName,
+              fieldType,
+              originalType,
+              field: parseify(property),
+            },
+            `Fallback handling for unknown output field type: ${fieldType}`
+          );
+        }
 
         if (!isFieldType(fieldType)) {
           logger('nodes').warn(
-            { fieldName: propertyName, fieldType, field: parseify(property) },
-            'Skipping unknown output field type'
+            {
+              node: type,
+              fieldName: propertyName,
+              fieldType,
+              field: parseify(property),
+            },
+            `Unable to parse field type: ${fieldType}`
           );
           return outputsAccumulator;
         }
@@ -240,6 +292,7 @@ export const parseSchema = (
           ui_hidden: property.ui_hidden ?? false,
           ui_type: property.ui_type,
           ui_order: property.ui_order,
+          originalType,
         };
 
         return outputsAccumulator;

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "3.4.0"
+__version__ = "3.4.0post1"