Commit Graph

13242 Commits

Author SHA1 Message Date
psychedelicious
fcf0200168 docs(mm): document flux variant attr 2025-10-10 16:48:33 +11:00
psychedelicious
407926b8dc docs(mm): update docsstrings in factory.py 2025-10-10 16:48:33 +11:00
psychedelicious
7659a131f4 fix(mm): inverted condition 2025-10-10 16:48:33 +11:00
psychedelicious
5adce0266b refactor(mm): remove legacy probe, new configs dir structure, update imports 2025-10-10 16:48:33 +11:00
psychedelicious
2043aa3807 chore(ui): typegen 2025-10-10 16:48:33 +11:00
psychedelicious
f640920c6b docs(mm): add comments for identification utils 2025-10-10 16:48:33 +11:00
psychedelicious
d93d4242f9 refactor(mm): split configs into separate files 2025-10-10 16:48:33 +11:00
psychedelicious
6cc67e53a8 tidy(mm): consistent class names 2025-10-10 16:48:33 +11:00
psychedelicious
165f57286a fix(mm): tag generation & scattered probe fixes 2025-10-10 16:48:33 +11:00
psychedelicious
1e1c8b988b feat(mm): consistent naming for all model config classes 2025-10-10 16:48:33 +11:00
psychedelicious
315ddefbf1 refactor(mm): diffusers loras
w
2025-10-10 16:48:33 +11:00
psychedelicious
629db4acfe 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-10 16:48:33 +11:00
psychedelicious
a7f1cf4c17 tidy(mm): flux lora format util 2025-10-10 16:48:33 +11:00
psychedelicious
a9b88d46e2 tidy(mm): clean up ModelOnDisk caching 2025-10-10 16:48:32 +11:00
psychedelicious
dd7a51b351 tidy(mm): clean up model heuristic utils 2025-10-10 16:48:32 +11:00
psychedelicious
e9911cf135 feat(mm): wip port main models to new api 2025-10-10 16:48:32 +11:00
psychedelicious
6b5e3ca17f tidy(mm): removed unused model merge class 2025-10-10 16:48:32 +11:00
psychedelicious
54e3c3e209 docs(mm): add todos 2025-10-10 16:48:32 +11:00
psychedelicious
0192caa90f feat(mm): wip port of main models to new api 2025-10-10 16:48:32 +11:00
psychedelicious
24bc4f5047 feat(mm): wip port of main models to new api 2025-10-10 16:48:32 +11:00
psychedelicious
6f5720904a feat(mm): wip port of main models to new api 2025-10-10 16:48:32 +11:00
psychedelicious
f9686b38fa refactor(mm): add config validation utils, make it all consistent and clean 2025-10-10 16:48:32 +11:00
psychedelicious
41c4c82f1d feat(mm): port cnet to new api 2025-10-10 16:48:32 +11:00
psychedelicious
9fe3c12275 fix(mm): t2i base determination 2025-10-10 16:48:32 +11:00
psychedelicious
e79f8b641a tidy(ui): use Extract to get model config types 2025-10-10 16:48:32 +11:00
psychedelicious
532a777a06 feat(mm): port flux "control lora" and t2i adapter to new api 2025-10-10 16:48:32 +11:00
psychedelicious
d9b0c6786a refactor(mm): continue iterating on config 2025-10-10 16:48:32 +11:00
psychedelicious
6d96fa055a tidy(mm): skip optimistic override handling for now 2025-10-10 16:48:32 +11:00
psychedelicious
b74e0f6ca4 feat(mm): port ip adapter to new api 2025-10-10 16:48:32 +11:00
psychedelicious
ab2b1b2bde feat(mm): port flux redux to new api 2025-10-10 16:48:32 +11:00
psychedelicious
eb1eee37f1 feat(mm): make match helpers more succint 2025-10-10 16:48:32 +11:00
psychedelicious
1a9da83376 feat(mm): port SigLIPDiffusersConfig to new api 2025-10-10 16:48:32 +11:00
psychedelicious
6b3d79e479 feat(mm): port CLIPVisionDiffusersConfig to new api 2025-10-10 16:48:32 +11:00
psychedelicious
00463e9407 fix(mm): fall back to UnknownModelConfig correctly 2025-10-10 16:48:32 +11:00
psychedelicious
b87bfd9a06 tidy(mm): clarify that model id utils are private 2025-10-10 16:48:32 +11:00
psychedelicious
37743dea38 fix(mm): abstractmethod bork 2025-10-10 16:48:31 +11:00
psychedelicious
202979dcb7 refactor(mm): add model config parsing utils 2025-10-10 16:48:31 +11:00
psychedelicious
4476ebff60 refactor(mm): remove unused methods in config.py 2025-10-10 16:48:31 +11:00
psychedelicious
e278b120b1 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-10 16:48:31 +11:00
psychedelicious
9fba676346 feat(mm): make config_path optional 2025-10-10 16:48:31 +11:00
psychedelicious
f10d0e80a2 feat(mm): port t5 to new API 2025-10-10 16:48:31 +11:00
psychedelicious
424b2deb5c feat(mm): better errors when invalid model config found in db 2025-10-10 16:48:31 +11:00
psychedelicious
b7491b700f tidy(mm): patcher types and import paths 2025-10-10 16:48:31 +11:00
psychedelicious
93db54957c fix(mm): vae class inheritance and config_path 2025-10-10 16:48:31 +11:00
psychedelicious
3dfcf9a869 feat(mm): port vae to new API 2025-10-10 16:48:31 +11:00
psychedelicious
37de184198 fix(mm): tis use existing weight_files method 2025-10-10 16:48:31 +11:00
psychedelicious
18165bc265 fix(mm): loader for clip embed 2025-10-10 16:48:31 +11:00
psychedelicious
3bebae0deb fix(mm): parsing for spandrel 2025-10-10 16:48:31 +11:00
psychedelicious
4f413d2714 feat(mm): port spandrel to new API 2025-10-10 16:48:31 +11:00
psychedelicious
6877e0bd01 tidy(mm): remove unused probes 2025-10-10 16:48:31 +11:00