ollamadiffuser 1.1.1__tar.gz → 1.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.1
+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
@@ -119,6 +119,9 @@ pip install -e .
 
 ### Basic Usage
 ```bash
+# Check version
+ollamadiffuser -V
+
 # Install a model
 ollamadiffuser pull stable-diffusion-1.5
 
@@ -134,7 +137,7 @@ curl -X POST http://localhost:8000/api/generate \
 # Start web interface
 ollamadiffuser --mode ui
 
-open http://localhost:8001 in your browser
+open http://localhost:8001
 ```
 
 ### ControlNet Quick Start
@@ -267,6 +270,9 @@ ollamadiffuser load stable-diffusion-1.5
 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
@@ -389,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
@@ -424,6 +467,29 @@ curl -X POST http://localhost:8000/api/generate \
 # Use basic preprocessors instead of advanced ones
 ```
 
+### Platform-Specific Issues
+
+#### macOS Apple Silicon
+```bash
+# If you encounter OpenCV issues on Apple Silicon
+pip uninstall opencv-python
+pip install opencv-python-headless>=4.8.0
+```
+
+#### Windows
+```bash
+# If you encounter build errors
+pip install --only-binary=all opencv-python>=4.8.0
+```
+
+#### Linux
+```bash
+# 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
+```
+
 ### Debug Mode
 ```bash
 # Enable verbose logging

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

@@ -53,6 +53,9 @@ pip install -e .
 
 ### Basic Usage
 ```bash
+# Check version
+ollamadiffuser -V
+
 # Install a model
 ollamadiffuser pull stable-diffusion-1.5
 
@@ -68,7 +71,7 @@ curl -X POST http://localhost:8000/api/generate \
 # Start web interface
 ollamadiffuser --mode ui
 
-open http://localhost:8001 in your browser
+open http://localhost:8001
 ```
 
 ### ControlNet Quick Start
@@ -201,6 +204,9 @@ ollamadiffuser load stable-diffusion-1.5
 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
@@ -323,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
@@ -358,6 +401,29 @@ curl -X POST http://localhost:8000/api/generate \
 # Use basic preprocessors instead of advanced ones
 ```
 
+### Platform-Specific Issues
+
+#### macOS Apple Silicon
+```bash
+# If you encounter OpenCV issues on Apple Silicon
+pip uninstall opencv-python
+pip install opencv-python-headless>=4.8.0
+```
+
+#### Windows
+```bash
+# If you encounter build errors
+pip install --only-binary=all opencv-python>=4.8.0
+```
+
+#### Linux
+```bash
+# 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
+```
+
 ### Debug Mode
 ```bash
 # Enable verbose logging

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() 

ollamadiffuser-1.1.2/ollamadiffuser/cli/commands.py

