Skip to content

Commit ff6afd3

Browse files
authored
Merge pull request #2823 from jrobertboos/sync-main-to-release-0.7
LCORE-2976: Sync main to release 0.7
2 parents 2ee1edc + 8e39e32 commit ff6afd3

249 files changed

Lines changed: 24995 additions & 4850 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/e2e_tests.yaml‎

Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
push:
66
pull_request_target:
77
types: [opened, synchronize, reopened, labeled]
8+
branches:
9+
- main
10+
- release/0.6
11+
- release/0.7
812

913
jobs:
1014
# Own job so repository secrets are never sent to a runner unless this passes.
@@ -20,6 +24,8 @@ jobs:
2024
matrix:
2125
mode: ["server", "library"]
2226
environment: ["ci"]
27+
is_release_06:
28+
- ${{ github.base_ref == 'release/0.6' }}
2329
# Config-aligned shards (@cfg_*). Packed small groups keep job count reasonable
2430
# while avoiding mixed-config restarts inside large suites.
2531
shard:
@@ -36,25 +42,76 @@ jobs:
3642
- name: shields
3743
tags: "not @skip and @cfg_shields"
3844
- name: other
39-
tags: "not @skip and (@cfg_rh_identity or @cfg_negative or @cfg_byok_pdf or @cfg_degraded or @cfg_unified)"
45+
tags: "not @skip and (@cfg_rh_identity or @cfg_negative or @cfg_byok_pdf or @cfg_degraded or @cfg_unified or @cfg_compaction)"
4046
# Server-only; listed in shard (not matrix.include) so it expands with
4147
# mode=server before any library jobs. include would append after library.
4248
- name: tls
4349
tags: "not @skip and @cfg_tls"
50+
- name: group 1
51+
tags: "not @skip and @e2e_group_1"
52+
- name: group 2
53+
tags: "not @skip and @e2e_group_2"
54+
- name: group 3
55+
tags: "not @skip and @e2e_group_3"
4456
exclude:
4557
- mode: library
4658
shard:
4759
name: tls
4860
tags: "not @skip and @cfg_tls"
61+
- is_release_06: true
62+
shard:
63+
name: default
64+
tags: "not @skip and @cfg_default"
65+
- is_release_06: true
66+
shard:
67+
name: authorized
68+
tags: "not @skip and @cfg_authorized"
69+
- is_release_06: true
70+
shard:
71+
name: mcp
72+
tags: "not @skip and (@cfg_mcp or @cfg_mcp_invalid or @cfg_mcp_api_auth)"
73+
- is_release_06: true
74+
shard:
75+
name: rbac
76+
tags: "not @skip and @cfg_rbac"
77+
- is_release_06: true
78+
shard:
79+
name: skills
80+
tags: "not @skip and (@cfg_skills or @cfg_skills_directory)"
81+
- is_release_06: true
82+
shard:
83+
name: shields
84+
tags: "not @skip and @cfg_shields"
85+
- is_release_06: true
86+
shard:
87+
name: other
88+
tags: "not @skip and (@cfg_rh_identity or @cfg_negative or @cfg_byok_pdf or @cfg_degraded or @cfg_unified)"
89+
- is_release_06: true
90+
shard:
91+
name: tls
92+
tags: "not @skip and @cfg_tls"
93+
- is_release_06: false
94+
shard:
95+
name: group 1
96+
tags: "not @skip and @e2e_group_1"
97+
- is_release_06: false
98+
shard:
99+
name: group 2
100+
tags: "not @skip and @e2e_group_2"
101+
- is_release_06: false
102+
shard:
103+
name: group 3
104+
tags: "not @skip and @e2e_group_3"
49105

50106
name: "E2E: ${{ matrix.mode }} / ${{ matrix.environment }} / ${{ matrix.shard.name }}"
51-
107+
52108
env:
53109
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
54110
E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
55111
E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
56112
FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
57113
E2E_OGX_HOSTNAME: ogx
114+
E2E_LLAMA_HOSTNAME: ${{ vars.E2E_LLAMA_HOSTNAME || 'llama-stack' }}
58115

