Merge pull request #2076 from max-svistunov/lcore-2339-legacy-two-file-config-deprecation-warn

LCORE-2339: warn at startup when legacy two-file config is used

Author: tisnik

src/lightspeed_stack.py

@@ -159,6 +159,18 @@ def main() -> None:
         "Llama stack configuration: %s", configuration.llama_stack_configuration
     )
 
+    # Deprecation schedule (Decision S2): the legacy two-file path keeps
+    # working through 0.6 with this single startup WARN and is removed in 0.7.
+    if configuration.llama_stack_configuration.library_client_config_path is not None:
+        logger.warning(
+            "DEPRECATED: the two-file configuration "
+            "(llama_stack.library_client_config_path + external run.yaml) is "
+            "deprecated and will be removed in release 0.7. Migrate to the "
+            "unified lightspeed-stack.yaml: https://lightspeed-core.github.io"
+            "/lightspeed-stack/design/llama-stack-config-merge"
+            "/llama-stack-config-merge.html#migration--backwards-compatibility"
+        )
+
     # -d or --dump-configuration CLI flags are used to dump the actual configuration
     # to a JSON file w/o doing any other operation
     if args.dump_configuration:

tests/unit/test_lightspeed_stack.py

@@ -1,12 +1,31 @@
 """Unit tests for functions defined in src/lightspeed_stack.py."""
 
+import logging
 from pathlib import Path
 
 import pytest
 import yaml
 
+import lightspeed_stack
+from configuration import AppConfig
 from lightspeed_stack import create_argument_parser, main
 
+LEGACY_DEPRECATION_MARKER = "DEPRECATED: the two-file configuration"
+
+COMMON_CONFIG_SECTIONS = """
+name: test
+service:
+  host: localhost
+  port: 8080
+  auth_enabled: false
+  workers: 1
+  color_log: true
+  access_log: true
+user_data_collection:
+  feedback_enabled: false
+mcp_servers: []
+"""
+
 
 def test_create_argument_parser() -> None:
     """Test for create_argument_parser function.
@@ -97,3 +116,82 @@ def test_main_migrate_config_requires_run_yaml_and_output(
     )
     with pytest.raises(SystemExit):
         main()
+
+
+def run_main_with_config(
+    config_yaml: str,
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Run main() against a config file, with the runners stubbed out.
+
+    Writes ``config_yaml`` to a temporary file, points argv at it, replaces
+    the module-level configuration singleton with a fresh AppConfig (so the
+    shared singleton is not mutated for other tests), and stubs the quota
+    scheduler and uvicorn runners.
+    """
+    cfg_file = tmp_path / "lightspeed-stack.yaml"
+    cfg_file.write_text(config_yaml, encoding="utf-8")
+    monkeypatch.setattr("sys.argv", ["lightspeed-stack", "-c", str(cfg_file)])
+    monkeypatch.setattr(lightspeed_stack, "configuration", AppConfig())
+    monkeypatch.setattr(lightspeed_stack, "start_quota_scheduler", lambda _: None)
+    monkeypatch.setattr(lightspeed_stack, "start_uvicorn", lambda _: None)
+    main()
+
+
+def test_main_warns_on_legacy_two_file_config(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A legacy library_client_config_path config emits one deprecation WARN."""
+    run_yaml = tmp_path / "run.yaml"
+    run_yaml.write_text("version: 2\n", encoding="utf-8")
+    config_yaml = COMMON_CONFIG_SECTIONS + f"""
+llama_stack:
+  use_as_library_client: true
+  library_client_config_path: {run_yaml}
+"""
+    with caplog.at_level(logging.WARNING):
+        run_main_with_config(config_yaml, tmp_path, monkeypatch)
+    warnings = [
+        r for r in caplog.records if LEGACY_DEPRECATION_MARKER in r.getMessage()
+    ]
+    assert len(warnings) == 1
+    assert warnings[0].levelno == logging.WARNING
+    # the WARN carries a stable link to the migration doc
+    assert "#migration--backwards-compatibility" in warnings[0].getMessage()
+
+
+def test_main_does_not_warn_in_unified_mode(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A unified-mode config (llama_stack.config) emits no deprecation WARN."""
+    config_yaml = COMMON_CONFIG_SECTIONS + """
+llama_stack:
+  use_as_library_client: true
+  config:
+    baseline: default
+"""
+    with caplog.at_level(logging.WARNING):
+        run_main_with_config(config_yaml, tmp_path, monkeypatch)
+    assert not any(LEGACY_DEPRECATION_MARKER in r.getMessage() for r in caplog.records)
+
+
+def test_main_does_not_warn_in_server_mode(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A server-mode config (url, no legacy fields) emits no deprecation WARN."""
+    config_yaml = COMMON_CONFIG_SECTIONS + """
+llama_stack:
+  use_as_library_client: false
+  url: http://localhost:8321
+  api_key: xyzzy
+"""
+    with caplog.at_level(logging.WARNING):
+        run_main_with_config(config_yaml, tmp_path, monkeypatch)
+    assert not any(LEGACY_DEPRECATION_MARKER in r.getMessage() for r in caplog.records)