@@ -0,0 +1,133 @@
+import click
+import subprocess
+import sys
+from rich.console import Console
+from rich.table import Table
+from rich.panel import Panel
+from ..core.models.manager import model_manager
+from ..core.config.settings import settings
+
+console = Console()
+
+@click.command()
+def verify_deps():
+    """Verify and install missing dependencies"""
+    console.print("\n🔍 [bold blue]Checking OllamaDiffuser Dependencies[/bold blue]")
+    
+    # Check critical dependencies
+    deps_status = {}
+    
+    # OpenCV check
+    try:
+        import cv2
+        deps_status['opencv-python'] = f"✅ Installed (v{cv2.__version__})"
+    except ImportError:
+        deps_status['opencv-python'] = "❌ Missing"
+    
+    # ControlNet Aux check
+    try:
+        import controlnet_aux
+        deps_status['controlnet-aux'] = "✅ Installed"
+    except ImportError:
+        deps_status['controlnet-aux'] = "❌ Missing"
+    
+    # Torch check
+    try:
+        import torch
+        deps_status['torch'] = f"✅ Installed (v{torch.__version__})"
+    except ImportError:
+        deps_status['torch'] = "❌ Missing"
+    
+    # Diffusers check
+    try:
+        import diffusers
+        deps_status['diffusers'] = f"✅ Installed (v{diffusers.__version__})"
+    except ImportError:
+        deps_status['diffusers'] = "❌ Missing"
+    
+    # Create status table
+    table = Table(title="Dependency Status")
+    table.add_column("Package", style="cyan")
+    table.add_column("Status", style="white")
+    
+    missing_deps = []
+    for dep, status in deps_status.items():
+        table.add_row(dep, status)
+        if "❌ Missing" in status:
+            missing_deps.append(dep)
+    
+    console.print(table)
+    
+    if missing_deps:
+        console.print(f"\n⚠️  [bold yellow]{len(missing_deps)} dependencies are missing[/bold yellow]")
+        
+        if click.confirm("\nWould you like to install missing dependencies?"):
+            for dep in missing_deps:
+                console.print(f"\n📦 Installing {dep}...")
+                
+                # Determine package name
+                if dep == 'opencv-python':
+                    package = 'opencv-python>=4.8.0'
+                elif dep == 'controlnet-aux':
+                    package = 'controlnet-aux>=0.0.7'
+                else:
+                    package = dep
+                
+                try:
+                    subprocess.check_call([
+                        sys.executable, "-m", "pip", "install", package
+                    ])
+                    console.print(f"✅ {dep} installed successfully")
+                except subprocess.CalledProcessError as e:
+                    console.print(f"❌ Failed to install {dep}: {e}")
+        
+        console.print("\n🔄 Re-run 'ollamadiffuser verify-deps' to check status")
+    else:
+        console.print("\n🎉 [bold green]All dependencies are installed![/bold green]")
+    
+    # Check ControlNet preprocessors
+    console.print("\n🔧 [bold blue]Testing ControlNet Preprocessors[/bold blue]")
+    try:
+        from ..core.utils.controlnet_preprocessors import controlnet_preprocessor
+        if controlnet_preprocessor.is_available():
+            available_types = controlnet_preprocessor.get_available_types()
+            console.print(f"✅ Available types: {', '.join(available_types)}")
+        else:
+            console.print("⚠️  ControlNet preprocessors not fully available")
+    except Exception as e:
+        console.print(f"❌ Error testing preprocessors: {e}")
+
+@click.command()
+def doctor():
+    """Run comprehensive system diagnostics"""
+    console.print(Panel.fit("🩺 [bold blue]OllamaDiffuser Doctor[/bold blue]"))
+    
+    # System info
+    import platform
+    console.print(f"\n💻 System: {platform.system()} {platform.release()}")
+    console.print(f"🐍 Python: {sys.version.split()[0]}")
+    
+    # GPU info
+    try:
+        import torch
+        if torch.cuda.is_available():
+            console.print(f"🎮 CUDA: Available ({torch.cuda.get_device_name()})")
+        elif hasattr(torch.backends, 'mps') and torch.backends.mps.is_available():
+            console.print("🍎 Apple Metal: Available")
+        else:
+            console.print("⚙️ GPU: CPU only")
+    except ImportError:
+        console.print("❌ PyTorch not installed")
+    
+    # Memory info
+    try:
+        import psutil
+        memory = psutil.virtual_memory()
+        console.print(f"🧠 RAM: {memory.total // (1024**3)} GB total, {memory.available // (1024**3)} GB available")
+    except ImportError:
+        console.print("⚠️ Cannot check memory (psutil missing)")
+    
+    # Run dependency check
+    console.print("\n" + "="*50)
+    ctx = click.Context(verify_deps)
+    ctx.invoke(verify_deps) 

{ollamadiffuser-1.1.1 → ollamadiffuser-1.1.2}/ollamadiffuser/cli/main.py

@@ -9,6 +9,7 @@ from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, Downlo
 from rich import print as rprint
 import time
 
+from .. import __version__, print_version
 from ..core.models.manager import model_manager
 from ..core.config.settings import settings
 from ..api.server import run_server
@@ -53,14 +54,47 @@ class OllamaStyleProgress:
             # For other messages, print with dimmed style
             self.console.print(f"[dim]{message}[/dim]")
 
-@click.group()
+@click.group(invoke_without_command=True)
 @click.option('--verbose', '-v', is_flag=True, help='Enable verbose output')
