Sync main with development branch

.github/workflows/build-docker-admin.yml

@@ -1,4 +1,4 @@
-name: Admin Web App Docker Image
+name: og - Admin Web App Docker Image
 
 on:
   workflow_run:

.github/workflows/build-docker-backend.yml

@@ -1,4 +1,4 @@
-name: Backend Docker Image
+name: og - Backend Docker Image
 
 on:
   workflow_run:
@@ -27,4 +27,4 @@ jobs:
         docker build . --file docker/Backend.Dockerfile --cache-from fruoccopublic.azurecr.io/rag-backend:latest --tag fruoccopublic.azurecr.io/rag-backend:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;
         docker tag fruoccopublic.azurecr.io/rag-backend:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER fruoccopublic.azurecr.io/rag-backend:latest;
         docker push fruoccopublic.azurecr.io/rag-backend:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;
-        docker push fruoccopublic.azurecr.io/rag-backend:latest;
+        docker push fruoccopublic.azurecr.io/rag-backend:latest;

.github/workflows/build-docker-frontend.yml

@@ -1,4 +1,4 @@
-name: WebApp Docker Image
+name: og - WebApp Docker Image
 
 on:
   workflow_run:
@@ -27,4 +27,4 @@ jobs:
         docker build . --file docker/Frontend.Dockerfile --cache-from fruoccopublic.azurecr.io/rag-webapp:latest --tag fruoccopublic.azurecr.io/rag-webapp:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;
         docker tag fruoccopublic.azurecr.io/rag-webapp:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER fruoccopublic.azurecr.io/rag-webapp:latest;
         docker push fruoccopublic.azurecr.io/rag-webapp:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;
-        docker push fruoccopublic.azurecr.io/rag-webapp:latest;
+        docker push fruoccopublic.azurecr.io/rag-webapp:latest;

.github/workflows/deploy-azure.yml

@@ -0,0 +1,69 @@
+name: deploy using azd
+on:
+  workflow_dispatch:
+  push:
+    # Run when commits are pushed to mainline branch (main or master)
+    # Set this to the mainline branch you are using
+    branches:
+      - main
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install azd
+        uses: Azure/setup-azd@v0.1.0
+
+      - name: Log in with Azure (Federated Credentials)
+        if: ${{ env.AZURE_CLIENT_ID != '' }}
+        run: |
+          azd auth login `
+            --client-id "$Env:AZURE_CLIENT_ID" `
+            --federated-credential-provider "github" `
+            --tenant-id "$Env:AZURE_TENANT_ID"
+        shell: pwsh
+
+      - name: Log in with Azure (Client Credentials)
+        if: ${{ env.AZURE_CREDENTIALS != '' }}
+        run: |
+          $info = $Env:AZURE_CREDENTIALS | ConvertFrom-Json -AsHashtable;
+          Write-Host "::add-mask::$($info.clientSecret)"
+
+          azd auth login `
+            --client-id "$($info.clientId)" `
+            --client-secret "$($info.clientSecret)" `
+            --tenant-id "$($info.tenantId)"
+        shell: pwsh
+        env:
+          AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
+
+      # - name: Azd Init
+      #   run: azd init -t chat-with-your-data-solution-accelerator@1.7.0 
+      #   env:
+      #     AZURE_ENV_NAME: rg-rsta4xey-temp
+      #     AZURE_LOCATION: East US
+      #     AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}           
+
+      - name: Provision Infrastructure
+        run: azd provision --no-prompt --preview   
+        env:
+          AZURE_ENV_NAME: rg-rsta4xey-temp
+          AZURE_LOCATION: East US
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} 
+
+
+      - name: Deploy Application
+        run: azd deploy --no-prompt --preview   
+        env:
+          AZURE_ENV_NAME: rg-rsta4xey-temp
+          AZURE_LOCATION: East US
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

.github/workflows/dev_deploy_admin.yml

@@ -0,0 +1,39 @@
+name: DEV - admin - build container and release
+on:
+  push:
+    branches:
+      - development
+  workflow_dispatch:
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: 'production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT 
+    steps:
+    # checkout the repo
+    - name: 'Checkout Github Action'
+      uses: actions/checkout@master
+    - uses: azure/docker-login@v1
+      with:
+        login-server: prontocontainers.azurecr.io
+        username: ${{ secrets.REGISTRY_USERNAME }}
+        password: ${{ secrets.REGISTRY_PASSWORD }}
+    - run: |
+        docker build . -t prontocontainers.azurecr.io/pronto-admin -f ./docker/Admin.Dockerfile
+        docker push prontocontainers.azurecr.io/pronto-admin
+
+    - name: Login to Azure
+      uses: azure/login@v1
+      with:
+        client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_F85D40AB85B047FEB5ED3378D7CB5108  }}
+        tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_A204C83B469A46BCB930BEFE434FE4C1  }}
+        subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_484B46252DAB4347A4D95C41EFF9683C  }}
+    - name: 'Deploy to Azure Web App'
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: 'web-dsfb352ephiyu-admin'
+        images:  prontocontainers.azurecr.io/pronto-admin
+

