Merge branch 'main' into lcore-1246

Author: jrobertboos

.github/workflows/e2e_tests.yaml

@@ -18,6 +18,7 @@ jobs:
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
       E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
+      FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/e2e_tests_providers.yaml

@@ -24,6 +24,7 @@ jobs:
       CLIENT_ID: ${{ secrets.CLIENT_ID }}
       TENANT_ID: ${{ secrets.TENANT_ID }}
       E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
+      FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/e2e_tests_rhaiis.yaml

@@ -11,13 +11,21 @@ jobs:
   e2e_tests:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
+        mode: ["server", "library"]
         environment: [ "rhaiis" ]
+
+    name: "RHAIIS E2E: ${{ matrix.mode }} mode / ${{ matrix.environment }}"
+
     env:
+      E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       RHAIIS_URL: ${{ secrets.RHAIIS_URL }}
+      RHAIIS_PORT: ${{ secrets.RHAIIS_PORT }}
       RHAIIS_API_KEY: ${{ secrets.RHAIIS_API_KEY }}
       RHAIIS_MODEL: ${{ vars.RHAIIS_MODEL }}
+      FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
 
     steps:
       - uses: actions/checkout@v4
@@ -46,37 +54,18 @@ jobs:
           echo "=== Recent commits (should show setup-metrics commits) ==="
           git log --oneline -5
 
-      - uses: 1arp/create-a-file-action@0.4.5
-        with:
-          path: '.'
-          isAbsolutePath: false
-          file: 'lightspeed-stack.yaml'
-          content: |
-            name: Lightspeed Core Service (LCS)
-            service:
-              host: 0.0.0.0
-              port: 8080
-              auth_enabled: false
-              workers: 1
-              color_log: true
-              access_log: true
-            llama_stack:
-              # Uses a remote llama-stack service
-              # The instance would have already been started with a llama-stack-run.yaml file
-              use_as_library_client: false
-              # Alternative for "as library use"
-              # use_as_library_client: true
-              # library_client_config_path: <path-to-llama-stack-run.yaml-file>
-              url: http://llama-stack:8321
-              api_key: xyzzy
-            user_data_collection:
-              feedback_enabled: true
-              feedback_storage: "/tmp/data/feedback"
-              transcripts_enabled: true
-              transcripts_storage: "/tmp/data/transcripts"
-
-            authentication:
-              module: "noop"
+      - name: Load lightspeed-stack.yaml configuration
+        run: |
+          MODE="${{ matrix.mode }}"
+          CONFIG_FILE="tests/e2e/configuration/${MODE}-mode/lightspeed-stack.yaml"
+          echo "Loading configuration for ${MODE} mode from ${CONFIG_FILE}"
+
+          if [ ! -f "${CONFIG_FILE}" ]; then
+            echo "Configuration file not found: ${CONFIG_FILE}"
+            exit 1
+          fi
+
+          cp "${CONFIG_FILE}" lightspeed-stack.yaml
 
       - name: Select and configure run.yaml
         env:
@@ -120,20 +109,22 @@ jobs:
 
       - name: Test RHAIIS connectivity
         run: |  
-          curl -f ${RHAIIS_URL}:8000/v1/models   -H "Authorization: Bearer ${RHAIIS_API_KEY}"  
+          curl -f ${RHAIIS_URL}:${RHAIIS_PORT}/v1/models   -H "Authorization: Bearer ${RHAIIS_API_KEY}"  
 
       - name: Docker Login for quay access
+        if: matrix.mode == 'server'
         env:
           QUAY_ROBOT_USERNAME: ${{ secrets.QUAY_DOWNSTREAM_USERNAME }}
           QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_DOWNSTREAM_TOKEN }}
         run: |
           echo $QUAY_ROBOT_TOKEN | docker login quay.io -u=$QUAY_ROBOT_USERNAME --password-stdin
 
-      - name: Run service manually
-        run: |         
+      - name: Run services (Server Mode)
+        if: matrix.mode == 'server'
+        run: |
           docker compose version
           docker compose up -d
-          
+
           # Check for errors and show logs if any services failed
           if docker compose ps | grep -E 'Exit|exited|stopped'; then
             echo "Some services failed to start - showing logs:"
@@ -143,6 +134,20 @@ jobs:
             echo "All services started successfully"
           fi
 
+      - name: Run services (Library Mode)
+        if: matrix.mode == 'library'
+        run: |
+          echo "Starting service in library mode (1 container)"
+          docker compose -f docker-compose-library.yaml up -d
+
+          if docker compose -f docker-compose-library.yaml ps | grep -E 'Exit|exited|stopped'; then
+            echo "Service failed to start - showing logs:"
+            docker compose -f docker-compose-library.yaml logs
+            exit 1
+          else
+            echo "Service started successfully"
+          fi
+
       - name: Wait for services
         run: |
           echo "Waiting for services to be healthy..."
