slide-stream 2.2.0__tar.gz → 2.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slide-stream
-Version: 2.2.0
+Version: 2.3.0
 Summary: An AI-powered tool to automatically create video presentations from Markdown and PowerPoint files
 Project-URL: Homepage, https://github.com/michael-borck/slide-stream
 Project-URL: Repository, https://github.com/michael-borck/slide-stream
@@ -168,7 +168,19 @@ slide-stream create --config my-config.yaml presentation.pptx video.mp4
 
 ## ⚙️ Configuration
 
-SlideStream uses YAML configuration files for maximum flexibility:
+SlideStream layers configuration so you set shared things (a TTS server URL,
+API keys) once and keep per-deck settings separate. Later layers win:
+
+1. Built-in defaults
+2. **`~/.slidestream.yaml`** — personal: your Chatterbox/LLM server URLs and
+   API-key references, shared across every project
+3. **`./slidestream.yaml`** (or `--config FILE`) — settings for the deck at hand
+4. **CLI flags** (`--voice`, `--tts-base-url`, `--narration-seconds`, …) — win
+   over everything, for one-off runs
+
+Run `slide-stream init` to write a starter `slidestream.yaml`. API keys are
+read from the environment via `${VAR}` expansion, so secrets never live in the
+files. Example:
 
 ```yaml
 # slidestream.yaml

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

@@ -105,7 +105,19 @@ slide-stream create --config my-config.yaml presentation.pptx video.mp4
 
 ## ⚙️ Configuration
 
-SlideStream uses YAML configuration files for maximum flexibility:
+SlideStream layers configuration so you set shared things (a TTS server URL,
+API keys) once and keep per-deck settings separate. Later layers win:
+
+1. Built-in defaults
+2. **`~/.slidestream.yaml`** — personal: your Chatterbox/LLM server URLs and
+   API-key references, shared across every project
+3. **`./slidestream.yaml`** (or `--config FILE`) — settings for the deck at hand
+4. **CLI flags** (`--voice`, `--tts-base-url`, `--narration-seconds`, …) — win
+   over everything, for one-off runs
+
+Run `slide-stream init` to write a starter `slidestream.yaml`. API keys are
+read from the environment via `${VAR}` expansion, so secrets never live in the
+files. Example:
 
 ```yaml
 # slidestream.yaml

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "slide-stream"
-version = "2.2.0"
+version = "2.3.0"
 description = "An AI-powered tool to automatically create video presentations from Markdown and PowerPoint files"
 readme = "README.md"
 license = { text = "MIT" }

{slide_stream-2.2.0 → slide_stream-2.3.0}/src/slide_stream/__init__.py

@@ -1,5 +1,5 @@
 """Slide Stream - AI-powered tool for creating video presentations from Markdown."""
 
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 __author__ = "Michael Borck"
 __email__ = "michael.borck@curtin.edu.au"

{slide_stream-2.2.0 → slide_stream-2.3.0}/src/slide_stream/config_loader.py

@@ -91,47 +91,88 @@ def expand_env_vars(value: Any) -> Any:
     return value
 
 
-def find_config_file() -> Path | None:
-    """Find configuration file in standard locations."""
-    possible_locations = [
+def _first_existing(*candidates: Path) -> Path | None:
+    """Return the first path that exists, or None."""
+    for path in candidates:
+        if path.exists():
+            return path
+    return None
+
+
+def find_home_config() -> Path | None:
+    """Find the user-level config (~/.slidestream.yaml) — personal defaults
+    like a TTS server URL and API keys, shared across all projects."""
+    return _first_existing(
+        Path.home() / ".slidestream.yaml",
+        Path.home() / ".slidestream.yml",
+    )
+
+
+def find_project_config() -> Path | None:
+    """Find the project-level config (./slidestream.yaml) — settings for the
+    deck at hand."""
+    return _first_existing(
         Path("./slidestream.yaml"),
         Path("./slidestream.yml"),
-        Path.home() / ".slidestream.yaml",
-        Path.home() / ".slidestream.yml"
-    ]
+    )
 
-    for location in possible_locations:
-        if location.exists():
-            return location
 
