Merge branch 'develop' into 'fb-leap-1356/unsaved-sidebar'

Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/12547705317
HumanSignal · Dec 30, 2024 · 697a0d9 · 697a0d9
2 parents 47d74d8 + 1adffca
commit 697a0d9
Show file tree

Hide file tree

Showing 98 changed files with 2,168 additions and 950 deletions.
diff --git a/.github/workflows/cicd_pipeline.yml b/.github/workflows/cicd_pipeline.yml
@@ -199,21 +199,21 @@ jobs:
     steps:
       - uses: actions/github-script@v7
         env:
-          DOCKER_IMAGE_VERSION: ${{ needs.build-docker.outputs.image_version }}
-          APP_NAME: ${{ startsWith(github.ref_name, 'ls-release/') && 'ls-release' || 'ls-develop' }}
+          DOCKER_IMAGE_VERSION: ${{ needs.build-docker.outputs.build_version }}
+          RELEASE_NAME: ${{ startsWith(github.ref_name, 'ls-release/') && 'ls-release' || 'ls-develop' }}
         with:
           github-token: ${{ secrets.GIT_PAT }}
           script: |
             const docker_image_version = process.env.DOCKER_IMAGE_VERSION;
-            const app_name = process.env.APP_NAME;
+            const release_name = process.env.RELEASE_NAME;
             github.rest.actions.createWorkflowDispatch({
               owner: "HumanSignal",
               repo: "label-studio-enterprise",
               workflow_id: "argocd-deploy.yml",
               ref: "develop",
               inputs: {
                 docker_image_version: docker_image_version,
-                app_name: app_name,
+                release_name: release_name,
                 template_name: "lso",
               }
             });

diff --git a/.github/workflows/docker-build-ontop.yml b/.github/workflows/docker-build-ontop.yml
@@ -91,7 +91,7 @@ jobs:
           cat "${DOCKERFILE_PATH}"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v3.3.0

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -66,8 +66,8 @@ jobs:
           sha="$(git rev-parse HEAD)"
           echo "sha=$sha" >> $GITHUB_OUTPUT
            
-          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed 's#/#-#g' | sed 's#_#-#g'| sed 's#\.#-#g' | tr '[:upper:]' '[:lower:]')"
-          echo "pretty_branch_name=$pretty_branch_name" >> $GITHUB_OUTPUT
+          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed -E 's#[/_\.-]+#-#g' | tr '[:upper:]' '[:lower:]' | cut -c1-25 | sed -E 's#-$##g')"
+          echo "pretty_branch_name=${pretty_branch_name}" >> "${GITHUB_OUTPUT}"
 
           regexp='^ls-release\/(.*)$';
           if [[ "$BRANCH_NAME" =~ $regexp ]]; then
@@ -89,7 +89,7 @@ jobs:
           echo "build_version=$version" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v3.3.0

diff --git a/.github/workflows/docker-release-promote.yml b/.github/workflows/docker-release-promote.yml
@@ -154,7 +154,7 @@ jobs:
           fi
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v3.3.0

diff --git a/.github/workflows/follow-merge-upstream-repo-sync.yml b/.github/workflows/follow-merge-upstream-repo-sync.yml
@@ -128,13 +128,14 @@ jobs:
             This PR was automaticaly generated via Follow Merge. 
             Please ensure that all linked upstream Pull Requests are merged before proceeding with this one.
 
-      - name: Add PR Reviewers
-        uses: ./.github/actions-hub/actions/github-add-pull-request-reviewers
+      - name: Add PR Assignees
+        if: steps.fm.outputs.assignees
+        uses: ./.github/actions-hub/actions/github-add-pull-request-assignees
         continue-on-error: true
         with:
           github_token: ${{ secrets.GIT_PAT }}
           pullrequest_number: "${{ steps.get-pr.outputs.number }}"
-          reviewers: "${{ steps.fm.outputs.actor }}"
+          assignees: "${{ steps.fm.outputs.assignees }}"
 
       - name: Link PR
         uses: ./.github/actions-hub/actions/github-link-upstream-pull-request

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -163,7 +163,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: ${{ github.event.pull_request.head.repo.fork == false && github.event.pull_request.user.login != 'dependabot[bot]' }}
-        uses: codecov/codecov-action@v5.1.1
+        uses: codecov/codecov-action@v5.1.2
         with:
           name: codecov-python-${{ matrix.python-version }}
           flags: pytests
@@ -179,7 +179,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.9'
+          - '3.10'
 
     # required for poetry action
     # see https://github.com/marketplace/actions/install-poetry-action#running-on-windows

diff --git a/docs/source/guide/auth_setup.md b/docs/source/guide/auth_setup.md
@@ -21,7 +21,7 @@ To more easily [manage access to Label Studio Enterprise](manage_users.html), yo
 
 ## Set up SAML SSO
 
-The organization owner for Label Studio Enterprise can set up SSO & SAML for the instance. Label Studio Enterprise supports the following IdPs:
+The organization Owner or Administrator for Label Studio Enterprise can set up SSO & SAML for the instance. Label Studio Enterprise supports the following IdPs:
 - [Okta](https://www.youtube.com/watch?v=Dr-_hyWIw4M)
 - [Google SAML](google_saml.html)
 - [Ping Federate and Ping Identity SAML SSO Setup Example](pingone.html)