Skip to content

Commit 11d5075

Browse files
asimurkaasimurka
committed
Azure config bump to 0.3.0
1 parent 3d4e2c5 commit 11d5075

File tree

2 files changed

+134
-135
lines changed

2 files changed

+134
-135
lines changed

‎src/utils/llama_stack_version.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,22 @@ def compare_versions(version_info: str, minimal: str, maximal: str) -> None:
6565
"Failed to extract version pattern from '%s'. Skipping version check.",
6666
version_info,
6767
)
68-
return
68+
raise InvalidLlamaStackVersionException(
69+
f"Failed to extract version pattern from '{version_info}'. Skipping version check."
70+
)
6971

7072
normalized_version = match.group(0)
7173

7274
try:
7375
current_version = Version.parse(normalized_version)
74-
except ValueError:
76+
except ValueError as e:
7577
logger.warning(
76-
"Failed to parse Llama Stack version '%s' (extracted: '%s'). Skipping version check.",
77-
version_info,
78-
normalized_version,
78+
"Failed to parse Llama Stack version '%s'.",
79+
version_info
7980
)
80-
return
81+
raise InvalidLlamaStackVersionException(
82+
f"Failed to parse Llama Stack version '{version_info}'."
83+
) from e
8184

8285
minimal_version = Version.parse(minimal)
8386
maximal_version = Version.parse(maximal)

‎tests/e2e/configs/run-azure.yaml‎

