Merge pull request trustyai-explainability#30 from adolfo-ab/update-pr-container-build

feat: update pr-container-build workflow

Author: adolfo-ab

.github/workflows/pr-container-build.yaml

@@ -1,4 +1,4 @@
-name: Build PR LLS Distro Container Image
+name: Build and Push Distro Image
 
 on:
   pull_request_target:
@@ -8,6 +8,7 @@ env:
   REGISTRY: quay.io
   ORG: trustyai_testing
   IMAGE_NAME: llama-stack-trustyai-fms
+  MODULE_VERSION: '0.2.2'
 
 jobs:
   build-and-push:
@@ -52,6 +53,7 @@ jobs:
       - name: Copy provider code to build context
         run: |
           cp -r llama_stack_provider_trustyai_fms/ build-context/
+          cp -r providers.d/ build-context/
           cp run.yaml build-context/
           cp pyproject.toml build-context/
 
@@ -60,37 +62,38 @@ jobs:
           cat > build-context/Containerfile << 'EOF'
           FROM registry.access.redhat.com/ubi9/python-312:latest
           WORKDIR /opt/app-root
-          
-          # Copy the local provider code
-          COPY llama_stack_provider_trustyai_fms/ /opt/app-root/src/
+
+          # Copy the local provider code and pyproject.toml to the same directory
+          COPY llama_stack_provider_trustyai_fms/ /opt/app-root/llama_stack_provider_trustyai_fms/
           COPY pyproject.toml /opt/app-root/
-          
+
           RUN pip install \
-                        aiosqlite \
-                        autoevals \
-                        datasets \
-                        fastapi \
-                        fire \
-                        httpx \
-                        kubernetes \
-                        "openai==1.66.0" \
-                        opentelemetry-exporter-otlp-proto-http \
-                        opentelemetry-sdk \
-                        pandas \
-                        requests \
-                        sqlalchemy[asyncio] \
-                        uvicorn
-                    RUN pip install --index-url https://download.pytorch.org/whl/cpu torch torchvision
-                    RUN pip install --no-deps sentence-transformers
-                    RUN pip install --no-cache llama-stack==0.2.16
-
-                    # Install the local provider package
-                    RUN pip install -e /opt/app-root/
-          
+              aiosqlite \
+              autoevals \
+              datasets \
+              fastapi \
+              fire \
+              httpx \
+              kubernetes \
+              "openai==1.66.0" \
+              opentelemetry-exporter-otlp-proto-http \
+              opentelemetry-sdk \
+              pandas \
+              requests \
+              sqlalchemy[asyncio] \
+              uvicorn
+
+          RUN pip install --index-url https://download.pytorch.org/whl/cpu torch torchvision
+          RUN pip install --no-deps sentence-transformers
+          RUN pip install --no-cache llama-stack==0.2.22
+
+          # Install the local provider package 
+          RUN pip install /opt/app-root/
+
           RUN mkdir -p ${HOME}/.cache
           COPY run.yaml ${APP_ROOT}/run.yaml
-          
-          ENTRYPOINT ["python", "-m", "llama_stack.distribution.server.server", "--config", "/opt/app-root/run.yaml"]
+
+          ENTRYPOINT ["python", "-m", "llama_stack.core.server.server", "/opt/app-root/run.yaml"]
           EOF
 
       - name: Build Image

run.yaml

@@ -7,6 +7,7 @@ providers:
   safety:
     - provider_id: trustyai_fms
       provider_type: remote::trustyai_fms
+      module: llama_stack_provider_trustyai_fms==${env.MODULE_VERSION}
       config:
         orchestrator_url: ${env.FMS_ORCHESTRATOR_URL}
         shields: