ollamadiffuser 1.1.0__tar.gz → 1.1.2__tar.gz

{ollamadiffuser-1.1.0/ollamadiffuser.egg-info → ollamadiffuser-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.0
+Version: 1.1.2
 Summary: 🎨 Local AI Image Generation with Ollama-style CLI for Stable Diffusion, FLUX.1, and LoRA support
 Home-page: https://github.com/ollamadiffuser/ollamadiffuser
 Author: OllamaDiffuser Team
@@ -70,6 +70,7 @@ Dynamic: requires-python
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 
+
 ## Local AI Image Generation with OllamaDiffuser
 
 **OllamaDiffuser** simplifies local deployment of **Stable Diffusion**, **FLUX.1**, and other AI image generation models. An intuitive **local SD** tool inspired by **Ollama's** simplicity - perfect for **local diffuser** workflows with CLI, web UI, and LoRA support.
@@ -109,7 +110,7 @@ curl -X POST http://localhost:8000/api/generate \
 ### Option 2: Development Installation
 ```bash
 # Clone the repository
-git clone https://github.com/yourusername/ollamadiffuser.git
+git clone https://github.com/ollamadiffuser/ollamadiffuser.git
 cd ollamadiffuser
 
 # Install dependencies
@@ -118,17 +119,25 @@ pip install -e .
 
 ### Basic Usage
 ```bash
+# Check version
+ollamadiffuser -V
+
 # Install a model
 ollamadiffuser pull stable-diffusion-1.5
 
-# Load the model
-ollamadiffuser load stable-diffusion-1.5
+# Run the model (loads and starts API server)
+ollamadiffuser run stable-diffusion-1.5
 
-# Generate an image
-ollamadiffuser generate "a beautiful sunset over mountains"
+# Generate an image via API
+curl -X POST http://localhost:8000/api/generate \
+  -H "Content-Type: application/json" \
+  -d '{"prompt": "a beautiful sunset over mountains"}' \
+  --output image.png
 
 # Start web interface
 ollamadiffuser --mode ui
+
+open http://localhost:8001
 ```
 
 ### ControlNet Quick Start
@@ -136,8 +145,8 @@ ollamadiffuser --mode ui
 # Install ControlNet model
 ollamadiffuser pull controlnet-canny-sd15
 
-# Load ControlNet model
-ollamadiffuser load controlnet-canny-sd15
+# Run ControlNet model (loads and starts API server)
+ollamadiffuser run controlnet-canny-sd15
 
 # Generate with control image
 curl -X POST http://localhost:8000/api/generate/controlnet \
@@ -219,21 +228,29 @@ ollamadiffuser lora unload
 
 ### Command Line Interface
 ```bash
-# Generate with advanced parameters
-ollamadiffuser generate \
-  "a futuristic cityscape" \
-  --negative-prompt "blurry, low quality" \
-  --steps 30 \
-  --guidance 7.5 \
-  --width 1024 \
-  --height 1024
+# Pull and run a model
+ollamadiffuser pull stable-diffusion-1.5
+ollamadiffuser run stable-diffusion-1.5
+
+# In another terminal, generate images via API
+curl -X POST http://localhost:8000/api/generate \
+  -H "Content-Type: application/json" \
+  -d '{
+    "prompt": "a futuristic cityscape",
+    "negative_prompt": "blurry, low quality",
+    "num_inference_steps": 30,
+    "guidance_scale": 7.5,
+    "width": 1024,
+    "height": 1024
+  }' \
+  --output image.png
 ```
 
 ### Web UI
 ```bash
 # Start web interface
 ollamadiffuser --mode ui
-# Open http://localhost:8001
+Open http://localhost:8001
 ```
 
 Features:
@@ -247,10 +264,15 @@ Features:
 # Start API server
 ollamadiffuser --mode api
 
+ollamadiffuser load stable-diffusion-1.5
+
 # Generate image
 curl -X POST http://localhost:8000/api/generate \
   -H "Content-Type: application/json" \
   -d '{"prompt": "a beautiful landscape", "width": 1024, "height": 1024}'
+
+# API document
+http://localhost:8000/docs
 ```
 
 ### Python API
@@ -258,16 +280,19 @@ curl -X POST http://localhost:8000/api/generate \
 from ollamadiffuser.core.models.manager import model_manager
 
 # Load model