-def cli(verbose):
+@click.option('--version', '-V', is_flag=True, help='Show version and exit')
+@click.option('--mode', type=click.Choice(['cli', 'api', 'ui']), help='Running mode: cli (command line), api (API server), ui (Web interface)')
+@click.option('--host', default=None, help='Server host address (for api/ui modes)')
+@click.option('--port', type=int, default=None, help='Server port (for api/ui modes)')
+@click.pass_context
+def cli(ctx, verbose, version, mode, host, port):
     """OllamaDiffuser - Image generation model management tool"""
+    if version:
+        print_version()
+        sys.exit(0)
+        
     if verbose:
         logging.basicConfig(level=logging.DEBUG)
     else:
         logging.basicConfig(level=logging.WARNING)
+    
+    # Handle mode-based execution
+    if mode:
+        if mode == 'api':
+            rprint("[blue]Starting OllamaDiffuser API server...[/blue]")
+            run_server(host=host, port=port)
+            sys.exit(0)
+        elif mode == 'ui':
+            rprint("[blue]Starting OllamaDiffuser Web UI...[/blue]")
+            import uvicorn
+            from ..ui.web import create_ui_app
+            app = create_ui_app()
+            ui_host = host or settings.server.host
+            ui_port = port or (settings.server.port + 1)  # Web UI uses different port
+            uvicorn.run(app, host=ui_host, port=ui_port)
+            sys.exit(0)
+        elif mode == 'cli':
+            # Continue with normal CLI processing
+            pass
+    
+    # If no subcommand is provided and no mode/version flag, show help
+    if ctx.invoked_subcommand is None and not version and not mode:
+        rprint(ctx.get_help())
+        sys.exit(0)
 
 @cli.command()
 @click.argument('model_name')
@@ -890,8 +924,39 @@ def show(lora_name: str):
 @cli.command()
 def version():
     """Show version information"""
-    rprint("[bold cyan]OllamaDiffuser v1.0.0[/bold cyan]")
-    rprint("Image generation model management tool")
+    print_version()
+    rprint("\n[bold]Features:[/bold]")
+    rprint("• 🚀 Fast Startup with lazy loading architecture")
+    rprint("• 🎛️ ControlNet Support with 10+ control types")
+    rprint("• 🔄 LoRA Integration with dynamic loading")
+    rprint("• 🌐 Multiple Interfaces: CLI, Python API, Web UI, REST API")
+    rprint("• 📦 Easy model management and switching")
+    rprint("• ⚡ Performance optimized with GPU acceleration")
+    
+    rprint("\n[bold]Supported Models:[/bold]")
+    rprint("• FLUX.1-schnell (Apache 2.0, Commercial OK, 4-step generation)")
+    rprint("• FLUX.1-dev (Non-commercial, High quality, 50-step generation)")
+    rprint("• Stable Diffusion 3.5 Medium")
+    rprint("• Stable Diffusion XL Base")
+    rprint("• Stable Diffusion 1.5")
+    rprint("• ControlNet models for SD15 and SDXL")
+    
+    rprint("\n[dim]For help: ollamadiffuser --help[/dim]")
+    rprint("[dim]For diagnostics: ollamadiffuser doctor[/dim]")
+
+@cli.command(name='verify-deps')
+def verify_deps_cmd():
+    """Verify and install missing dependencies"""
+    from .commands import verify_deps
+    ctx = click.Context(verify_deps)
+    ctx.invoke(verify_deps)
+
+@cli.command()
+def doctor():
+    """Run comprehensive system diagnostics"""
+    from .commands import doctor
+    ctx = click.Context(doctor)
+    ctx.invoke(doctor)
 
 if __name__ == '__main__':
     cli() 

{ollamadiffuser-1.1.1 → ollamadiffuser-1.1.2}/ollamadiffuser/core/utils/controlnet_preprocessors.py

@@ -1,4 +1,10 @@
-import cv2
+try:
+    import cv2
+    CV2_AVAILABLE = True
+except ImportError:
+    CV2_AVAILABLE = False
+    cv2 = None
+
 import numpy as np
 from PIL import Image
 import logging
