g3w-admin-processing 1.2.1b1.dev1__tar.gz → 2.0.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- g3w_admin_processing-2.0.1/.github/workflows/cd.yml +107 -0
- g3w_admin_processing-2.0.1/.github/workflows/ci.yml +69 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/.gitignore +0 -3
- g3w_admin_processing-2.0.1/.vscode/settings.json +2 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/PKG-INFO +10 -5
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/README.md +7 -2
- g3w_admin_processing-2.0.1/doc/images/qprocessing_schema.png +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/g3w_admin_processing.egg-info/PKG-INFO +10 -5
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/g3w_admin_processing.egg-info/SOURCES.txt +10 -8
- g3w_admin_processing-2.0.1/g3w_admin_processing.egg-info/requires.txt +2 -0
- g3w_admin_processing-2.0.1/g3w_admin_processing.egg-info/scm_file_list.json +96 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/pyproject.toml +6 -20
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/models.py +19 -6
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/upload.py +23 -2
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/configs.py +43 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/receivers.py +3 -0
- g3w_admin_processing-2.0.1/qprocessing/run_celery.sh +11 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/DrawInputVectorFeatures.js +193 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/InputFieldChooser.js +253 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/InputPrjRasterLayer.js +222 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/InputPrjVectorLayer.js +443 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/ModelInput.js +141 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/ModelPanel.js +588 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/static/qprocessing/js/components/ModelResults.js +31 -16
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/OutputFile.js +62 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/OutputRasterLayer.js +66 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/components/OutputVectorLayer.js +169 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/i18n/en.js +19 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/i18n/fr.js +17 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/static/qprocessing/js/i18n/index.js +2 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/i18n/it.js +17 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/plugin.js +193 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/vendors/jszip.min.js +13 -0
- g3w_admin_processing-2.0.1/qprocessing/static/qprocessing/js/vendors/shp.min.js +9 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tasks.py +22 -4
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/test_algorithm.py +2 -1
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/test_api.py +1 -1
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/test_api_models.py +23 -3
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/utils/formtypes.py +21 -3
- g3w_admin_processing-1.2.1b1.dev1/g3w_admin_processing.egg-info/requires.txt → g3w_admin_processing-2.0.1/requirements.txt +1 -2
- g3w_admin_processing-1.2.1b1.dev1/.github/ISSUE_TEMPLATE/bug_report.yml +0 -62
- g3w_admin_processing-1.2.1b1.dev1/.github/ISSUE_TEMPLATE/config.yml +0 -6
- g3w_admin_processing-1.2.1b1.dev1/.github/ISSUE_TEMPLATE/feature_request.yml +0 -37
- g3w_admin_processing-1.2.1b1.dev1/.github/PULL_REQUEST_TEMPLATE.md +0 -1
- g3w_admin_processing-1.2.1b1.dev1/.github/workflows/publish-to-github.yml +0 -33
- g3w_admin_processing-1.2.1b1.dev1/.github/workflows/publish-to-pypi.yml +0 -34
- g3w_admin_processing-1.2.1b1.dev1/Makefile +0 -13
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/DrawInputVectorFeatures.js +0 -180
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/InputFieldChooser.js +0 -226
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/InputPrjRasterLayer.js +0 -135
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/InputPrjVectorLayer.js +0 -415
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/ModelPanel.js +0 -496
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/OutputFile.js +0 -63
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/OutputRasterLayer.js +0 -63
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/OutputVectorLayer.js +0 -115
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/components/UploadVectorFile.js +0 -53
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/i18n/en.js +0 -33
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/i18n/it.js +0 -33
- g3w_admin_processing-1.2.1b1.dev1/qprocessing/static/qprocessing/js/plugin.js +0 -122
- g3w_admin_processing-1.2.1b1.dev1/requirements.txt +0 -1
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/.gitattributes +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/.github/release.yml +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/LICENSE +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/doc/images/g3w-suite.png +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/doc/images/qgis.png +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/g3w_admin_processing.egg-info/dependency_links.txt +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/g3w_admin_processing.egg-info/top_level.txt +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/__init__.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/admin.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/__init__.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/permissions.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/__init__.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/actions.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/admin.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/apiurls.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/apps.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/forms.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/migrations/0001_initial.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/migrations/0002_auto_20230615_1609.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/migrations/0003_qprocessinginputupload.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/migrations/0004_auto_20230809_0920.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/migrations/0005_alter_qprocessinginputupload_user.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/migrations/__init__.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/models.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/sitetrees.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/templates/qprocessing/project_form.html +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/templates/qprocessing/projects_list.html +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/__init__.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/base.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/models/qbuffer.model3 +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/models/qintersection.model3 +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/models/qpointspolygons.model3 +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/models/test.model3 +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/models/test_buffer_all_inputs.model3 +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/models/test_buffer_layer1.model3 +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/project_data/buildings.geojson +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/project_data/qprocessing.gpkg +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/qprocessing_qprocessing.qgs +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/qprocessing_qprocessing_attachments.zip +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/test_qgis_328.qgs +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/test_qgis_328_attachments.zip +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/fail_shp_to_upload.zip +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/linestring_to_upload.geojson +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/point_to_upload.geojson +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/point_to_upload_espg4326.geojson +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/point_to_upload_espg4326.qmd +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/polygon_to_upload.geojson +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.cpg +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.dbf +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.prj +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.qix +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.shp +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.shx +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/tests/data/upload/shp_to_upload.zip +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/urls.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/utils/__init__.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/utils/data.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/utils/exceptions.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/views.py +0 -0
- {g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/setup.cfg +0 -0
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
name: CD
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
workflow_run:
|
|
5
|
+
workflows: [CI]
|
|
6
|
+
types: [completed]
|
|
7
|
+
|
|
8
|
+
permissions:
|
|
9
|
+
contents: read
|
|
10
|
+
|
|
11
|
+
concurrency:
|
|
12
|
+
group: publish-qprocessing
|
|
13
|
+
queue: max
|
|
14
|
+
|
|
15
|
+
jobs:
|
|
16
|
+
publish:
|
|
17
|
+
if: >-
|
|
18
|
+
github.event.workflow_run.conclusion == 'success' &&
|
|
19
|
+
github.event.workflow_run.event == 'push' &&
|
|
20
|
+
github.event.workflow_run.head_repository.full_name == github.repository
|
|
21
|
+
runs-on: ubuntu-latest
|
|
22
|
+
permissions:
|
|
23
|
+
contents: write
|
|
24
|
+
id-token: write
|
|
25
|
+
steps:
|
|
26
|
+
- uses: actions/checkout@v4
|
|
27
|
+
with:
|
|
28
|
+
ref: ${{ github.event.workflow_run.head_sha }}
|
|
29
|
+
fetch-depth: 0
|
|
30
|
+
persist-credentials: false
|
|
31
|
+
- uses: actions/setup-python@v5
|
|
32
|
+
with:
|
|
33
|
+
python-version: '3.11'
|
|
34
|
+
- name: Select next version
|
|
35
|
+
id: version
|
|
36
|
+
env:
|
|
37
|
+
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
|
|
38
|
+
run: |
|
|
39
|
+
tag=$(git tag --points-at "$COMMIT_SHA" -l 'v*' --format='%(refname:short) %(contents:subject)' | sed -n "s/^\(v[0-9][0-9]*\.[0-9]\.[0-9]\) Automated release for $COMMIT_SHA$/\1/p" | head -n 1)
|
|
40
|
+
if [ -z "$tag" ]; then
|
|
41
|
+
latest=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]\.[0-9]$' | sort -V | tail -n 1)
|
|
42
|
+
test -n "$latest" || { echo "No stable version tag found" >&2; exit 1; }
|
|
43
|
+
bump() {
|
|
44
|
+
local major minor patch
|
|
45
|
+
IFS=. read -r major minor patch <<< "${1#v}"
|
|
46
|
+
patch=$((patch + 1))
|
|
47
|
+
if [ "$patch" -eq 10 ]; then
|
|
48
|
+
patch=0
|
|
49
|
+
minor=$((minor + 1))
|
|
50
|
+
fi
|
|
51
|
+
if [ "$minor" -eq 10 ]; then
|
|
52
|
+
minor=0
|
|
53
|
+
major=$((major + 1))
|
|
54
|
+
fi
|
|
55
|
+
echo "v$major.$minor.$patch"
|
|
56
|
+
}
|
|
57
|
+
test "$(bump v1.2.3)" = v1.2.4
|
|
58
|
+
test "$(bump v1.2.9)" = v1.3.0
|
|
59
|
+
test "$(bump v1.9.9)" = v2.0.0
|
|
60
|
+
tag=$(bump "$latest")
|
|
61
|
+
fi
|
|
62
|
+
echo "tag=$tag" >> "$GITHUB_OUTPUT"
|
|
63
|
+
- name: Build package
|
|
64
|
+
env:
|
|
65
|
+
SETUPTOOLS_SCM_PRETEND_VERSION: ${{ steps.version.outputs.tag }}
|
|
66
|
+
run: |
|
|
67
|
+
python -m pip install build twine
|
|
68
|
+
python -m build
|
|
69
|
+
python -m twine check dist/*
|
|
70
|
+
- name: Create tag
|
|
71
|
+
env:
|
|
72
|
+
GH_TOKEN: ${{ github.token }}
|
|
73
|
+
TAG: ${{ steps.version.outputs.tag }}
|
|
74
|
+
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
|
|
75
|
+
run: |
|
|
76
|
+
if ! git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
|
|
77
|
+
git config user.name github-actions[bot]
|
|
78
|
+
git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
|
|
79
|
+
git tag -a "$TAG" "$COMMIT_SHA" -m "Automated release for $COMMIT_SHA"
|
|
80
|
+
git -c http.extraheader="AUTHORIZATION: basic $(printf 'x-access-token:%s' "$GH_TOKEN" | base64 -w0)" push origin "refs/tags/$TAG"
|
|
81
|
+
fi
|
|
82
|
+
- name: Publish to PyPI
|
|
83
|
+
uses: pypa/gh-action-pypi-publish@release/v1
|
|
84
|
+
- name: Create GitHub release
|
|
85
|
+
env:
|
|
86
|
+
GH_TOKEN: ${{ github.token }}
|
|
87
|
+
TAG: ${{ steps.version.outputs.tag }}
|
|
88
|
+
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
|
|
89
|
+
run: |
|
|
90
|
+
released=$(gh api --paginate "repos/$GITHUB_REPOSITORY/releases?per_page=100" --jq '.[] | select(.draft == false) | .tag_name')
|
|
91
|
+
previous=
|
|
92
|
+
while IFS= read -r candidate; do
|
|
93
|
+
if [ "$candidate" != "$TAG" ] && grep -Fxq -- "$candidate" <<< "$released"; then
|
|
94
|
+
previous=$candidate
|
|
95
|
+
break
|
|
96
|
+
fi
|
|
97
|
+
done < <(git tag --merged "$COMMIT_SHA" --sort=-version:refname)
|
|
98
|
+
|
|
99
|
+
notes="$RUNNER_TEMP/release-notes.md"
|
|
100
|
+
printf '## Commits\n\n' > "$notes"
|
|
101
|
+
if [ -n "$previous" ]; then
|
|
102
|
+
git log --no-merges --format="- [%h](https://github.com/$GITHUB_REPOSITORY/commit/%H) %s" "$previous..$COMMIT_SHA" >> "$notes"
|
|
103
|
+
gh release create "$TAG" dist/* --verify-tag --generate-notes --notes-start-tag "$previous" --notes-file "$notes"
|
|
104
|
+
else
|
|
105
|
+
git log --no-merges --format="- [%h](https://github.com/$GITHUB_REPOSITORY/commit/%H) %s" "$COMMIT_SHA" >> "$notes"
|
|
106
|
+
gh release create "$TAG" dist/* --verify-tag --generate-notes --notes-file "$notes"
|
|
107
|
+
fi
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
name: CI
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
push:
|
|
5
|
+
branches: ['**']
|
|
6
|
+
pull_request:
|
|
7
|
+
|
|
8
|
+
permissions:
|
|
9
|
+
contents: read
|
|
10
|
+
|
|
11
|
+
jobs:
|
|
12
|
+
package:
|
|
13
|
+
runs-on: ubuntu-latest
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@v4
|
|
16
|
+
with:
|
|
17
|
+
fetch-depth: 0
|
|
18
|
+
- uses: actions/setup-python@v5
|
|
19
|
+
with:
|
|
20
|
+
python-version: '3.11'
|
|
21
|
+
- run: python -m pip install build twine
|
|
22
|
+
- run: python -m build && python -m twine check dist/*
|
|
23
|
+
- name: Check wheel contents
|
|
24
|
+
run: |
|
|
25
|
+
python - <<'PY'
|
|
26
|
+
from glob import glob
|
|
27
|
+
from zipfile import ZipFile
|
|
28
|
+
|
|
29
|
+
with ZipFile(glob("dist/*.whl")[0]) as wheel:
|
|
30
|
+
files = set(wheel.namelist())
|
|
31
|
+
assert {
|
|
32
|
+
"qprocessing/api/views/actions.py",
|
|
33
|
+
"qprocessing/migrations/0001_initial.py",
|
|
34
|
+
"qprocessing/utils/data.py",
|
|
35
|
+
"qprocessing/static/qprocessing/js/plugin.js",
|
|
36
|
+
"qprocessing/templates/qprocessing/project_form.html",
|
|
37
|
+
} <= files
|
|
38
|
+
PY
|
|
39
|
+
|
|
40
|
+
tests:
|
|
41
|
+
runs-on: ubuntu-24.04
|
|
42
|
+
timeout-minutes: 60
|
|
43
|
+
steps:
|
|
44
|
+
- uses: actions/checkout@v4
|
|
45
|
+
with:
|
|
46
|
+
repository: g3w-suite/g3w-admin
|
|
47
|
+
- uses: actions/checkout@v4
|
|
48
|
+
with:
|
|
49
|
+
path: plugin
|
|
50
|
+
- name: Install plugin source
|
|
51
|
+
run: |
|
|
52
|
+
mv plugin/qprocessing g3w-admin/
|
|
53
|
+
cp plugin/requirements.txt g3w-admin/qprocessing/
|
|
54
|
+
- name: Start services
|
|
55
|
+
run: docker compose -f docker-compose.ltr.yml up -d
|
|
56
|
+
- name: Copy source into container
|
|
57
|
+
run: docker cp . "$(docker compose -f docker-compose.ltr.yml ps -q g3w-suite)":/code
|
|
58
|
+
- name: Install dependencies
|
|
59
|
+
run: |
|
|
60
|
+
docker compose -f docker-compose.ltr.yml exec -T g3w-suite sh -c \
|
|
61
|
+
'cd /code && pip3 install --break-system-packages -r requirements_docker.txt -r requirements_huey.txt -r g3w-admin/qprocessing/requirements.txt'
|
|
62
|
+
- name: Configure and set up G3W-ADMIN
|
|
63
|
+
run: |
|
|
64
|
+
docker compose -f docker-compose.ltr.yml exec -T g3w-suite sh -c \
|
|
65
|
+
'printf "\nG3WADMIN_LOCAL_MORE_APPS = [\"qprocessing\"]\n" >> /code/settings_docker.py && /code/ci_scripts/build_suite.sh && /code/ci_scripts/setup_suite.sh'
|
|
66
|
+
- name: Run plugin tests
|
|
67
|
+
run: |
|
|
68
|
+
docker compose -f docker-compose.ltr.yml exec -T g3w-suite sh -c \
|
|
69
|
+
'cd /code/g3w-admin && python3 manage.py test qprocessing'
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: g3w-admin-processing
|
|
3
|
-
Version:
|
|
4
|
-
Summary: G3W-ADMIN plugin for use the processing features of QGIS application
|
|
3
|
+
Version: 2.0.1
|
|
4
|
+
Summary: G3W-ADMIN plugin for use the processing features of QGIS application
|
|
5
5
|
Author-email: Gis3w snc <info@gis3w.it>
|
|
6
6
|
License: Mozilla Public License 2.0 (MPL 2.0)
|
|
7
7
|
Project-URL: Homepage, https://github.com/g3w-suite/g3w-admin-processing
|
|
@@ -17,13 +17,18 @@ Classifier: Topic :: Software Development :: Libraries
|
|
|
17
17
|
Description-Content-Type: text/markdown
|
|
18
18
|
License-File: LICENSE
|
|
19
19
|
Requires-Dist: cryptography==3.4.8
|
|
20
|
-
|
|
20
|
+
Requires-Dist: django-bleach==2.0.0
|
|
21
21
|
Dynamic: license-file
|
|
22
22
|
|
|
23
|
-
# G3W-ADMIN-QPROCESSING
|
|
23
|
+
# G3W-ADMIN-QPROCESSING
|
|
24
|
+
|
|
25
|
+
[](https://pypi.org/project/g3w-admin-processing/)
|
|
26
|
+
[](https://deepwiki.com/g3w-suite/g3w-admin-processing)
|
|
24
27
|
|
|
25
28
|
A dedicated [QGIS Processing](https://docs.qgis.org/3.28/en/docs/training_manual/processing/index.html) module for G3W-SUITE framework:
|
|
26
29
|
|
|
30
|
+

|
|
31
|
+
|
|
27
32
|
1. upload a [`.model3`](https://docs.qgis.org/3.28/en/docs/user_manual/processing/modeler.html) file into G3W-ADMIN.
|
|
28
33
|
2. get QGIS Processing tools available within G3W-CLIENT.
|
|
29
34
|
|
|
@@ -66,7 +71,7 @@ pip3 install git+https://github.com/g3w-suite/g3w-admin-processing.git@v1.0.0
|
|
|
66
71
|
# Install module from local folder (git development)
|
|
67
72
|
# pip3 install -e /g3w-admin/plugins/qprocessing
|
|
68
73
|
|
|
69
|
-
# Install module from
|
|
74
|
+
# Install module from PyPI
|
|
70
75
|
# pip3 install g3w-admin-processing
|
|
71
76
|
```
|
|
72
77
|
|
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
# G3W-ADMIN-QPROCESSING
|
|
1
|
+
# G3W-ADMIN-QPROCESSING
|
|
2
|
+
|
|
3
|
+
[](https://pypi.org/project/g3w-admin-processing/)
|
|
4
|
+
[](https://deepwiki.com/g3w-suite/g3w-admin-processing)
|
|
2
5
|
|
|
3
6
|
A dedicated [QGIS Processing](https://docs.qgis.org/3.28/en/docs/training_manual/processing/index.html) module for G3W-SUITE framework:
|
|
4
7
|
|
|
8
|
+

|
|
9
|
+
|
|
5
10
|
1. upload a [`.model3`](https://docs.qgis.org/3.28/en/docs/user_manual/processing/modeler.html) file into G3W-ADMIN.
|
|
6
11
|
2. get QGIS Processing tools available within G3W-CLIENT.
|
|
7
12
|
|
|
@@ -44,7 +49,7 @@ pip3 install git+https://github.com/g3w-suite/g3w-admin-processing.git@v1.0.0
|
|
|
44
49
|
# Install module from local folder (git development)
|
|
45
50
|
# pip3 install -e /g3w-admin/plugins/qprocessing
|
|
46
51
|
|
|
47
|
-
# Install module from
|
|
52
|
+
# Install module from PyPI
|
|
48
53
|
# pip3 install g3w-admin-processing
|
|
49
54
|
```
|
|
50
55
|
|
|
Binary file
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: g3w-admin-processing
|
|
3
|
-
Version:
|
|
4
|
-
Summary: G3W-ADMIN plugin for use the processing features of QGIS application
|
|
3
|
+
Version: 2.0.1
|
|
4
|
+
Summary: G3W-ADMIN plugin for use the processing features of QGIS application
|
|
5
5
|
Author-email: Gis3w snc <info@gis3w.it>
|
|
6
6
|
License: Mozilla Public License 2.0 (MPL 2.0)
|
|
7
7
|
Project-URL: Homepage, https://github.com/g3w-suite/g3w-admin-processing
|
|
@@ -17,13 +17,18 @@ Classifier: Topic :: Software Development :: Libraries
|
|
|
17
17
|
Description-Content-Type: text/markdown
|
|
18
18
|
License-File: LICENSE
|
|
19
19
|
Requires-Dist: cryptography==3.4.8
|
|
20
|
-
|
|
20
|
+
Requires-Dist: django-bleach==2.0.0
|
|
21
21
|
Dynamic: license-file
|
|
22
22
|
|
|
23
|
-
# G3W-ADMIN-QPROCESSING
|
|
23
|
+
# G3W-ADMIN-QPROCESSING
|
|
24
|
+
|
|
25
|
+
[](https://pypi.org/project/g3w-admin-processing/)
|
|
26
|
+
[](https://deepwiki.com/g3w-suite/g3w-admin-processing)
|
|
24
27
|
|
|
25
28
|
A dedicated [QGIS Processing](https://docs.qgis.org/3.28/en/docs/training_manual/processing/index.html) module for G3W-SUITE framework:
|
|
26
29
|
|
|
30
|
+

|
|
31
|
+
|
|
27
32
|
1. upload a [`.model3`](https://docs.qgis.org/3.28/en/docs/user_manual/processing/modeler.html) file into G3W-ADMIN.
|
|
28
33
|
2. get QGIS Processing tools available within G3W-CLIENT.
|
|
29
34
|
|
|
@@ -66,7 +71,7 @@ pip3 install git+https://github.com/g3w-suite/g3w-admin-processing.git@v1.0.0
|
|
|
66
71
|
# Install module from local folder (git development)
|
|
67
72
|
# pip3 install -e /g3w-admin/plugins/qprocessing
|
|
68
73
|
|
|
69
|
-
# Install module from
|
|
74
|
+
# Install module from PyPI
|
|
70
75
|
# pip3 install g3w-admin-processing
|
|
71
76
|
```
|
|
72
77
|
|
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
.gitattributes
|
|
2
2
|
.gitignore
|
|
3
3
|
LICENSE
|
|
4
|
-
Makefile
|
|
5
4
|
README.md
|
|
6
5
|
pyproject.toml
|
|
7
6
|
requirements.txt
|
|
8
|
-
.github/PULL_REQUEST_TEMPLATE.md
|
|
9
7
|
.github/release.yml
|
|
10
|
-
.github/
|
|
11
|
-
.github/
|
|
12
|
-
.
|
|
13
|
-
.github/workflows/publish-to-github.yml
|
|
14
|
-
.github/workflows/publish-to-pypi.yml
|
|
8
|
+
.github/workflows/cd.yml
|
|
9
|
+
.github/workflows/ci.yml
|
|
10
|
+
.vscode/settings.json
|
|
15
11
|
doc/images/g3w-suite.png
|
|
16
12
|
doc/images/qgis.png
|
|
13
|
+
doc/images/qprocessing_schema.png
|
|
17
14
|
g3w_admin_processing.egg-info/PKG-INFO
|
|
18
15
|
g3w_admin_processing.egg-info/SOURCES.txt
|
|
19
16
|
g3w_admin_processing.egg-info/dependency_links.txt
|
|
20
17
|
g3w_admin_processing.egg-info/requires.txt
|
|
18
|
+
g3w_admin_processing.egg-info/scm_file_list.json
|
|
21
19
|
g3w_admin_processing.egg-info/top_level.txt
|
|
22
20
|
qprocessing/__init__.py
|
|
23
21
|
qprocessing/admin.py
|
|
@@ -27,6 +25,7 @@ qprocessing/configs.py
|
|
|
27
25
|
qprocessing/forms.py
|
|
28
26
|
qprocessing/models.py
|
|
29
27
|
qprocessing/receivers.py
|
|
28
|
+
qprocessing/run_celery.sh
|
|
30
29
|
qprocessing/sitetrees.py
|
|
31
30
|
qprocessing/tasks.py
|
|
32
31
|
qprocessing/urls.py
|
|
@@ -49,15 +48,18 @@ qprocessing/static/qprocessing/js/components/DrawInputVectorFeatures.js
|
|
|
49
48
|
qprocessing/static/qprocessing/js/components/InputFieldChooser.js
|
|
50
49
|
qprocessing/static/qprocessing/js/components/InputPrjRasterLayer.js
|
|
51
50
|
qprocessing/static/qprocessing/js/components/InputPrjVectorLayer.js
|
|
51
|
+
qprocessing/static/qprocessing/js/components/ModelInput.js
|
|
52
52
|
qprocessing/static/qprocessing/js/components/ModelPanel.js
|
|
53
53
|
qprocessing/static/qprocessing/js/components/ModelResults.js
|
|
54
54
|
qprocessing/static/qprocessing/js/components/OutputFile.js
|
|
55
55
|
qprocessing/static/qprocessing/js/components/OutputRasterLayer.js
|
|
56
56
|
qprocessing/static/qprocessing/js/components/OutputVectorLayer.js
|
|
57
|
-
qprocessing/static/qprocessing/js/components/UploadVectorFile.js
|
|
58
57
|
qprocessing/static/qprocessing/js/i18n/en.js
|
|
58
|
+
qprocessing/static/qprocessing/js/i18n/fr.js
|
|
59
59
|
qprocessing/static/qprocessing/js/i18n/index.js
|
|
60
60
|
qprocessing/static/qprocessing/js/i18n/it.js
|
|
61
|
+
qprocessing/static/qprocessing/js/vendors/jszip.min.js
|
|
62
|
+
qprocessing/static/qprocessing/js/vendors/shp.min.js
|
|
61
63
|
qprocessing/templates/qprocessing/project_form.html
|
|
62
64
|
qprocessing/templates/qprocessing/projects_list.html
|
|
63
65
|
qprocessing/tests/__init__.py
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
{
|
|
2
|
+
"files": [
|
|
3
|
+
".gitattributes",
|
|
4
|
+
".github/release.yml",
|
|
5
|
+
".github/workflows/cd.yml",
|
|
6
|
+
".github/workflows/ci.yml",
|
|
7
|
+
".gitignore",
|
|
8
|
+
".vscode/settings.json",
|
|
9
|
+
"LICENSE",
|
|
10
|
+
"README.md",
|
|
11
|
+
"doc/images/g3w-suite.png",
|
|
12
|
+
"doc/images/qgis.png",
|
|
13
|
+
"doc/images/qprocessing_schema.png",
|
|
14
|
+
"pyproject.toml",
|
|
15
|
+
"qprocessing/__init__.py",
|
|
16
|
+
"qprocessing/admin.py",
|
|
17
|
+
"qprocessing/api/__init__.py",
|
|
18
|
+
"qprocessing/api/permissions.py",
|
|
19
|
+
"qprocessing/api/views/__init__.py",
|
|
20
|
+
"qprocessing/api/views/actions.py",
|
|
21
|
+
"qprocessing/api/views/admin.py",
|
|
22
|
+
"qprocessing/api/views/models.py",
|
|
23
|
+
"qprocessing/api/views/upload.py",
|
|
24
|
+
"qprocessing/apiurls.py",
|
|
25
|
+
"qprocessing/apps.py",
|
|
26
|
+
"qprocessing/configs.py",
|
|
27
|
+
"qprocessing/forms.py",
|
|
28
|
+
"qprocessing/migrations/0001_initial.py",
|
|
29
|
+
"qprocessing/migrations/0002_auto_20230615_1609.py",
|
|
30
|
+
"qprocessing/migrations/0003_qprocessinginputupload.py",
|
|
31
|
+
"qprocessing/migrations/0004_auto_20230809_0920.py",
|
|
32
|
+
"qprocessing/migrations/0005_alter_qprocessinginputupload_user.py",
|
|
33
|
+
"qprocessing/migrations/__init__.py",
|
|
34
|
+
"qprocessing/models.py",
|
|
35
|
+
"qprocessing/receivers.py",
|
|
36
|
+
"qprocessing/run_celery.sh",
|
|
37
|
+
"qprocessing/sitetrees.py",
|
|
38
|
+
"qprocessing/static/qprocessing/js/components/DrawInputVectorFeatures.js",
|
|
39
|
+
"qprocessing/static/qprocessing/js/components/InputFieldChooser.js",
|
|
40
|
+
"qprocessing/static/qprocessing/js/components/InputPrjRasterLayer.js",
|
|
41
|
+
"qprocessing/static/qprocessing/js/components/InputPrjVectorLayer.js",
|
|
42
|
+
"qprocessing/static/qprocessing/js/components/ModelInput.js",
|
|
43
|
+
"qprocessing/static/qprocessing/js/components/ModelPanel.js",
|
|
44
|
+
"qprocessing/static/qprocessing/js/components/ModelResults.js",
|
|
45
|
+
"qprocessing/static/qprocessing/js/components/OutputFile.js",
|
|
46
|
+
"qprocessing/static/qprocessing/js/components/OutputRasterLayer.js",
|
|
47
|
+
"qprocessing/static/qprocessing/js/components/OutputVectorLayer.js",
|
|
48
|
+
"qprocessing/static/qprocessing/js/i18n/en.js",
|
|
49
|
+
"qprocessing/static/qprocessing/js/i18n/fr.js",
|
|
50
|
+
"qprocessing/static/qprocessing/js/i18n/index.js",
|
|
51
|
+
"qprocessing/static/qprocessing/js/i18n/it.js",
|
|
52
|
+
"qprocessing/static/qprocessing/js/plugin.js",
|
|
53
|
+
"qprocessing/static/qprocessing/js/vendors/jszip.min.js",
|
|
54
|
+
"qprocessing/static/qprocessing/js/vendors/shp.min.js",
|
|
55
|
+
"qprocessing/tasks.py",
|
|
56
|
+
"qprocessing/templates/qprocessing/project_form.html",
|
|
57
|
+
"qprocessing/templates/qprocessing/projects_list.html",
|
|
58
|
+
"qprocessing/tests/__init__.py",
|
|
59
|
+
"qprocessing/tests/base.py",
|
|
60
|
+
"qprocessing/tests/data/models/qbuffer.model3",
|
|
61
|
+
"qprocessing/tests/data/models/qintersection.model3",
|
|
62
|
+
"qprocessing/tests/data/models/qpointspolygons.model3",
|
|
63
|
+
"qprocessing/tests/data/models/test.model3",
|
|
64
|
+
"qprocessing/tests/data/models/test_buffer_all_inputs.model3",
|
|
65
|
+
"qprocessing/tests/data/models/test_buffer_layer1.model3",
|
|
66
|
+
"qprocessing/tests/data/project_data/buildings.geojson",
|
|
67
|
+
"qprocessing/tests/data/project_data/qprocessing.gpkg",
|
|
68
|
+
"qprocessing/tests/data/qprocessing_qprocessing.qgs",
|
|
69
|
+
"qprocessing/tests/data/qprocessing_qprocessing_attachments.zip",
|
|
70
|
+
"qprocessing/tests/data/test_qgis_328.qgs",
|
|
71
|
+
"qprocessing/tests/data/test_qgis_328_attachments.zip",
|
|
72
|
+
"qprocessing/tests/data/upload/fail_shp_to_upload.zip",
|
|
73
|
+
"qprocessing/tests/data/upload/linestring_to_upload.geojson",
|
|
74
|
+
"qprocessing/tests/data/upload/point_to_upload.geojson",
|
|
75
|
+
"qprocessing/tests/data/upload/point_to_upload_espg4326.geojson",
|
|
76
|
+
"qprocessing/tests/data/upload/point_to_upload_espg4326.qmd",
|
|
77
|
+
"qprocessing/tests/data/upload/polygon_to_upload.geojson",
|
|
78
|
+
"qprocessing/tests/data/upload/shp_to_upload.cpg",
|
|
79
|
+
"qprocessing/tests/data/upload/shp_to_upload.dbf",
|
|
80
|
+
"qprocessing/tests/data/upload/shp_to_upload.prj",
|
|
81
|
+
"qprocessing/tests/data/upload/shp_to_upload.qix",
|
|
82
|
+
"qprocessing/tests/data/upload/shp_to_upload.shp",
|
|
83
|
+
"qprocessing/tests/data/upload/shp_to_upload.shx",
|
|
84
|
+
"qprocessing/tests/data/upload/shp_to_upload.zip",
|
|
85
|
+
"qprocessing/tests/test_algorithm.py",
|
|
86
|
+
"qprocessing/tests/test_api.py",
|
|
87
|
+
"qprocessing/tests/test_api_models.py",
|
|
88
|
+
"qprocessing/urls.py",
|
|
89
|
+
"qprocessing/utils/__init__.py",
|
|
90
|
+
"qprocessing/utils/data.py",
|
|
91
|
+
"qprocessing/utils/exceptions.py",
|
|
92
|
+
"qprocessing/utils/formtypes.py",
|
|
93
|
+
"qprocessing/views.py",
|
|
94
|
+
"requirements.txt"
|
|
95
|
+
]
|
|
96
|
+
}
|
|
@@ -9,11 +9,10 @@ requires = [
|
|
|
9
9
|
name = "g3w-admin-processing"
|
|
10
10
|
dynamic = [
|
|
11
11
|
"version", # retrieve package version from git tags
|
|
12
|
-
"dependencies"
|
|
13
|
-
"optional-dependencies" # retrieve development dependencies from requirements_dev.txt
|
|
12
|
+
"dependencies" # retrieve package dependencies from requirements.txt
|
|
14
13
|
]
|
|
15
14
|
authors = [ { name = "Gis3w snc", email = "info@gis3w.it" } ]
|
|
16
|
-
description = "G3W-ADMIN plugin for use the processing features of QGIS application
|
|
15
|
+
description = "G3W-ADMIN plugin for use the processing features of QGIS application"
|
|
17
16
|
readme = "README.md"
|
|
18
17
|
license = { text = "Mozilla Public License 2.0 (MPL 2.0)" }
|
|
19
18
|
classifiers = [
|
|
@@ -32,29 +31,16 @@ classifiers = [
|
|
|
32
31
|
"Homepage" = "https://github.com/g3w-suite/g3w-admin-processing"
|
|
33
32
|
"Bug Tracker" = "https://github.com/g3w-suite/g3w-admin-processing/issues"
|
|
34
33
|
|
|
35
|
-
[tool.setuptools]
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
package-dir = { qprocessing = "qprocessing" }
|
|
39
|
-
|
|
40
|
-
# Custom package discovery
|
|
41
|
-
# [tool.setuptools.packages]
|
|
42
|
-
# find = { }
|
|
43
|
-
|
|
44
|
-
# https://setuptools.pypa.io/en/latest/userguide/package_discovery.html#automatic-discovery
|
|
45
|
-
#
|
|
46
|
-
# NB: see also: MANIFEST.in
|
|
34
|
+
[tool.setuptools.packages.find]
|
|
35
|
+
include = ["qprocessing*"]
|
|
36
|
+
namespaces = false
|
|
47
37
|
|
|
48
38
|
[tool.setuptools.dynamic]
|
|
49
39
|
dependencies = { file = ["requirements.txt"] }
|
|
50
40
|
|
|
51
|
-
[tool.setuptools.dynamic.optional-dependencies]
|
|
52
|
-
dev = { file = ["requirements_dev.txt"] }
|
|
53
|
-
|
|
54
41
|
[tool.setuptools_scm]
|
|
55
42
|
fallback_version = "v1.2.1-beta.0"
|
|
56
|
-
write_to = "_version.py"
|
|
57
|
-
local_scheme = "no-local-version" # avoid local version (eg. +g123abc) for PyPI
|
|
43
|
+
write_to = "_version.py" # hardcode version number in a file
|
|
58
44
|
#
|
|
59
45
|
# Or alternatively retrieve it at runtime:
|
|
60
46
|
# https://github.com/pypa/setuptools_scm/#retrieving-package-version-at-runtime
|
{g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/models.py
RENAMED
|
@@ -105,13 +105,18 @@ class QProcessingRunInfoTaskView(G3WAPIView):
|
|
|
105
105
|
ret_status = 500
|
|
106
106
|
|
|
107
107
|
task_model = TaskModel.objects.get(task_id=task_id)
|
|
108
|
-
|
|
108
|
+
if hasattr(task_model, 'progress_count'):
|
|
109
|
+
progress_count = task_model.progress_count
|
|
110
|
+
else:
|
|
111
|
+
progress_count = task_model.progress_info[0]
|
|
109
112
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
113
|
+
progress_percentage = (
|
|
114
|
+
int(100 * progress_count / task_model.total)
|
|
115
|
+
if progress_count is not None and task_model.total else 0
|
|
116
|
+
)
|
|
117
|
+
|
|
118
|
+
if task_model.state.signal_name == 'complete':
|
|
119
|
+
progress_percentage = 100
|
|
115
120
|
|
|
116
121
|
try:
|
|
117
122
|
return JsonResponse({
|
|
@@ -209,6 +214,14 @@ class QProcessingDownLoadOutputView(G3WAPIView):
|
|
|
209
214
|
content_type = 'application/geopackage+sqlite3'
|
|
210
215
|
elif ext == 'sqlite':
|
|
211
216
|
content_type = 'application / vnd.sqlite3'
|
|
217
|
+
elif ext in ['tiff', 'tif']:
|
|
218
|
+
content_type = 'image/tiff'
|
|
219
|
+
elif ext == 'png':
|
|
220
|
+
content_type = 'image/png'
|
|
221
|
+
elif ext in ['jpeg', 'jpg']:
|
|
222
|
+
content_type = 'image/jpeg'
|
|
223
|
+
elif ext == 'vrt':
|
|
224
|
+
content_type = 'application/xml'
|
|
212
225
|
else:
|
|
213
226
|
content_type = 'application/octet-stream'
|
|
214
227
|
|
{g3w_admin_processing-1.2.1b1.dev1 → g3w_admin_processing-2.0.1}/qprocessing/api/views/upload.py
RENAMED
|
@@ -21,7 +21,13 @@ from core.api.views import G3WAPIView
|
|
|
21
21
|
from core.api.authentication import CsrfExemptSessionAuthentication
|
|
22
22
|
from qprocessing.api.permissions import RunModelPermission
|
|
23
23
|
from qprocessing.models import QProcessingInputUpload, QProcessingProject
|
|
24
|
-
from qprocessing.utils.formtypes import
|
|
24
|
+
from qprocessing.utils.formtypes import (
|
|
25
|
+
MAPPING_QPROCESSINGTYPE_FORMTYPE,
|
|
26
|
+
QProcessingFormTypeException,
|
|
27
|
+
QgsProcessingParameterFeatureSource,
|
|
28
|
+
QgsProcessingParameterVectorLayer,
|
|
29
|
+
QgsProcessingParameterRasterLayer
|
|
30
|
+
)
|
|
25
31
|
|
|
26
32
|
from zipfile import ZipFile
|
|
27
33
|
import os
|
|
@@ -100,7 +106,22 @@ class QProcessingInputUploadView(G3WAPIView):
|
|
|
100
106
|
# Validate by ext
|
|
101
107
|
# -------------------------------------------------
|
|
102
108
|
ext = os.path.splitext(f.name)[-1][1:].lower()
|
|
103
|
-
|
|
109
|
+
|
|
110
|
+
# Get formats to check by input type
|
|
111
|
+
if self.qpm.inputs[kwargs['input_name']]['qprocessing_type'] in [
|
|
112
|
+
QgsProcessingParameterVectorLayer('').type(),
|
|
113
|
+
QgsProcessingParameterFeatureSource('').type()
|
|
114
|
+
]:
|
|
115
|
+
formats = [frm['value'] for frm in settings.QPROCESSING_INPUT_UPLOAD_VECTOR_FORMATS]
|
|
116
|
+
|
|
117
|
+
elif self.qpm.inputs[kwargs['input_name']]['qprocessing_type'] in [
|
|
118
|
+
QgsProcessingParameterRasterLayer('').type()
|
|
119
|
+
]:
|
|
120
|
+
formats = [frm['value'] for frm in settings.QPROCESSING_INPUT_UPLOAD_RASTER_FORMATS]
|
|
121
|
+
|
|
122
|
+
else:
|
|
123
|
+
formats = []
|
|
124
|
+
|
|
104
125
|
if ext not in formats:
|
|
105
126
|
raise QProcessingInputUploadValidationException(
|
|
106
127
|
f"File type not allowed: {ext}. "
|
|
@@ -37,6 +37,16 @@ QPROCESSING_OUTPUT_HTML_FORMAT_DEFAULT = 'html'
|
|
|
37
37
|
QPROCESSING_INPUT_SHP_EXTS = ['shp', 'shx', 'prj', 'dbf', 'shx']
|
|
38
38
|
|
|
39
39
|
# Formats available for input upload
|
|
40
|
+
# ----------------------------------
|
|
41
|
+
|
|
42
|
+
# Max file size for upload input files (in bytes),
|
|
43
|
+
# if None no limit
|
|
44
|
+
QPROCESSING_INPUT_UPLOAD_MAX_FILE_SIZE = None
|
|
45
|
+
|
|
46
|
+
# I.e.:
|
|
47
|
+
#QPROCESSING_INPUT_UPLOAD_MAX_FILE_SIZE = 20 * 1024 * 1024 # 20 MB
|
|
48
|
+
|
|
49
|
+
# Vector formats
|
|
40
50
|
QPROCESSING_INPUT_UPLOAD_VECTOR_FORMATS = [
|
|
41
51
|
{
|
|
42
52
|
'value': 'zip',
|
|
@@ -61,6 +71,35 @@ QPROCESSING_INPUT_UPLOAD_VECTOR_FORMATS = [
|
|
|
61
71
|
|
|
62
72
|
]
|
|
63
73
|
|
|
74
|
+
# Raster formats
|
|
75
|
+
QPROCESSING_INPUT_UPLOAD_RASTER_FORMATS = [
|
|
76
|
+
{
|
|
77
|
+
'value': 'vrt',
|
|
78
|
+
'key': 'VRT'
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
'value': 'tiff',
|
|
82
|
+
'key': 'TIFF'
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
'value': 'tif',
|
|
86
|
+
'key': 'TIF'
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
'value': 'png',
|
|
90
|
+
'key': 'PNG'
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
'value': 'jpeg',
|
|
94
|
+
'key': 'JPEG'
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
'value': 'jpg',
|
|
98
|
+
'key': 'JPG'
|
|
99
|
+
},
|
|
100
|
+
|
|
101
|
+
]
|
|
102
|
+
|
|
64
103
|
|
|
65
104
|
# For Processing form type: input/output
|
|
66
105
|
QPROCESSING_OUTPUT_VECTOR_FORMATS = [
|
|
@@ -129,3 +168,7 @@ QPROCESSING_OUTPUT_RASTER_FORMATS = [
|
|
|
129
168
|
QPROCESSING_CRYPTO_KEY = b'aAf72grwGaZYH9R7ZaGHgSSbtQVXPplXB4wpiMsKtJM='
|
|
130
169
|
|
|
131
170
|
|
|
171
|
+
# Time interval (in seconds) for check task info
|
|
172
|
+
QPROCESSING_TASK_INFO_INTERVAL = 5
|
|
173
|
+
|
|
174
|
+
|
|
@@ -42,6 +42,8 @@ def set_initconfig_value(sender, **kwargs):
|
|
|
42
42
|
'version': get_version('qprocessing'),
|
|
43
43
|
'gid': f"{kwargs['projectType']}:{kwargs['project']}",
|
|
44
44
|
'async': settings.QPROCESSING_ASYNC_RUN,
|
|
45
|
+
'max_upload_file_size': settings.QPROCESSING_INPUT_UPLOAD_MAX_FILE_SIZE,
|
|
46
|
+
'task_info_interval': settings.QPROCESSING_TASK_INFO_INTERVAL,
|
|
45
47
|
'urls': {
|
|
46
48
|
'run': f'/qprocessing{__BASE_RUN_MODEL_URL}',
|
|
47
49
|
'taskinfo': f'/qprocessing{__BASE_TASK_INFO_URL}',
|
|
@@ -51,6 +53,7 @@ def set_initconfig_value(sender, **kwargs):
|
|
|
51
53
|
'models': [{
|
|
52
54
|
**QProcessingModel(str(qpp.model.file)).render2dict(),
|
|
53
55
|
'id': qpp.pk,
|
|
56
|
+
'note': qpp.note,
|
|
54
57
|
'results': [],
|
|
55
58
|
# TODO: move the following into render2dict? (converts [admin] model inputs into [client] form inputs)
|
|
56
59
|
'inputs': [{
|