-model_manager.load_model("stable-diffusion-1.5")
-engine = model_manager.loaded_model
-
-# Generate image
-image = engine.generate_image(
-    prompt="a beautiful sunset",
-    width=1024,
-    height=1024
-)
-image.save("output.jpg")
+success = model_manager.load_model("stable-diffusion-1.5")
+if success:
+    engine = model_manager.loaded_model
+    
+    # Generate image
+    image = engine.generate_image(
+        prompt="a beautiful sunset",
+        width=1024,
+        height=1024
+    )
+    image.save("output.jpg")
+else:
+    print("Failed to load model")
 ```
 
 ## 📦 Supported Models
@@ -297,18 +322,6 @@ Models are automatically configured with optimal settings:
 - **Precision Handling**: FP16/BF16 support for efficiency
 - **Safety Features**: NSFW filter bypass for creative freedom
 
-### Performance Tuning
-```bash
-# Enable verbose logging
-ollamadiffuser -v generate "test prompt"
-
-# Check system status
-ollamadiffuser status
-
-# Monitor memory usage
-ollamadiffuser info
-```
-
 ## 🔧 Advanced Usage
 
 ### ControlNet Parameters
@@ -331,8 +344,9 @@ from ollamadiffuser.core.utils.controlnet_preprocessors import controlnet_prepro
 controlnet_preprocessor.initialize()
 
 # Process multiple images
-for image_path in image_list:
-    control_img = controlnet_preprocessor.preprocess(image, "canny")
+prompt = "beautiful landscape"  # Define the prompt
+for i, image_path in enumerate(image_list):
+    control_img = controlnet_preprocessor.preprocess(image_path, "canny")
     result = engine.generate_image(prompt, control_image=control_img)
     result.save(f"output_{i}.jpg")
 ```
@@ -360,8 +374,6 @@ with open("control.jpg", "rb") as f:
 ## 📚 Documentation & Guides
 
 - **[ControlNet Guide](CONTROLNET_GUIDE.md)**: Comprehensive ControlNet usage and examples
