Main prerelease 3 5 0

.env.dist

@@ -12,3 +12,4 @@ MICROSOFT_CLIENT_ID=''
 MICROSOFT_CLIENT_SECRET=''
 MICROSOFT_REDIRECT_URI=''
 CSRF_TRUSTED_ORIGINS='http://localhost:8000'
+# SWIRL_LOG_DEBUG='examples : swirl.page_fetch.web_page, swirl.processors.rag'

.github/workflows/docker-image-spg-experimental.yml

@@ -34,9 +34,9 @@ jobs:
         docker system prune -af
         docker volume prune -f
         docker builder prune -f
-    - name: Build the Docker Image
+    - name: Build the Docker image
       run: docker build --no-cache -t swirlai/spyglass:fork-x  -f Dockerfile.fork.spg .
-    - name: Push the Docker Image
+    - name: Push the Docker image
       run: docker push swirlai/spyglass:fork-x
     - name: Upload Log Files
       if: always()

.github/workflows/docker-image-spg-preview.yml

@@ -33,9 +33,9 @@ jobs:
         docker system prune -af
         docker volume prune -f
         docker builder prune -f
-    - name: Build the Docker Image
+    - name: Build the Docker image
       run: docker build --no-cache -t swirlai/spyglass:preview  -f Dockerfile.develop.spg .
-    - name: Push the Docker Image
+    - name: Push the Docker image
       run: docker push swirlai/spyglass:preview
     - name: Upload Log Files
       if: always()

.github/workflows/docker-image-spg.yml

@@ -33,9 +33,9 @@ jobs:
         docker system prune -af
         docker volume prune -f
         docker builder prune -f
-    - name: Build the Docker Image
-      run: docker build --no-cache -t swirlai/spyglass:latest -f Dockerfile.spg .
-    - name: Push the Docker Image
+    - name: Build the Docker image
+      run: docker build --no-cache -t swirlai/spyglass:latest  -f Dockerfile.spg .
+    - name: Push the Docker image
       run: docker push swirlai/spyglass
     - name: Upload Log Files
       if: always()

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: Docker + SA Docker Builds
+name: Docker Build and Push
 
 on:
   # Manual trigger only
@@ -7,51 +7,32 @@ on:
 jobs:
 
   swirl-docker:
