Merge branch 'develop' into feature/florence_2_support

.github/workflows/pypi-test-publish.yml → .github/workflows/publish-pre-release.yml

@@ -1,4 +1,4 @@
-name: Maestro Test Releases to PyPi
+name: Maestro Pre-Releases to PyPi
 on:
   push:
     tags:
@@ -11,20 +11,29 @@ on:
 
   workflow_dispatch:
 
+permissions: {} # Explicitly remove all permissions by default
+
 jobs:
-  build-n-publish:
-    name: Build and publish to PyPI
+  publish-pre-release:
+    name: Publish Pre-Release Package
     runs-on: ubuntu-latest
+    environment:
+      name: test
+      url: https://pypi.org/project/maestro/
+    timeout-minutes: 10
+    permissions:
+      id-token: write # Required for PyPI publishing
+      contents: read # Required for checkout
     strategy:
       matrix:
         python-version: ["3.10"]
     steps:
       - name: 🛎️ Checkout
-        uses: actions/checkout@v4
+        uses:  actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.head_ref }}
       - name: 🐍 Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -33,12 +42,8 @@ jobs:
           python -m pip install --upgrade build twine
           python -m build
           twine check --strict dist/*
+
       - name: 🚀 Publish to PyPi - Prelease
-        uses: pypa/gh-action-pypi-publish@release/v1.10
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-      - name: 🚀 Publish to Test-PyPi - Prelease
-        uses: pypa/gh-action-pypi-publish@release/v1.10
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
         with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          attestations: true

.github/workflows/pypi-publish.yml → .github/workflows/publish-release.yml

@@ -7,19 +7,29 @@ on:
 
   workflow_dispatch:
 
+permissions: {} # Explicitly remove all permissions by default
+
 jobs:
-  build:
+  publish-release:
+    name: Publish Release Package
     runs-on: ubuntu-latest
+    environment:
+      name: release
+      url: https://pypi.org/project/maestro/
+    timeout-minutes: 10
+    permissions:
+      id-token: write # Required for PyPI publishing
+      contents: read # Required for checkout
     strategy:
       matrix:
         python-version: ["3.10"]
     steps:
       - name: 🛎️ Checkout
-        uses: actions/checkout@v4
+        uses:  actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.head_ref }}
       - name: 🐍 Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -29,11 +39,6 @@ jobs:
           python -m build
           twine check --strict dist/*
       - name: 🚀 Publish to PyPi - Release
-        uses: pypa/gh-action-pypi-publish@release/v1.10
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-      - name: 🚀 Publish to Test-PyPi - Release
-        uses: pypa/gh-action-pypi-publish@release/v1.10
+      uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
         with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          attestations: true

.github/workflows/publish-test-release.yml

@@ -0,0 +1,42 @@
+name: Publish Maestro Releases to TestPyPI
+
+on:
+  workflow_dispatch:
+
+permissions: {} # Explicitly remove all permissions by default
+
+jobs:
+  publish-testpypi:
+    name: Publish Release Package to TestPyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: release
+      url: https://pypi.org/project/maestro/
+    timeout-minutes: 10
+    permissions:
+      id-token: write # Required for PyPI publishing
+      contents: read # Required for checkout
+    strategy:
+      matrix:
+        python-version: ["3.10"]
+    steps:
+      - name: 🛎️ Checkout
+        uses:  actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ github.head_ref }}
+      - name: 🐍 Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name:  🏗️ Build source and wheel distributions
+        run: |
+          python -m pip install --upgrade build twine
+          python -m build
+          twine check --strict dist/*
+
+      - name: 🚀 Publish to Test-PyPi
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
+        with:
+          repository-url: https://test.pypi.org/legacy/
+          attestations: true

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "maestro"
 version = "0.2.0rc6"
-description = "Visual Prompting for Large Multimodal Models (LMMs)"
+description = "Streamline the fine-tuning process for vision-language models like PaliGemma 2, Florence-2, and Qwen2.5-VL."
 authors = [
     {name = "Piotr Skalski", email = "[email protected]"}
 ]