Merge from develop branch

.github/workflows/engine-workflow.yml

@@ -17,12 +17,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: ["3.8", "3.9", "3.10"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -32,4 +32,4 @@ jobs:
           if [ -f ./requirements.txt ]; then pip install -r ./requirements.txt; fi
       - name: Lint with
         run: |
-          pylint ./src/engine
+          pylint ./src/engine/server

.github/workflows/release-workflow.yml

@@ -12,7 +12,7 @@ jobs:
         os: [macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set the env variables
         run: |
           echo "USE_HARD_LINKS=false" >> $GITHUB_ENV
@@ -33,17 +33,17 @@ jobs:
         shell: bash
         run: |
           if [ ${{ steps.extract_platform.outputs.platform }} = "windows" ]; then
-          echo "##[set-output name=name;]$(echo Portal Setup ${{ steps.extract_version.outputs.version }}.exe)"
+            echo "##[set-output name=name;]$(echo Portal Setup ${{ steps.extract_version.outputs.version }}.exe)"
           elif [ ${{ steps.extract_platform.outputs.platform }} = "ubuntu" ]; then
-          echo "##[set-output name=name;]$(echo Portal-${{ steps.extract_version.outputs.version }}.AppImage)"
+            echo "##[set-output name=name;]$(echo Portal-${{ steps.extract_version.outputs.version }}.AppImage)"
           else
-          echo "##[set-output name=name;]$(echo Portal-${{ steps.extract_version.outputs.version }}.dmg)"
+            echo "##[set-output name=name;]$(echo Portal-${{ steps.extract_version.outputs.version }}.dmg)"
           fi
         id: extract_executable_name
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: "3.10"
 
       - name: Install Engine dependencies
         run: |
@@ -56,10 +56,11 @@ jobs:
         working-directory: ./src/engine
         shell: bash
         run: |
-          pyinstaller -F run.py --hidden-import datature-hub --hidden-import engineio.async_drivers.threading  --distpath ../../portal_build/dist
+          pyinstaller --collect-data ultralytics --hidden-import pydicom.encoders.gdcm --hidden-import pydicom.encoders.pylibjpeg --hidden-import engineio.async_drivers.threading -F run.py --distpath ../../portal_build/dist
           if [ -f ../../portal_build/dist/run ]; then
-          chmod u+x ../../portal_build/dist/run
-          mv ../../portal_build/dist/run ../../portal_build/dist/run.exe
+            chmod u+x ../../portal_build/dist/run
+          else
+            chmod u+x ../../portal_build/dist/run.exe
           fi
           chmod u+x ../../portal_build/dist/run.exe
 

.pylintrc

@@ -52,7 +52,7 @@ confidence=
 # --disable=W"
 # TODO: remove R1710 (inconsistent-return-statements)
 # TODO: remove C0111 (missing-docstring)
-disable=similarities,fixme,I0011,E1102,R1710,C0111,C0330
+disable=similarities,fixme,I0011,E1102,R1710,C0111,cyclic-import
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -424,4 +424,4 @@ known-third-party=enchant
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception

Pipfile

@@ -1,27 +1,36 @@
 [[source]]
+name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
-name = "pypi"
 
 [packages]
-flask-restful = "==0.3.9"
+apscheduler = "==3.7.0"
+datature = "==1.6.0"
+dirhash = "==0.2.1"
 flask = "==2.0.0"
 flask-cors = "==3.0.10"
+flask-restful = "==0.3.9"
 flask-socketio = "==5.1.0"
-numpy = "==1.18.5"
-tensorflow = "==2.3.0"
-opencv-python = "==4.5.1.48"
 jsonpickle = "==2.0.0"
-dirhash = "==0.2.1"
+numpy = "==1.21.6"
+onnx = "==1.12.0"
+onnx2torch = "==1.5.6"
+onnxruntime = "==1.14.1"
+opencv-python = "==4.7.0.72"
+pillow = "==9.5.0"
 scandir = "==1.10.0"
-apscheduler = "==3.7.0"
-datature-hub = "==0.2.0"
-pillow = "==8.2.0"
-shapely = "==1.7.1"
+scantree = "==0.0.1"
+shapely = "==2.0.1"
+tensorflow = "==2.11.0"
+tensorflow-macos = {version = "==2.11.0", sys_platform = "== 'darwin'", platform_machine = "== 'arm64'"}
+torch = "==1.12.1"
+torchvision = "==0.13.1"
+ultralytics = "==8.0.133"
+werkzeug = "==2.0.0"
 
 [dev-packages]
-pylint = "*"
 isort = "*"
+pylint = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.9"