Skip to content

Commit 0cb1b98

Browse files
committed
remove check for subfolder
1 parent 1eb25dc commit 0cb1b98

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/diffusers/configuration_utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,10 @@ def load_config(
361361
)
362362
# Custom path for now
363363
if dduf_entries:
364-
# paths inside a DDUF file must always be "/"
365364
if subfolder is not None:
366-
config_file = "/".join([pretrained_model_name_or_path, subfolder, cls.config_name])
367-
else:
368-
config_file = "/".join([pretrained_model_name_or_path, cls.config_name])
365+
raise ValueError("DDUF file only allow for 1 level of directory. Please check the DDUF structure")
366+
# paths inside a DDUF file must always be "/"
367+
config_file = "/".join([pretrained_model_name_or_path, cls.config_name])
369368
if config_file not in dduf_entries:
370369
raise ValueError(
371370
f"We did not manage to find the file {config_file} in the dduf file. We only have the following files {dduf_entries.keys()}"

src/diffusers/utils/hub_utils.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,10 @@ def _get_model_file(
297297
pretrained_model_name_or_path = str(pretrained_model_name_or_path)
298298

299299
if dduf_entries:
300+
if subfolder is not None:
301+
raise ValueError("DDUF file only allow for 1 level of directory. Please check the DDUF structure")
300302
if "/".join([pretrained_model_name_or_path, weights_name]) in dduf_entries:
301303
return "/".join([pretrained_model_name_or_path, weights_name])
302-
elif (
303-
subfolder is not None
304-
and "/".join([pretrained_model_name_or_path, subfolder, weights_name]) in dduf_entries
305-
):
306-
return "/".join([pretrained_model_name_or_path, subfolder, weights_name])
307304
else:
308305
raise EnvironmentError(f"Error no file named {weights_name} found in archive {dduf_entries.keys()}.")
309306
elif os.path.isfile(pretrained_model_name_or_path):

0 commit comments

Comments
 (0)