schenesort 2.1.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

schenesort/cli.py

@@ -444,6 +444,9 @@ def get(
     paths_only: Annotated[
         bool, typer.Option("--paths-only", "-p", help="Output only file paths (for scripting)")
     ] = False,
+    browse: Annotated[
+        bool, typer.Option("--browse", "-b", help="Open results in TUI browser")
+    ] = False,
 ) -> None:
     """Query wallpapers by metadata attributes."""
     from schenesort.db import WallpaperDB
@@ -472,7 +475,13 @@ def get(
             typer.echo("No wallpapers found matching criteria.", err=True)
             raise typer.Exit(1)
 
-        if paths_only:
+        if browse:
+            from schenesort.tui import WallpaperBrowser
+
+            files = [Path(r["path"]) for r in results]
+            app_instance = WallpaperBrowser(files=files)
+            app_instance.run()
+        elif paths_only:
             for r in results:
                 typer.echo(r["path"])
         else:
@@ -542,7 +551,10 @@ def stats() -> None:
 
 @app.command()
 def browse(
-    path: Annotated[Path, typer.Argument(help="Directory or file to browse")],
+    path: Annotated[
+        Path | None,
+        typer.Argument(help="Directory or file to browse (default: config wallpaper path)"),
+    ] = None,
     recursive: Annotated[
         bool, typer.Option("--recursive", "-r", help="Browse directories recursively")
     ] = False,
@@ -550,6 +562,15 @@ def browse(
     """Browse wallpapers in a terminal UI with image preview and metadata display."""
     from schenesort.tui import WallpaperBrowser
 
+    if path is None:
+        cfg = load_config()
+        if cfg.wallpaper_path:
+            path = Path(cfg.wallpaper_path).expanduser()
+        else:
+            typer.echo("Error: No path provided and no wallpaper path configured.", err=True)
+            typer.echo("Set paths.wallpaper in config or provide a path argument.", err=True)
+            raise typer.Exit(1)
+
     path = path.resolve()
 
     if not path.exists():
@@ -572,22 +593,17 @@ def config(
     config_path = get_config_path()
 
     if create:
+        already_existed = config_path.exists()
         path = create_default_config()
-        if path.exists():
-            typer.echo(f"Config file: {path}")
-            if path == config_path:
-                typer.echo("(already existed)" if not create else "(created)")
-    else:
+        typer.echo(f"Config file: {path}")
+        typer.echo("(already existed)" if already_existed else "(created)")
+
+    if config_path.exists():
+        typer.echo(f"Config file: {config_path}\n")
+        typer.echo(config_path.read_text())
+    elif not create:
         typer.echo(f"Config file: {config_path}")
-        if config_path.exists():
-            typer.echo("\nCurrent settings:")
-            cfg = load_config()
-            typer.echo(f"  ollama.host: {cfg.ollama_host or '(default: localhost:11434)'}")
-            typer.echo(f"  ollama.model: {cfg.ollama_model}")
-            if cfg.wallpaper_path:
-                typer.echo(f"  paths.wallpaper: {cfg.wallpaper_path}")
-        else:
-            typer.echo("(file does not exist, use --create to create)")
+        typer.echo("(file does not exist, use --create to create)")
 
 
 DEFAULT_MODEL = "llava"
@@ -1108,20 +1124,27 @@ def metadata_generate(
             metadata = existing
             metadata.description = str(description)
             metadata.ai_model = effective_model
-            if isinstance(result.get("scene"), str):
-                metadata.scene = result["scene"]
-            if isinstance(result.get("tags"), list):
-                metadata.tags = result["tags"]
-            if isinstance(result.get("mood"), list):
-                metadata.mood = result["mood"]
-            if isinstance(result.get("style"), str):
-                metadata.style = result["style"]
-            if isinstance(result.get("colors"), list):
-                metadata.colors = result["colors"]
-            if isinstance(result.get("time"), str):
-                metadata.time_of_day = result["time"]
-            if isinstance(result.get("subject"), str):
-                metadata.subject = result["subject"]
+            scene = result.get("scene")
+            if isinstance(scene, str):
+                metadata.scene = scene
+            tags = result.get("tags")
+            if isinstance(tags, list):
+                metadata.tags = tags
+            mood = result.get("mood")
+            if isinstance(mood, list):
+                metadata.mood = mood
+            style = result.get("style")
+            if isinstance(style, str):
+                metadata.style = style
+            colors = result.get("colors")
+            if isinstance(colors, list):
+                metadata.colors = colors
+            time_val = result.get("time")
+            if isinstance(time_val, str):
+                metadata.time_of_day = time_val
+            subject = result.get("subject")
+            if isinstance(subject, str):
+                metadata.subject = subject
 
             # Add image dimensions
             width, height = get_image_dimensions(target_path)
@@ -1202,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/config.py

@@ -73,7 +73,15 @@ def load_config() -> Config:
 
         return config
 
-    except Exception:
+    except tomllib.TOMLDecodeError as e:
+        import sys
+
+        print(f"Warning: Failed to parse config file: {e}", file=sys.stderr)
+        return Config()
+    except Exception as e:
+        import sys
+
+        print(f"Warning: Failed to load config file: {e}", file=sys.stderr)
         return Config()
 
 

schenesort/tui/app.py

@@ -73,10 +73,16 @@ class WallpaperBrowser(App):
         Binding("end", "last_image", "Last", show=False),
     ]
 
-    def __init__(self, path: Path, recursive: bool = False) -> None:
+    def __init__(
+        self,
+        path: Path | None = None,
+        recursive: bool = False,
+        files: list[Path] | None = None,
+    ) -> None:
         super().__init__()
         self._base_path = path
         self._recursive = recursive
+        self._files = files  # Pre-specified file list (from query results)
         self._images: list[Path] = []
         self._current_index: int = 0
 
@@ -99,7 +105,15 @@ class WallpaperBrowser(App):
             self._update_status("No images found", "")
 
     def _load_images(self) -> None:
-        """Load list of images from the specified path."""
+        """Load list of images from the specified path or file list."""
+        # If files were provided directly (e.g., from query results), use them
+        if self._files:
+            self._images = [f for f in self._files if f.exists()]
+            return
+
+        if self._base_path is None:
+            return
+
         if self._base_path.is_file():
             if self._base_path.suffix.lower() in VALID_IMAGE_EXTENSIONS:
                 self._images = [self._base_path]
@@ -128,12 +142,11 @@ class WallpaperBrowser(App):
         panel.update_metadata(metadata, current_image.name)
 
         # Update status
-        self._update_status(
-            str(current_image.relative_to(self._base_path))
-            if current_image.is_relative_to(self._base_path)
-            else current_image.name,
-            f"{self._current_index + 1}/{len(self._images)}",
-        )
+        if self._base_path and current_image.is_relative_to(self._base_path):
+            display_path = str(current_image.relative_to(self._base_path))
+        else:
+            display_path = current_image.name
+        self._update_status(display_path, f"{self._current_index + 1}/{len(self._images)}")
 
     def _update_status(self, left: str, right: str) -> None:
         """Update the status bar."""

schenesort/tui/widgets/image_preview.py

@@ -20,8 +20,10 @@ class ImagePreview(Container):
     }
 
     ImagePreview Image {
-        width: 100%;
-        height: 100%;
+        width: auto;
+        height: auto;
+        max-width: 100%;
+        max-height: 100%;
     }
 
     ImagePreview .no-image {

{schenesort-2.1.1.dist-info → schenesort-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schenesort
-Version: 2.1.1
+Version: 2.3.0
 Summary: Wallpaper collection management CLI tool
 License-File: LICENSE
 Requires-Python: >=3.13
@@ -12,20 +12,43 @@ Requires-Dist: textual>=0.95.0
 Requires-Dist: typer>=0.21.1
 Description-Content-Type: text/markdown
 
-# Schenesort v2.1.1
+# Schenesort v2.3.0
 
-A CLI tool for managing wallpaper collections with AI-powered metadata, terminal UI browsing, and fast SQLite-based querying.
+A CLI tool for managing wallpaper collections with model generated metadata, terminal UI browsing, and SQLite-based
+querying.
+
+schenesort takes a directory of random wallpapers, with random filenames, and uses olama with a decent vision model to
+- look at each wallpaper
+- rename the wallpaper to something sensible
+- drop a XMP sidecar with metadata about the file
+
+Once you have a collection of wallpapers re-named with metadata sidecars, run the indexer over it to create a sqlitedb
+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)"`
+
+![Browse example - Autumn](docs/browse-destruction.png)
 
 ## Installation
 
 ```bash
+uv tool install schenesort
+```
+
+For development:
+
+```bash
+git clone https://github.com/sthysel/schenesort.git
+cd schenesort
 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 AI metadata for images
+# Generate metadata for images
 schenesort metadata generate ~/wallpapers -r
 
 # Browse with TUI
@@ -54,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)                  |
@@ -67,8 +91,14 @@ Browse your wallpaper collection with image preview and metadata display:
 ```bash
 schenesort browse ~/wallpapers
 schenesort browse ~/wallpapers -r  # recursive
+schenesort browse                  # uses paths.wallpaper from config
+schenesort get --mood peaceful -b  # browse query results
 ```
 
+![Browse example - Autumn](docs/browse-autumn.png)
+
+![Browse example - Stallman](docs/browse-stallman.png)
+
 **Keyboard shortcuts:**
 | Key          | Action         |
 |--------------|----------------|
@@ -104,6 +134,10 @@ schenesort get --random -n 10             # 10 random wallpapers
 schenesort get -1                         # single random wallpaper
 schenesort get -1 --mood dramatic         # random with filter
 
+# Browse results in TUI
+schenesort get --mood peaceful --browse   # open matches in browser
+schenesort get --style photography -b     # short form
+
 # For scripting (paths only)
 schenesort get -1 -p                      # just the path
 feh $(schenesort get -1 -p)               # set random wallpaper
@@ -115,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.
@@ -136,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
@@ -304,15 +368,15 @@ Metadata is stored in standard XMP format, compatible with digiKam, darktable, a
 
 Images are tagged with recommended screen sizes based on resolution:
 
-| Screen | Resolution |
-|--------|------------|
-| 8K | 7680x4320 |
-| 5K | 5120x2880 |
-| 4K | 3840x2160 |
-| Ultrawide 4K | 5120x2160 |
-| Ultrawide 1440p | 3440x1440 |
-| 1440p | 2560x1440 |
-| 1080p | 1920x1080 |
-| 720p | 1280x720 |
+| Screen          | Resolution |
+|-----------------|------------|
+| 8K              | 7680x4320  |
+| 5K              | 5120x2880  |
+| 4K              | 3840x2160  |
+| Ultrawide 4K    | 5120x2160  |
+| Ultrawide 1440p | 3440x1440  |
+| 1440p           | 2560x1440  |
+| 1080p           | 1920x1080  |
+| 720p            | 1280x720   |
 
 An image is recommended for a screen size if it can cover the screen without upscaling.

schenesort-2.3.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+schenesort/__init__.py,sha256=Z7bmXIWiFUCKj1j4JRlPZvmfzc4RC10Lh1WCKNsJn20,61
+schenesort/cli.py,sha256=LU_s4c7Eg_uozxP5I599TV9Y-WirQxx0h-8LvFNYlqM,51550
+schenesort/config.py,sha256=8EuYv2nma3QKnLPSAgAsaOHZlORzinHjy-Bj_LKPfJA,2739
+schenesort/db.py,sha256=RbfZN6d5O5MkTRPbu51fA7tQLOJf1huIjxFdoT4sESk,11398
+schenesort/xmp.py,sha256=1VS_I4akY8Dv_KLPOdzPgBCFy0280oSCsMmo-_A9cNE,9749
+schenesort/tui/__init__.py,sha256=bqSyRlefPfsYhUxsub4Rltz7yjCQVPXvhzj9n2bn370,141
+schenesort/tui/app.py,sha256=HGKBnszTJXtLu9Mo7eJY4wiO2qkB7dFftBoM4GC_js4,6202
+schenesort/tui/widgets/__init__.py,sha256=3cm7vfXG5-xC_UhIbgEtuMxq5I5tXg6okokJ4ecjGIE,202
+schenesort/tui/widgets/image_preview.py,sha256=j_KTQBJk0vbO18FzTo-GYkRlgerBe1K3VGQwMPbEuUw,2846
+schenesort/tui/widgets/metadata_panel.py,sha256=8DnsvDdKf3jzqHOo7dDmxJxL0Mjx5mX7HNwwcMUcJn0,4860
+schenesort-2.3.0.dist-info/METADATA,sha256=F8AMExvB_0nU7CgGkW2CM1az2XJizdQafy0EBJkwnPw,12592
+schenesort-2.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+schenesort-2.3.0.dist-info/entry_points.txt,sha256=J5lS-N6KgmzjutFi5bG1jv-4Wszbz3MfcOHcbznBVcw,50
+schenesort-2.3.0.dist-info/licenses/LICENSE,sha256=sMw3SMb9ec9dbM2twEMVeunsGwuljza-9kEXg4kSJpg,1070
+schenesort-2.3.0.dist-info/RECORD,,

schenesort-2.1.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-schenesort/__init__.py,sha256=Z7bmXIWiFUCKj1j4JRlPZvmfzc4RC10Lh1WCKNsJn20,61
-schenesort/cli.py,sha256=L7TISfb_ebXI6Do0ncpWsYOj--OZtxfTnVqWjgTg8-I,45659
-schenesort/config.py,sha256=n8rf2htxwYuyRqBXnfEZ0pJIwK5DTTQws82MPbDQ4zQ,2476
-schenesort/db.py,sha256=RbfZN6d5O5MkTRPbu51fA7tQLOJf1huIjxFdoT4sESk,11398
-schenesort/xmp.py,sha256=1VS_I4akY8Dv_KLPOdzPgBCFy0280oSCsMmo-_A9cNE,9749
-schenesort/tui/__init__.py,sha256=bqSyRlefPfsYhUxsub4Rltz7yjCQVPXvhzj9n2bn370,141
-schenesort/tui/app.py,sha256=nyEUBuffGuIrXJvzNjq0pVFujhJ2Z-1NAjy3bdK_kuU,5736
-schenesort/tui/widgets/__init__.py,sha256=3cm7vfXG5-xC_UhIbgEtuMxq5I5tXg6okokJ4ecjGIE,202
-schenesort/tui/widgets/image_preview.py,sha256=FhFwaIPzNkwcMlL9aqKV7yvuI3SVe6ATYWgY__9ySo4,2795
-schenesort/tui/widgets/metadata_panel.py,sha256=8DnsvDdKf3jzqHOo7dDmxJxL0Mjx5mX7HNwwcMUcJn0,4860
-schenesort-2.1.1.dist-info/METADATA,sha256=a2kMj55og_OmHo_zJ1_OOzwQr_5PecBY2oIqrOcf51I,9928
-schenesort-2.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-schenesort-2.1.1.dist-info/entry_points.txt,sha256=J5lS-N6KgmzjutFi5bG1jv-4Wszbz3MfcOHcbznBVcw,50
-schenesort-2.1.1.dist-info/licenses/LICENSE,sha256=sMw3SMb9ec9dbM2twEMVeunsGwuljza-9kEXg4kSJpg,1070
-schenesort-2.1.1.dist-info/RECORD,,