-    runs-on: ubuntu-latest
-    steps:
-        - name: Checkout the Code
-          uses: actions/checkout@v4
-        - name: Login to Docker Hub
-          uses: docker/login-action@v3
-          with:
-            username: ${{ secrets.DOCKER_USERNAME }}
-            password: ${{ secrets.DOCKER_PASSWORD }}
-        - name: Build and Push Swirl Docker Image
-          run: |
-            BRANCH_NAME=${GITHUB_REF#refs/heads/}
-            TAG_NAME=$([ "$BRANCH_NAME" = "main" ] && echo "latest" || echo "$BRANCH_NAME")
-            docker buildx use devBuilder || docker buildx create --name devBuilder --use
-            docker buildx build -t swirlai/swirl-search:$TAG_NAME --platform linux/amd64,linux/arm64 --push .
-        - name: Update the Docker Repo Description
-          uses: peter-evans/dockerhub-description@v4
-          with:
-            username: ${{ secrets.DOCKER_USERNAME_X }}
-            password: ${{ secrets.DOCKER_PASSWORD_X }}
-            repository: swirlai/swirl-search
-
-  standalone-docker:
-    needs: swirl-docker
-    runs-on: ubuntu-latest
-    steps:
-        - name: Checkout the Code
-          uses: actions/checkout@v4
-        - name: Login to Docker Hub
-          uses: docker/login-action@v3
-          with:
-            username: ${{ secrets.DOCKER_USERNAME }}
-            password: ${{ secrets.DOCKER_PASSWORD }}
-        - name: Build and Push Standalone Docker Image
-          run: |
-            BRANCH_NAME=${GITHUB_REF#refs/heads/}
-            TAG_SUFFIX="-sa"
-            TAG_NAME=$([ "$BRANCH_NAME" = "main" ] && echo "latest$TAG_SUFFIX" || echo "$BRANCH_NAME$TAG_SUFFIX")
-            docker buildx use devBuilder || docker buildx create --name devBuilder --use
-            docker buildx build -f DevUtils/docker/Dockerfile.sa --platform linux/amd64,linux/arm64 -t swirlai/swirl-search:${TAG_NAME} --push .
-        - name: Upload Log Files
-          if: always()
-          uses: actions/upload-artifact@v4
-          with:
-            name: log-files
-            path: |
-              logs/
-              /var/log/syslog*
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout the Code
+            uses: actions/checkout@v4
+          - name: Login to Docker Hub
+            uses: docker/login-action@v3
+            with:
+              username: ${{ secrets.DOCKER_USERNAME }}
+              password: ${{ secrets.DOCKER_PASSWORD }}
+          - name: Build and Push Swirl Docker Image
+            run: |
+              BRANCH_NAME=${GITHUB_REF#refs/heads/}
+              TAG_NAME=$([ "$BRANCH_NAME" = "main" ] && echo "latest" || echo "$BRANCH_NAME")
+              docker buildx use devBuilder || docker buildx create --name devBuilder --use
+              docker buildx build -t swirlai/swirl-search:$TAG_NAME --platform linux/amd64,linux/arm64 --push .
+          - name: Update the Docker Repo Description
+            uses: peter-evans/dockerhub-description@v4
+            with:
+              username: ${{ secrets.DOCKER_USERNAME_X }}
+              password: ${{ secrets.DOCKER_PASSWORD_X }}
+              repository: swirlai/swirl-search
+          - name: Upload Log Files
+            if: always()
+            uses: actions/upload-artifact@v4
+            with:
+              name: log-files
+              path: |
+                logs/
+                /var/log/syslog*

.github/workflows/qa-suite.yml

@@ -5,7 +5,6 @@ on:
   workflow_dispatch:
 
 jobs:
-
   qa-suite:
     runs-on: ubuntu-latest
     services:
@@ -29,14 +28,14 @@ jobs:
       - name: Set Up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12.1'
+          python-version: '3.12.2'
           cache: 'pip'
       - name: Install Swirl
         run: ./install.sh
       - name: Setup Swirl
         run: python swirl.py setup
       - name: Install the Latest Galaxy UI
-        run: ./install-ui.sh
+        run: ./install-ui.sh -p
         env:
           MSAL_CB_PORT: 8000
           MSAL_HOST: localhost

.github/workflows/test-build-pipeline.yml

@@ -15,19 +15,19 @@ jobs:
     unit-tests:
       runs-on: ubuntu-latest
       steps:
-          - name: Checkout the Code
-            uses: actions/checkout@v4
-          - name: Set Up Python
-            uses: actions/setup-python@v5
-            with:
-              python-version: '3.12.1'
-              cache: 'pip'
-          - name: Install Swirl
-            run: ./install.sh
-          - name: Install the Unit Tests
-            run: ./install-test.sh
-          - name: Run the Unit Tests
-            run: pytest
+        - name: Checkout the Code
+          uses: actions/checkout@v4
+        - name: Set Up Python
+          uses: actions/setup-python@v5
+          with:
+            python-version: '3.12.2'
+            cache: 'pip'
+        - name: Install Swirl
+          run: ./install.sh
+        - name: Install the Unit Tests
+          run: ./install-test.sh
+        - name: Run the Unit Tests
+          run: pytest
 
     qa-suite:
       needs: unit-tests
@@ -53,14 +53,14 @@ jobs:
         - name: Set Up Python
           uses: actions/setup-python@v5
           with:
-            python-version: '3.12.1'
+            python-version: '3.12.2'
             cache: 'pip'
         - name: Install Swirl
           run: ./install.sh
         - name: Setup Swirl
           run: python swirl.py setup
         - name: Install the Latest Galaxy UI
-          run: ./install-ui.sh
+          run: ./install-ui.sh -p
           env:
             MSAL_CB_PORT: 8000
             MSAL_HOST: localhost
@@ -84,52 +84,33 @@ jobs:
             docker run --net=host --env-file .env.qa -t swirlai/swirl-search-qa:automated-tests-master sh -c "behave --tags=qa_suite,community"
 
     swirl-docker:
-        needs: qa-suite
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout the Code
-              uses: actions/checkout@v4
-            - name: Login to Docker Hub
-              uses: docker/login-action@v3
-              with:
-                username: ${{ secrets.DOCKER_USERNAME }}
-                password: ${{ secrets.DOCKER_PASSWORD }}
-            - name: Build and Push Swirl Docker Image
-              run: |
-                BRANCH_NAME=${GITHUB_REF#refs/heads/}
-                TAG_NAME=$([ "$BRANCH_NAME" = "main" ] && echo "latest" || echo "$BRANCH_NAME")
-                docker buildx use devBuilder || docker buildx create --name devBuilder --use
-                docker buildx build -t swirlai/swirl-search:$TAG_NAME --platform linux/amd64,linux/arm64 --push .
-            - name: Update the Docker Repo Description
-              uses: peter-evans/dockerhub-description@v4
-              with:
-                username: ${{ secrets.DOCKER_USERNAME_X }}
-                password: ${{ secrets.DOCKER_PASSWORD_X }}
-                repository: swirlai/swirl-search
-
-    standalone-docker:
-        needs: swirl-docker
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout the Code
-              uses: actions/checkout@v4
-            - name: Login to Docker Hub
-              uses: docker/login-action@v3
-              with:
-                username: ${{ secrets.DOCKER_USERNAME }}
-                password: ${{ secrets.DOCKER_PASSWORD }}
-            - name: Build and Push Standalone Docker Image
-              run: |
-                BRANCH_NAME=${GITHUB_REF#refs/heads/}
-                TAG_SUFFIX="-sa"
-                TAG_NAME=$([ "$BRANCH_NAME" = "main" ] && echo "latest$TAG_SUFFIX" || echo "$BRANCH_NAME$TAG_SUFFIX")
-                docker buildx use devBuilder || docker buildx create --name devBuilder --use
-                docker buildx build -f DevUtils/docker/Dockerfile.sa --platform linux/amd64,linux/arm64 -t swirlai/swirl-search:${TAG_NAME} --push .
-            - name: Upload Log Files
-              if: always()
-              uses: actions/upload-artifact@v4
-              with:
-                name: log-files
-                path: |
-                  logs/
-                  /var/log/syslog*
+      needs: qa-suite
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout the Code
+          uses: actions/checkout@v4
+        - name: Login to Docker Hub
+          uses: docker/login-action@v3
+          with:
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+        - name: Build and Push Swirl Docker Image
+          run: |
+            BRANCH_NAME=${GITHUB_REF#refs/heads/}
+            TAG_NAME=$([ "$BRANCH_NAME" = "main" ] && echo "latest" || echo "$BRANCH_NAME")
+            docker buildx use devBuilder || docker buildx create --name devBuilder --use
+            docker buildx build -t swirlai/swirl-search:$TAG_NAME --platform linux/amd64,linux/arm64 --push .
+        - name: Update the Docker Repo Description
+          uses: peter-evans/dockerhub-description@v4
+          with:
+            username: ${{ secrets.DOCKER_USERNAME_X }}
+            password: ${{ secrets.DOCKER_PASSWORD_X }}
+            repository: swirlai/swirl-search
+        - name: Upload Log Files
+          if: always()
+          uses: actions/upload-artifact@v4
+          with:
+            name: log-files
+            path: |
+              logs/
+              /var/log/syslog*