forked from phoenix-oss/llama-stack-mirror
6bb57e72a7
This PR makes several core changes to the developer experience surrounding Llama Stack. Background: PR #92 introduced the notion of "routing" to the Llama Stack. It introduces three object types: (1) models, (2) shields and (3) memory banks. Each of these objects can be associated with a distinct provider. So you can get model A to be inferenced locally while model B, C can be inference remotely (e.g.) However, this had a few drawbacks: you could not address the provider instances -- i.e., if you configured "meta-reference" with a given model, you could not assign an identifier to this instance which you could re-use later. the above meant that you could not register a "routing_key" (e.g. model) dynamically and say "please use this existing provider I have already configured" for a new model. the terms "routing_table" and "routing_key" were exposed directly to the user. in my view, this is way too much overhead for a new user (which almost everyone is.) people come to the stack wanting to do ML and encounter a completely unexpected term. What this PR does: This PR structures the run config with only a single prominent key: - providers Providers are instances of configured provider types. Here's an example which shows two instances of the remote::tgi provider which are serving two different models. providers: inference: - provider_id: foo provider_type: remote::tgi config: { ... } - provider_id: bar provider_type: remote::tgi config: { ... } Secondly, the PR adds dynamic registration of { models | shields | memory_banks } to the API surface. The distribution still acts like a "routing table" (as previously) except that it asks the backing providers for a listing of these objects. For example it asks a TGI or Ollama inference adapter what models it is serving. Only the models that are being actually served can be requested by the user for inference. Otherwise, the Stack server will throw an error. When dynamically registering these objects, you can use the provider IDs shown above. Info about providers can be obtained using the Api.inspect set of endpoints (/providers, /routes, etc.) The above examples shows the correspondence between inference providers and models registry items. Things work similarly for the safety <=> shields and memory <=> memory_banks pairs. Registry: This PR also makes it so that Providers need to implement additional methods for registering and listing objects. For example, each Inference provider is now expected to implement the ModelsProtocolPrivate protocol (naming is not great!) which consists of two methods register_model list_models The goal is to inform the provider that a certain model needs to be supported so the provider can make any relevant backend changes if needed (or throw an error if the model cannot be supported.) There are many other cleanups included some of which are detailed in a follow-up comment.
133 lines
3.8 KiB
Python
133 lines
3.8 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.
|
|
|
|
from datetime import datetime
|
|
|
|
import pytest
|
|
import yaml
|
|
from llama_stack.distribution.configure import (
|
|
LLAMA_STACK_RUN_CONFIG_VERSION,
|
|
parse_and_maybe_upgrade_config,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def up_to_date_config():
|
|
return yaml.safe_load(
|
|
"""
|
|
version: {version}
|
|
image_name: foo
|
|
apis_to_serve: []
|
|
built_at: {built_at}
|
|
providers:
|
|
inference:
|
|
- provider_id: provider1
|
|
provider_type: meta-reference
|
|
config: {{}}
|
|
safety:
|
|
- provider_id: provider1
|
|
provider_type: meta-reference
|
|
config:
|
|
llama_guard_shield:
|
|
model: Llama-Guard-3-1B
|
|
excluded_categories: []
|
|
disable_input_check: false
|
|
disable_output_check: false
|
|
enable_prompt_guard: false
|
|
memory:
|
|
- provider_id: provider1
|
|
provider_type: meta-reference
|
|
config: {{}}
|
|
""".format(
|
|
version=LLAMA_STACK_RUN_CONFIG_VERSION, built_at=datetime.now().isoformat()
|
|
)
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def old_config():
|
|
return yaml.safe_load(
|
|
"""
|
|
image_name: foo
|
|
built_at: {built_at}
|
|
apis_to_serve: []
|
|
routing_table:
|
|
inference:
|
|
- provider_type: remote::ollama
|
|
config:
|
|
host: localhost
|
|
port: 11434
|
|
routing_key: Llama3.2-1B-Instruct
|
|
- provider_type: meta-reference
|
|
config:
|
|
model: Llama3.1-8B-Instruct
|
|
routing_key: Llama3.1-8B-Instruct
|
|
safety:
|
|
- routing_key: ["shield1", "shield2"]
|
|
provider_type: meta-reference
|
|
config:
|
|
llama_guard_shield:
|
|
model: Llama-Guard-3-1B
|
|
excluded_categories: []
|
|
disable_input_check: false
|
|
disable_output_check: false
|
|
enable_prompt_guard: false
|
|
memory:
|
|
- routing_key: vector
|
|
provider_type: meta-reference
|
|
config: {{}}
|
|
api_providers:
|
|
telemetry:
|
|
provider_type: noop
|
|
config: {{}}
|
|
""".format(
|
|
built_at=datetime.now().isoformat()
|
|
)
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def invalid_config():
|
|
return yaml.safe_load(
|
|
"""
|
|
routing_table: {}
|
|
api_providers: {}
|
|
"""
|
|
)
|
|
|
|
|
|
def test_parse_and_maybe_upgrade_config_up_to_date(up_to_date_config):
|
|
result = parse_and_maybe_upgrade_config(up_to_date_config)
|
|
assert result.version == LLAMA_STACK_RUN_CONFIG_VERSION
|
|
assert "inference" in result.providers
|
|
|
|
|
|
def test_parse_and_maybe_upgrade_config_old_format(old_config):
|
|
result = parse_and_maybe_upgrade_config(old_config)
|
|
assert result.version == LLAMA_STACK_RUN_CONFIG_VERSION
|
|
assert all(
|
|
api in result.providers
|
|
for api in ["inference", "safety", "memory", "telemetry"]
|
|
)
|
|
safety_provider = result.providers["safety"][0]
|
|
assert safety_provider.provider_type == "meta-reference"
|
|
assert "llama_guard_shield" in safety_provider.config
|
|
|
|
inference_providers = result.providers["inference"]
|
|
assert len(inference_providers) == 2
|
|
assert set(x.provider_id for x in inference_providers) == {
|
|
"remote::ollama-00",
|
|
"meta-reference-01",
|
|
}
|
|
|
|
ollama = inference_providers[0]
|
|
assert ollama.provider_type == "remote::ollama"
|
|
assert ollama.config["port"] == 11434
|
|
|
|
|
|
def test_parse_and_maybe_upgrade_config_invalid(invalid_config):
|
|
with pytest.raises(ValueError):
|
|
parse_and_maybe_upgrade_config(invalid_config)
|