LCORE-4167: Merge main into release/0.7

.github/workflows/e2e_tests.yaml

@@ -54,8 +54,7 @@ jobs:
       E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
       E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
       FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
-      # Override via repo Actions variable E2E_LLAMA_HOSTNAME; default matches server-mode lightspeed-stack.yaml
-      E2E_LLAMA_HOSTNAME: ${{ vars.E2E_LLAMA_HOSTNAME || 'llama-stack' }}
+      E2E_OGX_HOSTNAME: ogx
 
     steps:
       - uses: actions/checkout@v7
@@ -289,8 +288,8 @@ jobs:
           echo "=== Test failure logs ==="
 
           if [ "${{ matrix.mode }}" == "server" ]; then
-            echo "=== llama-stack logs ==="
-            docker compose logs llama-stack
+            echo "=== OGX logs ==="
+            docker compose logs ogx
             echo ""
             echo "=== lightspeed-stack logs ==="
             docker compose logs lightspeed-stack

.github/workflows/e2e_tests_providers.yaml

@@ -355,8 +355,8 @@ jobs:
           echo "=== Test failure logs ==="
 
           if [ "${{ matrix.mode }}" == "server" ]; then
-            echo "=== llama-stack logs ==="
-            docker compose logs llama-stack
+            echo "=== OGX logs ==="
+            docker compose logs ogx
             echo ""
             echo "=== lightspeed-stack logs ==="
             docker compose logs lightspeed-stack

.github/workflows/e2e_tests_rhaiis.yaml

@@ -249,8 +249,8 @@ jobs:
           echo "=== Test failure logs ==="
 
           if [ "${{ matrix.mode }}" == "server" ]; then
-            echo "=== llama-stack logs ==="
-            docker compose logs llama-stack
+            echo "=== OGX logs ==="
+            docker compose logs ogx
             echo ""
             echo "=== lightspeed-stack logs ==="
             docker compose logs lightspeed-stack

.gitignore

@@ -183,7 +183,7 @@ dev/
 # VSCode
 .vscode/
 
-# Llama related - when running the stack as lib client
+# OGX related - when running the stack as lib client
 .llama
 
 # Database files
@@ -195,7 +195,7 @@ requirements.*.backup
 # Local run files
 local-run.yaml
 
-# Synthesized Llama Stack run.yaml written by unified library mode (LCORE-2336)
+# Synthesized OGX run.yaml written by unified library mode (LCORE-2336)
 .generated/
 
 # Sisyphus planning files

.konflux/build-args-konflux.conf

@@ -1,4 +1,4 @@
-BUILDER_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.1-1787661100
+BUILDER_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.1-1789137687
 BUILDER_DNF_COMMAND=dnf
-RUNTIME_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.1-1787661100
+RUNTIME_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.1-1789137687
 RUNTIME_DNF_COMMAND=dnf

.konflux/requirements.hashes.wheel.txt

@@ -59,9 +59,9 @@ chevron==0.14.0 \
     --hash=sha256:4cbb3abb3803127a24947e075384f21bde2e00d43b8b8026f4ba9af7f866a423
 click==8.4.2 \
     --hash=sha256:368d4af9976de9fc5efc4d8a26c64d23c187c21a2eba9336254832d466dd6198
-cryptography==49.0.0 \
-    --hash=sha256:272f6cf35bd11146fb7182ed94b7123b9547174e944a0ec41fb547d1ad363982 \
-    --hash=sha256:44e7dda87cce4e64a4eada2469ade616471772ee8203d7331967ef7ba2fee2bd
+cryptography==50.0.1 \
+    --hash=sha256:3e29639a33400721f710beeba7741e275bdb4c5bc53107c9dfef240d251c0590 \
+    --hash=sha256:8ae962f84e7f36290feca5f8ba7bfc01fea9cd9a48f446bca52ef115657cca3d
 datasets==5.0.0 \
     --hash=sha256:0fbc08ef020b03a22d91ad38b3b22091a1e18c1335f2963d357ea540bfb032e7
 defusedxml==0.7.1 \
