Skip to content

[Feature] AutoModel can load components using model_index.json #11401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
May 26, 2025
Merged

[Feature] AutoModel can load components using model_index.json #11401

Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e506314
update
ishan-modi Apr 23, 2025
85024b0
update
ishan-modi Apr 23, 2025
6a0d0be
update
ishan-modi Apr 23, 2025
d86b0f2
update
ishan-modi Apr 23, 2025
314b6cc
Merge branch 'main' into fixes-issue-11388
ishan-modi Apr 23, 2025
528e002
addressed PR comments
ishan-modi Apr 29, 2025
6e92f40
update
ishan-modi Apr 29, 2025
76ea98d
Merge branch 'main' into fixes-issue-11388
ishan-modi Apr 29, 2025
0e53ad0
Merge branch 'main' into fixes-issue-11388
sayakpaul May 2, 2025
f697631
addressed PR comments
ishan-modi May 2, 2025
5614a15
added tests
ishan-modi May 2, 2025
f6b6b42
addressed PR comments
ishan-modi May 2, 2025
4e5cac1
updates
ishan-modi May 2, 2025
24f16f6
update
ishan-modi May 4, 2025
684384c
Merge branch 'main' into fixes-issue-11388
ishan-modi May 4, 2025
0fe68cd
addressed PR comments
ishan-modi May 13, 2025
2950372
Merge branch 'fixes-issue-11388' of https://github.com/ishan-modi/dif…
ishan-modi May 13, 2025
67e3404
Merge branch 'main' into fixes-issue-11388
ishan-modi May 13, 2025
694b81c
update
ishan-modi May 20, 2025
3bf51cd
Merge branch 'fixes-issue-11388' of https://github.com/ishan-modi/dif…
ishan-modi May 20, 2025
13420fb
fix style
ishan-modi May 26, 2025
af007ab
Merge branch 'main' into fixes-issue-11388
DN6 May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/diffusers/models/auto_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,17 @@ def from_pretrained(cls, pretrained_model_or_path: Optional[Union[str, os.PathLi
"token": token,
"local_files_only": local_files_only,
"revision": revision,
"subfolder": subfolder,
}

config = cls.load_config(pretrained_model_or_path, **load_config_kwargs)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would avoid using exceptions for control flow and simplify this a bit

        load_config_kwargs = {
            "cache_dir": cache_dir,
            "force_download": force_download,
            "proxies": proxies,
            "token": token,
            "local_files_only": local_files_only,
            "revision": revision,
        }

        library = None
        orig_class_name = None
        from diffusers import pipelines

        # Always attempt to fetch model_index.json first
        try:
            cls.config_name = "model_index.json"
            config = cls.load_config(pretrained_model_or_path, **load_config_kwargs)

            if subfolder is not None and subfolder in config:
                library, orig_class_name = config[subfolder]

        except EntryNotFoundError as e:
            logger.debug(e)

        # Unable to load from model_index.json so fallback to loading from config
        if library is None and orig_class_name is None:
            cls.config_name = "config.json"
            load_config_kwargs.update({"subfolder": subfolder})

            config = cls.load_config(pretrained_model_or_path, **load_config_kwargs)
            orig_class_name = config["_class_name"]
            library = "diffusers"

        model_cls, _ = get_class_obj_and_candidates(
            library_name=library,
            class_name=orig_class_name,
            importable_classes=ALL_IMPORTABLE_CLASSES,
            pipelines=pipelines,
            is_pipeline_module=hasattr(pipelines, library), 
        )

orig_class_name = config["_class_name"]

library = importlib.import_module("diffusers")
try:
config = cls.load_config(os.path.join(pretrained_model_or_path, "model_index.json"), **load_config_kwargs)
library, orig_class_name = config["subfolder"]
except Exception:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should catch the specific Exception here instead of making it generic. This will help eliminate other side-effects.

# Fallback to loading the config from the config.json file
load_config_kwargs["subfolder"] = subfolder
config = cls.load_config(os.path.join(pretrained_model_or_path, cls.config_name), **load_config_kwargs)
library = importlib.import_module("diffusers")
orig_class_name = config["_class_name"]

model_cls = getattr(library, orig_class_name, None)
if model_cls is None:
Expand Down