Lines changed: 125 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,127 @@
1-
version: '2'
2-
image_name: minimal-viable-llama-stack-configuration
3-
41
apis:
5-
- agents
6-
- datasetio
7-
- eval
8-
- files
9-
- inference
10-
- post_training
11-
- safety
12-
- scoring
13-
- telemetry
14-
- tool_runtime
15-
- vector_io
16-
benchmarks: []
17-
container_image: null
18-
datasets: []
19-
external_providers_dir: null
20-
inference_store:
21-
db_path: .llama/distributions/ollama/inference_store.db
22-
type: sqlite
23-
logging: null
24-
metadata_store:
25-
db_path: .llama/distributions/ollama/registry.db
26-
namespace: null
27-
type: sqlite
28-
providers:
29-
files:
30-
- provider_id: localfs
31-
provider_type: inline::localfs
2+
- agents
3+
- batches
4+
- datasetio
5+
- eval
6+
- files
7+
- inference
8+
- safety
9+
- scoring
10+
- telemetry
11+
- tool_runtime
12+
- vector_io
13+
benchmarks: []
14+
conversations_store:
15+
db_path: /opt/app-root/src/.llama/distributions/starter/conversations.db
16+
type: sqlite
17+
datasets: []
18+
image_name: starter
19+
inference_store:
20+
db_path: /opt/app-root/src/.llama/distributions/starter/inference_store.db
21+
type: sqlite
22+
metadata_store:
23+
db_path: /opt/app-root/src/.llama/distributions/starter/registry.db
24+
type: sqlite
25+
models: []
26+
providers:
27+
agents:
28+
- config:
29+
persistence_store:
30+
db_path: /opt/app-root/src/.llama/distributions/starter/agents_store.db
31+
type: sqlite
32+
responses_store:
33+
db_path: /opt/app-root/src/.llama/distributions/starter/responses_store.db
34+
type: sqlite
35+
provider_id: meta-reference
36+
provider_type: inline::meta-reference
37+
batches:
38+
- config:
39+
kvstore:
40+
db_path: /opt/app-root/src/.llama/distributions/starter/batches.db
41+
type: sqlite
42+
provider_id: reference
43+
provider_type: inline::reference
44+
datasetio:
45+
- config:
46+
kvstore:
47+
db_path: /opt/app-root/src/.llama/distributions/starter/huggingface_datasetio.db
48+
type: sqlite
49+
provider_id: huggingface
50+
provider_type: remote::huggingface
51+
- config:
52+
kvstore:
53+
db_path: /opt/app-root/src/.llama/distributions/starter/localfs_datasetio.db
54+
type: sqlite
55+
provider_id: localfs
56+
provider_type: inline::localfs
57+
eval:
58+
- config:
59+
kvstore:
60+
db_path: /opt/app-root/src/.llama/distributions/starter/meta_reference_eval.db
61+
type: sqlite
62+
provider_id: meta-reference
63+
provider_type: inline::meta-reference
64+
files:
65+
- config:
66+
metadata_store:
67+
db_path: /opt/app-root/src/.llama/distributions/starter/files_metadata.db
68+
type: sqlite
69+
storage_dir: /opt/app-root/src/.llama/distributions/starter/files
70+
provider_id: meta-reference-files
71+
provider_type: inline::localfs
72+
inference:
73+
- provider_id: openai
74+
provider_type: remote::openai
3275
config:
33-
storage_dir: /tmp/llama-stack-files
34-
metadata_store:
35-
type: sqlite
36-
db_path: .llama/distributions/ollama/files_metadata.db
37-
agents:
38-
- provider_id: meta-reference
39-
provider_type: inline::meta-reference
40-
config:
41-
persistence_store:
42-
db_path: .llama/distributions/ollama/agents_store.db
43-
namespace: null
44-
type: sqlite
45-
responses_store:
46-
db_path: .llama/distributions/ollama/responses_store.db
47-
type: sqlite
48-
datasetio:
49-
- provider_id: huggingface
50-
provider_type: remote::huggingface
51-
config:
52-
kvstore:
53-
db_path: .llama/distributions/ollama/huggingface_datasetio.db
54-
namespace: null
55-
type: sqlite
56-
- provider_id: localfs
57-
provider_type: inline::localfs
58-
config:
59-
kvstore:
60-
db_path: .llama/distributions/ollama/localfs_datasetio.db
61-
namespace: null
62-
type: sqlite
63-
eval:
64-
- provider_id: meta-reference
65-
provider_type: inline::meta-reference
66-
config:
67-
kvstore:
68-
db_path: .llama/distributions/ollama/meta_reference_eval.db
69-
namespace: null
70-
type: sqlite
71-
inference:
72-
- provider_id: azure
73-
provider_type: remote::azure
74-
config:
75-
api_key: ${env.AZURE_API_KEY}
76-
api_base: https://ols-test.openai.azure.com/
77-
api_version: 2024-02-15-preview
78-
api_type: ${env.AZURE_API_TYPE:=}
79-
post_training:
80-
- provider_id: huggingface
81-
provider_type: inline::huggingface-gpu
82-
config:
83-
checkpoint_format: huggingface
84-
device: cpu
85-
distributed_backend: null
86-
dpo_output_dir: "."
87-
safety:
88-
- provider_id: llama-guard
89-
provider_type: inline::llama-guard
90-
config:
91-
excluded_categories: []
92-
scoring:
93-
- provider_id: basic
94-
provider_type: inline::basic
95-
config: {}
96-
- provider_id: llm-as-judge
97-
provider_type: inline::llm-as-judge
98-
config: {}
99-
- provider_id: braintrust
100-
provider_type: inline::braintrust
101-
config:
102-
openai_api_key: '********'
103-
telemetry:
104-
- provider_id: meta-reference
105-
provider_type: inline::meta-reference
106-
config:
107-
service_name: 'lightspeed-stack-telemetry'
108-
sinks: sqlite
109-
sqlite_db_path: .llama/distributions/ollama/trace_store.db
110-
tool_runtime:
111-
- provider_id: model-context-protocol
112-
provider_type: remote::model-context-protocol
113-
config: {}
114-
scoring_fns: []
115-
server:
116-
auth: null
117-
host: null
118-
port: 8321
119-
quota: null
120-
tls_cafile: null
121-
tls_certfile: null
122-
tls_keyfile: null
123-
shields:
124-
- shield_id: llama-guard-shield
125-
provider_id: llama-guard
126-
provider_shield_id: "gpt-4o-mini"
127-
models:
128-
- model_id: gpt-4o-mini
129-
model_type: llm
130-
provider_id: azure
131-
provider_model_id: gpt-4o-mini
76+
api_key: ${env.OPENAI_API_KEY}
77+
allowed_models:
78+
- "gpt-4o"
79+
- provider_id: azure
80+
provider_type: remote::azure
81+
config:
82+
api_key: ${env.AZURE_API_KEY}
83+
api_base: https://ols-test.openai.azure.com/
84+
api_version: 2024-02-15-preview
85+
api_type: ${env.AZURE_API_TYPE:=}
86+
allowed_models:
87+
- "gpt-4o-mini"
88+
- config: {}
89+
provider_id: sentence-transformers
90+
provider_type: inline::sentence-transformers
91+
safety:
92+
- config:
93+
excluded_categories: []
94+
provider_id: llama-guard
95+
provider_type: inline::llama-guard
96+
scoring:
97+
- config: {}
98+
provider_id: basic
99+
provider_type: inline::basic
100+
- config: {}
101+
provider_id: llm-as-judge
102+
provider_type: inline::llm-as-judge
103+
telemetry:
104+
- config:
105+
service_name: "\u200B"
106+
provider_id: meta-reference
107+
provider_type: inline::meta-reference
108+
tool_runtime:
109+
- config: {}
110+
provider_id: rag-runtime
111+
provider_type: inline::rag-runtime
112+
vector_io:
113+
- config:
114+
kvstore:
115+
db_path: /opt/app-root/src/.llama/distributions/starter/faiss_store.db
116+
type: sqlite
117+
provider_id: faiss
118+
provider_type: inline::faiss
119+
scoring_fns: []
120+
server:
121+
port: 8321
122+
shields: []
123+
tool_groups:
124+
- provider_id: rag-runtime
125+
toolgroup_id: builtin::rag
126+
vector_dbs: []
127+
version: 2

0 commit comments

Comments
 (0)