@@ -152,12 +157,20 @@ jobs:
         run: |
           echo "Testing basic connectivity before full test suite..."
           curl -f http://localhost:8080/v1/models || {
-            echo "❌ Basic connectivity failed - showing logs before running full tests"
-            docker compose logs --tail=30
+            echo "Basic connectivity failed - showing logs"
+            if [ "${{ matrix.mode }}" == "server" ]; then
+              docker compose logs --tail=30
+            else
+              docker compose -f docker-compose-library.yaml logs --tail=30
+            fi
             exit 1
           }
 
       - name: Run e2e tests
+        env:
+          TERM: xterm-256color
+          FORCE_COLOR: 1
+          E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
         run: |
           echo "Installing test dependencies..."
           pip install uv
@@ -170,9 +183,14 @@ jobs:
         if: failure()
         run: |
           echo "=== Test failure logs ==="
-          echo "=== llama-stack logs ==="
-          docker compose logs llama-stack
-          
-          echo ""
-          echo "=== lightspeed-stack logs ==="
-          docker compose logs lightspeed-stack
+
+          if [ "${{ matrix.mode }}" == "server" ]; then
+            echo "=== llama-stack logs ==="
+            docker compose logs llama-stack
+            echo ""
+            echo "=== lightspeed-stack logs ==="
+            docker compose logs lightspeed-stack
+          else
+            echo "=== lightspeed-stack (library mode) logs ==="
+            docker compose -f docker-compose-library.yaml logs lightspeed-stack
+          fi

.github/workflows/e2e_tests_rhelai.yaml

@@ -18,6 +18,7 @@ jobs:
       RHEL_AI_API_KEY: ${{ secrets.RHEL_AI_API_KEY }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       RHEL_AI_MODEL: ${{ vars.RHEL_AI_MODEL }}
+      FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
 
     steps:
       - uses: actions/checkout@v4

CLAUDE.md

@@ -53,7 +53,7 @@ src/
 
 #### Module Standards
 - All modules start with descriptive docstrings explaining purpose
-- Use `logger = logging.getLogger(__name__)` pattern for module logging
+- Use `logger = get_logger(__name__)` from `log.py` for module logging
 - Package `__init__.py` files contain brief package descriptions
 - Central `constants.py` for shared constants with descriptive comments
 - Type aliases defined at module level for clarity
@@ -89,7 +89,7 @@ src/
   - Handle `APIConnectionError` from Llama Stack
 
 #### Logging Standards
-- Use `import logging` and module logger pattern: `logger = logging.getLogger(__name__)`
+- Use `from log import get_logger` and module logger pattern: `logger = get_logger(__name__)`
 - Standard log levels with clear purposes:
   - `logger.debug()` - Detailed diagnostic information
   - `logger.info()` - General information about program execution

docker-compose-library.yaml

@@ -49,6 +49,7 @@ services:
       - CLIENT_SECRET=${CLIENT_SECRET:-}
       # RHAIIS
       - RHAIIS_URL=${RHAIIS_URL:-}
+      - RHAIIS_PORT=${RHAIIS_PORT:-}
       - RHAIIS_API_KEY=${RHAIIS_API_KEY:-}
       - RHAIIS_MODEL=${RHAIIS_MODEL:-}
       # RHEL AI
@@ -66,6 +67,8 @@ services:
       - WATSONX_API_KEY=${WATSONX_API_KEY:-}
       # Enable debug logging if needed
       - LLAMA_STACK_LOGGING=${LLAMA_STACK_LOGGING:-}
+      # FAISS test
+      - FAISS_VECTOR_STORE_ID=${FAISS_VECTOR_STORE_ID:-}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/liveness"]
       interval: 10s   # how often to run the check

docker-compose.yaml

@@ -43,6 +43,7 @@ services:
       - CLIENT_SECRET=${CLIENT_SECRET:-}
       # RHAIIS
       - RHAIIS_URL=${RHAIIS_URL}
+      - RHAIIS_PORT=${RHAIIS_PORT}
       - RHAIIS_API_KEY=${RHAIIS_API_KEY}
       - RHAIIS_MODEL=${RHAIIS_MODEL}
       # RHEL AI
@@ -60,6 +61,8 @@ services:
       - WATSONX_API_KEY=${WATSONX_API_KEY:-}
       # Enable debug logging if needed
       - LLAMA_STACK_LOGGING=${LLAMA_STACK_LOGGING:-}
+      # FAISS test
+      - FAISS_VECTOR_STORE_ID=${FAISS_VECTOR_STORE_ID:-}
     networks:
       - lightspeednet
     healthcheck:

docs/a2a_protocol.md

@@ -771,7 +771,7 @@ service:
   color_log: true
 ```
 
-Check logs for entries from `app.endpoints.handlers` logger.
+Check logs for entries from `app.endpoints.a2a` logger.
 
 ## Protocol Version