Documentation Update and Docker fix

.buildcontainer/Dockerfile

@@ -1,42 +1,29 @@
-FROM ubuntu:22.04
+FROM mcr.microsoft.com/devcontainers/python:3.12
 
 ARG USERNAME=vscode
 
 USER root
 
-RUN apt-get update -y && apt-get install -y sudo wget gnupg software-properties-common curl bash && \
-    # Download and install Miniconda
-    wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/miniconda.sh && \
-    bash /tmp/miniconda.sh -b -p /opt/miniconda && \
-    rm /tmp/miniconda.sh && \
-    # Create a non-root user
-    useradd -m -s /bin/bash $USERNAME && \
-    echo "$USERNAME ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/$USERNAME && \
-    chmod 0440 /etc/sudoers.d/$USERNAME && \
-    # Change ownership of Miniconda to the non-root user
-    chown -R $USERNAME:$USERNAME /opt/miniconda
-
-ENV PATH=/opt/miniconda/bin:$PATH
-
-# Install dependencies
-WORKDIR /home/$USERNAME
-
 # Install Azure CLI
-RUN sudo apt-get update && sudo apt-get install -y gnupg software-properties-common curl && \
-    curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash && \
-    az config set extension.use_dynamic_install=yes_without_prompt && \
-    az extension add -n ml
+RUN pip install azure-cli && \
+    az config set extension.use_dynamic_install=yes_without_prompt
+
+# Setup User
+USER $USERNAME
+WORKDIR /home/$USERNAME
 
 COPY requirements.txt .
 
-# Create Conda environment and install Python dependencies
-RUN conda create -n llm-env python=3.12 pip=23.2 -q -y && \
-    conda run -n llm-env pip install -r requirements.txt && \
-    conda clean -a -y && \
-    conda run -n llm-env pip list
+# Create virtual environment and install dependencies
+# We use a venv named 'llm-env' to maintain consistency with previous conda setup
+RUN python -m venv llm-env && \
+    /home/$USERNAME/llm-env/bin/pip install --upgrade pip setuptools wheel && \
+    /home/$USERNAME/llm-env/bin/pip install -r requirements.txt
 
-RUN echo "conda activate llm-env" >> /home/$USERNAME/.bashrc
+# Configure shell to use the environment
+RUN echo "source /home/$USERNAME/llm-env/bin/activate" >> /home/$USERNAME/.bashrc
 
-ENV PATH=/opt/miniconda/envs/llm-env/bin:$PATH
+# Add venv to PATH
+ENV PATH="/home/$USERNAME/llm-env/bin:$PATH"
 
-CMD ["conda", "run", "-n", "llm-env", "python", "--version"]
+CMD ["python", "--version"]

.env.sample

@@ -4,6 +4,7 @@ RESOURCE_GROUP_NAME=
 STORAGE_ACCOUNT_NAME=
 ACS_SERVICE_NAME=
 AOAI_BASE_ENDPOINT=
-AI_STUDIO_PROJECT_NAME=
+AI_FOUNDRY_PROJECT_URI="https://${AI_FOUNDRY_NAME}.services.ai.azure.com/api/projects/${PROJECT_NAME}"
 MANAGED_IDENTITY_CLIENT_ID=
 MANAGED_IDENTITY_NAME=
+FUNCTION_APP_NAME=

.github/workflows/ai_pull_ci_workflow.yml

@@ -14,10 +14,12 @@ env:
     STORAGE_ACCOUNT_NAME: ${{ vars.STORAGE_ACCOUNT_NAME }}
     ACS_SERVICE_NAME: ${{ vars.ACS_SERVICE_NAME }}
     AOAI_BASE_ENDPOINT: ${{ vars.AOAI_BASE_ENDPOINT }}
-    AI_STUDIO_PROJECT_NAME: ${{ vars.AI_STUDIO_PROJECT_NAME }}
+    AI_FOUNDRY_PROJECT_URI: ${{ vars.AI_FOUNDRY_PROJECT_URI }}
     MANAGED_IDENTITY_CLIENT_ID: ${{ vars.MANAGED_IDENTITY_CLIENT_ID }}
     MANAGED_IDENTITY_NAME: ${{ vars.MANAGED_IDENTITY_NAME }}
     MANAGED_IDENTITY_TENANT_ID: ${{ vars.MANAGED_IDENTITY_TENANT_ID }}
