ollamadiffuser 1.1.2__tar.gz → 1.1.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.2
+Version: 1.1.4
 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
@@ -51,14 +51,16 @@ Requires-Dist: python-multipart>=0.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: jinja2>=3.0.0
 Requires-Dist: peft>=0.10.0
-Requires-Dist: controlnet-aux>=0.0.7
-Requires-Dist: opencv-python>=4.8.0
+Requires-Dist: numpy>=1.21.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: flake8>=6.0.0; extra == "dev"
+Provides-Extra: full
+Requires-Dist: controlnet-aux>=0.0.7; extra == "full"
+Requires-Dist: opencv-python>=4.8.0; extra == "full"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -408,7 +410,14 @@ pip install opencv-python>=4.8.0
 ollamadiffuser verify-deps
 
 # Or install with all optional dependencies
+# For bash/sh:
 pip install ollamadiffuser[full]
+
+# For zsh (macOS default):
+pip install "ollamadiffuser[full]"
+
+# For fish shell:
+pip install 'ollamadiffuser[full]'
 ```
 
 #### Complete Dependency Check
@@ -426,8 +435,17 @@ If you're having persistent issues:
 ```bash
 # Uninstall and reinstall
 pip uninstall ollamadiffuser
+
+# Reinstall with all dependencies (shell-specific syntax):
+# For bash/sh:
 pip install --no-cache-dir ollamadiffuser[full]
 
+# For zsh (macOS default):
+pip install --no-cache-dir "ollamadiffuser[full]"
+
+# For fish shell:
+pip install --no-cache-dir 'ollamadiffuser[full]'
+
 # Verify installation
 ollamadiffuser verify-deps
 ```

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

@@ -342,7 +342,14 @@ pip install opencv-python>=4.8.0
 ollamadiffuser verify-deps
 
 # Or install with all optional dependencies
+# For bash/sh:
 pip install ollamadiffuser[full]
+
+# For zsh (macOS default):
+pip install "ollamadiffuser[full]"
+
+# For fish shell:
+pip install 'ollamadiffuser[full]'
 ```
 
 #### Complete Dependency Check
@@ -360,8 +367,17 @@ If you're having persistent issues:
 ```bash
 # Uninstall and reinstall
 pip uninstall ollamadiffuser
+
+# Reinstall with all dependencies (shell-specific syntax):
+# For bash/sh:
 pip install --no-cache-dir ollamadiffuser[full]
 
+# For zsh (macOS default):
+pip install --no-cache-dir "ollamadiffuser[full]"
+
+# For fish shell:
+pip install --no-cache-dir 'ollamadiffuser[full]'
+
 # Verify installation
 ollamadiffuser verify-deps
 ```

{ollamadiffuser-1.1.2 → ollamadiffuser-1.1.4}/ollamadiffuser/__init__.py

@@ -4,7 +4,7 @@ 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"
+__version__ = "1.1.4"
 __author__ = "OllamaDiffuser Team"
 __email__ = "ollamadiffuser@gmail.com"
 __description__ = "🎨 Local AI Image Generation with Ollama-style CLI for Stable Diffusion, FLUX.1, and LoRA support"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollamadiffuser
-Version: 1.1.2
+Version: 1.1.4
 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
@@ -51,14 +51,16 @@ Requires-Dist: python-multipart>=0.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: jinja2>=3.0.0
 Requires-Dist: peft>=0.10.0
-Requires-Dist: controlnet-aux>=0.0.7
-Requires-Dist: opencv-python>=4.8.0
+Requires-Dist: numpy>=1.21.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: flake8>=6.0.0; extra == "dev"
+Provides-Extra: full
+Requires-Dist: controlnet-aux>=0.0.7; extra == "full"
+Requires-Dist: opencv-python>=4.8.0; extra == "full"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -408,7 +410,14 @@ pip install opencv-python>=4.8.0
 ollamadiffuser verify-deps
 
 # Or install with all optional dependencies
