schenesort 2.2.0__tar.gz → 2.3.0__tar.gz

{schenesort-2.2.0 → schenesort-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schenesort
-Version: 2.2.0
+Version: 2.3.0
 Summary: Wallpaper collection management CLI tool
 License-File: LICENSE
 Requires-Python: >=3.13
@@ -12,7 +12,7 @@ Requires-Dist: textual>=0.95.0
 Requires-Dist: typer>=0.21.1
 Description-Content-Type: text/markdown
 
-# Schenesort v2.2.0
+# Schenesort v2.3.0
 
 A CLI tool for managing wallpaper collections with model generated metadata, terminal UI browsing, and SQLite-based
 querying.
@@ -26,7 +26,7 @@ Once you have a collection of wallpapers re-named with metadata sidecars, run th
 that can be queried to retrieve suggestions based on tags, colours, names and the like. Then use `get` to get a
 wallpaper path `feh $(schenesort get -1 -p)` or `hyprctl hyprpaper wallpaper "eDP-1,$(schenesort get -1 -p)"`
 
-schenesort also provides a bunch of utility commands to satisfy a gooner collection.
+![Browse example - Autumn](docs/browse-destruction.png)
 
 ## Installation
 
@@ -44,6 +44,9 @@ uv sync
 
 ## Quick Start
 
+To generate metadata you need a olama server serving llava nearby, it takes a minute to set one up see [ollama
+setup](./ollama-setup.md).
+
 ```bash
 # Generate metadata for images
 schenesort metadata generate ~/wallpapers -r
@@ -74,6 +77,7 @@ schenesort get -1 -p | xargs feh  # random wallpaper
 | `info`                       | Show collection file statistics                     |
 | `describe`                   | AI-rename images based on content (Ollama)          |
 | `models`                     | List available Ollama models                        |
+| `collage`                    | Create a collage grid from matching wallpapers      |
 | `metadata show`              | Display XMP sidecar metadata                        |
 | `metadata set`               | Manually set metadata fields                        |
 | `metadata generate`          | Generate metadata with AI (Ollama)                  |
@@ -91,8 +95,6 @@ schenesort browse                  # uses paths.wallpaper from config
 schenesort get --mood peaceful -b  # browse query results
 ```
 
-![Browse example - Greek](docs/browse-greek.png)
-
 ![Browse example - Autumn](docs/browse-autumn.png)
 
 ![Browse example - Stallman](docs/browse-stallman.png)
@@ -147,6 +149,36 @@ schenesort stats
 
 The database is stored at `$XDG_DATA_HOME/schenesort/index.db` (default: `~/.local/share/schenesort/index.db`).
 
+## Collage Generation
+
+Create a collage grid (up to 4x4) from wallpapers matching query criteria:
+
+```bash
+# Create a 2x2 collage (default)
+schenesort collage output.png --mood peaceful
+
+# Create a 4x4 collage of landscape images
+schenesort collage wall.png --subject landscape --cols 4 --rows 4
+
+# Custom tile size (default: 480x270)
+schenesort collage collage.png --tile-width 640 --tile-height 360
+
+# Combine filters
+schenesort collage night_cities.png --time night --subject urban --cols 3 --rows 2
+```
+
+![Collage example](docs/collage.png)
+
+| Option          | Description                          | Default |
+|-----------------|--------------------------------------|---------|
+| `--cols`        | Number of columns (1-4)              | 2       |
+| `--rows`        | Number of rows (1-4)                 | 2       |
+| `--tile-width`  | Width of each tile in pixels         | 480     |
+| `--tile-height` | Height of each tile in pixels        | 270     |
+| `--random`      | Select images randomly               | True    |
+
+All `get` query filters are supported: `--tag`, `--mood`, `--color`, `--style`, `--subject`, `--time`, `--screen`, `--min-width`, `--min-height`, `--search`.
+
 ## Metadata Management
 
 Store metadata in XMP sidecar files (`.xmp`) alongside images without modifying the original files.
@@ -168,7 +200,7 @@ Store metadata in XMP sidecar files (`.xmp`) alongside images without modifying
 | `source`             | Source URL or info                                       |
 | `ai_model`           | Model used for metadata generation                       |
 
-### Generate Metadata with AI
+### Generate Metadata using ollama
 
 ```bash
 # Preview what would be generated

{schenesort-2.2.0 → schenesort-2.3.0}/README.md

@@ -1,4 +1,4 @@
-# Schenesort v2.2.0
+# Schenesort v2.3.0
 
 A CLI tool for managing wallpaper collections with model generated metadata, terminal UI browsing, and SQLite-based
 querying.
@@ -12,7 +12,7 @@ Once you have a collection of wallpapers re-named with metadata sidecars, run th
 that can be queried to retrieve suggestions based on tags, colours, names and the like. Then use `get` to get a
 wallpaper path `feh $(schenesort get -1 -p)` or `hyprctl hyprpaper wallpaper "eDP-1,$(schenesort get -1 -p)"`
 
-schenesort also provides a bunch of utility commands to satisfy a gooner collection.
+![Browse example - Autumn](docs/browse-destruction.png)
 
 ## Installation
 
@@ -30,6 +30,9 @@ uv sync
 
 ## Quick Start
 
+To generate metadata you need a olama server serving llava nearby, it takes a minute to set one up see [ollama
+setup](./ollama-setup.md).
+
 ```bash
 # Generate metadata for images
 schenesort metadata generate ~/wallpapers -r
@@ -60,6 +63,7 @@ schenesort get -1 -p | xargs feh  # random wallpaper
 | `info`                       | Show collection file statistics                     |
 | `describe`                   | AI-rename images based on content (Ollama)          |
 | `models`                     | List available Ollama models                        |
+| `collage`                    | Create a collage grid from matching wallpapers      |
 | `metadata show`              | Display XMP sidecar metadata                        |
 | `metadata set`               | Manually set metadata fields                        |
 | `metadata generate`          | Generate metadata with AI (Ollama)                  |
@@ -77,8 +81,6 @@ schenesort browse                  # uses paths.wallpaper from config
 schenesort get --mood peaceful -b  # browse query results
 ```
 
-![Browse example - Greek](docs/browse-greek.png)
-
 ![Browse example - Autumn](docs/browse-autumn.png)
 
 ![Browse example - Stallman](docs/browse-stallman.png)
@@ -133,6 +135,36 @@ schenesort stats
 
 The database is stored at `$XDG_DATA_HOME/schenesort/index.db` (default: `~/.local/share/schenesort/index.db`).
 
+## Collage Generation
+
+Create a collage grid (up to 4x4) from wallpapers matching query criteria:
+
+```bash
+# Create a 2x2 collage (default)
+schenesort collage output.png --mood peaceful
+
+# Create a 4x4 collage of landscape images
+schenesort collage wall.png --subject landscape --cols 4 --rows 4
+
+# Custom tile size (default: 480x270)
+schenesort collage collage.png --tile-width 640 --tile-height 360
+
+# Combine filters
+schenesort collage night_cities.png --time night --subject urban --cols 3 --rows 2
+```
+
+![Collage example](docs/collage.png)
+
+| Option          | Description                          | Default |
+|-----------------|--------------------------------------|---------|
+| `--cols`        | Number of columns (1-4)              | 2       |
+| `--rows`        | Number of rows (1-4)                 | 2       |
+| `--tile-width`  | Width of each tile in pixels         | 480     |
+| `--tile-height` | Height of each tile in pixels        | 270     |
+| `--random`      | Select images randomly               | True    |
+
+All `get` query filters are supported: `--tag`, `--mood`, `--color`, `--style`, `--subject`, `--time`, `--screen`, `--min-width`, `--min-height`, `--search`.
+
 ## Metadata Management
 
 Store metadata in XMP sidecar files (`.xmp`) alongside images without modifying the original files.
@@ -154,7 +186,7 @@ Store metadata in XMP sidecar files (`.xmp`) alongside images without modifying
 | `source`             | Source URL or info                                       |
 | `ai_model`           | Model used for metadata generation                       |
 
-### Generate Metadata with AI
+### Generate Metadata using ollama
 
 ```bash
 # Preview what would be generated

{schenesort-2.2.0 → schenesort-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "schenesort"
-version = "2.2.0"
+version = "2.3.0"
 description = "Wallpaper collection management CLI tool"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -56,7 +56,7 @@ testpaths = ["tests"]
 pythonpath = ["src"]
 
 [tool.bumpversion]
-current_version = "2.2.0"
+current_version = "2.3.0"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{schenesort-2.2.0 → schenesort-2.3.0}/src/schenesort/cli.py

@@ -1225,6 +1225,138 @@ def metadata_update_dimensions(
     typer.echo(f"\n{action} {updated_count} sidecar(s), skipped {skipped_count}.")
 
 
+@app.command()
+def collage(
+    output: Annotated[Path, typer.Argument(help="Output PNG file path")],
+    tag: Annotated[str | None, typer.Option("--tag", "-t", help="Filter by tag")] = None,
+    mood: Annotated[str | None, typer.Option("--mood", "-m", help="Filter by mood")] = None,
+    color: Annotated[str | None, typer.Option("--color", "-c", help="Filter by color")] = None,
+    style: Annotated[str | None, typer.Option("--style", "-s", help="Filter by style")] = None,
+    subject: Annotated[str | None, typer.Option("--subject", help="Filter by subject")] = None,
+    time: Annotated[str | None, typer.Option("--time", help="Filter by time of day")] = None,
+    screen: Annotated[
+        str | None, typer.Option("--screen", help="Filter by recommended screen (4K, 1440p, etc)")
+    ] = None,
+    min_width: Annotated[
+        int | None, typer.Option("--min-width", help="Minimum width in pixels")
+    ] = None,
+    min_height: Annotated[
+        int | None, typer.Option("--min-height", help="Minimum height in pixels")
+    ] = None,
+    search: Annotated[
+        str | None, typer.Option("--search", "-q", help="Search description, scene, style, subject")
+    ] = None,
+    cols: Annotated[int, typer.Option("--cols", help="Number of columns (1-4)")] = 2,
+    rows: Annotated[int, typer.Option("--rows", help="Number of rows (1-4)")] = 2,
+    tile_width: Annotated[
+        int, typer.Option("--tile-width", "-w", help="Width of each tile in pixels")
+    ] = 480,
+    tile_height: Annotated[
+        int, typer.Option("--tile-height", "-h", help="Height of each tile in pixels")
+    ] = 270,
+    random: Annotated[bool, typer.Option("--random", "-R", help="Select images randomly")] = True,
+) -> None:
+    """Create a collage of wallpapers matching the given criteria (max 4x4 grid)."""
+    from PIL import Image
+
+    from schenesort.db import WallpaperDB
+
+    # Validate grid size
+    if cols < 1 or cols > 4:
+        typer.echo("Error: --cols must be between 1 and 4.", err=True)
+        raise typer.Exit(1)
+    if rows < 1 or rows > 4:
+        typer.echo("Error: --rows must be between 1 and 4.", err=True)
+        raise typer.Exit(1)
+
+    num_images = cols * rows
+
+    with WallpaperDB() as db:
+        results = db.query(
+            tag=tag,
+            mood=mood,
+            color=color,
+            style=style,
+            subject=subject,
+            time_of_day=time,
+            screen=screen,
+            min_width=min_width,
+            min_height=min_height,
+            search=search,
+            limit=num_images,
+            random=random,
+        )
+
+        if not results:
+            typer.echo("No wallpapers found matching criteria.", err=True)
+            raise typer.Exit(1)
+
+        if len(results) < num_images:
+            typer.echo(
+                f"Warning: Only found {len(results)} image(s), "
+                f"need {num_images} for {cols}x{rows} grid."
+            )
+
+        # Create collage canvas
+        collage_width = cols * tile_width
+        collage_height = rows * tile_height
+        collage_img = Image.new("RGB", (collage_width, collage_height), color=(0, 0, 0))
+
+        typer.echo(f"Creating {cols}x{rows} collage ({collage_width}x{collage_height})...")
+
+        for idx, r in enumerate(results):
+            if idx >= num_images:
+                break
+
+            filepath = Path(r["path"])
+            row = idx // cols
+            col = idx % cols
+
+            try:
+                with Image.open(filepath) as img:
+                    # Convert to RGB if necessary (handles RGBA, palette, etc.)
+                    if img.mode != "RGB":
+                        img = img.convert("RGB")
+
+                    # Resize to fit tile while preserving aspect ratio, then crop to fill
+                    img_ratio = img.width / img.height
+                    tile_ratio = tile_width / tile_height
+
+                    if img_ratio > tile_ratio:
+                        # Image is wider - fit by height, crop width
+                        new_height = tile_height
+                        new_width = int(tile_height * img_ratio)
+                    else:
+                        # Image is taller - fit by width, crop height
+                        new_width = tile_width
+                        new_height = int(tile_width / img_ratio)
+
+                    img = img.resize((new_width, new_height), Image.Resampling.LANCZOS)
+
+                    # Center crop to tile size
+                    left = (new_width - tile_width) // 2
+                    top = (new_height - tile_height) // 2
+                    img = img.crop((left, top, left + tile_width, top + tile_height))
+
+                    # Paste into collage
+                    x = col * tile_width
+                    y = row * tile_height
+                    collage_img.paste(img, (x, y))
+
+                    typer.echo(f"  [{row},{col}] {filepath.name}")
+
+            except Exception as e:
+                typer.echo(f"  [{row},{col}] Failed to load {filepath.name}: {e}", err=True)
+
+        # Save collage
+        output = output.resolve()
+        if not output.suffix.lower() == ".png":
+            output = output.with_suffix(".png")
+
+        collage_img.save(output, "PNG")
+        typer.echo(f"\nSaved collage to: {output}")
+
+
 @metadata_app.command("embed")
 def metadata_embed(
     path: Annotated[Path, typer.Argument(help="Image file or directory")],

{schenesort-2.2.0 → schenesort-2.3.0}/uv.lock

@@ -595,7 +595,7 @@ wheels = [
 
 [[package]]
 name = "schenesort"
-version = "1.0.0"
+version = "2.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "defusedxml" },