diff --git a/llama_stack/distribution/configure.py b/llama_stack/distribution/configure.py index f533422fe..2811d4142 100644 --- a/llama_stack/distribution/configure.py +++ b/llama_stack/distribution/configure.py @@ -335,7 +335,7 @@ def upgrade_from_routing_table_to_registry( provider_map = config_dict.get("api_providers", config_dict.get("provider_map", {})) if provider_map: for api_str, provider in provider_map.items(): - if isinstance(provider, dict): + if isinstance(provider, dict) and "provider_type" in provider: providers_by_api[api_str] = [ Provider( provider_id=f"{provider['provider_type']}", diff --git a/tests/examples/local-run.yaml b/tests/examples/local-run.yaml index e4319750a..108c805f8 100644 --- a/tests/examples/local-run.yaml +++ b/tests/examples/local-run.yaml @@ -1,8 +1,10 @@ -built_at: '2024-09-23T00:54:40.551416' +Upgrading config... +version: '2' +built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local -apis_to_serve: +apis: - shields - agents - models @@ -10,38 +12,19 @@ apis_to_serve: - memory_banks - inference - safety -api_providers: +providers: inference: - providers: - - meta-reference - safety: - providers: - - meta-reference - agents: + - provider_id: meta-reference provider_type: meta-reference - config: - persistence_store: - namespace: null - type: sqlite - db_path: /home/xiyan/.llama/runtime/kvstore.db - memory: - providers: - - meta-reference - telemetry: - provider_type: meta-reference - config: {} -routing_table: - inference: - - provider_type: meta-reference config: model: Llama3.1-8B-Instruct quantization: null torch_seed: null max_seq_len: 4096 max_batch_size: 1 - routing_key: Llama3.1-8B-Instruct safety: - - provider_type: meta-reference + - provider_id: meta-reference + provider_type: meta-reference config: llama_guard_shield: model: Llama-Guard-3-1B @@ -50,8 +33,47 @@ routing_table: disable_output_check: false prompt_guard_shield: model: Prompt-Guard-86M - routing_key: ["llama_guard", "code_scanner_guard", "injection_shield", "jailbreak_shield"] memory: - - provider_type: meta-reference + - provider_id: meta-reference + provider_type: meta-reference config: {} - routing_key: vector + agents: + - provider_id: meta-reference + provider_type: meta-reference + config: + persistence_store: + namespace: null + type: sqlite + db_path: /home/xiyan/.llama/runtime/kvstore.db + telemetry: + - provider_id: meta-reference + provider_type: meta-reference + config: {} +models: +- identifier: Llama3.1-8B-Instruct + llama_model: Llama3.1-8B-Instruct + provider_id: meta-reference +shields: +- identifier: llama_guard + type: llama_guard + provider_id: meta-reference + params: {} +- identifier: code_scanner_guard + type: llama_guard + provider_id: meta-reference + params: {} +- identifier: injection_shield + type: llama_guard + provider_id: meta-reference + params: {} +- identifier: jailbreak_shield + type: llama_guard + provider_id: meta-reference + params: {} +memory_banks: +- identifier: vector + provider_id: meta-reference + type: vector + embedding_model: all-MiniLM-L6-v2 + chunk_size_in_tokens: 512 + overlap_size_in_tokens: null