-    return None
+def find_config_file() -> Path | None:
+    """Find a single config file (project preferred, then home).
 
+    Retained for backwards compatibility; ``load_config`` layers home and
+    project configs rather than using this.
+    """
+    return find_project_config() or find_home_config()
+
+
+def _read_config_file(config_file: Path) -> dict[str, Any] | None:
+    """Read and parse one YAML config file (None if empty)."""
+    try:
+        with open(config_file, encoding="utf-8") as f:
+            return yaml.safe_load(f)
+    except yaml.YAMLError as e:
+        raise ConfigurationError(f"Invalid YAML in config file: {e}")
+    except Exception as e:
+        raise ConfigurationError(f"Error reading config file: {e}")
 
-def load_config(config_path: str | None = None) -> dict[str, Any]:
-    """Load configuration from file or return defaults."""
-    config = DEFAULT_CONFIG.copy()
 
+def load_config(config_path: str | None = None) -> dict[str, Any]:
+    """Load configuration by layering, later layers winning:
+
+    1. Built-in defaults
+    2. User-level config (~/.slidestream.yaml) — personal server URLs / keys
+    3. Project-level config — the explicit ``config_path`` if given, otherwise
+       ./slidestream.yaml
+
+    So a personal home config can hold your TTS server and API keys once, and
+    each project's config only needs its deck-specific overrides.
+    """
+    import copy
+
+    config = copy.deepcopy(DEFAULT_CONFIG)
+
+    # Layer sources: (label, path). Home is always layered underneath; an
+    # explicit --config replaces the auto-discovered project file but still
+    # sits on top of home.
+    sources: list[Path] = []
+    if home_config := find_home_config():
+        sources.append(home_config)
     if config_path:
-        config_file = Path(config_path)
-        if not config_file.exists():
+        project_config = Path(config_path)
+        if not project_config.exists():
             raise ConfigurationError(f"Configuration file not found: {config_path}")
-    else:
-        config_file = find_config_file()
-
-    if config_file:
-        try:
-            with open(config_file, encoding='utf-8') as f:
-                file_config = yaml.safe_load(f)
-
-            if file_config:
-                # Deep merge with defaults
-                config = merge_configs(config, file_config)
-                console.print(f"✅ Loaded configuration from: {config_file}")
-        except yaml.YAMLError as e:
-            raise ConfigurationError(f"Invalid YAML in config file: {e}")
-        except Exception as e:
-            raise ConfigurationError(f"Error reading config file: {e}")
-    else:
+        sources.append(project_config)
+    elif project_config := find_project_config():
+        sources.append(project_config)
+
+    for source in sources:
+        file_config = _read_config_file(source)
+        if file_config:
+            config = merge_configs(config, file_config)
+            console.print(f"✅ Loaded configuration from: {source}")
+
+    if not sources:
         console.print("📋 Using default configuration")
 
     # Expand environment variables
@@ -181,6 +222,13 @@ def validate_config(config: dict[str, Any]) -> None:
 def create_example_config() -> str:
     """Create example configuration file content."""
     return """# SlideStream Configuration File
+#
+# Config is layered, later winning:
+#   1. built-in defaults
+#   2. ~/.slidestream.yaml   (personal: TTS server URL, API keys — set once)
+#   3. ./slidestream.yaml    (this deck's settings; or pass --config FILE)
+# So keep your server and keys in the home file and only put per-deck
+# overrides here. Any CLI flag (e.g. --voice, --tts-base-url) wins over both.
 
 providers:
   llm:

{slide_stream-2.2.0 → slide_stream-2.3.0}/tests/test_config_loader.py

@@ -13,6 +13,15 @@ from slide_stream.config_loader import (
     validate_config,
 )
 
+
+@pytest.fixture(autouse=True)
+def _no_home_config(monkeypatch):
+    """Isolate tests from a real ~/.slidestream.yaml on the dev machine."""
+    monkeypatch.setattr(
+        "slide_stream.config_loader.find_home_config", lambda: None
+    )
+
+
 # --- expand_env_vars --------------------------------------------------------
 
 
@@ -95,10 +104,10 @@ def test_validate_config_bad_resolution_raises():
 
 
 def test_load_config_returns_defaults_when_no_file(monkeypatch, tmp_path):
-    # Run in an empty dir with no home config so find_config_file returns None.
+    # Run in an empty dir with no home config so no layer applies.
     monkeypatch.chdir(tmp_path)
     monkeypatch.setattr(
-        "slide_stream.config_loader.find_config_file", lambda: None
+        "slide_stream.config_loader.find_home_config", lambda: None
     )
     config = load_config()
     assert config["providers"]["tts"]["provider"] == "gtts"
@@ -162,3 +171,88 @@ def test_save_example_config_writes_file(tmp_path):
     save_example_config(str(out))
     assert out.exists()
     assert "providers" in out.read_text()
+
+
+# --- layered config (home + project) ----------------------------------------
+
+
+def test_home_config_layers_under_project(tmp_path, monkeypatch):
+    """Personal home config supplies a server URL; the project config only
+    overrides deck-specific settings; both survive the merge."""
+    home = tmp_path / "home.yaml"
+    home.write_text(
+        "providers:\n"
+        "  tts:\n"
+        "    provider: chatterbox\n"
+        "    base_url: https://voice.example.org\n"
+    )
+    monkeypatch.setattr(
+        "slide_stream.config_loader.find_home_config", lambda: home
+    )
+    project = tmp_path / "proj"
+    project.mkdir()
+    monkeypatch.chdir(project)
+    (project / "slidestream.yaml").write_text(
+        "providers:\n"
+        "  tts:\n"
+        "    voice: Michael.wav\n"
+        "settings:\n"
+        "  cleanup: false\n"
+    )
+
+    config = load_config()
+
+    # Home layer supplies the server; project layer supplies the voice.
+    assert config["providers"]["tts"]["base_url"] == "https://voice.example.org"
+    assert config["providers"]["tts"]["provider"] == "chatterbox"
+    assert config["providers"]["tts"]["voice"] == "Michael.wav"
+    assert config["settings"]["cleanup"] is False
+
+
+def test_project_config_overrides_home(tmp_path, monkeypatch):
+    """When both set the same key, the project layer wins."""
+    home = tmp_path / "home.yaml"
+    home.write_text("providers:\n  tts:\n    voice: HomeVoice.wav\n")
+    monkeypatch.setattr(
+        "slide_stream.config_loader.find_home_config", lambda: home
+    )
+    project = tmp_path / "proj"
+    project.mkdir()
+    monkeypatch.chdir(project)
+    (project / "slidestream.yaml").write_text(
+        "providers:\n  tts:\n    voice: ProjectVoice.wav\n"
+    )
+
+    config = load_config()
+    assert config["providers"]["tts"]["voice"] == "ProjectVoice.wav"
+
+
+def test_explicit_config_still_layers_over_home(tmp_path, monkeypatch):
+    """An explicit --config replaces auto-discovery but keeps the home layer."""
+    home = tmp_path / "home.yaml"
+    home.write_text("providers:\n  tts:\n    base_url: https://voice.example.org\n")
+    monkeypatch.setattr(
+        "slide_stream.config_loader.find_home_config", lambda: home
+    )
+    monkeypatch.chdir(tmp_path)
+    explicit = tmp_path / "deck.yaml"
+    explicit.write_text("providers:\n  tts:\n    voice: Michael.wav\n")
+
+    config = load_config(str(explicit))
+    assert config["providers"]["tts"]["base_url"] == "https://voice.example.org"
+    assert config["providers"]["tts"]["voice"] == "Michael.wav"
+
+
+def test_home_config_alone_applies(tmp_path, monkeypatch):
+    """Home config applies even with no project config present."""
+    home = tmp_path / "home.yaml"
+    home.write_text("settings:\n  strict: true\n")
+    monkeypatch.setattr(
+        "slide_stream.config_loader.find_home_config", lambda: home
+    )
+    empty = tmp_path / "empty"
+    empty.mkdir()
+    monkeypatch.chdir(empty)
+
+    config = load_config()
+    assert config["settings"]["strict"] is True

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

@@ -2167,7 +2167,7 @@ wheels = [
 
 [[package]]
 name = "slide-stream"
-version = "2.2.0"
+version = "2.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "beautifulsoup4" },