Commit Graph

18559 Commits

Author SHA1 Message Date
psychedelicious
af305250cb refactor(mm): make config classes narrow
Simpler logic to identify, less complexity to add new model, fewer
useless attrs that do not relate to the model arch, etc
2025-10-13 10:30:06 +11:00
psychedelicious
c065655a1d tidy(mm): flux lora format util 2025-10-13 10:30:06 +11:00
psychedelicious
a0a4eb9a5a tidy(mm): clean up ModelOnDisk caching 2025-10-13 10:30:06 +11:00
psychedelicious
c53c731371 tidy(mm): clean up model heuristic utils 2025-10-13 10:30:06 +11:00
psychedelicious
951635fbee feat(mm): wip port main models to new api 2025-10-13 10:30:06 +11:00
psychedelicious
044648fe61 tidy(mm): removed unused model merge class 2025-10-13 10:30:06 +11:00
psychedelicious
111782d6c9 docs(mm): add todos 2025-10-13 10:30:06 +11:00
psychedelicious
f5cbf60fc0 feat(mm): wip port of main models to new api 2025-10-13 10:30:06 +11:00
psychedelicious
395b7d8bbf feat(mm): wip port of main models to new api 2025-10-13 10:30:06 +11:00
psychedelicious
934b3f8b87 feat(mm): wip port of main models to new api 2025-10-13 10:30:06 +11:00
psychedelicious
9745c25b1b refactor(mm): add config validation utils, make it all consistent and clean 2025-10-13 10:30:06 +11:00
psychedelicious
925698a688 feat(mm): port cnet to new api 2025-10-13 10:30:06 +11:00
psychedelicious
96bbd8a26e fix(mm): t2i base determination 2025-10-13 10:30:06 +11:00
psychedelicious
eb1ed245fe tidy(ui): use Extract to get model config types 2025-10-13 10:30:06 +11:00
psychedelicious
a118700cc8 feat(mm): port flux "control lora" and t2i adapter to new api 2025-10-13 10:30:06 +11:00
psychedelicious
eaddd6f533 refactor(mm): continue iterating on config 2025-10-13 10:30:06 +11:00
psychedelicious
7ca0a0a0fd tidy(mm): skip optimistic override handling for now 2025-10-13 10:30:06 +11:00
psychedelicious
d185b85fb7 feat(mm): port ip adapter to new api 2025-10-13 10:30:06 +11:00
psychedelicious
a35a49f585 feat(mm): port flux redux to new api 2025-10-13 10:30:06 +11:00
psychedelicious
3b606b6d63 feat(mm): make match helpers more succint 2025-10-13 10:30:05 +11:00
psychedelicious
d89472d3b1 feat(mm): port SigLIPDiffusersConfig to new api 2025-10-13 10:30:05 +11:00
psychedelicious
036ab04376 feat(mm): port CLIPVisionDiffusersConfig to new api 2025-10-13 10:30:05 +11:00
psychedelicious
e1a54badc1 fix(mm): fall back to UnknownModelConfig correctly 2025-10-13 10:30:05 +11:00
psychedelicious
bbecc86d0f tidy(mm): clarify that model id utils are private 2025-10-13 10:30:05 +11:00
psychedelicious
d4823b6869 fix(mm): abstractmethod bork 2025-10-13 10:30:05 +11:00
psychedelicious
3488975b2b refactor(mm): add model config parsing utils 2025-10-13 10:30:05 +11:00
psychedelicious
fd47da6842 refactor(mm): remove unused methods in config.py 2025-10-13 10:30:05 +11:00
psychedelicious
8399de9c25 refactor(mm): simplify model classification process
Previously, we had a multi-phase strategy to identify models from their
files on disk:
1. Run each model config classes' `matches()` method on the files. It
checks if the model could possibly be an identified as the candidate
model type. This was intended to be a quick check. Break on the first
match.
2. If we have a match, run the config class's `parse()` method. It
derive some additional model config attrs from the model files. This was
intended to encapsulate heavier operations that may require loading the
model into memory.
3. Derive the common model config attrs, like name, description,
calculate the hash, etc. Some of these are also heavier operations.

