add cmdopt status

Signed-off-by: Vladimir Mandic <mandic00@live.com>

modules/shared_items.py

@@ -1,3 +1,52 @@
+import diffusers
+
+
+pipelines = {
+    # note: not all pipelines can be used manually as they require prior pipeline next to decoder pipeline
+    'Autodetect': None,
+    'Custom Diffusers Pipeline': getattr(diffusers, 'DiffusionPipeline', None),
+
+    # standard pipelines
+    'Stable Diffusion 1.5': getattr(diffusers, 'StableDiffusionPipeline', None),
+    'Stable Diffusion 2.x': getattr(diffusers, 'StableDiffusionPipeline', None),
+    'Stable Diffusion Upscale': getattr(diffusers, 'StableDiffusionUpscalePipeline', None),
+    'Stable Diffusion XL': getattr(diffusers, 'StableDiffusionXLPipeline', None),
+    'Stable Cascade': getattr(diffusers, 'StableCascadeCombinedPipeline', None),
+    'Stable Diffusion 3.x': getattr(diffusers, 'StableDiffusion3Pipeline', None),
+    'Latent Consistency Model': getattr(diffusers, 'LatentConsistencyModelPipeline', None),
+    'PixArt Alpha': getattr(diffusers, 'PixArtAlphaPipeline', None),
+    'PixArt Sigma': getattr(diffusers, 'PixArtSigmaPipeline', None),
+    'HunyuanDiT': getattr(diffusers, 'HunyuanDiTPipeline', None),
+    'DeepFloyd IF': getattr(diffusers, 'IFPipeline', None),
+    'FLUX': getattr(diffusers, 'FluxPipeline', None),
+    'Sana': getattr(diffusers, 'SanaPipeline', None),
+    'Lumina-Next': getattr(diffusers, 'LuminaText2ImgPipeline', None),
+    'Lumina 2': getattr(diffusers, 'Lumina2Text2ImgPipeline', None),
+    'AuraFlow': getattr(diffusers, 'AuraFlowPipeline', None),
+    'Kandinsky 2.1': getattr(diffusers, 'KandinskyCombinedPipeline', None),
+    'Kandinsky 2.2': getattr(diffusers, 'KandinskyV22CombinedPipeline', None),
+    'Kandinsky 3.0': getattr(diffusers, 'Kandinsky3Pipeline', None),
+    'Wuerstchen': getattr(diffusers, 'WuerstchenCombinedPipeline', None),
+    'Kolors': getattr(diffusers, 'KolorsPipeline', None),
+    'CogView 3': getattr(diffusers, 'CogView3PlusPipeline', None),
+    'CogView 4': getattr(diffusers, 'CogView4Pipeline', None),
+    'UniDiffuser': getattr(diffusers, 'UniDiffuserPipeline', None),
+    'Amused': getattr(diffusers, 'AmusedPipeline', None),
+
+    # dynamically imported and redefined later
+    'Meissonic': getattr(diffusers, 'StableDiffusionPipeline', None), # dynamically redefined and loaded in sd_models.load_diffuser
+    'OmniGenPipeline': getattr(diffusers, 'StableDiffusionPipeline', None), # dynamically redefined and loaded in sd_models.load_diffuser
+    'InstaFlow': getattr(diffusers, 'StableDiffusionPipeline', None), # dynamically redefined and loaded in sd_models.load_diffuser
+    'SegMoE': getattr(diffusers, 'StableDiffusionPipeline', None), # dynamically redefined and loaded in sd_models.load_diffuser
+}
+onnx_pipelines = {
+    'ONNX Stable Diffusion': getattr(diffusers, 'OnnxStableDiffusionPipeline', None),
+    'ONNX Stable Diffusion Img2Img': getattr(diffusers, 'OnnxStableDiffusionImg2ImgPipeline', None),
+    'ONNX Stable Diffusion Inpaint': getattr(diffusers, 'OnnxStableDiffusionInpaintPipeline', None),
+    'ONNX Stable Diffusion Upscale': getattr(diffusers, 'OnnxStableDiffusionUpscalePipeline', None),
+}
+
+
 def postprocessing_scripts():
     import modules.scripts
     return modules.scripts.scripts_postproc.scripts
@@ -38,8 +87,8 @@ def refresh_te_list():
     modules.model_te.refresh_te_list()
 
 
-def list_crossattention(diffusers=False):
-    if diffusers:
+def list_crossattention(native:bool=True):
+    if native:
         return [
             "Disabled",
             "Scaled-Dot-Product",
@@ -60,67 +109,9 @@ def list_crossattention(diffusers=False):
         ]
 
 def get_pipelines():
-    import diffusers
     from installer import log
