Merge pull request #292 from matysek/lcore-399

LCORE-497, LCORE-498, LCORE-499: Bundle most of ansible, assist-installer, default run.yaml dependencies, with pytorch and libs that depends on it.

Author: tisnik

.github/workflows/pylint.yaml

@@ -18,6 +18,6 @@ jobs:
         with:
           python-version: '3.12'
       - name: Install dependencies
-        run: uv sync
+        run: uv sync --group llslibdev
       - name: Python linter
         run: uv run pylint src tests

.github/workflows/pyright.yaml

@@ -18,6 +18,6 @@ jobs:
         with:
           python-version: '3.12'
       - name: Install dependencies
-        run: uv sync
+        run: uv sync --group llslibdev
       - name: Run Pyright tests
         run: uv run pyright src

.github/workflows/unit_tests.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: uv version
         run: uv --version
       - name: Install dependencies
-        run: uv pip install --python ${{ matrix.python-version }} -e .
+        run: uv pip install --python ${{ matrix.python-version }} --group llslibdev .
       - name: Install pdm  # Required for dynamic version test
         run: uv pip install pdm
       - name: Run unit tests

Containerfile

@@ -1,5 +1,5 @@
 # vim: set filetype=dockerfile
-FROM registry.access.redhat.com/ubi9/python-312-minimal AS builder
+FROM registry.access.redhat.com/ubi9/python-312 AS builder
 
 ARG APP_ROOT=/app-root
 ARG LSC_SOURCE_DIR=.
@@ -11,16 +11,21 @@ ENV UV_COMPILE_BYTECODE=0 \
 
 WORKDIR /app-root
 
+# Install gcc - required by polyleven python package on aarch64
+# (dependency of autoevals, no pre-built binary wheels for linux on aarch64)
+USER root
+RUN dnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs gcc
+
 # Install uv package manager
-RUN pip3.12 install uv
+RUN pip3.12 install "uv==0.8.11"
 
 # Add explicit files and directories
 # (avoid accidental inclusion of local directories or env files or credentials)
 COPY ${LSC_SOURCE_DIR}/src ./src
 COPY ${LSC_SOURCE_DIR}/pyproject.toml ${LSC_SOURCE_DIR}/LICENSE ${LSC_SOURCE_DIR}/README.md ${LSC_SOURCE_DIR}/uv.lock ./
 
-RUN uv sync --locked --no-dev
-
+# Bundle additional dependencies for library mode.
+RUN uv sync --locked --no-dev --group llslibdev
 
 # Final image without uv package manager
 FROM registry.access.redhat.com/ubi9/python-312-minimal
@@ -42,6 +47,11 @@ COPY --from=builder --chown=1001:1001 /app-root /app-root
 # this directory is checked by ecosystem-cert-preflight-checks task in Konflux
 COPY --from=builder /app-root/LICENSE /licenses/
 
+# Add uv to final image for derived images to add additional dependencies
+# with command:
+# $ uv pip install <dependency>
+RUN pip3.12 install "uv==0.8.11"
+
 # Add executables from .venv to system PATH
 ENV PATH="/app-root/.venv/bin:$PATH"
 

pyproject.toml