+    FEDERATED_CLIENT_ID: ${{ vars.FEDERATED_CLIENT_ID }}
+    FUNCTION_APP_NAME: ${{ vars.FUNCTION_APP_NAME }}
 
 permissions:
   id-token: write
@@ -27,7 +29,7 @@ jobs:
     name: Deployment and Evaluation
     runs-on: ubuntu-latest
     container:
-        image: aipullacr.azurecr.io/devops_container_image:latest
+        image:  ${{ vars.ACR_CONTAINER_REGISTRY }}.azurecr.io/${{ vars.IMAGE_NAME }}:latest
         options: --user root
         credentials:
             username: ${{ secrets.ACR_USERNAME }}
@@ -39,7 +41,7 @@ jobs:
       - name: Azure login
         uses: azure/login@v2
         with:
-            client-id: ${{ env.MANAGED_IDENTITY_CLIENT_ID }}
+            client-id: ${{ env.FEDERATED_CLIENT_ID }}
             tenant-id: ${{ env.MANAGED_IDENTITY_TENANT_ID}}
             subscription-id: ${{ env.SUBSCRIPTION_ID }}
 

.github/workflows/ai_pull_pr_workflow.yml

@@ -12,10 +12,12 @@ env:
     STORAGE_ACCOUNT_NAME: ${{ vars.STORAGE_ACCOUNT_NAME }}
     ACS_SERVICE_NAME: ${{ vars.ACS_SERVICE_NAME }}
     AOAI_BASE_ENDPOINT: ${{ vars.AOAI_BASE_ENDPOINT }}
-    AI_STUDIO_PROJECT_NAME: ${{ vars.AI_STUDIO_PROJECT_NAME }}
+    AI_FOUNDRY_PROJECT_URI: ${{ vars.AI_FOUNDRY_PROJECT_URI }}
     MANAGED_IDENTITY_CLIENT_ID: ${{ vars.MANAGED_IDENTITY_CLIENT_ID }}
     MANAGED_IDENTITY_NAME: ${{ vars.MANAGED_IDENTITY_NAME }}
     MANAGED_IDENTITY_TENANT_ID: ${{ vars.MANAGED_IDENTITY_TENANT_ID }}
+    FEDERATED_CLIENT_ID: ${{ vars.FEDERATED_CLIENT_ID }}
+    FUNCTION_APP_NAME: ${{ vars.FUNCTION_APP_NAME }}
 
 permissions:
   id-token: write
@@ -32,49 +34,49 @@ jobs:
   deploy-and-evaluate:
     name: Deployment and Evaluation
     runs-on: ubuntu-latest
+    needs: build-validation
     container:
-        image: aipullacr.azurecr.io/devops_container_image:latest
+        image: ${{ vars.ACR_CONTAINER_REGISTRY }}.azurecr.io/${{ vars.IMAGE_NAME }}:latest
         options: --user root
         credentials:
             username: ${{ secrets.ACR_USERNAME }}
             password: ${{ secrets.ACR_PASSWORD }}
-    needs: build-validation
     steps:
       - name: Checkout Actions
         uses: actions/checkout@v1
 
       - name: Azure login
         uses: azure/login@v2
         with:
-            client-id: ${{ env.MANAGED_IDENTITY_CLIENT_ID }}
+            client-id: ${{ env.FEDERATED_CLIENT_ID }}
             tenant-id: ${{ env.MANAGED_IDENTITY_TENANT_ID}}
             subscription-id: ${{ env.SUBSCRIPTION_ID }}
 
       - name: Execute Azure Functions Deployment
         shell: bash
         run: |
-            python -u -m mlops.deployment_scripts.deploy_azure_functions
+            python -u -m mlops.deployment_scripts.deploy_azure_functions --ignore_slot
         env:
             BUILD_SOURCEBRANCHNAME: ${{ github.head_ref || github.ref_name }}
 
       - name: Validate Azure Functions Deployment
         shell: bash
         run: |
-            python -u -m mlops.deployment_scripts.run_functions
+            python -u -m mlops.deployment_scripts.run_functions --ignore_slot
         env:
             BUILD_SOURCEBRANCHNAME: ${{ github.head_ref || github.ref_name }}             
 
       - name: Deploy Indexer
         shell: bash
         run: |
-            python -u -m mlops.deployment_scripts.build_indexer
+            python -u -m mlops.deployment_scripts.build_indexer --ignore_slot
         env:
             BUILD_SOURCEBRANCHNAME: ${{ github.head_ref || github.ref_name }}              
 
       - name: Execute search evaluation
         shell: bash
         run: |
