Skip to content

LCORE-2547: rename llama_stack config key to ogx with deprecated alias #2560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asimurka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

LCORE-2547: rename llama_stack config key to ogx with deprecated alias #2560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
echo "Models: $(grep -c "model_id:" run.yaml)"
echo ""
echo "=== lightspeed-stack.yaml ==="
grep -A 3 "llama_stack:" lightspeed-stack.yaml
grep -A 3 "ogx:" lightspeed-stack.yaml

- name: Cache HuggingFace embedding model
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests_lightspeed_evaluation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
echo "Models: $(grep -c "model_id:" run.yaml)"
echo ""
echo "=== lightspeed-stack.yaml ==="
grep -A 3 "llama_stack:" lightspeed-stack.yaml
grep -A 3 "ogx:" lightspeed-stack.yaml

- name: Run services (Library Mode)
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests_providers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
echo "Models: $(grep -c "model_id:" run.yaml)"
echo ""
echo "=== lightspeed-stack.yaml ==="
grep -A 3 "llama_stack:" lightspeed-stack.yaml
grep -A 3 "ogx:" lightspeed-stack.yaml

- name: Cache HuggingFace embedding model
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion docs/basic_info/getting_started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
# Unified mode (recommended): the run.yaml created above is consumed as
# the synthesis profile. The legacy library_client_config_path setup is
Expand Down
26 changes: 13 additions & 13 deletions docs/devel_doc/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6835,11 +6835,6 @@
"default_model": "gpt-4-turbo",
"default_provider": "openai"
},
"llama_stack": {
"api_key": "*****",
"url": "http://localhost:8321",
"use_as_library_client": false
},
"mcp_servers": [
{
"name": "server1",
Expand All @@ -6857,6 +6852,11 @@
"OTEL_SERVICE_NAME": ""
}
},
"ogx": {
"api_key": "*****",
"url": "http://localhost:8321",
"use_as_library_client": false
},
"quota_handlers": {
"enable_token_history": false,
"limiters": [],
Expand Down Expand Up @@ -13073,14 +13073,14 @@
}
],
"title": "Configuration format version",
"description": "Optional explicit marker of the configuration format. When set, it must agree with the shape detected from the configuration body: 'unified' requires a synthesis input (a non-empty inference.providers, a non-empty vector_store.providers, or a llama_stack.config block), 'legacy' requires no synthesis input. Reserved as the lever for a future breaking change of the unified schema (R11)."
"description": "Optional explicit marker of the configuration format. When set, it must agree with the shape detected from the configuration body: 'unified' requires a synthesis input (a non-empty inference.providers, a non-empty vector_store.providers, or an ogx.config block), 'legacy' requires no synthesis input. Reserved as the lever for a future breaking change of the unified schema (R11)."
},
"service": {
"$ref": "#/components/schemas/ServiceConfiguration",
"title": "Service configuration",
"description": "This section contains Lightspeed Core Stack service configuration."
},
"llama_stack": {
"ogx": {
"$ref": "#/components/schemas/OgxConfiguration",
"title": "OGX configuration",
"description": "This section contains OGX configuration. Lightspeed Core Stack service can call OGX in library mode or in server mode."
Expand Down Expand Up @@ -13254,7 +13254,7 @@
"required": [
"name",
"service",
"llama_stack",
"ogx",
"user_data_collection"
],
"title": "Configuration",
Expand Down Expand Up @@ -13292,11 +13292,6 @@
"default_model": "gpt-4-turbo",
"default_provider": "openai"
},
"llama_stack": {
"api_key": "*****",
"url": "http://localhost:8321",
"use_as_library_client": false
},
"mcp_servers": [
{
"name": "server1",
Expand All @@ -13314,6 +13309,11 @@
"OTEL_SERVICE_NAME": ""
}
},
"ogx": {
"api_key": "*****",
"url": "http://localhost:8321",
"use_as_library_client": false
},
"quota_handlers": {
"enable_token_history": false,
"limiters": [],
Expand Down
4 changes: 2 additions & 2 deletions docs/user_doc/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ <h2 id="configuration">Configuration</h2>
<td>Optional explicit marker of the configuration format. When set, it
must agree with the shape detected from the configuration body:
&#x2018;unified&#x2019; requires a synthesis input (a non-empty inference.providers, a
non-empty vector_store.providers, or a llama_stack.config block),
non-empty vector_store.providers, or a ogx.config block),
&#x2018;legacy&#x2019; requires no synthesis input. Reserved as the lever for a future
breaking change of the unified schema (R11).</td>
</tr>
Expand All @@ -640,7 +640,7 @@ <h2 id="configuration">Configuration</h2>
configuration.</td>
</tr>
<tr class="even">
<td>llama_stack</td>
<td>ogx</td>
<td/>
<td>This section contains OGX configuration. Lightspeed Core
Stack service can call OGX in library mode or in server
Expand Down
6 changes: 3 additions & 3 deletions docs/user_doc/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,15 @@
"type": "string",
"nullable": true,
"default": null,
"description": "Optional explicit marker of the configuration format. When set, it must agree with the shape detected from the configuration body: 'unified' requires a synthesis input (a non-empty inference.providers, a non-empty vector_store.providers, or a llama_stack.config block), 'legacy' requires no synthesis input. Reserved as the lever for a future breaking change of the unified schema (R11).",
"description": "Optional explicit marker of the configuration format. When set, it must agree with the shape detected from the configuration body: 'unified' requires a synthesis input (a non-empty inference.providers, a non-empty vector_store.providers, or an ogx.config block), 'legacy' requires no synthesis input. Reserved as the lever for a future breaking change of the unified schema (R11).",
"title": "Configuration format version"
},
"service": {
"$ref": "`#/components/schemas/`ServiceConfiguration",
"description": "This section contains Lightspeed Core Stack service configuration.",
"title": "Service configuration"
},
"llama_stack": {
"ogx": {
"$ref": "`#/components/schemas/`LlamaStackConfiguration",
"description": "This section contains OGX configuration. Lightspeed Core Stack service can call OGX in library mode or in server mode.",
"title": "OGX configuration"
Expand Down Expand Up @@ -625,7 +625,7 @@
"required": [
"name",
"service",
"llama_stack",
"ogx",
"user_data_collection"
],
"title": "Configuration",
Expand Down
4 changes: 2 additions & 2 deletions docs/user_doc/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ Global service configuration.
| Field | Type | Description |
|------------------------|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| name | string | Name of the service. That value will be used in REST API endpoints. |
| config_format_version | string | Optional explicit marker of the configuration format. When set, it must agree with the shape detected from the configuration body: 'unified' requires a synthesis input (a non-empty inference.providers, a non-empty vector_store.providers, or a llama_stack.config block), 'legacy' requires no synthesis input. Reserved as the lever for a future breaking change of the unified schema (R11). |
| config_format_version | string | Optional explicit marker of the configuration format. When set, it must agree with the shape detected from the configuration body: 'unified' requires a synthesis input (a non-empty inference.providers, a non-empty vector_store.providers, or a ogx.config block), 'legacy' requires no synthesis input. Reserved as the lever for a future breaking change of the unified schema (R11). |
| service | | This section contains Lightspeed Core Stack service configuration. |
| llama_stack | | This section contains OGX configuration. Lightspeed Core Stack service can call OGX in library mode or in server mode. |
| ogx | | This section contains OGX configuration. Lightspeed Core Stack service can call OGX in library mode or in server mode. |
| user_data_collection | | This section contains configuration for subsystem that collects user data(transcription history and feedbacks). |
| database | | Configuration for database to store conversation IDs and other runtime data |
| mcp_servers | array | MCP (Model Context Protocol) servers provide tools and capabilities to the AI agents. These are configured in this section. Only MCP servers defined in the lightspeed-stack.yaml configuration are available to the agents. Tools configured in the OGX run.yaml are not accessible to lightspeed-core agents. |
Expand Down
5 changes: 3 additions & 2 deletions docs/user_doc/config.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class "Configuration" as src.models.config.Configuration {
database
deployment_environment : str
inference
llama_stack
ogx
mcp_servers : list[ModelContextProtocolServer]
name : str
okp
Expand All @@ -106,6 +106,7 @@ class "Configuration" as src.models.config.Configuration {
skills : Optional[SkillsConfiguration]
splunk : Optional[SplunkConfiguration]
user_data_collection
accept_llama_stack_section_alias(data: Any) -> Any
check_unified_vs_legacy() -> Self
dump(filename: str | Path) -> None
validate_mcp_auth_headers() -> Self
Expand Down Expand Up @@ -370,7 +371,7 @@ src.models.config.DatabaseConfiguration --* src.models.config.Configuration : da
src.models.config.InferenceConfiguration --* src.models.config.Configuration : inference
src.models.config.JsonPathOperator --* src.models.config.JwtRoleRule : operator
src.models.config.JwtConfiguration --* src.models.config.JwkConfiguration : jwt_configuration
src.models.config.LlamaStackConfiguration --* src.models.config.Configuration : llama_stack
src.models.config.LlamaStackConfiguration --* src.models.config.Configuration : ogx
src.models.config.OkpConfiguration --* src.models.config.Configuration : okp
src.models.config.QuotaHandlersConfiguration --* src.models.config.Configuration : quota_handlers
src.models.config.QuotaSchedulerConfiguration --* src.models.config.QuotaHandlersConfiguration : scheduler
Expand Down
4 changes: 2 additions & 2 deletions docs/user_doc/config.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-a2a-state-pg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ service:
workers: 4
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
library_client_config_path: run.yaml
user_data_collection:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-a2a-state-sqlite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
library_client_config_path: run.yaml
user_data_collection:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-api-key-auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
authentication:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-azure-entraid-lib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
# Uses a remote OGX service
# The instance would have already been started with an `ogx-run.yaml` file
# use_as_library_client: false
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-azure-entraid-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
# Uses a remote OGX service
# The instance would have already been started with an `ogx-run.yaml` file
use_as_library_client: false
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-byok-okp-rag.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
api_key: xyzzy
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-conversation-cache-pg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
library_client_config_path: run.yaml
user_data_collection:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-conversation-cache-sqlite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
library_client_config_path: run.yaml
user_data_collection:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-lls-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
api_key: xyzzy
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-lls-library.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
# Unified mode: the run.yaml next to this file is consumed as the
# synthesis profile (legacy library_client_config_path is deprecated,
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-mcp-servers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
api_key: xyzzy
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-quota-limiter-pg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
api_key: xyzzy
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-quota-limiter-sqlite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
api_key: xyzzy
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-rh-identity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
authentication:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-rlsapi-cla.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: false
url: http://localhost:8321
inference:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-shields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
library_client_config_path: run.yaml
user_data_collection:
Expand Down
2 changes: 1 addition & 1 deletion examples/lightspeed-stack-skills.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ service:
workers: 1
color_log: true
access_log: true
llama_stack:
ogx:
use_as_library_client: true
library_client_config_path: run.yaml
user_data_collection:
Expand Down
Loading
Loading