ollamadiffuser 1.1.0__tar.gz → 1.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.0
+Version: 1.1.1
 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
@@ -121,14 +122,19 @@ pip install -e .
 # 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 in your browser
 ```
 
 ### ControlNet Quick Start
@@ -136,8 +142,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 +225,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,6 +261,8 @@ 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" \
@@ -258,16 +274,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 +316,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 +338,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 +368,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
@@ -407,46 +413,26 @@ 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
-
-# Check system information
-ollamadiffuser info
-
-# Validate installation
-ollamadiffuser doctor
+ollamadiffuser --verbose run model-name
 ```
 
 ## 🤝 Contributing
 
-We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) for details.
-
-### Development Setup
-```bash
-# Clone repository
-git clone https://github.com/yourusername/ollamadiffuser.git
-cd ollamadiffuser
-
-# Install in development mode
-pip install -e ".[dev]"
-
-# Run tests
-pytest tests/
-
-# Run linting
-flake8 ollamadiffuser/
-black ollamadiffuser/
-```
+We welcome contributions! Please check the GitHub repository for contribution guidelines.
 
 ## 🤝 Community & Support
 
@@ -476,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.0 → ollamadiffuser-1.1.1}/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
@@ -55,14 +56,19 @@ pip install -e .
 # 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 in your browser
 ```
 
 ### ControlNet Quick Start
@@ -70,8 +76,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 +159,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,6 +195,8 @@ 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" \
@@ -192,16 +208,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 +250,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 +272,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 +302,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
@@ -341,46 +347,26 @@ 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
-
-# Check system information
-ollamadiffuser info
-
-# Validate installation
-ollamadiffuser doctor
+ollamadiffuser --verbose run model-name
 ```
 
 ## 🤝 Contributing
 
-We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) for details.
-
-### Development Setup
-```bash
-# Clone repository
-git clone https://github.com/yourusername/ollamadiffuser.git
-cd ollamadiffuser
-
-# Install in development mode
-pip install -e ".[dev]"
-
-# Run tests
-pytest tests/
-
-# Run linting
-flake8 ollamadiffuser/
-black ollamadiffuser/
-```
+We welcome contributions! Please check the GitHub repository for contribution guidelines.
 
 ## 🤝 Community & Support
 
@@ -410,9 +396,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.1}/ollamadiffuser/cli/main.py

@@ -5,8 +5,9 @@ import logging
 from typing import Optional
 from rich.console import Console
 from rich.table import Table
-from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, DownloadColumn, TransferSpeedColumn, TimeRemainingColumn
 from rich import print as rprint
+import time
 
 from ..core.models.manager import model_manager
 from ..core.config.settings import settings
@@ -14,6 +15,44 @@ from ..api.server import run_server
 
 console = Console()
 
+class OllamaStyleProgress:
+    """Enhanced progress tracker that mimics Ollama's progress display"""
+    
+    def __init__(self, console: Console):
+        self.console = console
+        self.last_message = ""
+        
+    def update(self, message: str):
+        """Update progress with a message"""
+        # Skip duplicate messages
+        if message == self.last_message:
+            return
+            
+        self.last_message = message
+        
+        # Handle different types of messages
+        if message.startswith("pulling ") and ":" in message and "%" in message:
+            # This is a file progress message from download_utils
+            # Format: "pulling e6a7edc1a4d7: 12% ▕██                ▏ 617 MB/5200 MB 44 MB/s 1m44s"
+            self.console.print(message)
+        elif message.startswith("pulling manifest"):
+            self.console.print(message)
+        elif message.startswith("📦 Repository:"):
+            # Repository info
+            self.console.print(f"[dim]{message}[/dim]")
+        elif message.startswith("📁 Found"):
+            # Existing files info
+            self.console.print(f"[dim]{message}[/dim]")
+        elif message.startswith("✅") and "download completed" in message:
+            self.console.print(f"[green]{message}[/green]")
+        elif message.startswith("❌"):
+            self.console.print(f"[red]{message}[/red]")
+        elif message.startswith("⚠️"):
+            self.console.print(f"[yellow]{message}[/yellow]")
+        else:
+            # For other messages, print with dimmed style
+            self.console.print(f"[dim]{message}[/dim]")
+
 @click.group()
 @click.option('--verbose', '-v', is_flag=True, help='Enable verbose output')
 def cli(verbose):
@@ -30,24 +69,26 @@ def pull(model_name: str, force: bool):
     """Download model"""
     rprint(f"[blue]Downloading model: {model_name}[/blue]")
     
