From 1fb9aa2cd7a69f4234ba9a6715eb46d706d800f3 Mon Sep 17 00:00:00 2001 From: Andrej Simurka Date: Thu, 27 Aug 2026 13:30:27 +0200 Subject: [PATCH] rename llama_stack_version to ogx_version in info API --- docs/devel_doc/openapi.json | 12 ++++++------ docs/devel_doc/openapi.md | 4 ++-- docs/models/responses.puml | 2 +- docs/models/responses.svg | 2 +- docs/models/successful_responses.json | 10 +++++----- docs/models/successful_responses.md | 4 ++-- src/app/endpoints/info.py | 8 ++++---- src/models/api/responses/successful/probes.py | 6 +++--- tests/e2e/features/info.feature | 2 +- tests/e2e/features/steps/info.py | 14 +++++++------- .../integration/endpoints/test_info_integration.py | 2 +- tests/unit/app/endpoints/test_info.py | 2 +- .../models/responses/test_successful_responses.py | 4 ++-- tests/unit/utils/test_models_dumper.py | 8 ++++---- 14 files changed, 40 insertions(+), 40 deletions(-) diff --git a/docs/devel_doc/openapi.json b/docs/devel_doc/openapi.json index a0ac02e8b..d42b98d81 100644 --- a/docs/devel_doc/openapi.json +++ b/docs/devel_doc/openapi.json @@ -183,8 +183,8 @@ "$ref": "#/components/schemas/InfoResponse" }, "example": { - "llama_stack_version": "1.0.0", "name": "Lightspeed Stack", + "ogx_version": "1.0.0", "service_version": "1.0.0" } } @@ -14807,9 +14807,9 @@ "1.0.0" ] }, - "llama_stack_version": { + "ogx_version": { "type": "string", - "title": "Llama Stack Version", + "title": "Ogx Version", "description": "OGX version", "examples": [ "0.2.1", @@ -14824,14 +14824,14 @@ "required": [ "name", "service_version", - "llama_stack_version" + "ogx_version" ], "title": "InfoResponse", - "description": "Model representing a response to an info request.\n\nAttributes:\n name: Service name.\n service_version: Service version.\n llama_stack_version: OGX version.", + "description": "Model representing a response to an info request.\n\nAttributes:\n name: Service name.\n service_version: Service version.\n ogx_version: OGX version.", "examples": [ { - "llama_stack_version": "1.0.0", "name": "Lightspeed Stack", + "ogx_version": "1.0.0", "service_version": "1.0.0" } ] diff --git a/docs/devel_doc/openapi.md b/docs/devel_doc/openapi.md index 4150ca833..2ec236399 100644 --- a/docs/devel_doc/openapi.md +++ b/docs/devel_doc/openapi.md @@ -6602,14 +6602,14 @@ Model representing a response to an info request. Attributes: name: Service name. service_version: Service version. - llama_stack_version: OGX version. + ogx_version: OGX version. | Field | Type | Description | |-------|------|-------------| | name | string | Service name | | service_version | string | Service version | -| llama_stack_version | string | OGX version | +| ogx_version | string | OGX version | ## InputToolMCP diff --git a/docs/models/responses.puml b/docs/models/responses.puml index 8d1d3ea25..374df39a5 100644 --- a/docs/models/responses.puml +++ b/docs/models/responses.puml @@ -98,7 +98,7 @@ class "ForbiddenResponse" as src.models.api.responses.error.forbidden.ForbiddenR saved_prompt(action: str, resource_id: str, user_id: str) -> Self } class "InfoResponse" as src.models.api.responses.successful.probes.InfoResponse { - llama_stack_version : Optional[str] + ogx_version : Optional[str] model_config : dict name : Optional[str] service_version : Optional[str] diff --git a/docs/models/responses.svg b/docs/models/responses.svg index a368d0474..fb26942bc 100644 --- a/docs/models/responses.svg +++ b/docs/models/responses.svg @@ -232,7 +232,7 @@ InfoResponse - llama_stack_version : Optional[str] + ogx_version : Optional[str] model_config : dict name : Optional[str] service_version : Optional[str] diff --git a/docs/models/successful_responses.json b/docs/models/successful_responses.json index 4958a57ac..d9bea062f 100644 --- a/docs/models/successful_responses.json +++ b/docs/models/successful_responses.json @@ -1854,11 +1854,11 @@ "type": "object" }, "InfoResponse": { - "description": "Model representing a response to an info request.\n\nAttributes:\n name: Service name.\n service_version: Service version.\n llama_stack_version: OGX version.", + "description": "Model representing a response to an info request.\n\nAttributes:\n name: Service name.\n service_version: Service version.\n ogx_version: OGX version.", "examples": [ { - "llama_stack_version": "1.0.0", "name": "Lightspeed Stack", + "ogx_version": "1.0.0", "service_version": "1.0.0" } ], @@ -1881,7 +1881,7 @@ "title": "Service Version", "type": "string" }, - "llama_stack_version": { + "ogx_version": { "description": "OGX version", "examples": [ "0.2.1", @@ -1890,14 +1890,14 @@ "0.2.21", "0.2.22" ], - "title": "Llama Stack Version", + "title": "Ogx Version", "type": "string" } }, "required": [ "name", "service_version", - "llama_stack_version" + "ogx_version" ], "title": "InfoResponse", "type": "object" diff --git a/docs/models/successful_responses.md b/docs/models/successful_responses.md index 544986c0c..286c2184c 100644 --- a/docs/models/successful_responses.md +++ b/docs/models/successful_responses.md @@ -752,14 +752,14 @@ Model representing a response to an info request. Attributes: name: Service name. service_version: Service version. - llama_stack_version: OGX version. + ogx_version: OGX version. | Field | Type | Description | |-------|------|-------------| | name | string | Service name | | service_version | string | Service version | -| llama_stack_version | string | OGX version | +| ogx_version | string | OGX version | ## JsonPathOperator diff --git a/src/app/endpoints/info.py b/src/app/endpoints/info.py index 198b86d8c..b7662b7b2 100644 --- a/src/app/endpoints/info.py +++ b/src/app/endpoints/info.py @@ -76,11 +76,11 @@ async def info_endpoint_handler( # try to get OGX client client = AsyncOgxClientHolder().get_client() # retrieve version - llama_stack_version_object = await client.inspect.version() - llama_stack_version = llama_stack_version_object.version + ogx_version_object = await client.inspect.version() + ogx_version = ogx_version_object.version logger.debug("Service name: %s", configuration.configuration.name) logger.debug("Service version: %s", __version__) - logger.debug("OGX version: %s", llama_stack_version) + logger.debug("OGX version: %s", ogx_version) set_span_attributes( span, { @@ -91,7 +91,7 @@ async def info_endpoint_handler( return InfoResponse( name=configuration.configuration.name, service_version=__version__, - llama_stack_version=llama_stack_version, + ogx_version=ogx_version, ) # connection to OGX server except APIConnectionError as e: diff --git a/src/models/api/responses/successful/probes.py b/src/models/api/responses/successful/probes.py index 7b4e48f8a..735bae232 100644 --- a/src/models/api/responses/successful/probes.py +++ b/src/models/api/responses/successful/probes.py @@ -17,7 +17,7 @@ class InfoResponse(AbstractSuccessfulResponse): Attributes: name: Service name. service_version: Service version. - llama_stack_version: OGX version. + ogx_version: OGX version. """ name: str = Field( @@ -30,7 +30,7 @@ class InfoResponse(AbstractSuccessfulResponse): examples=["0.1.0", "0.2.0", "1.0.0"], ) - llama_stack_version: str = Field( + ogx_version: str = Field( description="OGX version", examples=["0.2.1", "0.2.2", "0.2.18", "0.2.21", "0.2.22"], ) @@ -42,7 +42,7 @@ class InfoResponse(AbstractSuccessfulResponse): { "name": "Lightspeed Stack", "service_version": "1.0.0", - "llama_stack_version": "1.0.0", + "ogx_version": "1.0.0", } ] } diff --git a/tests/e2e/features/info.feature b/tests/e2e/features/info.feature index d04923e95..b79c76f9a 100644 --- a/tests/e2e/features/info.feature +++ b/tests/e2e/features/info.feature @@ -19,7 +19,7 @@ Feature: Info tests When I access REST API endpoint "info" using HTTP GET method Then The status code of the response is 200 And The body of the response has proper name Lightspeed Core Service (LCS) and version 0.6.0rc2 - And The body of the response has llama-stack version 1.0.2 + And The body of the response has ogx version 1.0.2 Scenario: Check if shields endpoint is working When I access REST API endpoint "shields" using HTTP GET method diff --git a/tests/e2e/features/steps/info.py b/tests/e2e/features/steps/info.py index 08cec90db..291d41576 100644 --- a/tests/e2e/features/steps/info.py +++ b/tests/e2e/features/steps/info.py @@ -19,21 +19,21 @@ def check_name_version(context: Context, service_name: str, version: str) -> Non ), f"version is {response_json["service_version"]}" -@then("The body of the response has llama-stack version {llama_version}") -def check_llama_version(context: Context, llama_version: str) -> None: +@then("The body of the response has ogx version {ogx_version}") +def check_ogx_version(context: Context, ogx_version: str) -> None: """Check proper OGX version number.""" response_json = context.response.json() assert response_json is not None, "Response is not valid JSON" version_pattern = r"\d+\.\d+\.\d+" - llama_stack_version = response_json["llama_stack_version"] - match = re.search(version_pattern, llama_stack_version) - assert match is not None, f"Could not extract version from {llama_stack_version}" + response_ogx_version = response_json["ogx_version"] + match = re.search(version_pattern, response_ogx_version) + assert match is not None, f"Could not extract version from {response_ogx_version}" extracted_version = match.group(0) assert ( - extracted_version == llama_version - ), f"llama-stack version is {extracted_version}, expected {llama_version}" + extracted_version == ogx_version + ), f"ogx version is {extracted_version}, expected {ogx_version}" @then("The body of the response has proper shield structure") diff --git a/tests/integration/endpoints/test_info_integration.py b/tests/integration/endpoints/test_info_integration.py index 1963e89a1..1b1454c9a 100644 --- a/tests/integration/endpoints/test_info_integration.py +++ b/tests/integration/endpoints/test_info_integration.py @@ -80,7 +80,7 @@ async def test_info_endpoint_returns_service_information( # Verify values from real configuration assert response.name == "foo bar baz" # From lightspeed-stack.yaml assert response.service_version == __version__ - assert response.llama_stack_version == "0.2.22" + assert response.ogx_version == "0.2.22" # Verify the OGX client was called mock_ogx_client.inspect.version.assert_called_once() diff --git a/tests/unit/app/endpoints/test_info.py b/tests/unit/app/endpoints/test_info.py index b501c2bc9..bc37a6695 100644 --- a/tests/unit/app/endpoints/test_info.py +++ b/tests/unit/app/endpoints/test_info.py @@ -76,7 +76,7 @@ async def test_info_endpoint(mocker: MockerFixture) -> None: assert response is not None assert response.name is not None assert response.service_version is not None - assert response.llama_stack_version == "0.1.2" + assert response.ogx_version == "0.1.2" @pytest.mark.asyncio diff --git a/tests/unit/models/responses/test_successful_responses.py b/tests/unit/models/responses/test_successful_responses.py index a29ab2fdd..51919e854 100644 --- a/tests/unit/models/responses/test_successful_responses.py +++ b/tests/unit/models/responses/test_successful_responses.py @@ -403,12 +403,12 @@ def test_constructor(self) -> None: response = InfoResponse( name="Lightspeed Stack", service_version="1.0.0", - llama_stack_version="1.0.0", + ogx_version="1.0.0", ) assert isinstance(response, AbstractSuccessfulResponse) assert response.name == "Lightspeed Stack" assert response.service_version == "1.0.0" - assert response.llama_stack_version == "1.0.0" + assert response.ogx_version == "1.0.0" def test_missing_required_parameters(self) -> None: """Test InfoResponse raises ValidationError when required fields are missing.""" diff --git a/tests/unit/utils/test_models_dumper.py b/tests/unit/utils/test_models_dumper.py index 77d55530f..ab79934d8 100644 --- a/tests/unit/utils/test_models_dumper.py +++ b/tests/unit/utils/test_models_dumper.py @@ -2504,10 +2504,10 @@ def test_dump_models(tmpdir: Path) -> None: "type": "object" }, "InfoResponse": { - "description": "Model representing a response to an info request.\n\nAttributes:\n name: Service name.\n service_version: Service version.\n llama_stack_version: OGX version.", + "description": "Model representing a response to an info request.\n\nAttributes:\n name: Service name.\n service_version: Service version.\n ogx_version: OGX version.", "examples": [ { - "llama_stack_version": "1.0.0", + "ogx_version": "1.0.0", "name": "Lightspeed Stack", "service_version": "1.0.0" } @@ -2531,7 +2531,7 @@ def test_dump_models(tmpdir: Path) -> None: "title": "Service Version", "type": "string" }, - "llama_stack_version": { + "ogx_version": { "description": "OGX version", "examples": [ "0.2.1", @@ -2547,7 +2547,7 @@ def test_dump_models(tmpdir: Path) -> None: "required": [ "name", "service_version", - "llama_stack_version" + "ogx_version" ], "title": "InfoResponse", "type": "object"