Merge pull request #160 from PaddleCV-SIG/develop

Develop

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build PaddleLabel package
+name: Build & E2E Tests
 
 on:
   push:
@@ -93,14 +93,6 @@ jobs:
             version: $(cat paddlelabel/version)
           " >> $GITHUB_STEP_SUMMARY
 
-      - name: Bump version
-        id: bump_version
-        if: github.event_name == 'push'
-        run: |
-          python tool/bumpversion.py
-          git config --global user.email "bot@github.com" && git config --global user.name "Action Bot"
-          git add paddlelabel/version; git commit -m "bump version"; git push
-
       - name: Save built package
         uses: actions/upload-artifact@v3
         with:
@@ -112,3 +104,21 @@ jobs:
     needs: build
     # uses: PaddleCV-SIG/PaddleLabel/.github/workflows/cypress.yml@develop
     uses: ./.github/workflows/cypress.yml
+
+  bump_version:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.11"]
+    needs: cypress_e2e_test
+    steps:
+      - name: Checkout backend code
+        uses: actions/checkout@v3
+
+      - name: Bump version
+        id: bump_version
+        if: github.event_name == 'push'
+        run: |
+          python tool/bumpversion.py
+          git config --global user.email "bot@github.com" && git config --global user.name "Action Bot"
+          git add paddlelabel/version; git commit -m "bump version"; git push

.github/workflows/cypress.yml

@@ -22,10 +22,10 @@ jobs:
       matrix:
         node-version: ["19.x"]
 
-        # python-version: ["3.11", "3.10", "3.9", "3.8", "3.7"]
+        python-version: ["3.11", "3.10", "3.9", "3.8", "3.7"]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
-        python-version: ["3.11"]
+        # python-version: ["3.11"]
         # os: [ubuntu-latest]
 
       fail-fast: false
@@ -41,7 +41,10 @@ jobs:
           cache-env: true
           channels: conda-forge
 
+      - run: echo ${{ github.event_name }}
+
       - name: Download built paddlelabel package
+        if: github.event_name == 'push'
         uses: actions/download-artifact@v3
         with:
           name: PaddleLabel_built_package
@@ -54,21 +57,28 @@ jobs:
           cd ~/测试路径/3rd_party/
           curl -LO https://github.com/linhandev/static/releases/download/PaddleLabel%E7%9B%B8%E5%85%B3/paddlelabel_3rd_party_tests.zip
           echo ----------------------------------
-          # ls
           unzip -q paddlelabel_3rd_party_tests.zip
-          # pwd
-          # ls
           } &
           bgid=$!
           echo $bgid
 
           # download latest build
-          # curl -LO https://nightly.link/PaddleCV-SIG/PaddleLabel/workflows/build/develop/PaddleLabel_built_package.zip
-          # unzip PaddleLabel_built_package.zip
+          if [[ ${{ github.event_name }} != "push" ]]
+          then
+            echo "here"
+            curl -LO https://nightly.link/PaddleCV-SIG/PaddleLabel/workflows/build/develop/PaddleLabel_built_package.zip
+            pwd
+            ls
+            unzip PaddleLabel_built_package.zip
+          fi
+
+          pwd
+          ls
 
           # install latest build
           echo ========================================================
           pip uninstall paddlelabel -y
+          pip uninstall paddlelabel -y
           pip install paddlelabel-*-py3-none-any.whl
 
           # wait for bg job
@@ -114,6 +124,22 @@ jobs:
           # ls
           echo "tests=$(python cypress/order_tests.py)" >> $GITHUB_OUTPUT
 
+      # - uses: Wandalen/wretry.action@master
+      #   id: test
+      #   with:
+      #     action: cypress-io/github-action@v5
+      #     with: |
+      #       working-directory: ./cypress
+      #       browser: chrome
+      #       config: baseUrl=http://localhost:1111
+      #       env: os=${{ matrix.os }}
+      #       spec: ${{ steps.test_order.outputs.tests }}
+      #       wait-on: "http://localhost:1111"
+      #       wait-on-timeout: 120
+      #       start-windows: yarn run test:win
+      #       start: yarn run test:unix
+      #     attempt_limit: 2
+
       - name: Run tests
         uses: cypress-io/github-action@v5
         id: test

doc/CN/README.md

@@ -8,8 +8,6 @@
 
 <b> 飞桨智能标注，让标注快人一步 </b>
 
-<!-- TODO: can we make this 3.7+ -->
-
 <p>
 <img src="https://img.shields.io/badge/python-3.7+-blue.svg">
 <img src="https://img.shields.io/badge/os-linux%2C%20windows%2C%20macos-blue.svg"/>
