From a7f1cf4c1792bc24488c1881434e30111be8f4b8 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:46:38 +1000
Subject: [PATCH] tidy(mm): flux lora format util

---
 invokeai/backend/model_manager/config.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/invokeai/backend/model_manager/config.py b/invokeai/backend/model_manager/config.py
index c94ff28117..c36aca067f 100644
--- a/invokeai/backend/model_manager/config.py
+++ b/invokeai/backend/model_manager/config.py
@@ -540,16 +540,12 @@ class LoRAConfigBase(ABC, BaseModel):
     )
 
 
-def get_flux_lora_format(mod: ModelOnDisk) -> FluxLoRAFormat | None:
-    key = "FLUX_LORA_FORMAT"
-    if key in mod.cache:
-        return mod.cache[key]
-
+def _get_flux_lora_format(mod: ModelOnDisk) -> FluxLoRAFormat | None:
+    # TODO(psyche): Moving this import to the function to avoid circular imports. Refactor later.
     from invokeai.backend.patches.lora_conversions.formats import flux_format_from_state_dict
 
-    sd = mod.load_state_dict(mod.path)
-    value = flux_format_from_state_dict(sd, mod.metadata())
-    mod.cache[key] = value
+    state_dict = mod.load_state_dict(mod.path)
+    value = flux_format_from_state_dict(state_dict, mod.metadata())
     return value
 
 
@@ -574,7 +570,7 @@ class LoRAOmiConfig(LoRAConfigBase, ModelConfigBase):
     @classmethod
     def _validate_is_not_controllora_or_diffusers(cls, mod: ModelOnDisk) -> None:
         """Raise `NotAMatch` if the model is a ControlLoRA or Diffusers LoRA."""
-        flux_format = get_flux_lora_format(mod)
+        flux_format = _get_flux_lora_format(mod)
         if flux_format in [FluxLoRAFormat.Control, FluxLoRAFormat.Diffusers]:
             raise NotAMatch(cls, "model looks like ControlLoRA or Diffusers LoRA")
 
@@ -663,13 +659,13 @@ class LoRALyCORISConfig(LoRAConfigBase, ModelConfigBase):
     @classmethod
     def _validate_is_not_controllora_or_diffusers(cls, mod: ModelOnDisk) -> None:
         """Raise `NotAMatch` if the model is a ControlLoRA or Diffusers LoRA."""
-        flux_format = get_flux_lora_format(mod)
+        flux_format = _get_flux_lora_format(mod)
         if flux_format in [FluxLoRAFormat.Control, FluxLoRAFormat.Diffusers]:
             raise NotAMatch(cls, "model looks like ControlLoRA or Diffusers LoRA")
 
     @classmethod
     def _get_base_or_raise(cls, mod: ModelOnDisk) -> LoRALyCORIS_SupportedBases:
-        if get_flux_lora_format(mod):
+        if _get_flux_lora_format(mod):
             return BaseModelType.Flux
 
         state_dict = mod.load_state_dict()
@@ -752,7 +748,7 @@ class LoRADiffusersConfig(LoRAConfigBase, ModelConfigBase):
 
     @classmethod
     def _validate_looks_like_diffusers_lora(cls, mod: ModelOnDisk) -> None:
-        flux_lora_format = get_flux_lora_format(mod)
+        flux_lora_format = _get_flux_lora_format(mod)
         if flux_lora_format is not FluxLoRAFormat.Diffusers:
             raise NotAMatch(cls, "model does not look like a FLUX Diffusers LoRA")