-- **[LoRA Guide](LORA_GUIDE.md)**: LoRA management and best practices
-- **[API Reference](API_REFERENCE.md)**: Complete API documentation
 - **[Website Documentation](https://www.ollamadiffuser.com/)**: Complete tutorials and guides
 
 ## 🚀 Performance & Hardware
@@ -383,6 +395,43 @@ with open("control.jpg", "rb") as f:
 
 ## 🔧 Troubleshooting
 
+### Installation Issues
+
+#### Missing Dependencies (cv2/OpenCV Error)
+If you encounter `ModuleNotFoundError: No module named 'cv2'`, run:
+
+```bash
+# Quick fix
+pip install opencv-python>=4.8.0
+
+# Or use the built-in verification tool
+ollamadiffuser verify-deps
+
+# Or install with all optional dependencies
+pip install ollamadiffuser[full]
+```
+
+#### Complete Dependency Check
+```bash
+# Run comprehensive system diagnostics
+ollamadiffuser doctor
+
+# Verify and install missing dependencies interactively
+ollamadiffuser verify-deps
+```
+
+#### Clean Installation
+If you're having persistent issues:
+
+```bash
+# Uninstall and reinstall
+pip uninstall ollamadiffuser
+pip install --no-cache-dir ollamadiffuser[full]
+
+# Verify installation
+ollamadiffuser verify-deps
+```
+
 ### Common Issues
 
 #### Slow Startup
@@ -407,46 +456,49 @@ curl -X POST http://localhost:8000/api/controlnet/initialize
 
 #### Memory Issues
 ```bash
-# Use smaller image sizes
-ollamadiffuser generate "test" --width 512 --height 512
+# Use smaller image sizes via API
+curl -X POST http://localhost:8000/api/generate \
+  -H "Content-Type: application/json" \
+  -d '{"prompt": "test", "width": 512, "height": 512}' \
+  --output test.png
 
-# Enable CPU offloading (automatic)
-# Close other applications
+# CPU offloading is automatic
+# Close other applications to free memory
 # Use basic preprocessors instead of advanced ones
 ```
 
-### Debug Mode
-```bash
-# Enable verbose logging
-ollamadiffuser -v run model-name
+### Platform-Specific Issues
 
-# Check system information
-ollamadiffuser info
-
-# Validate installation
-ollamadiffuser doctor
+#### macOS Apple Silicon
+```bash
+# If you encounter OpenCV issues on Apple Silicon
+pip uninstall opencv-python
+pip install opencv-python-headless>=4.8.0
 ```
 
-## 🤝 Contributing
-
-We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) for details.
+#### Windows
+```bash
+# If you encounter build errors
+pip install --only-binary=all opencv-python>=4.8.0
+```
 
-### Development Setup
+#### Linux
 ```bash
-# Clone repository
-git clone https://github.com/yourusername/ollamadiffuser.git
-cd ollamadiffuser
+# If you need system dependencies
+sudo apt-get update
+sudo apt-get install libgl1-mesa-glx libglib2.0-0
+pip install opencv-python>=4.8.0
+```
 
-# Install in development mode
-pip install -e ".[dev]"
+### Debug Mode
+```bash
+# Enable verbose logging
+ollamadiffuser --verbose run model-name
+```
 
-# Run tests
-pytest tests/
+## 🤝 Contributing
 
-# Run linting
-flake8 ollamadiffuser/
-black ollamadiffuser/
-```
+We welcome contributions! Please check the GitHub repository for contribution guidelines.
 
 ## 🤝 Community & Support
 
@@ -476,9 +528,8 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ## 📞 Support
 
-- **Documentation**: [Full documentation](docs/)
-- **Issues**: [GitHub Issues](https://github.com/yourusername/ollamadiffuser/issues)
-- **Discussions**: [GitHub Discussions](https://github.com/yourusername/ollamadiffuser/discussions)
+- **Issues**: [GitHub Issues](https://github.com/ollamadiffuser/ollamadiffuser/issues)
+- **Discussions**: [GitHub Discussions](https://github.com/ollamadiffuser/ollamadiffuser/discussions)
 
 ---
 

{ollamadiffuser-1.1.0 → ollamadiffuser-1.1.2}/README.md

@@ -4,6 +4,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 
+
 ## Local AI Image Generation with OllamaDiffuser
 
 **OllamaDiffuser** simplifies local deployment of **Stable Diffusion**, **FLUX.1**, and other AI image generation models. An intuitive **local SD** tool inspired by **Ollama's** simplicity - perfect for **local diffuser** workflows with CLI, web UI, and LoRA support.
@@ -43,7 +44,7 @@ curl -X POST http://localhost:8000/api/generate \
 ### Option 2: Development Installation
 ```bash
 # Clone the repository
-git clone https://github.com/yourusername/ollamadiffuser.git
+git clone https://github.com/ollamadiffuser/ollamadiffuser.git
 cd ollamadiffuser
 
 # Install dependencies
@@ -52,17 +53,25 @@ pip install -e .
 
 ### Basic Usage
 ```bash
+# Check version
+ollamadiffuser -V
+
 # Install a model
 ollamadiffuser pull stable-diffusion-1.5
 
-# Load the model
-ollamadiffuser load stable-diffusion-1.5
+# Run the model (loads and starts API server)
+ollamadiffuser run stable-diffusion-1.5
 
-# Generate an image
-ollamadiffuser generate "a beautiful sunset over mountains"
+# Generate an image via API
+curl -X POST http://localhost:8000/api/generate \
+  -H "Content-Type: application/json" \
+  -d '{"prompt": "a beautiful sunset over mountains"}' \
+  --output image.png
 
 # Start web interface
 ollamadiffuser --mode ui
+
+open http://localhost:8001
 ```
 
 ### ControlNet Quick Start
@@ -70,8 +79,8 @@ ollamadiffuser --mode ui
 # Install ControlNet model
 ollamadiffuser pull controlnet-canny-sd15
 
-# Load ControlNet model
-ollamadiffuser load controlnet-canny-sd15
+# Run ControlNet model (loads and starts API server)
+ollamadiffuser run controlnet-canny-sd15
 
 # Generate with control image
 curl -X POST http://localhost:8000/api/generate/controlnet \
@@ -153,21 +162,29 @@ ollamadiffuser lora unload
 
 ### Command Line Interface
 ```bash
-# Generate with advanced parameters
-ollamadiffuser generate \
-  "a futuristic cityscape" \
-  --negative-prompt "blurry, low quality" \
-  --steps 30 \
-  --guidance 7.5 \
-  --width 1024 \
-  --height 1024
+# Pull and run a model
+ollamadiffuser pull stable-diffusion-1.5
+ollamadiffuser run stable-diffusion-1.5
+
+# In another terminal, generate images via API
+curl -X POST http://localhost:8000/api/generate \
+  -H "Content-Type: application/json" \
+  -d '{
+    "prompt": "a futuristic cityscape",
+    "negative_prompt": "blurry, low quality",
+    "num_inference_steps": 30,
+    "guidance_scale": 7.5,
+    "width": 1024,
+    "height": 1024
+  }' \
+  --output image.png
 ```
 
 ### Web UI
 ```bash
 # Start web interface
 ollamadiffuser --mode ui
-# Open http://localhost:8001
+Open http://localhost:8001
 ```
 
 Features:
@@ -181,10 +198,15 @@ Features:
 # Start API server
 ollamadiffuser --mode api
 
+ollamadiffuser load stable-diffusion-1.5
+
 # Generate image
 curl -X POST http://localhost:8000/api/generate \
   -H "Content-Type: application/json" \
   -d '{"prompt": "a beautiful landscape", "width": 1024, "height": 1024}'
+
+# API document
+http://localhost:8000/docs
 ```
 
 ### Python API
@@ -192,16 +214,19 @@ curl -X POST http://localhost:8000/api/generate \
 from ollamadiffuser.core.models.manager import model_manager
 
 # Load model
-model_manager.load_model("stable-diffusion-1.5")
-engine = model_manager.loaded_model
-
-# Generate image
-image = engine.generate_image(
-    prompt="a beautiful sunset",
-    width=1024,
-    height=1024
-)
-image.save("output.jpg")
+success = model_manager.load_model("stable-diffusion-1.5")
+if success:
+    engine = model_manager.loaded_model
+    
+    # Generate image
+    image = engine.generate_image(
+        prompt="a beautiful sunset",
+        width=1024,
+        height=1024
+    )
+    image.save("output.jpg")
+else:
+    print("Failed to load model")
 ```
 
 ## 📦 Supported Models
@@ -231,18 +256,6 @@ Models are automatically configured with optimal settings:
 - **Precision Handling**: FP16/BF16 support for efficiency
 - **Safety Features**: NSFW filter bypass for creative freedom
 
-### Performance Tuning
-```bash
-# Enable verbose logging
-ollamadiffuser -v generate "test prompt"
-
-# Check system status
-ollamadiffuser status
-
-# Monitor memory usage
-ollamadiffuser info
-```
-
 ## 🔧 Advanced Usage
 
 ### ControlNet Parameters
@@ -265,8 +278,9 @@ from ollamadiffuser.core.utils.controlnet_preprocessors import controlnet_prepro
 controlnet_preprocessor.initialize()
 
 # Process multiple images
-for image_path in image_list:
-    control_img = controlnet_preprocessor.preprocess(image, "canny")
+prompt = "beautiful landscape"  # Define the prompt
+for i, image_path in enumerate(image_list):
+    control_img = controlnet_preprocessor.preprocess(image_path, "canny")
     result = engine.generate_image(prompt, control_image=control_img)
     result.save(f"output_{i}.jpg")
 ```
@@ -294,8 +308,6 @@ with open("control.jpg", "rb") as f:
 ## 📚 Documentation & Guides
 
 - **[ControlNet Guide](CONTROLNET_GUIDE.md)**: Comprehensive ControlNet usage and examples
-- **[LoRA Guide](LORA_GUIDE.md)**: LoRA management and best practices
-- **[API Reference](API_REFERENCE.md)**: Complete API documentation
 - **[Website Documentation](https://www.ollamadiffuser.com/)**: Complete tutorials and guides
 
 ## 🚀 Performance & Hardware
@@ -317,6 +329,43 @@ with open("control.jpg", "rb") as f:
 
 ## 🔧 Troubleshooting
 
+### Installation Issues
+
+#### Missing Dependencies (cv2/OpenCV Error)
+If you encounter `ModuleNotFoundError: No module named 'cv2'`, run:
+
+```bash
+# Quick fix
+pip install opencv-python>=4.8.0
+
+# Or use the built-in verification tool
+ollamadiffuser verify-deps
+
+# Or install with all optional dependencies
+pip install ollamadiffuser[full]
+```
+
+#### Complete Dependency Check
+```bash
+# Run comprehensive system diagnostics
+ollamadiffuser doctor
+
+# Verify and install missing dependencies interactively
+ollamadiffuser verify-deps
+```
+
+#### Clean Installation
+If you're having persistent issues:
+
+```bash
+# Uninstall and reinstall
+pip uninstall ollamadiffuser
+pip install --no-cache-dir ollamadiffuser[full]
+
+# Verify installation
+ollamadiffuser verify-deps
+```
+
 ### Common Issues
 
 #### Slow Startup
@@ -341,46 +390,49 @@ curl -X POST http://localhost:8000/api/controlnet/initialize
 
 #### Memory Issues
 ```bash
-# Use smaller image sizes
-ollamadiffuser generate "test" --width 512 --height 512
+# Use smaller image sizes via API
+curl -X POST http://localhost:8000/api/generate \
+  -H "Content-Type: application/json" \
+  -d '{"prompt": "test", "width": 512, "height": 512}' \
+  --output test.png
 
-# Enable CPU offloading (automatic)
-# Close other applications
+# CPU offloading is automatic
+# Close other applications to free memory
 # Use basic preprocessors instead of advanced ones
 ```
 
-### Debug Mode
-```bash
-# Enable verbose logging
-ollamadiffuser -v run model-name
+### Platform-Specific Issues
 
-# Check system information
-ollamadiffuser info
-
-# Validate installation
-ollamadiffuser doctor
+#### macOS Apple Silicon
+```bash
+# If you encounter OpenCV issues on Apple Silicon
+pip uninstall opencv-python
+pip install opencv-python-headless>=4.8.0
 ```
 
-## 🤝 Contributing
-
-We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) for details.
+#### Windows
+```bash
+# If you encounter build errors
+pip install --only-binary=all opencv-python>=4.8.0
+```
 
-### Development Setup
+#### Linux
 ```bash
-# Clone repository
-git clone https://github.com/yourusername/ollamadiffuser.git
-cd ollamadiffuser
+# If you need system dependencies
+sudo apt-get update
+sudo apt-get install libgl1-mesa-glx libglib2.0-0
+pip install opencv-python>=4.8.0
+```
 
-# Install in development mode
-pip install -e ".[dev]"
+### Debug Mode
+```bash
+# Enable verbose logging
+ollamadiffuser --verbose run model-name
+```
 
-# Run tests
-pytest tests/
+## 🤝 Contributing
 
-# Run linting
-flake8 ollamadiffuser/
-black ollamadiffuser/
-```
+We welcome contributions! Please check the GitHub repository for contribution guidelines.
 
 ## 🤝 Community & Support
 
@@ -410,9 +462,8 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ## 📞 Support
 
-- **Documentation**: [Full documentation](docs/)
-- **Issues**: [GitHub Issues](https://github.com/yourusername/ollamadiffuser/issues)
-- **Discussions**: [GitHub Discussions](https://github.com/yourusername/ollamadiffuser/discussions)
+- **Issues**: [GitHub Issues](https://github.com/ollamadiffuser/ollamadiffuser/issues)
+- **Discussions**: [GitHub Discussions](https://github.com/ollamadiffuser/ollamadiffuser/discussions)
 
 ---
 

ollamadiffuser-1.1.2/ollamadiffuser/__init__.py

@@ -0,0 +1,31 @@
+"""
+OllamaDiffuser - Local AI Image Generation with Ollama-style CLI
+
+A tool for managing and running Stable Diffusion, FLUX.1, and other AI image generation models locally.
+"""
+
+__version__ = "1.1.1"
+__author__ = "OllamaDiffuser Team"
+__email__ = "ollamadiffuser@gmail.com"
+__description__ = "🎨 Local AI Image Generation with Ollama-style CLI for Stable Diffusion, FLUX.1, and LoRA support"
+__url__ = "https://www.ollamadiffuser.com/"
+__repository__ = "https://github.com/ollamadiffuser/ollamadiffuser"
+
+def get_version_info():
+    """Get formatted version information"""
+    return {
+        "version": __version__,
+        "description": __description__,
+        "url": __url__,
+        "repository": __repository__
+    }
+
+def print_version():
+    """Print formatted version information"""
+    from rich import print as rprint
+    rprint(f"[bold cyan]OllamaDiffuser v{__version__}[/bold cyan]")
+    rprint(__description__)
+    rprint(f"🔗 {__url__}")
+
+# For backward compatibility
+__all__ = ["__version__", "__author__", "__email__", "__description__", "__url__", "__repository__", "get_version_info", "print_version"]

ollamadiffuser-1.1.2/ollamadiffuser/__main__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+from .cli.main import cli
+
+def main():
+    """Main entry function"""
+    cli()
+
+if __name__ == '__main__':
+    main()