Skip to content

Commit d172404

Browse files
[Import] Add missing settings / Correct some dummy imports (#5036)
* [Import] Add missing settings * up * up * up
1 parent 7512fc4 commit d172404

File tree

4 files changed

+37
-26
lines changed

4 files changed

+37
-26
lines changed

src/diffusers/pipelines/stable_diffusion_safe/__init__.py

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,26 @@ class SafetyConfig(object):
5050

5151
_dummy_objects = {}
5252
_additional_imports = {}
53-
_import_structure = {
54-
"pipeline_output": ["StableDiffusionSafePipelineOutput"],
55-
"pipeline_stable_diffusion_safe": ["StableDiffusionPipelineSafe"],
56-
"safety_checker": ["StableDiffusionSafetyChecker"],
57-
}
53+
_import_structure = {}
54+
5855
_additional_imports.update({"SafetyConfig": SafetyConfig})
5956

57+
try:
58+
if not (is_transformers_available() and is_torch_available()):
59+
raise OptionalDependencyNotAvailable()
60+
except OptionalDependencyNotAvailable:
61+
from ...utils import dummy_torch_and_transformers_objects
62+
63+
_dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects))
64+
else:
65+
_import_structure.update(
66+
{
67+
"pipeline_output": ["StableDiffusionSafePipelineOutput"],
68+
"pipeline_stable_diffusion_safe": ["StableDiffusionPipelineSafe"],
69+
"safety_checker": ["StableDiffusionSafetyChecker"],
70+
}
71+
)
72+
6073

6174
if TYPE_CHECKING:
6275
try:
@@ -70,25 +83,16 @@ class SafetyConfig(object):
7083
from .safety_checker import SafeStableDiffusionSafetyChecker
7184

7285
else:
73-
try:
74-
if not (is_transformers_available() and is_torch_available()):
75-
raise OptionalDependencyNotAvailable()
76-
except OptionalDependencyNotAvailable:
77-
from ...utils import dummy_torch_and_transformers_objects
78-
79-
_dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects))
80-
81-
else:
82-
import sys
86+
import sys
8387

84-
sys.modules[__name__] = _LazyModule(
85-
__name__,
86-
globals()["__file__"],
87-
_import_structure,
88-
module_spec=__spec__,
89-
)
88+
sys.modules[__name__] = _LazyModule(
89+
__name__,
90+
globals()["__file__"],
91+
_import_structure,
92+
module_spec=__spec__,
93+
)
9094

91-
for name, value in _dummy_objects.items():
92-
setattr(sys.modules[__name__], name, value)
93-
for name, value in _additional_imports.items():
94-
setattr(sys.modules[__name__], name, value)
95+
for name, value in _dummy_objects.items():
96+
setattr(sys.modules[__name__], name, value)
97+
for name, value in _additional_imports.items():
98+
setattr(sys.modules[__name__], name, value)

src/diffusers/pipelines/text_to_video_synthesis/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@
4747
_import_structure,
4848
module_spec=__spec__,
4949
)
50+
for name, value in _dummy_objects.items():
51+
setattr(sys.modules[__name__], name, value)

src/diffusers/pipelines/vq_diffusion/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@
5151
_import_structure,
5252
module_spec=__spec__,
5353
)
54+
55+
for name, value in _dummy_objects.items():
56+
setattr(sys.modules[__name__], name, value)

src/diffusers/pipelines/wuerstchen/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
from .pipeline_wuerstchen import WuerstchenDecoderPipeline
4242
from .pipeline_wuerstchen_combined import WuerstchenCombinedPipeline
4343
from .pipeline_wuerstchen_prior import WuerstchenPriorPipeline
44-
4544
else:
4645
import sys
4746

@@ -51,3 +50,6 @@
5150
_import_structure,
5251
module_spec=__spec__,
5352
)
53+
54+
for name, value in _dummy_objects.items():
55+
setattr(sys.modules[__name__], name, value)

0 commit comments

Comments
 (0)