59116
steps:
60117
- uses: actions/checkout@v7
@@ -153,7 +210,7 @@ jobs:
153210
echo "Models: $(grep -c "model_id:" run.yaml)"
154211
echo ""
155212
echo "=== lightspeed-stack.yaml ==="
156-
grep -A 3 "ogx:" lightspeed-stack.yaml
213+
grep -A 3 -E '^(ogx|llama_stack):' lightspeed-stack.yaml
157214
158215
- name: Cache HuggingFace embedding model
159216
uses: actions/cache@v4
@@ -288,8 +345,9 @@ jobs:
288345
echo "=== Test failure logs ==="
289346
290347
if [ "${{ matrix.mode }}" == "server" ]; then
291-
echo "=== OGX logs ==="
292-
docker compose logs ogx
348+
SERVICE=$(docker compose config --services | grep -E '^(ogx|llama-stack)$' | head -1)
349+
echo "=== ${SERVICE} logs ==="
350+
docker compose logs "$SERVICE"
293351
echo ""
294352
echo "=== lightspeed-stack logs ==="
295353
docker compose logs lightspeed-stack

‎.konflux/artifacts.lock.yaml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.konflux/build-args-konflux.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BUILDER_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.1-1789137687
1+
BUILDER_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.2-1790703656
22
BUILDER_DNF_COMMAND=dnf
3-
RUNTIME_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.1-1789137687
3+
RUNTIME_BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.5.2-1790703656
44
RUNTIME_DNF_COMMAND=dnf

‎.konflux/requirements-build.txt‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.14
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pybuild-deps compile --output-file=.konflux/requirements-build.txt .konflux/_tmp_sdist_list.txt
@@ -10,14 +10,16 @@ dunamai==1.26.2
1010
# via uv-dynamic-versioning
1111
flit-core==3.12.0
1212
# via jinja2
13-
flit-core==4.0.2
13+
flit-core==4.1.0
1414
# via
1515
# packaging
1616
# pathspec
1717
hatch-vcs==0.5.0
1818
# via pydantic-ai-skills
19-
hatchling==1.32.0
19+
hatchling==1.32.4
2020
# via
21+
# genai-prices
22+
# hatch-vcs
2123
# logfire
2224
# pydantic-ai
2325
# pydantic-ai-skills
@@ -30,31 +32,30 @@ pathspec==1.1.1
3032
# via hatchling
3133
pluggy==1.6.0
3234
# via hatchling
33-
poetry-core==2.4.1
35+
poetry-core==2.5.0
3436
# via
3537
# dunamai
3638
# tomlkit
37-
semantic-version==2.10.0
38-
# via setuptools-rust
39-
setuptools-rust==1.13.0
40-
# via maturin
41-
setuptools-scm==10.2.1
39+
setuptools-scm==10.3.4
4240
# via
41+
# hatch-vcs
42+
# ogx
43+
# ogx-api
4344
# pluggy
44-
# setuptools-rust
4545
tomlkit==0.15.1
4646
# via
4747
# hatchling
4848
# uv-dynamic-versioning
49-
trove-classifiers==2026.6.1.19
49+
trove-classifiers==2026.9.21.13
5050
# via hatchling
51-
uv-dynamic-versioning==0.14.0
51+
uv-dynamic-versioning==0.14.1
5252
# via
53+
# genai-prices
5354
# pydantic-ai
5455
# pydantic-ai-slim
5556
# pydantic-evals
5657
# pydantic-graph
57-
vcs-versioning==2.2.4
58+
vcs-versioning==2.5.0
5859
# via setuptools-scm
5960

6061
# The following packages are considered to be unsafe in a requirements file:

‎.konflux/requirements.hashes.source.txt‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
--index-url https://pypi.org/simple
2-
genai-prices==0.1.2 \
3-
--hash=sha256:930ffd34e3b65e32d24818073a2fb65f0174c4de7f6afbebfee1efdf8b003877 \
4-
--hash=sha256:bdcdb9b358de01d9c3d4337a86b8dbfbf4e8044c2c064e6e3c4a6fef2f640382
5-
google-cloud-aiplatform==1.165.1 \
6-
--hash=sha256:93874bd7993d1d901291595df693a8b9d4d7c89b93d4f41f8664d73f088dec89 \
7-
--hash=sha256:bd62ba7590255cacd66f9d0439eb731060af460d35bb48dbbeeefce9dfc0a359
8-
google-cloud-bigquery==3.43.0 \
9-
--hash=sha256:a39217f14f215472ce9da816f20ebaf77fdb1db7ccdc8360772d8bf6bafb55c2 \
10-
--hash=sha256:e3dc25ab9ac8b2b089408493177d4d4508b098c80c3931786fbc20b075298fe6
2+
genai-prices==0.1.9 \
3+
--hash=sha256:20ec774d32ec5d345510877fac415f2560bbfeb081bc4cd4e7ebce57a5503e8d \
4+
--hash=sha256:3da8faa0a126e4df7be36696b90abe2be1fea8826bfcf45d39d91bc397fa9d1d
5+
google-cloud-aiplatform==2.2.0 \
6+
--hash=sha256:8de28d03dcb0887fce4a77557085f4d308758526b76cfd53820420ae82a68c80 \
7+
--hash=sha256:adafcc07cd36289664ae36891137ad28f81a6372a3d698648646f2a9ca6e1c7d
8+
google-cloud-bigquery==3.45.2 \
9+
--hash=sha256:6920be2d7199810e2472be58204d7787dcf3cf677a21e682d5c636bae1b082ea \
10+
--hash=sha256:9342158e1a413c66b44b676a42c79cb8d1750da3971b957b267c9327749b4723
1111
google-cloud-resource-manager==1.18.0 \
1212
--hash=sha256:69bab144acd75878ebe44b720903dc3d140cb7d3be3261eaa8bc81e48afaff33 \
1313
--hash=sha256:db689f800a14c66d041196a7fbb8bb8aae8dc87f28c2929e101a5ec766b15512
14-
logfire==4.40.0 \
15-
--hash=sha256:0ac2c950968812f27ee68ccec4a362230acffaffb28f04945ee07729d5866fa0 \
16-
--hash=sha256:f50f9637f9b5cc3eb5f8526e473effa1992d45056c89adc7c821ee7ab2520c75
14+
logfire==5.1.1 \
15+
--hash=sha256:7f9fc158988be37559045b054f278608d9fdc06bd9f875515ea6476bf260cb23 \
16+
--hash=sha256:ee2e25b83830f52ea3d7a1b35cf6f783490b2ba349f0383ca8ae6f5ff2a4f7dd
17+
oauthlib==4.0.0 \
18+
--hash=sha256:624c28c13a0a59cabf9747dfa52af63be3e512a7f2714df16e91b5b3a145e6cd \
19+
--hash=sha256:efb274799819440f95b4ab3b818869f1ce9ae26c5beacba0201d1a1b76b54f86
1720
ogx==1.2.5 \
1821
--hash=sha256:3435881ebc343ae8857224d631e56d8df72c5c80230a239672712fd56127b5be \
1922
--hash=sha256:a1928715063658b1a1d44f1cee1012e0a2f567489122838d5f79178e8e91a9cc
@@ -38,6 +41,9 @@ pydantic-evals==2.27.1 \
3841
pydantic-graph==2.27.1 \
3942
--hash=sha256:48f966b77e488083b334fb9bbfa00cb1df193736453481674ecd2ab27dc7401a \
4043
--hash=sha256:cc0d352dc9ce081ccfefeb7f5ee7fc830c2bc4185ec616af6aeb9269f4e807c1
41-
pythainlp==5.3.7 \
42-
--hash=sha256:625b32cd42320dc6e359315108c58eb62480804b16ae843ae3249d925f4f2cf9 \
43-
--hash=sha256:98b86c6d4a807749a8e9c9488090e20e0504f99be05b414b7da14dc5068a1f76
44+
pyjwt==2.15.1 \
45+
--hash=sha256:42d59d631f7768a1028a64c7ff581a9bf7519804daf91fc5b6c56e30eec5e193 \
46+
--hash=sha256:4f259e80cdfb6b3fc18a7de51fd1ef9ec79652f25019bae68975ca2468a34df8
47+
pythainlp==5.3.8 \
48+
--hash=sha256:7f4367782d250afa936f65a1c151129fb80c316c3b3dbaa08923de04705b53b3 \
49+
--hash=sha256:ef8cd131421b3f80a1262c63ce3391ccdfb155a60453051b09e6b5fdf1e62c0a

0 commit comments

Comments
 (0)