mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-06-28 02:53:30 +00:00
8de8eb03c8
## What does this PR do?
This is a long-pending change and particularly important to get done
now.
Specifically:
- we cannot "localize" (aka download) any URLs from media attachments
anywhere near our modeling code. it must be done within llama-stack.
- `PIL.Image` is infesting all our APIs via `ImageMedia ->
InterleavedTextMedia` and that cannot be right at all. Anything in the
API surface must be "naturally serializable". We need a standard `{
type: "image", image_url: "<...>" }` which is more extensible
- `UserMessage`, `SystemMessage`, etc. are moved completely to
llama-stack from the llama-models repository.
See https://github.com/meta-llama/llama-models/pull/244 for the
corresponding PR in llama-models.
## Test Plan
```bash
cd llama_stack/providers/tests
pytest -s -v -k "fireworks or ollama or together" inference/test_vision_inference.py
pytest -s -v -k "(fireworks or ollama or together) and llama_3b" inference/test_text_inference.py
pytest -s -v -k chroma memory/test_memory.py \
--env EMBEDDING_DIMENSION=384 --env CHROMA_DB_PATH=/tmp/foobar
pytest -s -v -k fireworks agents/test_agents.py \
--safety-shield=meta-llama/Llama-Guard-3-8B \
--inference-model=meta-llama/Llama-3.1-8B-Instruct
```
Updated the client sdk (see PR ...), installed the SDK in the same
environment and then ran the SDK tests:
```bash
cd tests/client-sdk
LLAMA_STACK_CONFIG=together pytest -s -v agents/test_agents.py
LLAMA_STACK_CONFIG=ollama pytest -s -v memory/test_memory.py
# this one needed a bit of hacking in the run.yaml to ensure I could register the vision model correctly
INFERENCE_MODEL=llama3.2-vision:latest LLAMA_STACK_CONFIG=ollama pytest -s -v inference/test_inference.py
```
125 lines
3.6 KiB
Python
125 lines
3.6 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.
|
|
|
|
import pytest
|
|
|
|
from ..conftest import get_provider_fixture_overrides
|
|
|
|
from ..inference.fixtures import INFERENCE_FIXTURES
|
|
from ..memory.fixtures import MEMORY_FIXTURES
|
|
from ..safety.fixtures import SAFETY_FIXTURES, safety_model_from_shield
|
|
from .fixtures import AGENTS_FIXTURES
|
|
|
|
|
|
DEFAULT_PROVIDER_COMBINATIONS = [
|
|
pytest.param(
|
|
{
|
|
"inference": "meta_reference",
|
|
"safety": "llama_guard",
|
|
"memory": "faiss",
|
|
"agents": "meta_reference",
|
|
},
|
|
id="meta_reference",
|
|
marks=pytest.mark.meta_reference,
|
|
),
|
|
pytest.param(
|
|
{
|
|
"inference": "ollama",
|
|
"safety": "llama_guard",
|
|
"memory": "faiss",
|
|
"agents": "meta_reference",
|
|
},
|
|
id="ollama",
|
|
marks=pytest.mark.ollama,
|
|
),
|
|
pytest.param(
|
|
{
|
|
"inference": "together",
|
|
"safety": "llama_guard",
|
|
# make this work with Weaviate which is what the together distro supports
|
|
"memory": "faiss",
|
|
"agents": "meta_reference",
|
|
},
|
|
id="together",
|
|
marks=pytest.mark.together,
|
|
),
|
|
pytest.param(
|
|
{
|
|
"inference": "fireworks",
|
|
"safety": "llama_guard",
|
|
"memory": "faiss",
|
|
"agents": "meta_reference",
|
|
},
|
|
id="fireworks",
|
|
marks=pytest.mark.fireworks,
|
|
),
|
|
pytest.param(
|
|
{
|
|
"inference": "remote",
|
|
"safety": "remote",
|
|
"memory": "remote",
|
|
"agents": "remote",
|
|
},
|
|
id="remote",
|
|
marks=pytest.mark.remote,
|
|
),
|
|
]
|
|
|
|
|
|
def pytest_configure(config):
|
|
for mark in ["meta_reference", "ollama", "together", "fireworks", "remote"]:
|
|
config.addinivalue_line(
|
|
"markers",
|
|
f"{mark}: marks tests as {mark} specific",
|
|
)
|
|
|
|
|
|
def pytest_addoption(parser):
|
|
parser.addoption(
|
|
"--inference-model",
|
|
action="store",
|
|
default="meta-llama/Llama-3.2-3B-Instruct",
|
|
help="Specify the inference model to use for testing",
|
|
)
|
|
parser.addoption(
|
|
"--safety-shield",
|
|
action="store",
|
|
default="meta-llama/Llama-Guard-3-1B",
|
|
help="Specify the safety shield to use for testing",
|
|
)
|
|
|
|
|
|
def pytest_generate_tests(metafunc):
|
|
shield_id = metafunc.config.getoption("--safety-shield")
|
|
if "safety_shield" in metafunc.fixturenames:
|
|
metafunc.parametrize(
|
|
"safety_shield",
|
|
[pytest.param(shield_id, id="")],
|
|
indirect=True,
|
|
)
|
|
if "inference_model" in metafunc.fixturenames:
|
|
inference_model = metafunc.config.getoption("--inference-model")
|
|
models = set({inference_model})
|
|
if safety_model := safety_model_from_shield(shield_id):
|
|
models.add(safety_model)
|
|
|
|
metafunc.parametrize(
|
|
"inference_model",
|
|
[pytest.param(list(models), id="")],
|
|
indirect=True,
|
|
)
|
|
if "agents_stack" in metafunc.fixturenames:
|
|
available_fixtures = {
|
|
"inference": INFERENCE_FIXTURES,
|
|
"safety": SAFETY_FIXTURES,
|
|
"memory": MEMORY_FIXTURES,
|
|
"agents": AGENTS_FIXTURES,
|
|
}
|
|
combinations = (
|
|
get_provider_fixture_overrides(metafunc.config, available_fixtures)
|
|
or DEFAULT_PROVIDER_COMBINATIONS
|
|
)
|
|
metafunc.parametrize("agents_stack", combinations, indirect=True)
|