mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-16 21:09:27 +00:00
Some checks failed
SqlStore Integration Tests / test-postgres (3.13) (push) Failing after 0s
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 1s
Integration Tests (Replay) / generate-matrix (push) Successful in 3s
SqlStore Integration Tests / test-postgres (3.12) (push) Failing after 4s
Test Llama Stack Build / generate-matrix (push) Failing after 3s
Test Llama Stack Build / build (push) Has been skipped
Test External Providers Installed via Module / test-external-providers-from-module (venv) (push) Has been skipped
Test llama stack list-deps / generate-matrix (push) Failing after 3s
Test llama stack list-deps / list-deps (push) Has been skipped
API Conformance Tests / check-schema-compatibility (push) Successful in 11s
Python Package Build Test / build (3.13) (push) Successful in 19s
Python Package Build Test / build (3.12) (push) Successful in 23s
Test Llama Stack Build / build-single-provider (push) Successful in 33s
Test llama stack list-deps / show-single-provider (push) Successful in 36s
Test llama stack list-deps / list-deps-from-config (push) Successful in 44s
Vector IO Integration Tests / test-matrix (push) Failing after 57s
Test External API and Providers / test-external (venv) (push) Failing after 1m37s
Unit Tests / unit-tests (3.12) (push) Failing after 1m56s
UI Tests / ui-tests (22) (push) Successful in 2m2s
Unit Tests / unit-tests (3.13) (push) Failing after 2m35s
Pre-commit / pre-commit (22) (push) Successful in 3m16s
Test Llama Stack Build / build-custom-container-distribution (push) Successful in 3m34s
Test Llama Stack Build / build-ubi9-container-distribution (push) Successful in 3m59s
Integration Tests (Replay) / Integration Tests (, , , client=, ) (push) Failing after 4m30s
# What does this PR do? the build.yaml is only used in the following ways: 1. list-deps 2. distribution code-gen since `llama stack build` no longer exists, I found myself asking "why do we need two different files for list-deps and run"? Removing the BuildConfig and altering the usage of the DistributionTemplate in llama stack list-deps is the first step in removing the build yaml entirely. Removing the BuildConfig and build.yaml cuts the files users need to maintain in half, and allows us to focus on the stability of _just_ the run.yaml This PR removes the build.yaml, BuildConfig datatype, and its usage throughout the codebase. Users are now expected to point to run.yaml files when running list-deps, and our codebase automatically uses these types now for things like `get_provider_registry`. **Additionally, two renames: `StackRunConfig` -> `StackConfig` and `run.yaml` -> `config.yaml`.** The build.yaml made sense for when we were managing the build process for the user and actually _producing_ a run.yaml _from_ the build.yaml, but now that we are simply just getting the provider registry and listing the deps, switching to config.yaml simplifies the scope here greatly. ## Test Plan existing list-deps usage should work in the tests. --------- Signed-off-by: Charlie Doern <cdoern@redhat.com>
128 lines
5 KiB
Python
128 lines
5 KiB
Python
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# All rights reserved.
|
|
#
|
|
# This source code is licensed under the terms described in the LICENSE file in
|
|
# the root directory of this source tree.
|
|
|
|
"""Tests for the llama stack list command."""
|
|
|
|
import argparse
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from llama_stack.cli.stack.list_stacks import StackListBuilds
|
|
|
|
|
|
@pytest.fixture
|
|
def list_stacks_command():
|
|
"""Create a StackListBuilds instance for testing."""
|
|
parser = argparse.ArgumentParser()
|
|
subparsers = parser.add_subparsers()
|
|
return StackListBuilds(subparsers)
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_distribs_base_dir(tmp_path):
|
|
"""Create a mock DISTRIBS_BASE_DIR with some custom distributions."""
|
|
custom_dir = tmp_path / "distributions"
|
|
custom_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
# Create a custom distribution
|
|
starter_custom = custom_dir / "starter"
|
|
starter_custom.mkdir()
|
|
(starter_custom / "starter-config.yaml").write_text("# config")
|
|
|
|
return custom_dir
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_distro_dir(tmp_path):
|
|
"""Create a mock distributions directory with built-in distributions."""
|
|
distro_dir = tmp_path / "src" / "llama_stack" / "distributions"
|
|
distro_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
# Create some built-in distributions
|
|
for distro_name in ["starter", "nvidia", "dell"]:
|
|
distro_path = distro_dir / distro_name
|
|
distro_path.mkdir()
|
|
(distro_path / "config.yaml").write_text("# config")
|
|
|
|
return distro_dir
|
|
|
|
|
|
def create_path_mock(builtin_dist_dir):
|
|
"""Create a properly mocked Path object that returns builtin_dist_dir for the distributions path."""
|
|
mock_parent_parent_parent = MagicMock()
|
|
mock_parent_parent_parent.__truediv__ = (
|
|
lambda self, other: builtin_dist_dir if other == "distributions" else MagicMock()
|
|
)
|
|
|
|
mock_path = MagicMock()
|
|
mock_path.parent.parent.parent = mock_parent_parent_parent
|
|
|
|
return mock_path
|
|
|
|
|
|
class TestStackList:
|
|
"""Test suite for llama stack list command."""
|
|
|
|
def test_builtin_distros_shown_without_running(self, list_stacks_command, mock_distro_dir, tmp_path):
|
|
"""Test that built-in distributions are shown even before running them."""
|
|
mock_path = create_path_mock(mock_distro_dir)
|
|
|
|
# Mock DISTRIBS_BASE_DIR to be a non-existent directory (no custom distributions)
|
|
with patch("llama_stack.cli.stack.list_stacks.DISTRIBS_BASE_DIR", tmp_path / "nonexistent"):
|
|
with patch("llama_stack.cli.stack.list_stacks.Path") as mock_path_class:
|
|
mock_path_class.return_value = mock_path
|
|
|
|
distributions = list_stacks_command._get_distribution_dirs()
|
|
|
|
# Verify built-in distributions are found
|
|
assert len(distributions) > 0, "Should find built-in distributions"
|
|
assert all(source_type == "built-in" for _, source_type in distributions.values()), (
|
|
"All should be built-in"
|
|
)
|
|
|
|
# Check specific distributions we created
|
|
assert "starter" in distributions
|
|
assert "nvidia" in distributions
|
|
assert "dell" in distributions
|
|
|
|
def test_custom_distribution_overrides_builtin(self, list_stacks_command, mock_distro_dir, mock_distribs_base_dir):
|
|
"""Test that custom distributions override built-in ones with the same name."""
|
|
mock_path = create_path_mock(mock_distro_dir)
|
|
|
|
with patch("llama_stack.cli.stack.list_stacks.DISTRIBS_BASE_DIR", mock_distribs_base_dir):
|
|
with patch("llama_stack.cli.stack.list_stacks.Path") as mock_path_class:
|
|
mock_path_class.return_value = mock_path
|
|
|
|
distributions = list_stacks_command._get_distribution_dirs()
|
|
|
|
# "starter" should exist and be marked as "custom" (not "built-in")
|
|
# because the custom version overrides the built-in one
|
|
assert "starter" in distributions
|
|
_, source_type = distributions["starter"]
|
|
assert source_type == "custom", "Custom distribution should override built-in"
|
|
|
|
def test_hidden_directories_ignored(self, list_stacks_command, mock_distro_dir, tmp_path):
|
|
"""Test that hidden directories (starting with .) are ignored."""
|
|
# Add a hidden directory
|
|
hidden_dir = mock_distro_dir / ".hidden"
|
|
hidden_dir.mkdir()
|
|
(hidden_dir / "config.yaml").write_text("# config")
|
|
|
|
# Add a __pycache__ directory
|
|
pycache_dir = mock_distro_dir / "__pycache__"
|
|
pycache_dir.mkdir()
|
|
|
|
mock_path = create_path_mock(mock_distro_dir)
|
|
|
|
with patch("llama_stack.cli.stack.list_stacks.DISTRIBS_BASE_DIR", tmp_path / "nonexistent"):
|
|
with patch("llama_stack.cli.stack.list_stacks.Path") as mock_path_class:
|
|
mock_path_class.return_value = mock_path
|
|
|
|
distributions = list_stacks_command._get_distribution_dirs()
|
|
|
|
assert ".hidden" not in distributions
|
|
assert "__pycache__" not in distributions
|