@@ -215,8 +215,8 @@ narwhals==2.24.0 \
     --hash=sha256:30285014e6754ed468b29358bc0aebff0117d6a1d64383254ae55ceef31ffb25
 networkx==3.6.1 \
     --hash=sha256:56b687ad58bed743066f1b7d5e6f56a72d2f193c8eaf35064abaedda4fba3745
-nltk==3.10.0 \
-    --hash=sha256:a15da2911adca5c7b4574b902f6b344f3f65db72ded7f79b30617bbe7100d318
+nltk==3.10.3 \
+    --hash=sha256:fb9ae77ba878bf1f09e6cca649f2c296f20b1c83143932ae06c12018b505afd7
 numpy==2.3.5 \
     --hash=sha256:927205c8882f7a53543a8fc5b13fcb05771d6bfff35e06daf8030e57549cc7be \
     --hash=sha256:a08c6c26c26d7530d09ac93bc177593958c2e3ce4a9b5750c14a80329cca157c

.konflux/rpms.in.yaml

@@ -9,9 +9,8 @@ packages:
   ]
 upgradePackages:
   [
-    libxslt,
-    libarchive,
-    python3-urllib3,
+    acl,
+    ffmpeg-free-rhai,
   ]
 contentOrigin:
   repofiles: ["./redhat.repo"]

.konflux/rpms.lock.yaml

@@ -4,6 +4,69 @@ lockfileVendor: redhat
 arches:
 - arch: aarch64
   packages:
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/f/ffmpeg-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 1515025
+    checksum: sha256:c6bfee462ad3b3f5b4fd19cf96367d549ea7bfeea0ab4ffe634dd497ba5847ba
+    name: ffmpeg-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libavcodec-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 4031909
+    checksum: sha256:9ca273eea853bd5c0781add66b1620978468ce9e54a288e972bb668b4d6d7360
+    name: libavcodec-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libavdevice-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 75640
+    checksum: sha256:4f32d0216ddc8e6f83732aece446b0e618f0bcd358f85c86fb9d5e8b760c3da7
+    name: libavdevice-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libavfilter-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 1446844
+    checksum: sha256:795dd36bacac138d1efb3f1a41e8cb6e9f13843a856fd9f6ef6fe6e9c0b4bf9b
+    name: libavfilter-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libavformat-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 1136615
+    checksum: sha256:c17182dfc59bda4af4bda6da1efcd13c860c11af50523910e708fd5debfa177c
+    name: libavformat-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libavutil-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 345879
+    checksum: sha256:00d27c22f8aed4753ef047771597c7f263030e06549d445e22a9206abd1f3664
+    name: libavutil-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libpostproc-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 39547
+    checksum: sha256:8b1a8cc49a38014789179fb39eb3bbe81ae74b58da2d078f2d8581461222f03e
+    name: libpostproc-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libswresample-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 60307
+    checksum: sha256:bb0259b949e925f3eed54e75cde70e76e0992938ee24c82cf1bae0b85a461a00
+    name: libswresample-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/rhelai/3.5/os/Packages/l/libswscale-free-rhai-6.1.6-9.el9ai.aarch64.rpm
+    repoid: rhelai-3.5-for-rhel-9-aarch64-rpms
+    size: 162587
+    checksum: sha256:bd4e3882c78fffd4ffac7d99bdcea42d7eebd337a6da75223580eeb828ac55be
+    name: libswscale-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
   - url: https://cdn.redhat.com/content/eus/rhel9/9.6/aarch64/appstream/os/Packages/c/cargo-1.84.1-1.el9.aarch64.rpm
     repoid: rhel-9-for-aarch64-appstream-eus-rpms__9_DOT_6
     size: 7744425
@@ -60,6 +123,13 @@ arches:
     name: rust-std-static
     evr: 1.84.1-1.el9
     sourcerpm: rust-1.84.1-1.el9.src.rpm