.github/workflows/dev_deploy_front_end.yml

@@ -0,0 +1,37 @@
+name: DEV - FE Deploy to storage
+on:
+  push:
+    branches: development
+  workflow_dispatch:
+
+jobs:
+  deploy_dev:
+    runs-on: ubuntu-latest
+    environment: 
+      name: dev
+      url: https://aasdoprontodev.z13.web.core.windows.net/
+    steps:
+    - uses: actions/checkout@v3
+    - uses: azure/login@v1
+      with:
+          creds: ${{ secrets.DEV_AZURE_CREDENTIALS }}
+
+    - name: npm install, build, and test
+      working-directory: ./code/frontend
+      run: |
+        npm install
+        npm run build --if-present
+        npm run test --if-present
+
+
+    - name: Upload to blob storage
+      uses: azure/CLI@v1
+      with:
+        inlineScript: |            
+            az storage blob upload-batch --account-name aasdoprontodev    -d '$web' -s ./code/frontend/build --overwrite
+
+      # Azure logout
+    - name: logout
+      run: |
+            az logout
+      if: always()

.github/workflows/dev_docker_build_app.yml

@@ -0,0 +1,86 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+
+name: DEV - build and release api
+
+on:
+  push:
+    branches:
+      - development
+  workflow_dispatch:
+
+jobs:
+
+  deploy-to-dev:
+    runs-on: ubuntu-latest
+    environment:
+      name: 'production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+
+    steps:
+    # checkout the repo
+    - name: 'Checkout Github Action'
+      uses: actions/checkout@master
+
+    - uses: azure/docker-login@v1
+      with:
+        login-server: prontocontainers.azurecr.io
+        username: ${{ secrets.REGISTRY_USERNAME }}
+        password: ${{ secrets.REGISTRY_PASSWORD }}
+
+
+    - run: |
+        docker build . -t prontocontainers.azurecr.io/pronto-fontend -f ./docker/Frontend.Dockerfile
+        docker push prontocontainers.azurecr.io/pronto-fontend
+
+    - name: Login to Azure
+      uses: azure/login@v1
+      with:
+        client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_1EC8C71974184A14A7AFB91F4676FE53 }}
+        tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_C68709E83D0B4B41815059C3FCED7A93 }}
+        subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_991984B989F44817B0925FB42F086658 }}                        
+
+    - uses: azure/webapps-deploy@v2
+      with:
+        app-name: 'web-dsfb352ephiyu'
+        images:  prontocontainers.azurecr.io/pronto-fontend
+
+  deploy-to-prod:
+    runs-on: ubuntu-latest
+    #if: github.ref == 'refs/heads/main'
+    environment:
+      name: 'production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+
+    steps:
+    # checkout the repo
+    - name: 'Checkout Github Action'
+      uses: actions/checkout@master
+
+    - uses: azure/docker-login@v1
+      with:
+        login-server: prontocontainers.azurecr.io
+        username: ${{ secrets.REGISTRY_USERNAME }}
+        password: ${{ secrets.REGISTRY_PASSWORD }}
+
+
+    - run: |
+        docker build . -t prontocontainers.azurecr.io/pronto-fontend -f ./docker/Frontend.Dockerfile
+        docker push prontocontainers.azurecr.io/pronto-fontend
+
+    - name: Login to Azure
+      uses: azure/login@v1
+      with:
+        client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_40F8872A222540F4A90B1A3C4BDD09F6 }}
+        tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_B64A0DAF04094E0EBC57C3F69091FD99 }}
+        subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_DE9C0EC07B6947CBA9333317F147DAA5 }}                      
+
+    - uses: azure/webapps-deploy@v2
+      with:
+        app-name: 'web-6fzbc32vpqwni'
+        images:  prontocontainers.azurecr.io/pronto-fontend      

.github/workflows/development_web-6fzbc32vpqwni-admin.yml

@@ -0,0 +1,78 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+
+name: Build and deploy Python app to Azure Web App - web-6fzbc32vpqwni-admin
+
+on:
+  push:
+    branches:
+      - development
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python version
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.11'
+
+      - name: Create and start virtual environment
+        run: |
+          python -m venv venv
+          source venv/bin/activate
+
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+
+      # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+
+      - name: Zip artifact for deployment
+        run: zip release.zip ./* -r
+
+      - name: Upload artifact for deployment jobs
+        uses: actions/upload-artifact@v3
+        with:
+          name: python-app
+          path: |
+            release.zip
+            !venv/
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v3
+        with:
+          name: python-app
+
+      - name: Unzip artifact for deployment
+        run: unzip release.zip
+
+
+      - name: Login to Azure
+        uses: azure/login@v1
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_73A3FE74C38349A5BB52C79AFAC5BF96 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_6F3AF3E2BF5949E79CC51223797DA85A }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_E61CF904F8FF4E4FA283B10496C7B811 }}
+
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v2
+        id: deploy-to-webapp
+        with:
+          app-name: 'web-6fzbc32vpqwni-admin'
+          slot-name: 'Production'
+