-    with Progress(
-        SpinnerColumn(),
-        TextColumn("[progress.description]{task.description}"),
-        console=console
-    ) as progress:
-        task = progress.add_task(f"Downloading {model_name}...", total=None)
-        
-        def progress_callback(message: str):
-            """Update progress display with download status"""
-            progress.update(task, description=message)
-        
+    # Use the new Ollama-style progress tracker
+    progress_tracker = OllamaStyleProgress(console)
+    
+    def progress_callback(message: str):
+        """Enhanced progress callback with Ollama-style display"""
+        progress_tracker.update(message)
+    
+    try:
         if model_manager.pull_model(model_name, force=force, progress_callback=progress_callback):
-            progress.update(task, description=f"✅ {model_name} download completed")
+            progress_tracker.update("✅ download completed")
             rprint(f"[green]Model {model_name} downloaded successfully![/green]")
         else:
-            progress.update(task, description=f"❌ {model_name} download failed")
             rprint(f"[red]Model {model_name} download failed![/red]")
             sys.exit(1)
+    except KeyboardInterrupt:
+        rprint("\n[yellow]Download cancelled by user[/yellow]")
+        sys.exit(1)
+    except Exception as e:
+        rprint(f"[red]Download failed: {str(e)}[/red]")
+        sys.exit(1)
 
 @cli.command()
 @click.argument('model_name')

{ollamadiffuser-1.1.0 → ollamadiffuser-1.1.1}/ollamadiffuser/core/utils/download_utils.py

@@ -11,25 +11,107 @@ from pathlib import Path
 from huggingface_hub import snapshot_download, hf_hub_download, HfApi
 from tqdm import tqdm
 import threading
+import requests
 
 logger = logging.getLogger(__name__)
 
-class ProgressTracker:
-    """Track download progress across multiple files"""
+class EnhancedProgressTracker:
+    """Enhanced progress tracker that provides Ollama-style detailed progress information"""
     
     def __init__(self, total_files: int = 0, progress_callback: Optional[Callable] = None):
         self.total_files = total_files
         self.completed_files = 0
         self.current_file = ""
         self.file_progress = {}
+        self.file_start_times = {}
+        self.file_speeds = {}
         self.progress_callback = progress_callback
         self.lock = threading.Lock()
+        self.overall_start_time = time.time()
+        self.total_size = 0
+        self.downloaded_size = 0
         
+    def set_total_size(self, total_size: int):
+        """Set the total size for all files"""
+        with self.lock:
+            self.total_size = total_size
+    
+    def start_file(self, filename: str, file_size: int = 0):
+        """Mark a file as started"""
+        with self.lock:
+            self.current_file = filename
+            self.file_start_times[filename] = time.time()
+            self.file_progress[filename] = (0, file_size)
+            
+            # Extract hash-like identifier for Ollama-style display
+            import re
+            hash_match = re.search(r'([a-f0-9]{8,})', filename)
+            if hash_match:
+                display_name = hash_match.group(1)[:12]  # First 12 characters
+            else:
+                # Fallback to filename without extension
+                display_name = Path(filename).stem[:12]
+            
+            if self.progress_callback:
+                self.progress_callback(f"pulling {display_name}")
+    
     def update_file_progress(self, filename: str, downloaded: int, total: int):
-        """Update progress for a specific file"""
+        """Update progress for a specific file with speed calculation"""
         with self.lock:
+            current_time = time.time()
+            
+            # Update file progress
+            old_downloaded = self.file_progress.get(filename, (0, 0))[0]
             self.file_progress[filename] = (downloaded, total)