+  - url: https://cdn.redhat.com/content/eus/rhel9/9.6/aarch64/baseos/os/Packages/a/acl-2.4.0-0.el9_6.1.aarch64.rpm
+    repoid: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_6
+    size: 77159
+    checksum: sha256:3b88acdb403b28e3d9b72010d6794d2306a3a92295e264f9ca6447883886ac8b
+    name: acl
+    evr: 2.4.0-0.el9_6.1
+    sourcerpm: acl-2.4.0-0.el9_6.1.src.rpm
   - url: https://cdn.redhat.com/content/eus/rhel9/9.6/aarch64/baseos/os/Packages/e/ed-1.14.2-12.el9.aarch64.rpm
     repoid: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_6
     size: 78931
@@ -74,17 +144,80 @@ arches:
     name: info
     evr: 6.7-15.el9
     sourcerpm: texinfo-6.7-15.el9.src.rpm
-  - url: https://cdn.redhat.com/content/eus/rhel9/9.6/aarch64/baseos/os/Packages/p/python3-urllib3-1.26.5-6.el9_6.2.noarch.rpm
+  - url: https://cdn.redhat.com/content/eus/rhel9/9.6/aarch64/baseos/os/Packages/l/libacl-2.4.0-0.el9_6.1.aarch64.rpm
     repoid: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_6
-    size: 223128
-    checksum: sha256:177899cd61996a1a459f23508428fe8be31d174cf998c624155e13137a10a4e9
-    name: python3-urllib3
-    evr: 1.26.5-6.el9_6.2
-    sourcerpm: python-urllib3-1.26.5-6.el9_6.2.src.rpm
+    size: 24904
+    checksum: sha256:44a0d95be843d5b5104a6182e13de076c3ed83321977aee6f69148a1d5fb2780
+    name: libacl
+    evr: 2.4.0-0.el9_6.1
+    sourcerpm: acl-2.4.0-0.el9_6.1.src.rpm
   source: []
   module_metadata: []
 - arch: x86_64
   packages:
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/f/ffmpeg-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 1518752
+    checksum: sha256:cd24a91037cbbdc29277a574666fc5e49dcfd582afd63f6f6fe0099ea1470c36
+    name: ffmpeg-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libavcodec-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 4213330
+    checksum: sha256:7786b455d74f44cc89b7a8017da2d606e3cbfa7f07b64ad575527e583bdbd178
+    name: libavcodec-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libavdevice-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 76627
+    checksum: sha256:620c454f720454d13e881966d770e598554b9db1f9e5daeed03a4c87aaf20e98
+    name: libavdevice-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libavfilter-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 1531710
+    checksum: sha256:32c1f98752cf9e40d18a6171ab68f7a3f9a5c435ae44e1beb6450ce1af183e9c
+    name: libavfilter-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libavformat-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 1122106
+    checksum: sha256:aee63758df3f99f5962a5ba61ca07c6c9b5d1ccde4677dd6ddc4c999599cd921
+    name: libavformat-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libavutil-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 351489
+    checksum: sha256:3338518a95b0931f570cadea63983faaee1a053e382c6fe7b09cd6e5c629275d
+    name: libavutil-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libpostproc-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 46878
+    checksum: sha256:31356012fb0d14be447a9357e4bb9be23de095072bdd5654d70efe2643fe1d11
+    name: libpostproc-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libswresample-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 66438
+    checksum: sha256:6252004c850c7741fb49e18c5eb86896192051caa6623c96051ac30c6e0c0a70
+    name: libswresample-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
+  - url: https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/rhelai/3.5/os/Packages/l/libswscale-free-rhai-6.1.6-9.el9ai.x86_64.rpm
+    repoid: rhelai-3.5-for-rhel-9-x86_64-rpms
+    size: 188983
+    checksum: sha256:f114a579b7cdc4458baecc516ca93f4abf64a66fa21eda0f186d5ef9799a8640
+    name: libswscale-free-rhai
+    evr: 6.1.6-9.el9ai
+    sourcerpm: ffmpeg-6.1.6-9.el9ai.src.rpm
   - url: https://cdn.redhat.com/content/eus/rhel9/9.6/x86_64/appstream/os/Packages/c/cargo-1.84.1-1.el9.x86_64.rpm
     repoid: rhel-9-for-x86_64-appstream-eus-rpms__9_DOT_6
     size: 8292467