@@ -15,6 +21,13 @@ class ControlNetPreprocessorManager:
         self._initialized = False
         self._initialization_attempted = False
         self._available_types = []
+        
+        # Check dependencies on initialization
+        if not CV2_AVAILABLE:
+            logger.warning(
+                "OpenCV (cv2) is not installed. "
+                "Install it with: pip install opencv-python>=4.8.0"
+            )
     
     def is_initialized(self) -> bool:
         """Check if preprocessors are initialized"""
@@ -22,6 +35,9 @@ class ControlNetPreprocessorManager:
     
     def is_available(self) -> bool:
         """Check if ControlNet preprocessors are available"""
+        if not CV2_AVAILABLE:
+            return False
+            
         if not self._initialization_attempted:
             # Try a lightweight check without full initialization
             try:
@@ -41,6 +57,12 @@ class ControlNetPreprocessorManager:
         Returns:
             True if initialization successful, False otherwise
         """
+        if not CV2_AVAILABLE:
+            raise ImportError(
+                "OpenCV (cv2) is required for ControlNet preprocessors. "
+                "Install it with: pip install opencv-python>=4.8.0"
+            )
+            
         if self._initialized and not force:
             return True
             
@@ -164,17 +186,28 @@ class ControlNetPreprocessorManager:
     
     def _init_basic_processors(self):
         """Initialize basic OpenCV-based processors as fallback"""
-        logger.info("Using basic OpenCV-based preprocessors")
-        self.processors = {
-            'canny': self._canny_opencv,
-            'depth': self._depth_basic,
-            'scribble': self._scribble_basic,
-        }
+        if not CV2_AVAILABLE:
+            logger.warning("OpenCV not available, using minimal fallback processors")
+            self.processors = {
+                'canny': self._simple_edge_fallback,
+                'depth': self._simple_depth_fallback,
+                'scribble': self._simple_edge_fallback,
+            }
+        else:
+            logger.info("Using basic OpenCV-based preprocessors")
+            self.processors = {
+                'canny': self._canny_opencv,
+                'depth': self._depth_basic,
+                'scribble': self._scribble_basic,
+            }
         self._initialized = True
         self._available_types = list(self.processors.keys())
     
     def _canny_opencv(self, image: Image.Image, low_threshold: int = 100, high_threshold: int = 200) -> Image.Image:
         """Basic Canny edge detection using OpenCV"""
+        if not CV2_AVAILABLE:
+            raise ImportError("OpenCV is required for Canny edge detection")
+            
         # Convert PIL to OpenCV format
         image_cv = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR)
         
@@ -187,6 +220,9 @@ class ControlNetPreprocessorManager:
     
     def _depth_basic(self, image: Image.Image) -> Image.Image:
         """Basic depth estimation using simple gradients"""
+        if not CV2_AVAILABLE:
+            raise ImportError("OpenCV is required for depth estimation")
+            
         # Convert to grayscale
         gray = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2GRAY)
         
@@ -207,6 +243,9 @@ class ControlNetPreprocessorManager:
     
     def _scribble_basic(self, image: Image.Image) -> Image.Image:
         """Basic scribble detection using edge detection"""
+        if not CV2_AVAILABLE:
+            raise ImportError("OpenCV is required for scribble detection")
+            
         # Convert to grayscale
         gray = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2GRAY)
         
@@ -221,6 +260,39 @@ class ControlNetPreprocessorManager:
         edges_rgb = cv2.cvtColor(edges, cv2.COLOR_GRAY2RGB)
         return Image.fromarray(edges_rgb)
     
+    def _simple_edge_fallback(self, image: Image.Image, **kwargs) -> Image.Image:
+        """Simple edge detection fallback using PIL/numpy only"""
+        # Convert to numpy array
+        img_array = np.array(image.convert('L'))  # Convert to grayscale
+        
+        # Simple gradient-based edge detection
+        grad_x = np.abs(np.diff(img_array, axis=1))
+        grad_y = np.abs(np.diff(img_array, axis=0))
+        
+        # Pad to maintain original size
+        grad_x = np.pad(grad_x, ((0, 0), (0, 1)), mode='edge')
+        grad_y = np.pad(grad_y, ((0, 1), (0, 0)), mode='edge')
+        
+        # Combine gradients
+        edges = np.sqrt(grad_x**2 + grad_y**2)
+        edges = np.uint8(255 * edges / np.max(edges) if np.max(edges) > 0 else edges)
+        
+        # Convert to RGB
+        edges_rgb = np.stack([edges, edges, edges], axis=2)
+        return Image.fromarray(edges_rgb)
+    
+    def _simple_depth_fallback(self, image: Image.Image, **kwargs) -> Image.Image:
+        """Simple depth estimation fallback using PIL/numpy only"""
+        # Convert to grayscale
+        gray = np.array(image.convert('L'))
+        
+        # Simple depth based on intensity (brighter = closer)
+        depth = 255 - gray  # Invert so darker areas are "further"
+        
+        # Convert to RGB
+        depth_rgb = np.stack([depth, depth, depth], axis=2)
+        return Image.fromarray(depth_rgb)
+    
     def preprocess(self, 
                    image: Union[Image.Image, str], 
                    control_type: str,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.1
+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
@@ -119,6 +119,9 @@ pip install -e .
 
 ### Basic Usage
 ```bash
+# Check version
+ollamadiffuser -V
+
 # Install a model
 ollamadiffuser pull stable-diffusion-1.5
 
@@ -134,7 +137,7 @@ curl -X POST http://localhost:8000/api/generate \
 # Start web interface
 ollamadiffuser --mode ui
 
-open http://localhost:8001 in your browser
+open http://localhost:8001
 ```
 
 ### ControlNet Quick Start
@@ -267,6 +270,9 @@ ollamadiffuser load stable-diffusion-1.5
 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
@@ -389,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
@@ -424,6 +467,29 @@ curl -X POST http://localhost:8000/api/generate \
 # Use basic preprocessors instead of advanced ones
 ```
 
+### Platform-Specific Issues
+
+#### macOS Apple Silicon
+```bash
+# If you encounter OpenCV issues on Apple Silicon
+pip uninstall opencv-python
+pip install opencv-python-headless>=4.8.0
+```
+
+#### Windows
+```bash
+# If you encounter build errors
+pip install --only-binary=all opencv-python>=4.8.0
+```
+
+#### Linux
+```bash
+# 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
+```
+
 ### Debug Mode
 ```bash
 # Enable verbose logging

{ollamadiffuser-1.1.1 → ollamadiffuser-1.1.2}/ollamadiffuser.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ ollamadiffuser.egg-info/top_level.txt
 ollamadiffuser/api/__init__.py
 ollamadiffuser/api/server.py
 ollamadiffuser/cli/__init__.py
+ollamadiffuser/cli/commands.py
 ollamadiffuser/cli/main.py
 ollamadiffuser/core/__init__.py
 ollamadiffuser/core/config/__init__.py

{ollamadiffuser-1.1.1 → ollamadiffuser-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ollamadiffuser"
-version = "1.1.1"
+version = "1.1.2"
 authors = [
     {name = "OllamaDiffuser Team", email = "ollamadiffuser@gmail.com"}
 ]

{ollamadiffuser-1.1.1 → ollamadiffuser-1.1.2}/setup.py

@@ -1,11 +1,49 @@
 from setuptools import setup, find_packages
+import sys
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
+# Core dependencies that must be installed
+REQUIRED = [
+    "torch>=2.1.0",
+    "diffusers>=0.26.0",
+    "transformers>=4.35.0",
+    "accelerate>=0.25.0",
+    "fastapi>=0.104.0",
+    "uvicorn>=0.23.0",
+    "huggingface-hub>=0.16.0",
+    "Pillow>=9.0.0",
+    "click>=8.0.0",
+    "rich>=13.0.0",
+    "pydantic>=2.0.0",
+    "protobuf>=3.20.0",
+    "sentencepiece>=0.1.99",
+    "safetensors>=0.3.0",
+    "python-multipart>=0.0.0",
+    "psutil>=5.9.0",
+    "jinja2>=3.0.0",
+    "peft>=0.10.0",
+    "numpy>=1.21.0",
+]
+
+# Optional dependencies that can fall back gracefully
+OPTIONAL = [
+    "controlnet-aux>=0.0.7",
+    "opencv-python>=4.8.0",
+]
+
+# Try to install optional dependencies, but don't fail if they can't be installed
+install_requires = REQUIRED[:]
+for dep in OPTIONAL:
+    try:
+        install_requires.append(dep)
+    except Exception:
+        print(f"Warning: Optional dependency {dep} could not be added to requirements")
+
 setup(
     name="ollamadiffuser",
-    version="1.1.1",
+    version="1.1.2",
     author="OllamaDiffuser Team",
     author_email="ollamadiffuser@gmail.com",
     description="🎨 Ollama-like image generation model management tool with LoRA support",
@@ -27,28 +65,7 @@ setup(
         "Topic :: Multimedia :: Graphics",
     ],
     python_requires=">=3.10",
-    install_requires=[
-        "torch>=2.1.0",
-        "diffusers>=0.26.0",
-        "transformers>=4.35.0",
-        "accelerate>=0.25.0",
-        "fastapi>=0.104.0",
-        "uvicorn>=0.23.0",
-        "huggingface-hub>=0.16.0",
-        "Pillow>=9.0.0",
-        "click>=8.0.0",
-        "rich>=13.0.0",
-        "pydantic>=2.0.0",
-        "protobuf>=3.20.0",
-        "sentencepiece>=0.1.99",
-        "safetensors>=0.3.0",
-        "python-multipart>=0.0.0",
-        "psutil>=5.9.0",
-        "jinja2>=3.0.0",
-        "peft>=0.10.0",
-        "controlnet-aux>=0.0.7",
-        "opencv-python>=4.8.0"
-    ],
+    install_requires=install_requires,
     extras_require={
         "dev": [
             "pytest>=7.0.0",
@@ -57,6 +74,10 @@ setup(
             "isort>=5.12.0",
             "flake8>=6.0.0",
         ],
+        "full": [
+            "controlnet-aux>=0.0.7",
+            "opencv-python>=4.8.0",
+        ],
     },
     entry_points={
         "console_scripts": [

ollamadiffuser-1.1.1/ollamadiffuser/__main__.py

@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import argparse
-from .cli.main import cli
-from .api.server import run_server
-from .ui.web import create_ui_app
-from .core.config.settings import settings
-
-def main():
-    """Main entry function"""
-    # Check if first argument is a mode flag
-    if len(sys.argv) > 1 and sys.argv[1] in ['--mode']:
-        # Use argparse for mode selection
-        parser = argparse.ArgumentParser(
-            description='OllamaDiffuser - Image generation model management tool'
-        )
-        parser.add_argument(
-            '--mode', 
-            choices=['cli', 'api', 'ui'], 
-            required=True,
-            help='Running mode: cli (command line), api (API server), ui (Web interface)'
-        )
-        parser.add_argument('--host', default=None, help='Server host address')
-        parser.add_argument('--port', type=int, default=None, help='Server port')
-        parser.add_argument('--verbose', '-v', action='store_true', help='Verbose output')
-        
-        args, unknown = parser.parse_known_args()
-        
-        if args.mode == 'cli':
-            # Command line mode
-            sys.argv = [sys.argv[0]] + unknown
-            cli()
-        elif args.mode == 'api':
-            # API server mode
-            print("Starting OllamaDiffuser API server...")
-            run_server(host=args.host, port=args.port)
-        elif args.mode == 'ui':
-            # Web UI mode
-            print("Starting OllamaDiffuser Web UI...")
-            import uvicorn
-            app = create_ui_app()
-            host = args.host or settings.server.host
-            port = args.port or (settings.server.port + 1)  # Web UI uses different port
-            uvicorn.run(app, host=host, port=port)
-    else:
-        # Default to CLI mode for direct command usage
-        cli()
-
-if __name__ == '__main__':
-    main()