feat: add Ovis support, update submodule

Author: william-murray1204

README.md

@@ -686,6 +686,36 @@ output = stable_diffusion.generate_image(
 
 ---
 
+### <u>Ovis</u>
+
+Download the weights from the links below:
+
+- Download `Ovis-Image-7B`
+  - safetensors: https://huggingface.co/Comfy-Org/Ovis-Image/tree/main/split_files/diffusion_models
+  - gguf: https://huggingface.co/leejet/Ovis-Image-7B-GGUF
+- Download `vae`
+  - safetensors: https://huggingface.co/black-forest-labs/FLUX.1-schnell/tree/main
+- Download `Ovis 2.5`
+  - safetensors: https://huggingface.co/Comfy-Org/Ovis-Image/tree/main/split_files/text_encoders
+
+```python
+from stable_diffusion_cpp import StableDiffusion
+
+stable_diffusion = StableDiffusion(
+      diffusion_model_path="../models/ovis_image-Q4_0.gguf",
+      llm_path="../models/ovis_2.5.safetensors",
+      vae_path="../models/ae.safetensors",
+      diffusion_flash_attn=True,
+)
+
+output = stable_diffusion.generate_image(
+      prompt="a lovely cat",
+      cfg_scale=5.0,
+)
+```
+
+---
+
 ### <u>Wan Video Generation</u>
 
 See [stable-diffusion.cpp Wan download weights](https://github.com/leejet/stable-diffusion.cpp/blob/master/docs/wan.md#download-weights) for a complete list of Wan models.

pyproject.toml

@@ -54,7 +54,6 @@ sdist.include = [
 sdist.exclude = [
     "assets",
     "vendor/stable-diffusion.cpp/assets",
-    # Exclude ALL objects
     ".git/objects/**",
     "vendor/stable-diffusion.cpp/.git/objects/**",
     ".git/logs/**",

tests/test_ovis.py

@@ -0,0 +1,71 @@
+from PIL import PngImagePlugin
+from conftest import OUTPUT_DIR
+
+from stable_diffusion_cpp import StableDiffusion
+
+DIFFUSION_MODEL_PATH = "F:\\stable-diffusion\\ovis\\ovis_image-Q4_0.gguf"
+LLM_PATH = "F:\\stable-diffusion\\ovis\\ovis_2.5.safetensors"
+VAE_PATH = "F:\\stable-diffusion\\ovis\\ae.safetensors"
+
+PROMPT = "a lovely cat"
+STEPS = 20
+CFG_SCALE = 5.0
+
+
+def test_ovis():
+
+    stable_diffusion = StableDiffusion(
+        diffusion_model_path=DIFFUSION_MODEL_PATH,
+        llm_path=LLM_PATH,
+        vae_path=VAE_PATH,
+        diffusion_flash_attn=True,
+    )
+
+    def progress_callback(step: int, steps: int, time: float):
+        print("Completed step: {} of {}".format(step, steps))
+
+    # Generate image
+    image = stable_diffusion.generate_image(
+        prompt=PROMPT,
+        sample_steps=STEPS,
+        cfg_scale=CFG_SCALE,
+        progress_callback=progress_callback,
+    )[0]
+
+    # Save image
+    pnginfo = PngImagePlugin.PngInfo()
+    pnginfo.add_text("Parameters", ", ".join([f"{k.replace('_', ' ').title()}: {v}" for k, v in image.info.items()]))
+    image.save(f"{OUTPUT_DIR}/ovis.png", pnginfo=pnginfo)
+
+
+# ===========================================
+# C++ CLI
+# ===========================================
+
+# import subprocess
+
+# from conftest import SD_CPP_CLI
+
+# stable_diffusion = None  # Clear model
+
+# cli_cmd = [
+#     SD_CPP_CLI,
+#     "--diffusion-model",
+#     DIFFUSION_MODEL_PATH,
+#     "--llm",
+#     LLM_PATH,
+#     "--vae",
+#     VAE_PATH,
+#     "--prompt",
+#     PROMPT,
+#     "--steps",
+#     str(STEPS),
+#     "--cfg-scale",
+#     str(CFG_SCALE),
+#     "--diffusion-fa",
+#     "--output",
+#     f"{OUTPUT_DIR}/ovis_cli.png",
+#     "-v",
+# ]
+# print(" ".join(cli_cmd))
+# subprocess.run(cli_cmd, check=True)

tests/tests.md

@@ -3,5 +3,5 @@ pytest -s
 ```
 
 ```bash
-pytest tests\test_txt2img.py -s; pytest tests\test_controlnet.py -s; pytest tests\test_convert_model.py -s; pytest tests\test_flux.py -s; pytest tests\test_img2img.py -s; pytest tests\test_preprocess_canny.py -s; pytest tests\test_system_info.py -s; pytest tests\test_list_maps.py -s; pytest tests\test_upscale.py -s; pytest tests\test_photomaker.py -s; pytest tests\test_photomaker_2.py -s; pytest tests\test_inpainting.py -s; pytest tests\test_chroma.py -s; pytest tests\test_edit.py -s; pytest tests/test_sd3.py -s; pytest tests\test_vid.py -s; pytest tests\test_vid_vace.py -s; pytest tests\test_multi_gpu.py -s; pytest tests\test_flex2.py -s; pytest tests\test_memory_leak.py -s; pytest tests\test_qwen_image.py -s; pytest tests\test_qwen_image_edit.py -s; pytest tests\test_z_image.py -s; pytest tests\test_flux2.py -s; 
+pytest tests\test_txt2img.py -s; pytest tests\test_controlnet.py -s; pytest tests\test_convert_model.py -s; pytest tests\test_flux.py -s; pytest tests\test_img2img.py -s; pytest tests\test_preprocess_canny.py -s; pytest tests\test_system_info.py -s; pytest tests\test_list_maps.py -s; pytest tests\test_upscale.py -s; pytest tests\test_photomaker.py -s; pytest tests\test_photomaker_2.py -s; pytest tests\test_inpainting.py -s; pytest tests\test_chroma.py -s; pytest tests\test_edit.py -s; pytest tests/test_sd3.py -s; pytest tests\test_vid.py -s; pytest tests\test_vid_vace.py -s; pytest tests\test_multi_gpu.py -s; pytest tests\test_flex2.py -s; pytest tests\test_memory_leak.py -s; pytest tests\test_qwen_image.py -s; pytest tests\test_qwen_image_edit.py -s; pytest tests\test_z_image.py -s; pytest tests\test_ovis.py -s; pytest tests\test_flux2.py -s; 
 ```