@@ -141,6 +274,13 @@ arches:
     name: rust-std-static
     evr: 1.84.1-1.el9
     sourcerpm: rust-1.84.1-1.el9.src.rpm
+  - url: https://cdn.redhat.com/content/eus/rhel9/9.6/x86_64/baseos/os/Packages/a/acl-2.4.0-0.el9_6.1.x86_64.rpm
+    repoid: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_6
+    size: 77918
+    checksum: sha256:7922ff8b02bdd4f0771e3036c3d293939bc2d182505772d7fccfb28a650fedc6
+    name: acl
+    evr: 2.4.0-0.el9_6.1
+    sourcerpm: acl-2.4.0-0.el9_6.1.src.rpm
   - url: https://cdn.redhat.com/content/eus/rhel9/9.6/x86_64/baseos/os/Packages/e/ed-1.14.2-12.el9.x86_64.rpm
     repoid: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_6
     size: 79993
@@ -155,12 +295,12 @@ arches:
     name: info
     evr: 6.7-15.el9
     sourcerpm: texinfo-6.7-15.el9.src.rpm
-  - url: https://cdn.redhat.com/content/eus/rhel9/9.6/x86_64/baseos/os/Packages/p/python3-urllib3-1.26.5-6.el9_6.2.noarch.rpm
+  - url: https://cdn.redhat.com/content/eus/rhel9/9.6/x86_64/baseos/os/Packages/l/libacl-2.4.0-0.el9_6.1.x86_64.rpm
     repoid: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_6
-    size: 223128
-    checksum: sha256:177899cd61996a1a459f23508428fe8be31d174cf998c624155e13137a10a4e9
-    name: python3-urllib3
-    evr: 1.26.5-6.el9_6.2
-    sourcerpm: python-urllib3-1.26.5-6.el9_6.2.src.rpm
+    size: 25027
+    checksum: sha256:3fefd0c83d5b54dab6f88bd85fd00493983fc26656c5e1f62f5ea56ce1711388
+    name: libacl
+    evr: 2.4.0-0.el9_6.1
+    sourcerpm: acl-2.4.0-0.el9_6.1.src.rpm
   source: []
   module_metadata: []

.tekton/integration-tests/pipeline/lightspeed-stack-integration-test.yaml

@@ -15,7 +15,7 @@ spec:
       default: '{"components": [{"name":"lightspeed-stack-0-7", "containerImage": "quay.io/example/lightspeed-stack-0-7:latest"}]}'
       type: string
     - name: llama-stack-image
-      description: 'Llama Stack runs from source on UBI (init container clones repo and installs deps). Kept for logging/backwards compatibility.'
+      description: 'OGX runs from source on UBI (init container clones repo and installs deps). Parameter name kept for backwards compatibility.'
       default: 'run-from-source (UBI)'
       type: string
     - name: test-name
@@ -81,7 +81,7 @@ spec:
               - name: instanceType
                 value: "m5.large"
     - name: get-stack-images
-      description: Extract lightspeed-stack image and commit from SNAPSHOT (Llama Stack runs from source in-pod)
+      description: Extract lightspeed-stack image and commit from SNAPSHOT (OGX runs from source in-pod)
       runAfter:
         - provision-cluster
       params:

Makefile

@@ -339,9 +339,9 @@ docstyle:	## Check the docstring style using Docstyle checker
 ruff:	## Check source code using Ruff linter
 	uv run ruff check src tests --per-file-ignores=tests/*:S101 --per-file-ignores=scripts/*:S101
 
-lint-openapi: ## Lint docs/openapi.json (Spectral OAS ruleset; fail on error)
+lint-openapi: ## Lint docs/devel_doc/openapi.json (Spectral OAS ruleset; fail on error)
 	@if command -v npx >/dev/null 2>&1; then \
-		npx --yes @stoplight/spectral-cli@6 lint docs/openapi.json --fail-severity error --display-only-failures; \
+		npx --yes @stoplight/spectral-cli@6 lint docs/devel_doc/openapi.json --fail-severity error --display-only-failures; \
 	else \
 		echo "lint-openapi: skipping Spectral (npx not found). Install Node.js for OpenAPI lint locally; CI still runs it."; \
 	fi