@@ -19,7 +17,7 @@
 <!-- <a href="https://github.com/PaddleCV-SIG/doc/network/members"> <img src="https://img.shields.io/github/forks/PaddleCV-SIG/PaddleLabel?color=blue"/></a> -->
 <a href="https://pypistats.org/packages/paddlelabel"><img src="https://img.shields.io/pypi/dm/paddlelabel?color=blue"/> </a>
 <a href="https://pepy.tech/project/paddlelabel"><img src="https://static.pepy.tech/personalized-badge/paddlelabel?period=total&units=international_system&left_color=grey&right_color=blue&left_text=Total%20Downloads"/></a>
-<a href="https://github.com/PaddleCV-SIG/PaddleLabel/actions/workflows/cypress.yml"><img src="https://github.com/PaddleCV-SIG/PaddleLabel/actions/workflows/cypress.yml/badge.svg"></a>
+<a href="https://github.com/PaddleCV-SIG/PaddleLabel/actions/workflows/build.yml"><img src="https://github.com/PaddleCV-SIG/PaddleLabel/actions/workflows/build.yml/badge.svg"></a>
 </p>
 </div>
 

paddlelabel/api/controller/data.py

@@ -8,12 +8,11 @@
 import flask
 import tempfile
 
-from paddlelabel.config import db
 from .base import crud
 from ..model import Data, Project, Task
 from ..schema import DataSchema
 from paddlelabel.api.util import abort
-from paddlelabel.task.segmentation import draw_mask
+from paddlelabel.task.instance_segmentation import draw_mask
 
 get_all, get, post, put, delete = crud(Data, DataSchema)
 

paddlelabel/api/controller/project.py

@@ -14,7 +14,7 @@
 import connexion
 
 from paddlelabel.config import db
-from paddlelabel.api.model import Project, Task, TaskCategory, Annotation, Label
+from paddlelabel.api.model import Project, Task, TaskCategory, Annotation, Label, TaskCategory
 from paddlelabel.api.schema import ProjectSchema
 from paddlelabel.api.controller.base import crud
 from paddlelabel.api.util import abort
@@ -199,6 +199,42 @@ def pre_put(project, body, se):
     return project, body
 
 
+# TODO: move to label controller
+def create_label(project, label_name):
+    color = rand_hex_color([l.color for l in project.labels])
+    ids = [l.id for l in project.labels]
+    ids.append(0)
+    label = Label(
+        id=max(ids) + 1,
+        project_id=project.project_id,
+        name=label_name,
+        color=color,
+    )
+    project.labels.append(label)
+    db.session.commit()
+    return label
+
+
+def post_delete(project, se):
+    warning_path = Path(project.data_dir) / "paddlelabel.warning"
+    if warning_path.exists():
+        warning_path.unlink()
+
+
+get_all, get, post, put, delete = crud(
+    Project,
+    ProjectSchema,
+    triggers=[pre_add, post_add, pre_put, post_delete],
+)
+
+
+def to_easydata(project_id):
+    _, project = Project._exists(project_id)
+    task_category = TaskCategory._get(task_category_id=project.task_category_id)
+    handler = eval(task_category.handler)(project)
+    handler.to_easydata(project_id=project_id, **{k: connexion.request.json[k] for k in ["access_token", "dataset_id"]})
+
+
 def split_dataset(project_id):
     Project._exists(project_id)
     split = connexion.request.json
@@ -239,22 +275,6 @@ def split_dataset(project_id):
     }, 200
 
 
-# TODO: move to label controller
-def create_label(project, label_name):
-    color = rand_hex_color([l.color for l in project.labels])
-    ids = [l.id for l in project.labels]
-    ids.append(0)
-    label = Label(
-        id=max(ids) + 1,
-        project_id=project.project_id,
-        name=label_name,
-        color=color,
-    )
-    project.labels.append(label)
-    db.session.commit()
-    return label
-
-
 def predict(project_id):
     _, project = Project._exists(project_id)
 
@@ -305,21 +325,8 @@ def predict(project_id):
     return "finished"
 
 
-def to_easydata(project_id):
-    _, project = Project._exists(project_id)
-    task_category = TaskCategory._get(task_category_id=project.task_category_id)
-    handler = eval(task_category.handler)(project)
-    handler.to_easydata(project_id=project_id, **{k: connexion.request.json[k] for k in ["access_token", "dataset_id"]})
-
-
-def post_delete(project, se):
-    warning_path = osp.join(project.data_dir, "paddlelabel.warning")
-    if osp.exists(warning_path):
-        os.remove(warning_path)
-
-
-get_all, get, post, put, delete = crud(
-    Project,
-    ProjectSchema,
-    triggers=[pre_add, post_add, pre_put, post_delete],
-)
+def import_options(project_type):
+    all_catgs = TaskCategory._get(many=True)
+    assert project_type in [c.name for c in all_catgs], f"Project type specified {project_type} isn't supported"
+    selector = eval(f"paddlelabel.task.{project_type}.ProjectSubtypeSelector")()
+    print(selector.questions)