-            python -u -m mlops.evaluation.search_evaluation --gt_path "./mlops/evaluation/data/search_evaluation_data.jsonl" --semantic_config my-semantic-config
+            python -u -m mlops.evaluation.search_evaluation --gt_path "./mlops/evaluation/data/search_evaluation_data_sample.jsonl" --semantic_config my-semantic-config
         env:
             BUILD_SOURCEBRANCHNAME: ${{ github.head_ref || github.ref_name }}
 

.github/workflows/build_devops_container.yml

@@ -6,13 +6,14 @@ on:
       - 'development'
     paths:
       - '.github/workflows/build_devops_container.yml' 
-      - 'requirements.txt' 
+      - 'requirements.txt'
+      - '.buildcontainer/Dockerfile'
 
 env:
-    IMAGE_NAME: devops_container_image
+    IMAGE_NAME: ${{ vars.IMAGE_NAME }}
     SUBSCRIPTION_ID: ${{ vars.SUBSCRIPTION_ID }}
     RESOURCE_GROUP_NAME: ${{ vars.RESOURCE_GROUP_NAME }}
-    MANAGED_IDENTITY_CLIENT_ID: ${{ vars.MANAGED_IDENTITY_CLIENT_ID }}
+    FEDERATED_CLIENT_ID: ${{ vars.FEDERATED_CLIENT_ID }}
     MANAGED_IDENTITY_TENANT_ID: ${{ vars.MANAGED_IDENTITY_TENANT_ID }}
     ACR_CONTAINER_REGISTRY: ${{ vars.ACR_CONTAINER_REGISTRY }}
 
@@ -34,7 +35,7 @@ jobs:
       - name: Azure login
         uses: azure/login@v2
         with:
-            client-id: ${{ env.MANAGED_IDENTITY_CLIENT_ID }}
+            client-id: ${{ env.FEDERATED_CLIENT_ID }}
             tenant-id: ${{ env.MANAGED_IDENTITY_TENANT_ID}}
             subscription-id: ${{ env.SUBSCRIPTION_ID }}
 

.github/workflows/build_validation_workflow.yml

@@ -13,7 +13,7 @@ jobs:
   run-unit-tests:
     runs-on: ubuntu-latest
     container:
-        image: aipullacr.azurecr.io/devops_container_image:latest
+        image:  ${{ vars.ACR_CONTAINER_REGISTRY }}.azurecr.io/${{ vars.IMAGE_NAME }}:latest
         options: --user root
         credentials:
             username: ${{ secrets.ACR_USERNAME }}

.github/workflows/data_initialization_workflow.yml

@@ -9,7 +9,7 @@ env:
     SUBSCRIPTION_ID: ${{ vars.SUBSCRIPTION_ID }}
     RESOURCE_GROUP_NAME: ${{ vars.RESOURCE_GROUP_NAME }}
     STORAGE_ACCOUNT_NAME: ${{ vars.STORAGE_ACCOUNT_NAME }}
-    MANAGED_IDENTITY_CLIENT_ID: ${{ vars.MANAGED_IDENTITY_CLIENT_ID }}
+    FEDERATED_CLIENT_ID: ${{ vars.FEDERATED_CLIENT_ID }}
     MANAGED_IDENTITY_TENANT_ID: ${{ vars.MANAGED_IDENTITY_TENANT_ID }}
 
 permissions:
@@ -20,7 +20,7 @@ jobs:
   upload-data:
     runs-on: ubuntu-latest
     container:
-        image: aipullacr.azurecr.io/devops_container_image:latest
+        image:  ${{ vars.ACR_CONTAINER_REGISTRY }}.azurecr.io/${{ vars.IMAGE_NAME }}:latest
         options: --user root
         credentials:
             username: ${{ secrets.ACR_USERNAME }}
@@ -32,7 +32,7 @@ jobs:
       - name: Azure login
         uses: azure/login@v2
         with:
-            client-id: ${{ env.MANAGED_IDENTITY_CLIENT_ID }}
+            client-id: ${{ env.FEDERATED_CLIENT_ID }}
             tenant-id: ${{ env.MANAGED_IDENTITY_TENANT_ID}}
             subscription-id: ${{ env.SUBSCRIPTION_ID }}
 

.gitignore

@@ -417,3 +417,5 @@ local.settings.json
 
 # Other
 .DS_Store
+
+results