@@ -22,7 +22,7 @@ requires-python = ">=3.12,<3.14"
 readme = "README.md"
 license = {file = "LICENSE"}
 dependencies = [
-    "fastapi>=0.115.6",
+    "fastapi>=0.115.12",
     "uvicorn>=0.34.3",
     "kubernetes>=30.1.0",
     "llama-stack==0.2.17",
@@ -33,11 +33,12 @@ dependencies = [
     "starlette>=0.47.1",
     "aiohttp>=3.12.14",
     "authlib>=1.6.0",
-    "openai==1.99.1",
-    "sqlalchemy>=2.0.42",
     "email-validator>=2.2.0",
+    "openai==1.99.9",
+    "sqlalchemy>=2.0.42",
 ]
 
+
 [tool.pyright]
 exclude = [
   # TODO(lucasagomes): This module was copied from road-core
@@ -61,6 +62,15 @@ lightspeed-stack = "lightspeed_stack:main"
 Homepage = "https://github.com/lightspeed-core/lightspeed-stack"
 Issues = "https://github.com/lightspeed-core/lightspeed-stack/issues"
 
+# PyTorch has multiple wheel variants for different backends - cpu, gpu, etc.
+# By default on pypi.org is the gpu variant. Forces uv to use the cpu variant.
+[[tool.uv.index]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+explicit = true
+[tool.uv.sources]
+torch = [{ index = "pytorch-cpu" }]
+
 [dependency-groups]
 dev = [
     "black>=25.1.0",
@@ -83,23 +93,49 @@ dev = [
     "openapi-to-md>=0.1.0b2",
 ]
 llslibdev = [
-    "fastapi>=0.115.12",
-    "opentelemetry-sdk>=1.34.0",
-    "opentelemetry-exporter-otlp>=1.34.0",
-    "opentelemetry-instrumentation>=0.55b0",
+    # To check llama-stack API provider dependecies:
+    #
+    #    $ uv run llama stack list-providers
+    #
+    # API agents: inline::meta-reference
+    "matplotlib>=3.10.0",
+    "pillow>=11.1.0",
+    "pandas>=2.2.3",
+    "scikit-learn>=1.5.2",
+    "psycopg2-binary>=2.9.10",
+    # API eval: inline::meta-reference
+    "tree_sitter>=0.24.0",
+    "pythainlp>=3.0.10",
+    "langdetect>=1.0.9",
+    "emoji>=2.1.0",
+    "nltk>=3.8.1",
+    # API inference: remote::gemini
+    "litellm>=1.75.5.post1",
+    # API vector_io: inline::faiss
+    "faiss-cpu>=1.11.0",
+    # API scoring: inline::basic
+    "requests>=2.32.4",
+    # API datasetio: inline::localfs
     "aiosqlite>=0.21.0",
-    "litellm>=1.72.1",
-    "uvicorn>=0.34.3",
-    "blobfile>=3.0.0",
+    # API datasetio: remote::huggingface
     "datasets>=3.6.0",
-    "sqlalchemy>=2.0.41",
-    "faiss-cpu>=1.11.0",
+    # API telemetry: inline::meta-reference
+    "opentelemetry-sdk>=1.34.1",
+    "opentelemetry-exporter-otlp>=1.34.1",
+    # API tool_runtime: inline::rag-runtime
+    "transformers>=4.34.0",
+    "numpy==2.2.6",
+    # API tool_runtime: remote::model-context-protocol
     "mcp>=1.9.4",
+    # Other
     "autoevals>=0.0.129",
-    "psutil>=7.0.0",
-    "torch>=2.7.1",
+    "torch==2.7.1",
     "peft>=0.15.2",
     "trl>=0.18.2",
+    "fire>=0.7.0",
+    "opentelemetry-instrumentation>=0.55b0",
+    "blobfile>=3.0.0",
+    "psutil>=7.0.0",
 ]
 
 build = [

test.containerfile

@@ -23,22 +23,6 @@ RUN uv -h
 # Install from pyproject.toml using uv sync for version consistency  
 # Note: using --no-install-project since this is llama-stack container, not lightspeed-stack
 # Include dev deps for testing (pytest, behave, etc.)
-RUN uv sync --locked --no-install-project && \
-    uv pip install \
-    opentelemetry-sdk \
-    opentelemetry-exporter-otlp \
-    opentelemetry-instrumentation \
-    aiosqlite \
-    litellm \
-    blobfile \
-    datasets \
-    sqlalchemy \
-    faiss-cpu \
-    mcp \
-    autoevals \
-    psutil \
-    torch \
-    peft \
-    trl
+RUN uv sync --locked --no-install-project --group dev --group llslibdev
 
 CMD ["uv", "run", "llama", "stack", "run", "run.yaml"]