-
-    pipelines = { # note: not all pipelines can be used manually as they require prior pipeline next to decoder pipeline
-        'Autodetect': None,
-        'Stable Diffusion': getattr(diffusers, 'StableDiffusionPipeline', None),
-        'Stable Diffusion 2': getattr(diffusers, 'StableDiffusionPipeline', None),
-        'Stable Diffusion Inpaint': getattr(diffusers, 'StableDiffusionInpaintPipeline', None),
-        'Stable Diffusion Img2Img': getattr(diffusers, 'StableDiffusionImg2ImgPipeline', None),
-        'Stable Diffusion Instruct': getattr(diffusers, 'StableDiffusionInstructPix2PixPipeline', None),
-        'Stable Diffusion Upscale': getattr(diffusers, 'StableDiffusionUpscalePipeline', None),
-        'Stable Diffusion XL': getattr(diffusers, 'StableDiffusionXLPipeline', None),
-        'Stable Diffusion XL Refiner': getattr(diffusers, 'StableDiffusionXLImg2ImgPipeline', None),
-        'Stable Diffusion XL Img2Img': getattr(diffusers, 'StableDiffusionXLImg2ImgPipeline', None),
-        'Stable Diffusion XL Inpaint': getattr(diffusers, 'StableDiffusionXLInpaintPipeline', None),
-        'Stable Diffusion XL Instruct': getattr(diffusers, 'StableDiffusionXLInstructPix2PixPipeline', None),
-        'Latent Consistency Model': getattr(diffusers, 'LatentConsistencyModelPipeline', None),
-        'PixArt-Alpha': getattr(diffusers, 'PixArtAlphaPipeline', None),
-        'UniDiffuser': getattr(diffusers, 'UniDiffuserPipeline', None),
-        'Wuerstchen': getattr(diffusers, 'WuerstchenCombinedPipeline', None),
-        'Kandinsky 2.1': getattr(diffusers, 'KandinskyPipeline', None),
-        'Kandinsky 2.2': getattr(diffusers, 'KandinskyV22Pipeline', None),
-        'Kandinsky 3': getattr(diffusers, 'Kandinsky3Pipeline', None),
-        'DeepFloyd IF': getattr(diffusers, 'IFPipeline', None),
-        'Custom Diffusers Pipeline': getattr(diffusers, 'DiffusionPipeline', None),
-        'InstaFlow': getattr(diffusers, 'StableDiffusionPipeline', None), # dynamically redefined and loaded in sd_models.load_diffuser
-        'SegMoE': getattr(diffusers, 'StableDiffusionPipeline', None), # dynamically redefined and loaded in sd_models.load_diffuser
-        'Kolors': getattr(diffusers, 'KolorsPipeline', None),
-        'AuraFlow': getattr(diffusers, 'AuraFlowPipeline', None),
-        'CogView3': getattr(diffusers, 'CogView3PlusPipeline', None),
-        'CogView4': getattr(diffusers, 'CogView4Pipeline', None),
-        'Stable Cascade': getattr(diffusers, 'StableCascadeCombinedPipeline', None),
-        'PixArt-Sigma': getattr(diffusers, 'PixArtSigmaPipeline', None),
-        'HunyuanDiT': getattr(diffusers, 'HunyuanDiTPipeline', None),
-        'Stable Diffusion 3': getattr(diffusers, 'StableDiffusion3Pipeline', None),
-        'Stable Diffusion 3 Img2Img': getattr(diffusers, 'StableDiffusion3Img2ImgPipeline', None),
-        'Lumina-Next': getattr(diffusers, 'LuminaText2ImgPipeline', None),
-        'FLUX': getattr(diffusers, 'FluxPipeline', None),
-        'Sana': getattr(diffusers, 'SanaPAGPipeline', None),
-    }
-    if hasattr(diffusers, 'OnnxStableDiffusionPipeline'):
-        onnx_pipelines = {
-            'ONNX Stable Diffusion': getattr(diffusers, 'OnnxStableDiffusionPipeline', None),
-            'ONNX Stable Diffusion Img2Img': getattr(diffusers, 'OnnxStableDiffusionImg2ImgPipeline', None),
-            'ONNX Stable Diffusion Inpaint': getattr(diffusers, 'OnnxStableDiffusionInpaintPipeline', None),
-            'ONNX Stable Diffusion Upscale': getattr(diffusers, 'OnnxStableDiffusionUpscalePipeline', None),
-        }
+    if hasattr(diffusers, 'OnnxStableDiffusionPipeline') and 'ONNX Stable Diffusion' not in list(pipelines):
         pipelines.update(onnx_pipelines)
-    if hasattr(diffusers, 'OnnxStableDiffusionXLPipeline'):
-        onnx_pipelines = {
-            'ONNX Stable Diffusion XL': getattr(diffusers, 'OnnxStableDiffusionXLPipeline', None),
-            'ONNX Stable Diffusion XL Img2Img': getattr(diffusers, 'OnnxStableDiffusionXLImg2ImgPipeline', None),
-        }
-        pipelines.update(onnx_pipelines)
-
-    # items that may rely on diffusers dev version
-    """
-    if hasattr(diffusers, 'FluxPipeline'):
-        pipelines['FLUX'] = getattr(diffusers, 'FluxPipeline', None)
-    """
-
     for k, v in pipelines.items():
         if k != 'Autodetect' and v is None:
             log.error(f'Not available: pipeline={k} diffusers={diffusers.__version__} path={diffusers.__file__}')