+# For bash/sh:
 pip install ollamadiffuser[full]
+
+# For zsh (macOS default):
+pip install "ollamadiffuser[full]"
+
+# For fish shell:
+pip install 'ollamadiffuser[full]'
 ```
 
 #### Complete Dependency Check
@@ -426,8 +435,17 @@ If you're having persistent issues:
 ```bash
 # Uninstall and reinstall
 pip uninstall ollamadiffuser
+
+# Reinstall with all dependencies (shell-specific syntax):
+# For bash/sh:
 pip install --no-cache-dir ollamadiffuser[full]
 
+# For zsh (macOS default):
+pip install --no-cache-dir "ollamadiffuser[full]"
+
+# For fish shell:
+pip install --no-cache-dir 'ollamadiffuser[full]'
+
 # Verify installation
 ollamadiffuser verify-deps
 ```

{ollamadiffuser-1.1.2 → ollamadiffuser-1.1.4}/ollamadiffuser.egg-info/requires.txt

@@ -16,8 +16,7 @@ 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
+numpy>=1.21.0
 
 [dev]
 pytest>=7.0.0
@@ -25,3 +24,7 @@ pytest-asyncio>=0.21.0
 black>=23.0.0
 isort>=5.12.0
 flake8>=6.0.0
+
+[full]
+controlnet-aux>=0.0.7
+opencv-python>=4.8.0

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ollamadiffuser"
-version = "1.1.2"
+version = "1.1.4"
 authors = [
     {name = "OllamaDiffuser Team", email = "ollamadiffuser@gmail.com"}
 ]
@@ -62,8 +62,7 @@ dependencies = [
     "psutil>=5.9.0",
     "jinja2>=3.0.0",
     "peft>=0.10.0",
-    "controlnet-aux>=0.0.7",
-    "opencv-python>=4.8.0",
+    "numpy>=1.21.0",
 ]
 
 [project.optional-dependencies]
@@ -74,6 +73,10 @@ dev = [
     "isort>=5.12.0",
     "flake8>=6.0.0",
 ]
+full = [
+    "controlnet-aux>=0.0.7",
+    "opencv-python>=4.8.0",
+]
 
 [project.scripts]
 ollamadiffuser = "ollamadiffuser.__main__:main"

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

@@ -1,5 +1,15 @@
 from setuptools import setup, find_packages
 import sys
+import os
+
+# Read version from __init__.py
+def get_version():
+    init_path = os.path.join(os.path.dirname(__file__), "ollamadiffuser", "__init__.py")
+    with open(init_path, "r", encoding="utf-8") as f:
+        for line in f:
+            if line.startswith("__version__"):
+                return line.split("=")[1].strip().strip('"').strip("'")
+    raise RuntimeError("Unable to find version string.")
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
@@ -27,23 +37,15 @@ REQUIRED = [
     "numpy>=1.21.0",
 ]
 
-# Optional dependencies that can fall back gracefully
-OPTIONAL = [
+# Optional dependencies for [full] installation
+FULL_EXTRAS = [
     "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.2",
+    version=get_version(),
     author="OllamaDiffuser Team",
     author_email="ollamadiffuser@gmail.com",
     description="🎨 Ollama-like image generation model management tool with LoRA support",
@@ -65,7 +67,7 @@ setup(
         "Topic :: Multimedia :: Graphics",
     ],
     python_requires=">=3.10",
-    install_requires=install_requires,
+    install_requires=REQUIRED,
     extras_require={
         "dev": [
             "pytest>=7.0.0",
@@ -74,10 +76,7 @@ setup(
             "isort>=5.12.0",
             "flake8>=6.0.0",
         ],
-        "full": [
-            "controlnet-aux>=0.0.7",
-            "opencv-python>=4.8.0",
-        ],
+        "full": FULL_EXTRAS,
     },
     entry_points={
         "console_scripts": [