Merge pull request #53 from roboflow/feature/florence_2_generic_metri…

…c_support

add generic metric support for Florence-2

.github/workflows/maestro-tests.yml

@@ -1,4 +1,4 @@
-name: Test WorkFlow
+name: Maestro PyTest WorkFlow 🧪
 
 on:
   pull_request:
@@ -40,5 +40,5 @@ jobs:
           pip install .
           pip install pytest
 
-      - name: 🧪 Test
+      - name: 🧪 Run Tests
         run: "python -m pytest ./test"

.github/workflows/publish-dev-docs.yml

@@ -0,0 +1,39 @@
+name: Maestro Develop Documentation Workflow 📚
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'push' && github.ref}}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  pages: write
+  pull-requests: write
+
+
+jobs:
+  maestro-dev-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🔄 Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: 🐍 Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: 📦 Install Packages
+        run: pip install "mkdocs-material" "mkdocstrings[python]" "mkdocs-material[imaging]" mike
+      - name: ⚙️ Configure git for github-actions
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: 🚀 Deploy MkDoc-Material with mike
+        run: |
+          MKDOCS_GIT_COMMITTERS_APIKEY=${{ secrets.GITHUB_TOKEN }} mike deploy --push develop

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

@@ -0,0 +1,41 @@
+name: Maestro Release Documentation Workflow 📚
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'push' && github.ref}}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  pages: write
+  pull-requests: write
+
+
+jobs:
+  maestro-release-docs:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10"]
+    steps:
+      - name: 🛎️ Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+
+      - name: 🐍 Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: 📦 Install Packages
+        run: pip install "mkdocs-material" "mkdocstrings[python]" "mkdocs-material[imaging]" mike
+      - name: ⚙️ Configure git for github-actions 👷
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: 🚀 Deploy MkDoc-Material 📚
+        run: |
+            latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
+            MKDOCS_GIT_COMMITTERS_APIKEY=${{ secrets.GITHUB_TOKEN }} mike deploy --push --update-aliases $latest_tag latest

.github/workflows/pypi-publish.yml

@@ -1,8 +1,9 @@
-name: Multimodal Maestro Releases to PyPi
+name: Maestro Releases to PyPi
 on:
   push:
     tags:
       - '[0-9]+.[0-9]+[0-9]+.[0-9]'
+      - '[0-9]+.[0-9]+.[0-9]'
 
   workflow_dispatch:
 
@@ -27,14 +28,12 @@ jobs:
           python -m pip install --upgrade build twine
           python -m build
           twine check --strict dist/*
-      - name: 🚀 Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
+      - name: 🚀 Publish to PyPi - Release
+        uses: pypa/gh-action-pypi-publish@release/v1.10
         with:
-          user: ${{ secrets.PYPI_USERNAME }}
-          password: ${{ secrets.PYPI_PASSWORD }}
-      - name: 🚀 Publish to Test-PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
+          password: ${{ secrets.PYPI_API_TOKEN }}
+      - name: 🚀 Publish to Test-PyPi - Release
+        uses: pypa/gh-action-pypi-publish@release/v1.10
         with:
           repository-url: https://test.pypi.org/legacy/
-          user: ${{ secrets.PYPI_TEST_USERNAME }}
-          password: ${{ secrets.PYPI_TEST_PASSWORD }}
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}

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

@@ -1,10 +1,13 @@
-name: Multimodal Maestro Test Releases to PyPi
+name: Maestro Test Releases to PyPi
 on:
   push:
     tags:
       - '[0-9]+.[0-9]+[0-9]+.[0-9]+a[0-9]'
       - '[0-9]+.[0-9]+[0-9]+.[0-9]+b[0-9]'
       - '[0-9]+.[0-9]+[0-9]+.[0-9]+rc[0-9]'
+      - '[0-9]+.[0-9]+.[0-9]+a[0-9]'
+      - '[0-9]+.[0-9]+.[0-9]+b[0-9]'
+      - '[0-9]+.[0-9]+.[0-9]+rc[0-9]'
 
   workflow_dispatch:
 
@@ -30,14 +33,12 @@ jobs:
           python -m pip install --upgrade build twine
           python -m build
           twine check --strict dist/*
-      - name: 🚀 Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+      - name: 🚀 Publish to PyPi - Prelease
+        uses: pypa/gh-action-pypi-publish@release/v1.10
         with:
-          user: ${{ secrets.PYPI_USERNAME }}
-          password: ${{ secrets.PYPI_PASSWORD }}
-      - name: 🚀 Publish to Test-PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
+          password: ${{ secrets.PYPI_API_TOKEN }}
+      - name: 🚀 Publish to Test-PyPi - Prelease
+        uses: pypa/gh-action-pypi-publish@release/v1.10
         with:
           repository-url: https://test.pypi.org/legacy/
-          user: ${{ secrets.PYPI_TEST_USERNAME }}
-          password: ${{ secrets.PYPI_TEST_PASSWORD }}
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}

README.md

@@ -11,7 +11,7 @@
 **maestro** is a tool designed to streamline and accelerate the fine-tuning process for
 multimodal models. It provides ready-to-use recipes for fine-tuning popular
 vision-language models (VLMs) such as **Florence-2**, **PaliGemma**, and
-**Phi-3.5 Vision** on downstream vision-language tasks.
+**Qwen2-VL** on downstream vision-language tasks.
 
 ## 💻 install
 
@@ -40,9 +40,9 @@ arguments as the CLI example above:
 
 ```python
 from maestro.trainer.common import MeanAveragePrecisionMetric
-from maestro.trainer.models.florence_2 import train, TrainingConfiguration
+from maestro.trainer.models.florence_2 import train, Configuration
 
-config = TrainingConfiguration(
+config = Configuration(
     dataset='<DATASET_PATH>',
     epochs=10,
     batch_size=8,