-            self._report_progress()
+            
+            # Update overall downloaded size
+            size_diff = downloaded - old_downloaded
+            self.downloaded_size += size_diff
+            
+            # Calculate speed for this file
+            if filename in self.file_start_times:
+                elapsed = current_time - self.file_start_times[filename]
+                if elapsed > 0 and downloaded > 0:
+                    speed = downloaded / elapsed  # bytes per second
+                    self.file_speeds[filename] = speed
+            
+            # Report progress in Ollama style
+            if self.progress_callback and total > 0:
+                percentage = (downloaded / total) * 100
+                
+                # Format sizes
+                downloaded_mb = downloaded / (1024 * 1024)
+                total_mb = total / (1024 * 1024)
+                
+                # Calculate speed in MB/s
+                speed_mbps = self.file_speeds.get(filename, 0) / (1024 * 1024)
+                
+                # Calculate ETA
+                if speed_mbps > 0:
+                    remaining_mb = total_mb - downloaded_mb
+                    eta_seconds = remaining_mb / speed_mbps
+                    eta_min = int(eta_seconds // 60)
+                    eta_sec = int(eta_seconds % 60)
+                    eta_str = f"{eta_min}m{eta_sec:02d}s"
+                else:
+                    eta_str = "?"
+                
+                # Extract hash for display
+                import re
+                hash_match = re.search(r'([a-f0-9]{8,})', filename)
+                if hash_match:
+                    display_name = hash_match.group(1)[:12]
+                else:
+                    display_name = Path(filename).stem[:12]
+                
+                # Create progress bar
+                bar_width = 20
+                filled = int((percentage / 100) * bar_width)
+                bar = "█" * filled + " " * (bar_width - filled)
+                
+                progress_msg = f"pulling {display_name}: {percentage:3.0f}% ▕{bar}▏ {downloaded_mb:.0f} MB/{total_mb:.0f} MB {speed_mbps:.0f} MB/s {eta_str}"
+                
+                self.progress_callback(progress_msg)
     
     def complete_file(self, filename: str):
         """Mark a file as completed"""
@@ -38,34 +120,42 @@ class ProgressTracker:
             if filename in self.file_progress:
                 downloaded, total = self.file_progress[filename]
                 self.file_progress[filename] = (total, total)
-            self._report_progress()
-    
-    def set_current_file(self, filename: str):
-        """Set the currently downloading file"""
-        with self.lock:
-            self.current_file = filename
-            self._report_progress()
+            
+            # Report completion
+            if self.progress_callback:
+                import re
+                hash_match = re.search(r'([a-f0-9]{8,})', filename)
+                if hash_match:
+                    display_name = hash_match.group(1)[:12]
+                else:
+                    display_name = Path(filename).stem[:12]
+                
+                total_mb = self.file_progress.get(filename, (0, 0))[1] / (1024 * 1024)
+                self.progress_callback(f"pulling {display_name}: 100% ▕████████████████████▏ {total_mb:.0f} MB/{total_mb:.0f} MB")
     
-    def _report_progress(self):
-        """Report current progress"""
+    def report_overall_progress(self):
+        """Report overall progress"""
         if self.progress_callback:
-            # Calculate overall progress
-            total_downloaded = 0
-            total_size = 0
-            
-            for downloaded, size in self.file_progress.values():
-                total_downloaded += downloaded
-                total_size += size
-            
-            progress_msg = f"Files: {self.completed_files}/{self.total_files}"
-            if total_size > 0:
-                percent = (total_downloaded / total_size) * 100
-                progress_msg += f" | Overall: {percent:.1f}%"
-            
-            if self.current_file:
-                progress_msg += f" | Current: {self.current_file}"
-            
-            self.progress_callback(progress_msg)
+            if self.total_size > 0:
+                overall_percent = (self.downloaded_size / self.total_size) * 100
+                downloaded_gb = self.downloaded_size / (1024 * 1024 * 1024)
+                total_gb = self.total_size / (1024 * 1024 * 1024)
+                
+                elapsed = time.time() - self.overall_start_time
+                if elapsed > 0:
+                    overall_speed = self.downloaded_size / elapsed / (1024 * 1024)  # MB/s
+                    
+                    if overall_speed > 0:
+                        remaining_gb = total_gb - downloaded_gb
+                        eta_seconds = (remaining_gb * 1024) / overall_speed  # Convert GB to MB for calculation
+                        eta_min = int(eta_seconds // 60)
+                        eta_sec = int(eta_seconds % 60)
+                        eta_str = f"{eta_min}m{eta_sec:02d}s"
+                    else:
+                        eta_str = "?"
+                    
+                    progress_msg = f"Overall progress: {overall_percent:.1f}% | {downloaded_gb:.1f} GB/{total_gb:.1f} GB | {overall_speed:.1f} MB/s | ETA: {eta_str}"
+                    self.progress_callback(progress_msg)
 
 def configure_hf_environment():
     """Configure HuggingFace Hub environment for better downloads"""
@@ -132,7 +222,7 @@ def robust_snapshot_download(
     
     # Get file list and sizes for progress tracking
     if progress_callback:
-        progress_callback("📋 Getting repository information...")
+        progress_callback("pulling manifest")
     
     file_sizes = get_repo_file_list(repo_id)
     total_size = sum(file_sizes.values())
@@ -140,20 +230,65 @@ def robust_snapshot_download(
     if progress_callback and file_sizes:
         progress_callback(f"📦 Repository: {len(file_sizes)} files, {format_size(total_size)} total")
     
+    # Initialize enhanced progress tracker
+    progress_tracker = EnhancedProgressTracker(len(file_sizes), progress_callback)
+    progress_tracker.set_total_size(total_size)
+    
     # Check what's already downloaded
     local_path = Path(local_dir)
+    existing_size = 0
     if local_path.exists() and not force_download:
         existing_files = []
-        existing_size = 0
         for file_path in local_path.rglob('*'):
             if file_path.is_file():
                 rel_path = file_path.relative_to(local_path)
                 existing_files.append(str(rel_path))
-                existing_size += file_path.stat().st_size
+                file_size = file_path.stat().st_size
+                existing_size += file_size
+                # Mark existing files as completed in progress tracker
+                progress_tracker.file_progress[str(rel_path)] = (file_size, file_size)
+                progress_tracker.downloaded_size += file_size
+                progress_tracker.completed_files += 1
         
         if progress_callback and existing_files:
             progress_callback(f"📁 Found {len(existing_files)} existing files ({format_size(existing_size)})")
     
+    # Custom tqdm class to capture HuggingFace download progress
+    class OllamaStyleTqdm(tqdm):
+        def __init__(self, *args, **kwargs):
+            # Extract description to get filename
+            desc = kwargs.get('desc', '')
+            self.current_filename = desc
+            
+            # Get file size from our pre-fetched data
+            file_size = file_sizes.get(self.current_filename, 0)
+            if file_size > 0:
+                kwargs['total'] = file_size
+                
+            super().__init__(*args, **kwargs)
+            
+            # Start tracking this file
+            if self.current_filename and progress_callback:
+                progress_tracker.start_file(self.current_filename, file_size)
+        
+        def update(self, n=1):
+            super().update(n)
+            
+            # Update our progress tracker
+            if self.current_filename and progress_callback:
+                downloaded = getattr(self, 'n', 0)
+                total = getattr(self, 'total', 0) or file_sizes.get(self.current_filename, 0)
+                
+                if total > 0:
+                    progress_tracker.update_file_progress(self.current_filename, downloaded, total)
+        
+        def close(self):
+            super().close()
+            
+            # Mark file as completed
+            if self.current_filename and progress_callback:
+                progress_tracker.complete_file(self.current_filename)
+    
     last_exception = None
     
     for attempt in range(max_retries):
@@ -166,12 +301,6 @@ def robust_snapshot_download(
             
             logger.info(f"Download attempt {attempt + 1}/{max_retries} with {workers} workers")
             
-            # Create a custom progress callback for tqdm
-            def tqdm_callback(t):
-                def inner(chunk_size):
-                    t.update(chunk_size)
-                return inner
-            
             result = snapshot_download(
                 repo_id=repo_id,
                 local_dir=local_dir,
@@ -181,7 +310,7 @@ def robust_snapshot_download(
                 resume_download=True,  # Enable resume
                 etag_timeout=300 + (attempt * 60),  # Increase timeout on retries
                 force_download=force_download,
-                tqdm_class=tqdm if progress_callback else None
+                tqdm_class=OllamaStyleTqdm if progress_callback else None
             )
             
             if progress_callback:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.0
+Version: 1.1.1
 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
@@ -121,14 +122,19 @@ pip install -e .
 # 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 in your browser
 ```
 
 ### ControlNet Quick Start
@@ -136,8 +142,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 +225,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,6 +261,8 @@ 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" \
@@ -258,16 +274,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 +316,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 +338,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 +368,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
@@ -407,46 +413,26 @@ 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
-
-# Check system information
-ollamadiffuser info
-
-# Validate installation
-ollamadiffuser doctor
+ollamadiffuser --verbose run model-name
 ```
 
 ## 🤝 Contributing
 
-We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) for details.
-
-### Development Setup
-```bash
-# Clone repository
-git clone https://github.com/yourusername/ollamadiffuser.git
-cd ollamadiffuser
-
-# Install in development mode
-pip install -e ".[dev]"
-
-# Run tests
-pytest tests/
-
-# Run linting
-flake8 ollamadiffuser/
-black ollamadiffuser/
-```
+We welcome contributions! Please check the GitHub repository for contribution guidelines.
 
 ## 🤝 Community & Support
 
@@ -476,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.0 → ollamadiffuser-1.1.1}/pyproject.toml

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

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

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="ollamadiffuser",
-    version="1.1.0",
+    version="1.1.1",
     author="OllamaDiffuser Team",
     author_email="ollamadiffuser@gmail.com",
     description="🎨 Ollama-like image generation model management tool with LoRA support",