This strategy has some issues:
- It is not clear how the pieces fit together. There is some
back-and-forth between different methods and the config base class. It
is hard to trace the flow of logic until you fully wrap your head around
the system and therefore difficult to add a model architecture to the
probe.
- The assumption that we could do quick, lightweight checks before
heavier checks is incorrect. We often _must_ load the model state dict
in the `matches()` method. So there is no practical perf benefit to
splitting up the responsibility of `matches()` and `parse()`.
- Sometimes we need to do the same checks in `matches()` and `parse()`.
In these cases, splitting the logic is has a negative perf impact
because we are doing the same work twice.
- As we introduce the concept of an "unknown" model config (i.e. a model
that we cannot identify, but still record in the db; see #8582), we will
_always_ run _all_ the checks for every model. Therefore we need not try
to defer heavier checks or resource-intensive ops like hashing. We are
going to do them anyways.
- There are situations where a model may match multiple configs. One
known case are SD pipeline models with merged LoRAs. In the old probe
API, we relied on the implicit order of checks to know that if a model
matched for pipeline _and_ LoRA, we prefer the pipeline match. But, in
the new API, we do not have this implicit ordering of checks. To resolve
this in a resilient way, we need to get all matches up front, then use
tie-breaker logic to figure out which should win (or add "differential
diagnosis" logic to the matchers).
- Field overrides weren't handled well by this strategy. They were only
applied at the very end, if a model matched successfully. This means we
cannot tell the system "Hey, this model is type X with base Y. Trust me
bro.". We cannot override the match logic. As we move towards letting
users correct mis-identified models (see #8582), this is a requirement.

We can simplify the process significantly and better support "unknown"
models.

Firstly, model config classes now have a single `from_model_on_disk()`
method that attempts to construct an instance of the class from the
model files. This replaces the `matches()` and `parse()` methods.

If we fail to create the config instance, a special exception is raised
that indicates why we think the files cannot be identified as the given
model config class.

Next, the flow for model identification is a bit simpler:
- Derive all the common fields up-front (name, desc, hash, etc).
- Merge in overrides.
- Call `from_model_on_disk()` for every config class, passing in the
fields. Overrides are handled in this method.
- Record the results for each config class and choose the best one.

The identification logic is a bit more verbose, with the special
exceptions and handling of overrides, but it is very clear what is
happening.

The one downside I can think of for this strategy is we do need to check
every model type, instead of stopping at the first match. It's a bit
less efficient. In practice, however, this isn't a hot code path, and
the improved clarity is worth far more than perf optimizations that the
end user will likely never notice.
2025-10-13 10:30:05 +11:00
psychedelicious
0fd58681a2 feat(mm): make config_path optional 2025-10-13 10:30:05 +11:00
psychedelicious
250163e6b7 feat(mm): port t5 to new API 2025-10-13 10:30:05 +11:00
psychedelicious
4b1450a4ff feat(mm): better errors when invalid model config found in db 2025-10-13 10:30:05 +11:00
psychedelicious
4e2145c6c4 tidy(mm): patcher types and import paths 2025-10-13 10:30:05 +11:00
psychedelicious
8a6d5f4f6a fix(mm): vae class inheritance and config_path 2025-10-13 10:30:05 +11:00
psychedelicious
06dcd290df feat(mm): port vae to new API 2025-10-13 10:30:05 +11:00
psychedelicious
73b6fae00e fix(mm): tis use existing weight_files method 2025-10-13 10:30:05 +11:00
psychedelicious
4ae20f4876 fix(mm): loader for clip embed 2025-10-13 10:30:05 +11:00
psychedelicious
f852c03ba5 fix(mm): parsing for spandrel 2025-10-13 10:30:05 +11:00
psychedelicious
8a14175ab2 feat(mm): port spandrel to new API 2025-10-13 10:30:05 +11:00
psychedelicious
9469bb05fe tidy(mm): remove unused probes 2025-10-13 10:30:05 +11:00
psychedelicious
8036bb0e8f feat(mm): port TIs to new API 2025-10-13 10:30:05 +11:00
psychedelicious
e72c78f7d4 refactor: port MM probes to new api
- Add concept of match certainty to new probe
- Port CLIP Embed models to new API
- Fiddle with stuff
2025-10-13 10:30:05 +11:00
psychedelicious
a8009b47e9 fix(mm): normalized multi-file/diffusers model installation no worky
now worky
2025-10-13 10:30:04 +11:00
psychedelicious
6294c294d0 feat(mm): add migration to flat model storage 2025-10-13 10:30:04 +11:00
psychedelicious
6f08a2bfb1 feat(mm): normalized model storage
Store models in a flat directory structure. Each model is in a dir named
its unique key (a UUID). Inside that dir is either the model file or the
model dir.
2025-10-13 10:30:04 +11:00
psychedelicious
84e4d313a8 fix(ui): wrong translation string 2025-10-13 10:30:04 +11:00
psychedelicious
092cff358a chore(ui): lint 2025-10-13 10:30:04 +11:00
psychedelicious
ca3ccf92bc tidy(ui): prefer types from zod schemas for model attrs 2025-10-13 10:30:04 +11:00
psychedelicious
7cdc821801 tests(mm): fix test for MM, leave the UnknownModelConfig class in the list of configs 2025-10-13 10:30:04 +11:00
psychedelicious
08853f9be2 chore(ui): typegen 2025-10-13 10:30:04 +11:00
psychedelicious
4897eebf5f docs: update config docstrings 2025-10-13 10:30:04 +11:00