Skip to content

Commit a572149

Browse files
weiloon-dataturemarcus-neoKoh Quan Wei Ivandenzel-dataturegkeechin
authored
Support for Python SDK v1.6.0 and Inference API (#175)
* Merge from develop branch (#174) * updated to match v0.5.6 * update engine-workflow * minor fixes * FIX: Added Support for M1 Chip * FIX: Windows compatibility issues (#154) * Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Fixed Windows incompatibility issues * Removed release build files --------- Co-authored-by: Keechin <[email protected]> Co-authored-by: Denzel <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <[email protected]> * Fixed electron build for MacOS * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * Merge divergent branches from release (#164) * Fixed same file error * Fixed TF inference error * Re-Exported Portal to Portal Build * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Removed build files * Removed legacy info --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update release workflow (#166) * Fixed same file error * Fixed TF inference error * Re-Exported Portal to Portal Build * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Removed build files * Removed legacy info * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes * Create Support for Datature API (#169) * Add Support for Python SDK v1.6.0 (#170) * Support SDK v1.6.0 * Fixed endpoint issues for Inference API * Update dependencies and setup * Upgrade to minimum Python 3.8 * Fix YAML parsing issue in workflow * Parity for release <> develop (#173) * Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Support Inference with YOLOv8 Models (#160) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Conflict fixes (#165) * Hot fixes v0.5.8 (#163) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * Merge divergent branches from release (#164) * Fixed same file error * Fixed TF inference error * Re-Exported Portal to Portal Build * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Removed build files * Removed legacy info --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update release workflow (#166) * Fixed same file error * Fixed TF inference error * Re-Exported Portal to Portal Build * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Removed build files * Removed legacy info * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Keechin <[email protected]> Co-authored-by: Denzel <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <[email protected]> --------- Co-authored-by: marcus-datature <[email protected]> Co-authored-by: Koh Quan Wei Ivan <[email protected]> Co-authored-by: Denzel <[email protected]> Co-authored-by: Keechin <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <[email protected]> * Re-Exported Portal to Portal Build --------- Co-authored-by: marcus-datature <[email protected]> Co-authored-by: Koh Quan Wei Ivan <[email protected]> Co-authored-by: Denzel <[email protected]> Co-authored-by: Keechin <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <[email protected]>
1 parent c18c1d9 commit a572149

File tree

16 files changed

+2105
-2150
lines changed

16 files changed

+2105
-2150
lines changed

‎.github/workflows/engine-workflow.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
python-version: [3.7, 3.8]
20+
python-version: ["3.8", "3.9", "3.10"]
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v2
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
- name: Install dependencies

‎.github/workflows/release-workflow.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
os: [macos-latest, windows-latest]
1313

1414
steps:
15-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v4
1616
- name: Set the env variables
1717
run: |
1818
echo "USE_HARD_LINKS=false" >> $GITHUB_ENV
@@ -41,9 +41,9 @@ jobs:
4141
fi
4242
id: extract_executable_name
4343

44-
- uses: actions/setup-python@v2
44+
- uses: actions/setup-python@v5
4545
with:
46-
python-version: 3.7
46+
python-version: "3.10"
4747

4848
- name: Install Engine dependencies
4949
run: |

‎.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ confidence=
5252
# --disable=W"
5353
# TODO: remove R1710 (inconsistent-return-statements)
5454
# TODO: remove C0111 (missing-docstring)
55-
disable=similarities,fixme,I0011,E1102,R1710,C0111
55+
disable=similarities,fixme,I0011,E1102,R1710,C0111,cyclic-import
5656

5757
# Enable the message, report, category or checker with the given id(s). You can
5858
# either give multiple identifier separated by comma (,) or put this option

‎Pipfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ verify_ssl = true
55

66
[packages]
77
apscheduler = "==3.7.0"
8-
datature = "==1.0.1"
8+
datature = "==1.6.0"
99
dirhash = "==0.2.1"
1010
flask = "==2.0.0"
1111
flask-cors = "==3.0.10"
@@ -16,13 +16,13 @@ numpy = "==1.21.6"
1616
onnx = "==1.12.0"
1717
onnx2torch = "==1.5.6"
1818
onnxruntime = "==1.14.1"
19-
opencv-python = "==4.6.0.66"
20-
pillow = "==8.2.0"
19+
opencv-python = "==4.7.0.72"
20+
pillow = "==9.5.0"
2121
scandir = "==1.10.0"
2222
scantree = "==0.0.1"
2323
shapely = "==2.0.1"
24-
tensorflow = "==2.10.0"
25-
tensorflow-macos = {version = "==2.10.0", sys_platform = "== 'darwin'", platform_machine = "== 'arm64'"}
24+
tensorflow = "==2.11.0"
25+
tensorflow-macos = {version = "==2.11.0", sys_platform = "== 'darwin'", platform_machine = "== 'arm64'"}
2626
torch = "==1.12.1"
2727
torchvision = "==0.13.1"
2828
ultralytics = "==8.0.133"
@@ -33,4 +33,4 @@ isort = "*"
3333
pylint = "*"
3434

3535
[requires]
36-
python_version = "3.7"
36+
python_version = "3.9"

‎Pipfile.lock

Lines changed: 1976 additions & 2024 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
},
6363
"devDependencies": {
6464
"electron": "^13.1.2",
65-
"electron-builder": "^23.0.2",
65+
"electron-builder": "^23.6.0",
6666
"npx": "^10.2.2"
6767
},
6868
"optionalDependencies": {

‎requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
APScheduler==3.7.0
2-
datature==1.0.1
2+
datature==1.6.0
33
dirhash==0.2.1
44
Flask==2.0.0
55
Flask-Cors==3.0.10
66
Flask-RESTful==0.3.9
77
Flask-SocketIO==5.1.0
88
jsonpickle==2.0.0
99
numpy==1.21.6
10-
opencv-python==4.6.0.66
11-
Pillow==8.2.0
10+
opencv-python==4.7.0.72
11+
Pillow==9.5.0
1212
scandir==1.10.0
1313
scantree==0.0.1
1414
shapely==2.0.1
15-
tensorflow==2.10.0; sys_platform != 'darwin' or platform_machine != 'arm64'
16-
tensorflow-macos==2.10.0; sys_platform == 'darwin' and platform_machine == 'arm64'
15+
tensorflow==2.11.0; sys_platform != 'darwin' or platform_machine != 'arm64'
16+
tensorflow-macos==2.11.0; sys_platform == 'darwin' and platform_machine == 'arm64'
1717
torch==1.12.1
1818
torchvision==0.13.1
1919
onnx==1.12.0

‎setup-virtualenv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ else
4444
python3 -m pip install --upgrade pip
4545
python3 -m pip install pipenv
4646
fi
47-
PIPENV_VENV_IN_PROJECT=1 PIPENV_DEFAULT_PYTHON_VERSION=3.7 pipenv sync -d
47+
PIPENV_VENV_IN_PROJECT=1 PIPENV_DEFAULT_PYTHON_VERSION=3.9 pipenv sync -d
4848

4949
cd ..
5050

‎src/app/src/api/annotation.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ export function APIRegisterModel(
136136
description: string,
137137
directory: string,
138138
modelKey: string,
139+
projectKey: string,
139140
projectSecret: string,
140141
modelURL: string
141142
): Promise<AxiosResponse<any>> {
@@ -146,6 +147,7 @@ export function APIRegisterModel(
146147
description,
147148
credentials: {
148149
modelKey,
150+
projectKey,
149151
projectSecret,
150152
modelURL,
151153
},

0 commit comments

Comments
 (0)