From e5539c59623901758668502e816709d5da8dc849 Mon Sep 17 00:00:00 2001 From: Carmen Date: Wed, 14 May 2025 17:52:40 +0200 Subject: [PATCH 01/16] move apidocs to plugin folder --- .../swagger2/actinia_grassdata_management_plugin/__init__.py | 0 .../apidocs/map_layer_management.py | 0 .../apidocs/raster_colors.py | 0 .../apidocs/raster_layer.py | 0 .../apidocs/raster_legend.py | 0 .../apidocs/raster_renderer.py | 0 .../apidocs/strds_management.py | 0 .../apidocs/strds_raster_management.py | 0 .../apidocs/strds_renderer.py | 0 .../apidocs/vector_layer.py | 0 .../apidocs/vector_renderer.py | 0 .../actinia_grassdata_management_plugin/schemas/__init__.py | 0 .../schemas/map_layer_base.py | 0 .../schemas/raster_colors.py | 0 .../schemas/raster_layer.py | 0 .../schemas/strds_management.py | 0 .../schemas/strds_raster_management.py | 0 .../schemas/vector_layer.py | 0 18 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/map_layer_management.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/raster_colors.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/raster_layer.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/raster_legend.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/raster_renderer.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/strds_management.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/strds_raster_management.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/strds_renderer.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/vector_layer.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/apidocs/vector_renderer.py (100%) create mode 100644 src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/schemas/map_layer_base.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/schemas/raster_colors.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/schemas/raster_layer.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/schemas/strds_management.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/schemas/strds_raster_management.py (100%) rename src/actinia_api/swagger2/{actinia_core => actinia_grassdata_management_plugin}/schemas/vector_layer.py (100%) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/map_layer_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/map_layer_management.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/raster_colors.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/raster_layer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_legend.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/raster_legend.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/raster_renderer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/strds_management.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/strds_raster_management.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/strds_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/strds_renderer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/vector_layer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/vector_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/apidocs/vector_renderer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/actinia_api/swagger2/actinia_core/schemas/map_layer_base.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/schemas/map_layer_base.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py diff --git a/src/actinia_api/swagger2/actinia_core/schemas/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/schemas/raster_colors.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py diff --git a/src/actinia_api/swagger2/actinia_core/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/schemas/raster_layer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py diff --git a/src/actinia_api/swagger2/actinia_core/schemas/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/schemas/strds_management.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py diff --git a/src/actinia_api/swagger2/actinia_core/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/schemas/strds_raster_management.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py diff --git a/src/actinia_api/swagger2/actinia_core/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py similarity index 100% rename from src/actinia_api/swagger2/actinia_core/schemas/vector_layer.py rename to src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py From e72cbea92416794ca8b7543f5d7b19c44430092e Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:29:06 +0200 Subject: [PATCH 02/16] update linting workflow --- .flake8 | 6 +++ .github/workflows/black.yml | 41 ------------------- .github/workflows/flake8.yml | 29 ------------- .github/workflows/linting.yml | 16 ++++++++ .gitignore | 3 ++ ruff.toml | 23 +++++++++++ setup.py | 2 + src/actinia_api/__init__.py | 9 ++++ src/actinia_api/swagger2/__init__.py | 1 + .../swagger2/actinia_core/__init__.py | 1 + .../swagger2/actinia_core/schemas/__init__.py | 4 ++ .../__init__.py | 4 ++ .../schemas/__init__.py | 4 ++ .../schemas/strds_raster_management.py | 4 ++ 14 files changed, 77 insertions(+), 70 deletions(-) create mode 100644 .flake8 delete mode 100644 .github/workflows/black.yml delete mode 100644 .github/workflows/flake8.yml create mode 100644 .github/workflows/linting.yml create mode 100644 ruff.toml diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000..0f2ac09 --- /dev/null +++ b/.flake8 @@ -0,0 +1,6 @@ +[flake8] + +exclude = .git,.pycache,build,.eggs + +# Allow longer lines due to so many JSON files +max-line-length = 88 diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml deleted file mode 100644 index ccd4dc7..0000000 --- a/.github/workflows/black.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Python Black Formatting - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - run-black: - name: Black ${{ matrix.black-version }} - - # Using matrix just to get variables which are not environmental variables - # and also to sync with other workflows which use matrix. - strategy: - matrix: - include: - - os: ubuntu-20.04 - python-version: "3.10" - black-version: "22.3.0" - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Install - run: | - python -m pip install --upgrade pip - pip install black==${{ matrix.black-version }} - - - name: Run Black - run: | - black --check --diff --line-length 79 . diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml deleted file mode 100644 index 45c4012..0000000 --- a/.github/workflows/flake8.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Python code quality check - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - flake8-actinia: - - runs-on: ubuntu-24.04 - - steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.8 - - name: Install - run: | - python -m pip install --upgrade pip - pip install flake8==3.8.0 - # enables config via pyproject.toml - pip install pyproject-flake8 - - name: Run Flake8 - run: | - pflake8 --count --statistics --show-source --jobs=$(nproc) . diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml new file mode 100644 index 0000000..05dc2de --- /dev/null +++ b/.github/workflows/linting.yml @@ -0,0 +1,16 @@ +--- +name: Linting and code quality check + +on: + push: + branches: + - main + - develop + pull_request: + +jobs: + lint: + uses: mundialis/github-workflows/.github/workflows/linting.yml@main + with: + # set pylint-version to empty string to skip the pylint workflow + pylint-version: '' diff --git a/.gitignore b/.gitignore index 19d4b9b..da6216c 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ MANIFEST # Per-project virtualenvs .venv*/ .conda*/ + +# Linting +ruff-merged.toml diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..f239e05 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,23 @@ +# Extends https://github.com/mundialis/github-workflows/blob/main/linting-config-examples/ruff.toml + +lint.ignore = [ + "BLE001", + "COM812", + "D200", + "D205", + "D212", + "D400", + "D404", + "D415", + "E501", + "I001", + "ISC001", + "RUF012", + "S108", + "S311", + "UP009", + "UP031", +] + +# [lint.per-file-ignores] +# "src/actinia_grassdata_management_plugin/apidocs/__init__.py" = [ "E501",] diff --git a/setup.py b/setup.py index 7f1a176..f1bcb8d 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +"""Setup script for actinia-api.""" + from setuptools import setup if __name__ == "__main__": diff --git a/src/actinia_api/__init__.py b/src/actinia_api/__init__.py index 2b00a6d..849155c 100644 --- a/src/actinia_api/__init__.py +++ b/src/actinia_api/__init__.py @@ -1,3 +1,12 @@ +""" +actinia-api +========= +actinia-api is a RESTful API for the actinia framework. It provides a +web service interface to the actinia framework, which is a geospatial +processing framework based on the GRASS GIS software. The API allows +users to access and manipulate geospatial data, run processing tasks, +and manage the underlying GRASS GIS environment. +""" import importlib.metadata API_VERSION = "v3" diff --git a/src/actinia_api/swagger2/__init__.py b/src/actinia_api/swagger2/__init__.py index e69de29..6c981f6 100644 --- a/src/actinia_api/swagger2/__init__.py +++ b/src/actinia_api/swagger2/__init__.py @@ -0,0 +1 @@ +"""This module contains the swagger2 API documentation for actinia.""" diff --git a/src/actinia_api/swagger2/actinia_core/__init__.py b/src/actinia_api/swagger2/actinia_core/__init__.py index e69de29..db6d9fc 100644 --- a/src/actinia_api/swagger2/actinia_core/__init__.py +++ b/src/actinia_api/swagger2/actinia_core/__init__.py @@ -0,0 +1 @@ +"""This module contains the swagger2 API documentation for actinia-core.""" diff --git a/src/actinia_api/swagger2/actinia_core/schemas/__init__.py b/src/actinia_api/swagger2/actinia_core/schemas/__init__.py index e69de29..d0b6e88 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/__init__.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/__init__.py @@ -0,0 +1,4 @@ +""" +This module contains schemas for the swagger2 API documentation for +actinia-core. +""" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py index e69de29..980eb05 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py @@ -0,0 +1,4 @@ +""" +This module contains the swagger2 API documentation for +actinia-grassdata-management-plugin. +""" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py index e69de29..aace50a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py @@ -0,0 +1,4 @@ +""" +This module contains schemas for the swagger2 API documentation for This module +contains the swagger2 API documentation for actinia-grassdata-management-plugin. +""" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py index d222248..456f52d 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py @@ -196,6 +196,8 @@ class STRDSRasterListResponseModel(ProcessingResponseModel): class RasterListEntryModel(Schema): + """Schema for items for RasterListRegisterModel.""" + type = "object" properties = { "name": {"type": "string"}, @@ -205,6 +207,8 @@ class RasterListEntryModel(Schema): class RasterListRegisterModel(Schema): + """Schema for the list of raster map layers to be registered.""" + type = "array" items = RasterListEntryModel example = [ From 60b33289ab5d8d7d6c45105a2f033e2b6bcbd32d Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:29:45 +0200 Subject: [PATCH 03/16] lint D200 --- ruff.toml | 1 - .../swagger2/actinia_core/apidocs/api_log_management.py | 4 +--- .../actinia_core/apidocs/download_cache_management.py | 4 +--- .../actinia_core/apidocs/ephemeral_processing_with_export.py | 4 +--- .../swagger2/actinia_core/apidocs/mapset_management.py | 4 +--- src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py | 4 +--- .../swagger2/actinia_core/apidocs/persistent_processing.py | 4 +--- .../swagger2/actinia_core/apidocs/process_chain_monitoring.py | 4 +--- .../swagger2/actinia_core/apidocs/process_validation.py | 4 +--- .../swagger2/actinia_core/apidocs/project_management.py | 4 +--- .../swagger2/actinia_core/apidocs/raster_export.py | 4 +--- .../swagger2/actinia_core/apidocs/resource_management.py | 4 +--- .../actinia_core/apidocs/resource_storage_management.py | 4 +--- src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py | 4 +--- .../swagger2/actinia_core/apidocs/user_management.py | 4 +--- .../swagger2/actinia_core/schemas/api_log_management.py | 4 +--- .../swagger2/actinia_core/schemas/mapset_management.py | 4 +--- .../swagger2/actinia_core/schemas/process_chain_monitoring.py | 4 +--- .../swagger2/actinia_core/schemas/project_management.py | 4 +--- .../apidocs/map_layer_management.py | 4 +--- .../apidocs/raster_colors.py | 4 +--- .../apidocs/raster_layer.py | 4 +--- .../apidocs/raster_legend.py | 4 +--- .../apidocs/raster_renderer.py | 4 +--- .../apidocs/strds_management.py | 4 +--- .../apidocs/strds_raster_management.py | 4 +--- .../apidocs/strds_renderer.py | 4 +--- .../apidocs/vector_layer.py | 4 +--- .../apidocs/vector_renderer.py | 4 +--- .../schemas/map_layer_base.py | 4 +--- .../schemas/raster_colors.py | 4 +--- .../schemas/raster_layer.py | 4 +--- .../schemas/vector_layer.py | 4 +--- 33 files changed, 32 insertions(+), 97 deletions(-) diff --git a/ruff.toml b/ruff.toml index f239e05..f8edb41 100644 --- a/ruff.toml +++ b/ruff.toml @@ -3,7 +3,6 @@ lint.ignore = [ "BLE001", "COM812", - "D200", "D205", "D212", "D400", diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py index ec454b3..fbddc03 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for api_log_management -""" +"""API docs for api_log_management""" from actinia_api.swagger2.actinia_core.schemas.api_log_management import ( ApiLogListModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py index 5479fe0..e350f7d 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for download_cache_management -""" +"""API docs for download_cache_management""" from actinia_core.models.response_models import ( StorageResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py index f7375dc..2c14dec 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for ephemeral_processing_with_export -""" +"""API docs for ephemeral_processing_with_export""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py index f09ce92..fe9f0a2 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for mapset_management -""" +"""API docs for mapset_management""" from actinia_core.models.response_models import ( MapsetInfoResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py index 0f3afd2..672befe 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for mapsets -""" +"""API docs for mapsets""" from actinia_core.models.response_models import ( LockedMapsetListResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py b/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py index 04e23a9..15ba3a7 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for ephemeral_processing -""" +"""API docs for ephemeral_processing""" from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ProcessingResponseModel diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py index 5428ada..8fbad46 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for process_chain_monitoring -""" +"""API docs for process_chain_monitoring""" from actinia_core.models.response_models import SimpleResponseModel diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py index aca4d10..c29967f 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for process_validation -""" +"""API docs for process_validation""" from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ( diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py index 8ef43ac..416ee3f 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for project_management -""" +"""API docs for project_management""" from actinia_core.models.response_models import ( MapsetInfoResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py index 52d14eb..f45f558 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for raster_export -""" +"""API docs for raster_export""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py index 61dbead..6eb7d49 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for resource_management -""" +"""API docs for resource_management""" from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ( diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py index ff2cc2b..ae00a71 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for resource_storage_management -""" +"""API docs for resource_storage_management""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py index e1c3dde..9874da4 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for user_api_key -""" +"""API docs for user_api_key""" from actinia_api.swagger2.actinia_core.schemas.user_api_key import ( TokenResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py index dafd3f1..8972f32 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for user_management -""" +"""API docs for user_management""" from actinia_core.models.response_models import ( UserInfoResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py index 4a0d44d..a8cbbb1 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py @@ -21,9 +21,7 @@ # ####### -""" -Models for api_log_management -""" +"""Models for api_log_management""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py index 35ceca0..2c456d2 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py @@ -21,9 +21,7 @@ # ####### -""" -Model for Mapset management resources -""" +"""Model for Mapset management resources""" from copy import deepcopy from actinia_core.models.response_models import ProcessingResponseModel diff --git a/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py index 5be4c84..08bd411 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py @@ -21,9 +21,7 @@ # ####### -""" -Process Chain Monitoring -""" +"""Process Chain Monitoring""" from flask_restful_swagger_2 import Schema __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py index b294a12..a4db4aa 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py @@ -21,9 +21,7 @@ # ####### -""" -Models for project_management -""" +"""Models for project_management""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py index 4d9112f..ce8569a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for map_layer_management -""" +"""API docs for map_layer_management""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py index 1ec7065..3f83711 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for raster_colors -""" +"""API docs for raster_colors""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py index a6dbbc7..b96512e 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for raster_layer -""" +"""API docs for raster_layer""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py index 2a28c68..5d23d6f 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for raster_legend -""" +"""API docs for raster_legend""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py index 7f5ec17..471fde4 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for raster_renderer -""" +"""API docs for raster_renderer""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py index aabe191..f063b6a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for strds_management -""" +"""API docs for strds_management""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py index ade128e..0bd903a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for strds_raster_management -""" +"""API docs for strds_raster_management""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py index 9ed99b5..62d81f8 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for strds_renderer -""" +"""API docs for strds_renderer""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py index be45152..18fafae 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for vector_layer -""" +"""API docs for vector_layer""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py index 596f1f9..a68c28f 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py @@ -21,9 +21,7 @@ # ####### -""" -API docs for vector_renderer -""" +"""API docs for vector_renderer""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py index 8de0231..62e45fe 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py @@ -21,9 +21,7 @@ # ####### -""" -Model for Base layer resources -""" +"""Model for Base layer resources""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py index 20fb069..b3a0c91 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py @@ -21,9 +21,7 @@ # ####### -""" -Models for Raster colors management -""" +"""Models for Raster colors management""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py index 111284a..5ceecef 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py @@ -21,9 +21,7 @@ # ####### -""" -Raster layer resources -""" +"""Raster layer resources""" from copy import deepcopy from flask_restful_swagger_2 import Schema from actinia_core.models.response_models import ProcessingResponseModel diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index eae4e12..2b20ca1 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -21,9 +21,7 @@ # ####### -""" -Vector layer resources -""" +"""Vector layer resources""" import random from copy import deepcopy from flask_restful_swagger_2 import Schema From b2d791797bd42af36f88835d8588d7798c678094 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:32:58 +0200 Subject: [PATCH 04/16] lint D212 --- ruff.toml | 1 - src/actinia_api/__init__.py | 4 ++-- src/actinia_api/swagger2/actinia_core/schemas/__init__.py | 3 +-- src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py | 3 +-- .../swagger2/actinia_grassdata_management_plugin/__init__.py | 3 +-- .../actinia_grassdata_management_plugin/schemas/__init__.py | 3 +-- .../schemas/strds_management.py | 3 +-- .../schemas/strds_raster_management.py | 3 +-- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ruff.toml b/ruff.toml index f8edb41..7f476a6 100644 --- a/ruff.toml +++ b/ruff.toml @@ -4,7 +4,6 @@ lint.ignore = [ "BLE001", "COM812", "D205", - "D212", "D400", "D404", "D415", diff --git a/src/actinia_api/__init__.py b/src/actinia_api/__init__.py index 849155c..6626a33 100644 --- a/src/actinia_api/__init__.py +++ b/src/actinia_api/__init__.py @@ -1,5 +1,4 @@ -""" -actinia-api +"""actinia-api ========= actinia-api is a RESTful API for the actinia framework. It provides a web service interface to the actinia framework, which is a geospatial @@ -7,6 +6,7 @@ users to access and manipulate geospatial data, run processing tasks, and manage the underlying GRASS GIS environment. """ + import importlib.metadata API_VERSION = "v3" diff --git a/src/actinia_api/swagger2/actinia_core/schemas/__init__.py b/src/actinia_api/swagger2/actinia_core/schemas/__init__.py index d0b6e88..dc94393 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/__init__.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/__init__.py @@ -1,4 +1,3 @@ -""" -This module contains schemas for the swagger2 API documentation for +"""This module contains schemas for the swagger2 API documentation for actinia-core. """ diff --git a/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py b/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py index 54a6a1d..7b91239 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py @@ -21,8 +21,7 @@ # ####### -""" -The user specific resources +"""The user specific resources This module specifies all endpoints to manage user accounts in the kvdb database via REST API calls. diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py index 980eb05..f989d78 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py @@ -1,4 +1,3 @@ -""" -This module contains the swagger2 API documentation for +"""This module contains the swagger2 API documentation for actinia-grassdata-management-plugin. """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py index aace50a..105d0b3 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py @@ -1,4 +1,3 @@ -""" -This module contains schemas for the swagger2 API documentation for This module +"""This module contains schemas for the swagger2 API documentation for This module contains the swagger2 API documentation for actinia-grassdata-management-plugin. """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py index 86010c4..5685eda 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py @@ -21,8 +21,7 @@ # ####### -""" -STRDS map layer management +"""STRDS map layer management TODO: Integrate into the ephemeral process chain approach """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py index 456f52d..e4ccbc3 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py @@ -21,8 +21,7 @@ # ####### -""" -STRDS raster map layer management +"""STRDS raster map layer management TODO: Integrate into the ephemeral process chain approach """ From 071ad879c7e4126d6790e6c7ffde692aee1ee981 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:34:02 +0200 Subject: [PATCH 05/16] lint D400 --- ruff.toml | 1 - src/actinia_api/__init__.py | 2 +- .../actinia_core/apidocs/api_log_management.py | 2 +- .../actinia_core/apidocs/download_cache_management.py | 2 +- .../apidocs/ephemeral_processing_with_export.py | 2 +- .../swagger2/actinia_core/apidocs/mapset_management.py | 2 +- .../swagger2/actinia_core/apidocs/mapsets.py | 2 +- .../actinia_core/apidocs/persistent_processing.py | 2 +- .../actinia_core/apidocs/process_chain_monitoring.py | 2 +- .../actinia_core/apidocs/process_validation.py | 2 +- .../actinia_core/apidocs/project_management.py | 2 +- .../swagger2/actinia_core/apidocs/raster_export.py | 2 +- .../actinia_core/apidocs/resource_management.py | 2 +- .../apidocs/resource_storage_management.py | 2 +- .../swagger2/actinia_core/apidocs/user_api_key.py | 2 +- .../swagger2/actinia_core/apidocs/user_management.py | 2 +- .../actinia_core/schemas/api_log_management.py | 2 +- .../swagger2/actinia_core/schemas/mapset_management.py | 4 ++-- .../actinia_core/schemas/process_chain_monitoring.py | 6 +++--- .../actinia_core/schemas/project_management.py | 6 +++--- .../swagger2/actinia_core/schemas/user_api_key.py | 2 +- .../apidocs/map_layer_management.py | 2 +- .../apidocs/raster_colors.py | 2 +- .../apidocs/raster_layer.py | 2 +- .../apidocs/raster_legend.py | 2 +- .../apidocs/raster_renderer.py | 2 +- .../apidocs/strds_management.py | 2 +- .../apidocs/strds_raster_management.py | 2 +- .../apidocs/strds_renderer.py | 2 +- .../apidocs/vector_layer.py | 2 +- .../apidocs/vector_renderer.py | 2 +- .../schemas/map_layer_base.py | 2 +- .../schemas/raster_colors.py | 2 +- .../schemas/raster_layer.py | 4 ++-- .../schemas/strds_management.py | 6 +++--- .../schemas/strds_raster_management.py | 4 ++-- .../schemas/vector_layer.py | 10 +++++----- 37 files changed, 49 insertions(+), 50 deletions(-) diff --git a/ruff.toml b/ruff.toml index 7f476a6..66c6ea4 100644 --- a/ruff.toml +++ b/ruff.toml @@ -4,7 +4,6 @@ lint.ignore = [ "BLE001", "COM812", "D205", - "D400", "D404", "D415", "E501", diff --git a/src/actinia_api/__init__.py b/src/actinia_api/__init__.py index 6626a33..8bf64db 100644 --- a/src/actinia_api/__init__.py +++ b/src/actinia_api/__init__.py @@ -1,4 +1,4 @@ -"""actinia-api +"""actinia-api. ========= actinia-api is a RESTful API for the actinia framework. It provides a web service interface to the actinia framework, which is a geospatial diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py index fbddc03..c9b1976 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for api_log_management""" +"""API docs for api_log_management.""" from actinia_api.swagger2.actinia_core.schemas.api_log_management import ( ApiLogListModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py index e350f7d..d59b4e0 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for download_cache_management""" +"""API docs for download_cache_management.""" from actinia_core.models.response_models import ( StorageResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py index 2c14dec..65a1b28 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py @@ -21,7 +21,7 @@ # ####### -"""API docs for ephemeral_processing_with_export""" +"""API docs for ephemeral_processing_with_export.""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py index fe9f0a2..e30f7e5 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for mapset_management""" +"""API docs for mapset_management.""" from actinia_core.models.response_models import ( MapsetInfoResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py index 672befe..431644c 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py @@ -21,7 +21,7 @@ # ####### -"""API docs for mapsets""" +"""API docs for mapsets.""" from actinia_core.models.response_models import ( LockedMapsetListResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py b/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py index 15ba3a7..d66d4ab 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py @@ -21,7 +21,7 @@ # ####### -"""API docs for ephemeral_processing""" +"""API docs for ephemeral_processing.""" from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ProcessingResponseModel diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py index 8fbad46..4e58b82 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py @@ -21,7 +21,7 @@ # ####### -"""API docs for process_chain_monitoring""" +"""API docs for process_chain_monitoring.""" from actinia_core.models.response_models import SimpleResponseModel diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py index c29967f..7bf2c93 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py @@ -21,7 +21,7 @@ # ####### -"""API docs for process_validation""" +"""API docs for process_validation.""" from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ( diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py index 416ee3f..8e76d6f 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for project_management""" +"""API docs for project_management.""" from actinia_core.models.response_models import ( MapsetInfoResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py index f45f558..4350657 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py @@ -21,7 +21,7 @@ # ####### -"""API docs for raster_export""" +"""API docs for raster_export.""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py index 6eb7d49..e282142 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for resource_management""" +"""API docs for resource_management.""" from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ( diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py index ae00a71..b74c0e9 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for resource_storage_management""" +"""API docs for resource_storage_management.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py index 9874da4..500436a 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py @@ -21,7 +21,7 @@ # ####### -"""API docs for user_api_key""" +"""API docs for user_api_key.""" from actinia_api.swagger2.actinia_core.schemas.user_api_key import ( TokenResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py index 8972f32..680940a 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for user_management""" +"""API docs for user_management.""" from actinia_core.models.response_models import ( UserInfoResponseModel, diff --git a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py index a8cbbb1..af9f66e 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py @@ -21,7 +21,7 @@ # ####### -"""Models for api_log_management""" +"""Models for api_log_management.""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py index 2c456d2..8ad1ed4 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py @@ -21,7 +21,7 @@ # ####### -"""Model for Mapset management resources""" +"""Model for Mapset management resources.""" from copy import deepcopy from actinia_core.models.response_models import ProcessingResponseModel @@ -34,7 +34,7 @@ class MapsetLockManagementResponseModel(ProcessingResponseModel): - """The response content that is returned by the GET request""" + """The response content that is returned by the GET request.""" type = "object" properties = deepcopy(ProcessingResponseModel.properties) diff --git a/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py index 08bd411..d256664 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py @@ -21,7 +21,7 @@ # ####### -"""Process Chain Monitoring""" +"""Process Chain Monitoring.""" from flask_restful_swagger_2 import Schema __license__ = "GPLv3" @@ -31,7 +31,7 @@ class MapsetSizeResponseModel(Schema): - """Response schema for mapset sizes of a resource""" + """Response schema for mapset sizes of a resource.""" type = "object" properties = { @@ -50,7 +50,7 @@ class MapsetSizeResponseModel(Schema): class MaxMapsetSizeResponseModel(Schema): - """Response schema for maximum mapset size of a resoucre""" + """Response schema for maximum mapset size of a resoucre.""" type = "object" properties = { diff --git a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py index a4db4aa..c79a502 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py @@ -21,7 +21,7 @@ # ####### -"""Models for project_management""" +"""Models for project_management.""" from flask_restful_swagger_2 import Schema @@ -38,7 +38,7 @@ class ProjectListResponseModel(Schema): - """Response schema for projects lists""" + """Response schema for projects lists.""" type = "object" properties = { @@ -72,7 +72,7 @@ class ProjectListResponseModel(Schema): class ProjectionInfoModel(Schema): - """Schema to define projection information as JSON input in POST requests""" + """Schema to define projection information as JSON input in POST requests.""" type = "object" properties = { diff --git a/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py b/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py index 7b91239..4db0823 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py @@ -21,7 +21,7 @@ # ####### -"""The user specific resources +"""The user specific resources. This module specifies all endpoints to manage user accounts in the kvdb database via REST API calls. diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py index ce8569a..717dc15 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for map_layer_management""" +"""API docs for map_layer_management.""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py index 3f83711..3646554 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py @@ -21,7 +21,7 @@ # ####### -"""API docs for raster_colors""" +"""API docs for raster_colors.""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py index b96512e..f72e425 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py @@ -21,7 +21,7 @@ # ####### -"""API docs for raster_layer""" +"""API docs for raster_layer.""" from actinia_core.models.response_models import ( ProcessingResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py index 5d23d6f..d088696 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py @@ -21,7 +21,7 @@ # ####### -"""API docs for raster_legend""" +"""API docs for raster_legend.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py index 471fde4..0f280ae 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py @@ -21,7 +21,7 @@ # ####### -"""API docs for raster_renderer""" +"""API docs for raster_renderer.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py index f063b6a..3a910ac 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for strds_management""" +"""API docs for strds_management.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py index 0bd903a..ca0f8b5 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py @@ -21,7 +21,7 @@ # ####### -"""API docs for strds_raster_management""" +"""API docs for strds_raster_management.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py index 62d81f8..9dc7a8a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py @@ -21,7 +21,7 @@ # ####### -"""API docs for strds_renderer""" +"""API docs for strds_renderer.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py index 18fafae..57f7ac4 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py @@ -21,7 +21,7 @@ # ####### -"""API docs for vector_layer""" +"""API docs for vector_layer.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py index a68c28f..24518ab 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py @@ -21,7 +21,7 @@ # ####### -"""API docs for vector_renderer""" +"""API docs for vector_renderer.""" from actinia_core.models.response_models import ( ProcessingErrorResponseModel, diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py index 62e45fe..5831031 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py @@ -21,7 +21,7 @@ # ####### -"""Model for Base layer resources""" +"""Model for Base layer resources.""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py index b3a0c91..8a050fe 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py @@ -21,7 +21,7 @@ # ####### -"""Models for Raster colors management""" +"""Models for Raster colors management.""" from flask_restful_swagger_2 import Schema diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py index 5ceecef..4c1d122 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py @@ -21,7 +21,7 @@ # ####### -"""Raster layer resources""" +"""Raster layer resources.""" from copy import deepcopy from flask_restful_swagger_2 import Schema from actinia_core.models.response_models import ProcessingResponseModel @@ -35,7 +35,7 @@ class RasterInfoModel(Schema): - """Schema that contains raster map layer information""" + """Schema that contains raster map layer information.""" type = "object" properties = { diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py index 5685eda..b1e9995 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py @@ -21,7 +21,7 @@ # ####### -"""STRDS map layer management +"""STRDS map layer management. TODO: Integrate into the ephemeral process chain approach """ @@ -38,7 +38,7 @@ class STRDSInfoModel(Schema): - """Schema that contains space-time raster dataset (STRDS) information""" + """Schema that contains space-time raster dataset (STRDS) information.""" description = ( "Information about a specific space-time raster dataset (STRDS)" @@ -209,7 +209,7 @@ class STRDSInfoResponseModel(ProcessingResponseModel): class STRDSCreationModel(Schema): - """Schema for STRDS creation""" + """Schema for STRDS creation.""" description = "Information required to create a new STRDS" type = "object" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py index e4ccbc3..b5b2d12 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py @@ -21,7 +21,7 @@ # ####### -"""STRDS raster map layer management +"""STRDS raster map layer management. TODO: Integrate into the ephemeral process chain approach """ @@ -38,7 +38,7 @@ class STRDSRasterListEntryModel(Schema): - """Schema that contains list entry + """Schema that contains list entry. columns=id,start_time,end_time,north,south,east,west,min,max,rows,cols """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index 2b20ca1..d2aa626 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -21,7 +21,7 @@ # ####### -"""Vector layer resources""" +"""Vector layer resources.""" import random from copy import deepcopy from flask_restful_swagger_2 import Schema @@ -39,7 +39,7 @@ class VectorAttributeModel(Schema): - """Simple model that represent the description of vector attributes""" + """Simple model that represent the description of vector attributes.""" description = "Description of a vector map layer attribute" type = "object" @@ -48,7 +48,7 @@ class VectorAttributeModel(Schema): class VectorInfoModel(Schema): - """Schema that contains vector map layer information""" + """Schema that contains vector map layer information.""" description = "Description of a GRASS GIS vector map layer" type = "object" @@ -295,7 +295,7 @@ class VectorInfoResponseModel(ProcessingResponseModel): class VectorCreationModel(Schema): - """Schema for input parameters to generate a random point vector map layer""" + """Schema for input parameters to generate a random point vector map layer.""" type = "object" properties = { @@ -328,7 +328,7 @@ class VectorCreationModel(Schema): class VectorRegionCreationModel(Schema): - """Schema for random vector generation in a specific region""" + """Schema for random vector generation in a specific region.""" type = "object" properties = {"region": SetRegionModel, "parameter": VectorCreationModel} From 868d1b3d6f50b9694d4705d182200a5951e9ce93 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:36:47 +0200 Subject: [PATCH 06/16] lint D404 --- ruff.toml | 1 - src/actinia_api/swagger2/__init__.py | 2 +- src/actinia_api/swagger2/actinia_core/__init__.py | 2 +- src/actinia_api/swagger2/actinia_core/schemas/__init__.py | 2 +- .../swagger2/actinia_grassdata_management_plugin/__init__.py | 2 +- .../actinia_grassdata_management_plugin/schemas/__init__.py | 2 +- .../schemas/map_layer_base.py | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruff.toml b/ruff.toml index 66c6ea4..698e4e5 100644 --- a/ruff.toml +++ b/ruff.toml @@ -4,7 +4,6 @@ lint.ignore = [ "BLE001", "COM812", "D205", - "D404", "D415", "E501", "I001", diff --git a/src/actinia_api/swagger2/__init__.py b/src/actinia_api/swagger2/__init__.py index 6c981f6..51f6f95 100644 --- a/src/actinia_api/swagger2/__init__.py +++ b/src/actinia_api/swagger2/__init__.py @@ -1 +1 @@ -"""This module contains the swagger2 API documentation for actinia.""" +"""Module containing swagger2 API documentation for actinia.""" diff --git a/src/actinia_api/swagger2/actinia_core/__init__.py b/src/actinia_api/swagger2/actinia_core/__init__.py index db6d9fc..fdbfcb1 100644 --- a/src/actinia_api/swagger2/actinia_core/__init__.py +++ b/src/actinia_api/swagger2/actinia_core/__init__.py @@ -1 +1 @@ -"""This module contains the swagger2 API documentation for actinia-core.""" +"""Module containing swagger2 API documentation for actinia-core.""" diff --git a/src/actinia_api/swagger2/actinia_core/schemas/__init__.py b/src/actinia_api/swagger2/actinia_core/schemas/__init__.py index dc94393..b265f24 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/__init__.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/__init__.py @@ -1,3 +1,3 @@ -"""This module contains schemas for the swagger2 API documentation for +"""Module containing schemas for the swagger2 API documentation for actinia-core. """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py index f989d78..7789cf3 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/__init__.py @@ -1,3 +1,3 @@ -"""This module contains the swagger2 API documentation for +"""Module containing swagger2 API documentation for actinia-grassdata-management-plugin. """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py index 105d0b3..db8a8b1 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/__init__.py @@ -1,3 +1,3 @@ -"""This module contains schemas for the swagger2 API documentation for This module +"""Module containing schemas for the swagger2 API documentation for This module contains the swagger2 API documentation for actinia-grassdata-management-plugin. """ diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py index 5831031..eac0866 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py @@ -34,7 +34,7 @@ class SetRegionModel(Schema): - """This schema represents the computational region definition for raster + """Schema representing the computational region definition for raster and vector map layers. n : for north From 9899c586ba37dfa1c0f4559eb863a23ca69b583c Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:39:33 +0200 Subject: [PATCH 07/16] lint I001 --- ruff.toml | 4 +--- .../swagger2/actinia_core/apidocs/api_log_management.py | 3 ++- .../actinia_core/apidocs/download_cache_management.py | 2 +- .../actinia_core/apidocs/ephemeral_processing_with_export.py | 5 ++--- .../swagger2/actinia_core/apidocs/mapset_management.py | 2 +- .../actinia_core/apidocs/process_chain_monitoring.py | 1 - .../swagger2/actinia_core/apidocs/process_validation.py | 2 +- .../swagger2/actinia_core/apidocs/project_management.py | 5 ++--- .../swagger2/actinia_core/apidocs/raster_export.py | 2 +- .../swagger2/actinia_core/apidocs/user_management.py | 2 +- .../swagger2/actinia_core/schemas/mapset_management.py | 1 + .../swagger2/actinia_core/schemas/project_management.py | 2 +- .../apidocs/raster_colors.py | 2 +- .../apidocs/raster_layer.py | 2 +- .../apidocs/strds_raster_management.py | 2 +- .../schemas/raster_layer.py | 3 ++- .../schemas/strds_management.py | 3 ++- .../schemas/strds_raster_management.py | 3 ++- .../schemas/vector_layer.py | 4 +++- 19 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ruff.toml b/ruff.toml index 698e4e5..42a2a88 100644 --- a/ruff.toml +++ b/ruff.toml @@ -4,9 +4,7 @@ lint.ignore = [ "BLE001", "COM812", "D205", - "D415", - "E501", - "I001", + "E501", # ignore here, flake checks with 88 lines "ISC001", "RUF012", "S108", diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py index c9b1976..835a55b 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py @@ -23,10 +23,11 @@ """API docs for api_log_management.""" +from actinia_core.models.response_models import SimpleResponseModel + from actinia_api.swagger2.actinia_core.schemas.api_log_management import ( ApiLogListModel, ) -from actinia_core.models.response_models import SimpleResponseModel __license__ = "GPLv3" __author__ = "Sören Gebbert, Anika Weinmann" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py index d59b4e0..1e8e725 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py @@ -24,8 +24,8 @@ """API docs for download_cache_management.""" from actinia_core.models.response_models import ( - StorageResponseModel, ProcessingResponseModel, + StorageResponseModel, ) __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py index 65a1b28..d6bbece 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py @@ -23,12 +23,11 @@ """API docs for ephemeral_processing_with_export.""" +from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ( - ProcessingResponseModel, ProcessingErrorResponseModel, + ProcessingResponseModel, ) -from actinia_core.core.common.process_chain import ProcessChainModel - __license__ = "GPLv3" __author__ = "Sören Gebbert, Anika Weinmann" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py index e30f7e5..806f03b 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py @@ -25,8 +25,8 @@ from actinia_core.models.response_models import ( MapsetInfoResponseModel, - ProcessingResponseModel, ProcessingErrorResponseModel, + ProcessingResponseModel, StringListProcessingResultResponseModel, ) diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py index 4e58b82..6850f6f 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py @@ -30,7 +30,6 @@ MaxMapsetSizeResponseModel, ) - __license__ = "GPLv3" __author__ = "Anika Weinmann, Carmen Tawalika" __copyright__ = "Copyright 2021-2022, mundialis GmbH & Co. KG" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py index 7bf2c93..986e7c7 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py @@ -25,8 +25,8 @@ from actinia_core.core.common.process_chain import ProcessChainModel from actinia_core.models.response_models import ( - ProcessingResponseModel, ProcessingErrorResponseModel, + ProcessingResponseModel, ) __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py index 8e76d6f..c6d9cca 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py @@ -28,11 +28,10 @@ ProcessingResponseModel, SimpleResponseModel, ) -from actinia_api.swagger2.actinia_core.schemas.project_management import ( - ProjectListResponseModel, -) + from actinia_api.swagger2.actinia_core.schemas.project_management import ( ProjectionInfoModel, + ProjectListResponseModel, ) __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py index 4350657..c2e65ad 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py @@ -24,8 +24,8 @@ """API docs for raster_export.""" from actinia_core.models.response_models import ( - ProcessingResponseModel, ProcessingErrorResponseModel, + ProcessingResponseModel, ) __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py index 680940a..bbddb5b 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py @@ -24,9 +24,9 @@ """API docs for user_management.""" from actinia_core.models.response_models import ( + SimpleResponseModel, UserInfoResponseModel, UserListResponseModel, - SimpleResponseModel, ) __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py index 8ad1ed4..21e2d1e 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py @@ -23,6 +23,7 @@ """Model for Mapset management resources.""" from copy import deepcopy + from actinia_core.models.response_models import ProcessingResponseModel __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py index c79a502..199dd5c 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py @@ -32,7 +32,7 @@ ) __maintainer__ = "mundialis GmbH & Co. KG" -from actinia_core.version import init_versions, G_VERSION +from actinia_core.version import G_VERSION, init_versions init_versions() diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py index 3646554..9424cf4 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py @@ -24,8 +24,8 @@ """API docs for raster_colors.""" from actinia_core.models.response_models import ( - ProcessingResponseModel, ProcessingErrorResponseModel, + ProcessingResponseModel, StringListProcessingResultResponseModel, ) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py index f72e425..20544ec 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py @@ -24,8 +24,8 @@ """API docs for raster_layer.""" from actinia_core.models.response_models import ( - ProcessingResponseModel, ProcessingErrorResponseModel, + ProcessingResponseModel, ) from actinia_api import URL_PREFIX diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py index ca0f8b5..9b6d2d4 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py @@ -29,8 +29,8 @@ ) from actinia_api.swagger2.actinia_core.schemas.strds_raster_management import ( - STRDSRasterListResponseModel, RasterListRegisterModel, + STRDSRasterListResponseModel, ) __license__ = "GPLv3" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py index 4c1d122..c7e8394 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py @@ -23,8 +23,9 @@ """Raster layer resources.""" from copy import deepcopy -from flask_restful_swagger_2 import Schema + from actinia_core.models.response_models import ProcessingResponseModel +from flask_restful_swagger_2 import Schema __license__ = "GPLv3" __author__ = "Sören Gebbert, Carmen Tawalika" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py index b1e9995..3fecd0d 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py @@ -26,8 +26,9 @@ TODO: Integrate into the ephemeral process chain approach """ from copy import deepcopy -from flask_restful_swagger_2 import Schema + from actinia_core.models.response_models import ProcessingResponseModel +from flask_restful_swagger_2 import Schema __license__ = "GPLv3" __author__ = "Sören Gebbert, Carmen Tawalika" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py index b5b2d12..12bde53 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py @@ -26,8 +26,9 @@ TODO: Integrate into the ephemeral process chain approach """ from copy import deepcopy -from flask_restful_swagger_2 import Schema + from actinia_core.models.response_models import ProcessingResponseModel +from flask_restful_swagger_2 import Schema __license__ = "GPLv3" __author__ = "Sören Gebbert, Carmen Tawalika" diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index d2aa626..4d5f443 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -24,8 +24,10 @@ """Vector layer resources.""" import random from copy import deepcopy -from flask_restful_swagger_2 import Schema + from actinia_core.models.response_models import ProcessingResponseModel +from flask_restful_swagger_2 import Schema + from actinia_api.swagger2.actinia_core.schemas.map_layer_base import ( SetRegionModel, ) From 1eb700d95542167face201ee7ab51cfe6c39ea22 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:40:23 +0200 Subject: [PATCH 08/16] lint ISC001 --- ruff.toml | 1 - .../swagger2/actinia_core/apidocs/user_management.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ruff.toml b/ruff.toml index 42a2a88..0adf4f3 100644 --- a/ruff.toml +++ b/ruff.toml @@ -5,7 +5,6 @@ lint.ignore = [ "COM812", "D205", "E501", # ignore here, flake checks with 88 lines - "ISC001", "RUF012", "S108", "S311", diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py index bbddb5b..9674688 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py @@ -115,7 +115,7 @@ user_delete_doc = { "tags": ["User Management"], - "description": "Deletes a user. " "Minimum required user role: admin.", + "description": "Deletes a user. Minimum required user role: admin.", "parameters": [ { "name": "user_id", From 155236742cc09c6200fef5f79d8dd602b164a975 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:49:28 +0200 Subject: [PATCH 09/16] lint S311 --- ruff.toml | 1 - .../schemas/vector_layer.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ruff.toml b/ruff.toml index 0adf4f3..dae8242 100644 --- a/ruff.toml +++ b/ruff.toml @@ -7,7 +7,6 @@ lint.ignore = [ "E501", # ignore here, flake checks with 88 lines "RUF012", "S108", - "S311", "UP009", "UP031", ] diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index 4d5f443..e2f1b59 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -22,7 +22,7 @@ ####### """Vector layer resources.""" -import random +import secrets from copy import deepcopy from actinia_core.models.response_models import ProcessingResponseModel @@ -312,7 +312,7 @@ class VectorCreationModel(Schema): "format": "integer", "description": "The seed to initialize the random generator. " "If not set the process ID is used", - "default": random.randint(0, 1000000), + "default": secrets.randbelow(1000000), }, "zmin": { "type": "number", From 243d964b7bc6234df037267af9d32a1e12384e5b Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:50:15 +0200 Subject: [PATCH 10/16] lint UP009 --- ruff.toml | 1 - .../swagger2/actinia_core/apidocs/api_log_management.py | 1 - .../swagger2/actinia_core/apidocs/download_cache_management.py | 1 - .../actinia_core/apidocs/ephemeral_processing_with_export.py | 1 - .../swagger2/actinia_core/apidocs/mapset_management.py | 1 - src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py | 1 - .../swagger2/actinia_core/apidocs/persistent_processing.py | 1 - .../swagger2/actinia_core/apidocs/process_chain_monitoring.py | 1 - .../swagger2/actinia_core/apidocs/process_validation.py | 1 - .../swagger2/actinia_core/apidocs/project_management.py | 1 - src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py | 1 - .../swagger2/actinia_core/apidocs/resource_management.py | 1 - .../swagger2/actinia_core/apidocs/resource_storage_management.py | 1 - src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py | 1 - src/actinia_api/swagger2/actinia_core/apidocs/user_management.py | 1 - .../swagger2/actinia_core/schemas/api_log_management.py | 1 - .../swagger2/actinia_core/schemas/mapset_management.py | 1 - .../swagger2/actinia_core/schemas/process_chain_monitoring.py | 1 - .../swagger2/actinia_core/schemas/project_management.py | 1 - src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py | 1 - .../apidocs/map_layer_management.py | 1 - .../actinia_grassdata_management_plugin/apidocs/raster_colors.py | 1 - .../actinia_grassdata_management_plugin/apidocs/raster_layer.py | 1 - .../actinia_grassdata_management_plugin/apidocs/raster_legend.py | 1 - .../apidocs/raster_renderer.py | 1 - .../apidocs/strds_management.py | 1 - .../apidocs/strds_raster_management.py | 1 - .../apidocs/strds_renderer.py | 1 - .../actinia_grassdata_management_plugin/apidocs/vector_layer.py | 1 - .../apidocs/vector_renderer.py | 1 - .../schemas/map_layer_base.py | 1 - .../actinia_grassdata_management_plugin/schemas/raster_colors.py | 1 - .../actinia_grassdata_management_plugin/schemas/raster_layer.py | 1 - .../schemas/strds_management.py | 1 - .../schemas/strds_raster_management.py | 1 - .../actinia_grassdata_management_plugin/schemas/vector_layer.py | 1 - 36 files changed, 36 deletions(-) diff --git a/ruff.toml b/ruff.toml index dae8242..dbd1f2f 100644 --- a/ruff.toml +++ b/ruff.toml @@ -7,7 +7,6 @@ lint.ignore = [ "E501", # ignore here, flake checks with 88 lines "RUF012", "S108", - "UP009", "UP031", ] diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py index 835a55b..67cb75a 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py index 1e8e725..1ae68bd 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/download_cache_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py index d6bbece..c0b3102 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/ephemeral_processing_with_export.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py index 806f03b..4c88e84 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py index 431644c..e9f4680 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapsets.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py b/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py index d66d4ab..c34e48e 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/persistent_processing.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py index 6850f6f..4864ebb 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_chain_monitoring.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py index 986e7c7..e5b6df8 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/process_validation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py index c6d9cca..4b1bfc6 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py index c2e65ad..913fc34 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/raster_export.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py index e282142..6177684 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py index b74c0e9..c23873c 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_storage_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py index 500436a..ad92d9b 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py index 9674688..5a095c5 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py index af9f66e..2e49057 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py index 21e2d1e..92f879e 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/mapset_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py b/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py index d256664..1d9ad06 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/process_chain_monitoring.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py index 199dd5c..6872304 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py b/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py index 4db0823..aa38554 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/user_api_key.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py index 717dc15..e3262ee 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/map_layer_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py index 9424cf4..4176582 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py index 20544ec..b061c32 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py index d088696..1f9ba1b 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_legend.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py index 0f280ae..f59234a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_renderer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py index 3a910ac..285e307 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py index 9b6d2d4..1ac706b 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py index 9dc7a8a..a5d463d 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_renderer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py index 57f7ac4..456ef23 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py index 24518ab..ff38ed0 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_renderer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py index eac0866..23d9947 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/map_layer_base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py index 8a050fe..4d2b7d3 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_colors.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py index c7e8394..4ae51aa 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py index 3fecd0d..231eed3 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py index 12bde53..c19f13b 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index e2f1b59..241d8b0 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ####### # actinia-core - an open source REST API for scalable, distributed, high # performance processing of geographical data that uses GRASS GIS for From 167f3b85066d2354367d38e969cb65dbe8c202b9 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:51:04 +0200 Subject: [PATCH 11/16] lint UP031 --- ruff.toml | 1 - src/actinia_api/__init__.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ruff.toml b/ruff.toml index dbd1f2f..ddbea04 100644 --- a/ruff.toml +++ b/ruff.toml @@ -7,7 +7,6 @@ lint.ignore = [ "E501", # ignore here, flake checks with 88 lines "RUF012", "S108", - "UP031", ] # [lint.per-file-ignores] diff --git a/src/actinia_api/__init__.py b/src/actinia_api/__init__.py index 8bf64db..cfa4226 100644 --- a/src/actinia_api/__init__.py +++ b/src/actinia_api/__init__.py @@ -12,7 +12,7 @@ API_VERSION = "v3" # This is the URL prefix that must be used in the tests -URL_PREFIX = "/api/%s" % API_VERSION +URL_PREFIX = f"/api/{API_VERSION}" try: # Change here if project is renamed and does not equal the package name From 76a27707da4c6e2a9f64cdd14d1931f382eef681 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 10:53:19 +0200 Subject: [PATCH 12/16] lint COM812 --- ruff.toml | 3 +-- .../actinia_core/apidocs/api_log_management.py | 2 +- .../swagger2/actinia_core/apidocs/mapset_management.py | 2 +- .../actinia_core/apidocs/project_management.py | 4 ++-- .../actinia_core/apidocs/resource_management.py | 2 +- .../swagger2/actinia_core/apidocs/user_api_key.py | 2 +- .../swagger2/actinia_core/apidocs/user_management.py | 6 +++--- .../actinia_core/schemas/api_log_management.py | 2 +- .../actinia_core/schemas/project_management.py | 2 +- .../schemas/raster_layer.py | 6 +++--- .../schemas/strds_management.py | 6 +++--- .../schemas/strds_raster_management.py | 10 +++++----- .../schemas/vector_layer.py | 2 +- 13 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ruff.toml b/ruff.toml index ddbea04..814fe88 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,8 +1,7 @@ # Extends https://github.com/mundialis/github-workflows/blob/main/linting-config-examples/ruff.toml lint.ignore = [ - "BLE001", - "COM812", + "BLE001", # BLE001 Do not catch blind exception: `Exception "D205", "E501", # ignore here, flake checks with 88 lines "RUF012", diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py index 67cb75a..26d811a 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/api_log_management.py @@ -48,7 +48,7 @@ "required": True, "in": "path", "type": "string", - } + }, ], "responses": { "200": { diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py index 4c88e84..5a560a0 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/mapset_management.py @@ -51,7 +51,7 @@ "in": "path", "type": "string", "default": "nc_spm_08", - } + }, ], "responses": { "200": { diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py index 4b1bfc6..cf0e017 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/project_management.py @@ -68,7 +68,7 @@ "in": "path", "type": "string", "default": "nc_spm_08", - } + }, ], "responses": { "200": { @@ -94,7 +94,7 @@ "required": True, "in": "path", "type": "string", - } + }, ], "responses": { "200": { diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py index 6177684..a25e497 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/resource_management.py @@ -206,7 +206,7 @@ "required": True, "in": "path", "type": "string", - } + }, ], "responses": { "200": { diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py index ad92d9b..850b72c 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_api_key.py @@ -63,7 +63,7 @@ "in": "query", "type": "integer", "default": 86400, - } + }, ], "responses": { "200": { diff --git a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py index 5a095c5..64492f0 100644 --- a/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py +++ b/src/actinia_api/swagger2/actinia_core/apidocs/user_management.py @@ -41,7 +41,7 @@ "200": { "description": "This response returns a list of user names.", "schema": UserListResponseModel, - } + }, }, } @@ -57,7 +57,7 @@ "required": True, "in": "path", "type": "string", - } + }, ], "responses": { "200": { @@ -122,7 +122,7 @@ "required": True, "in": "path", "type": "string", - } + }, ], "responses": { "200": { diff --git a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py index 2e49057..776a566 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/api_log_management.py @@ -82,6 +82,6 @@ class ApiLogListModel(Schema): "type": "array", "items": ApiLogEntryModel, "description": "A list of ApiLogEntryModel objects", - } + }, } required = ["api_log_list"] diff --git a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py index 6872304..44ea9be 100644 --- a/src/actinia_api/swagger2/actinia_core/schemas/project_management.py +++ b/src/actinia_api/swagger2/actinia_core/schemas/project_management.py @@ -79,7 +79,7 @@ class ProjectionInfoModel(Schema): "type": "string", "description": "The EPSG code of the projection that should be used " "to create a project", - } + }, } example = {"epsg": "4326"} required = ["epsg"] diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py index 4ae51aa..445a14d 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py @@ -131,8 +131,8 @@ class RasterInfoResponseModel(ProcessingResponseModel): "flags": "gre", "inputs": {"map": "elevation@PERMANENT"}, "module": "r.info", - } - } + }, + }, ], "process_log": [ { @@ -142,7 +142,7 @@ class RasterInfoResponseModel(ProcessingResponseModel): "run_time": 0.050168514251708984, "stderr": [""], "stdout": "...", - } + }, ], "process_results": { "cells": "2025000", diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py index 231eed3..91cc622 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_management.py @@ -144,8 +144,8 @@ class STRDSInfoResponseModel(ProcessingResponseModel): "type": "strds", }, "module": "t.info", - } - } + }, + }, ], "process_log": [ { @@ -159,7 +159,7 @@ class STRDSInfoResponseModel(ProcessingResponseModel): "run_time": 0.4944636821746826, "stderr": [""], "stdout": "...", - } + }, ], "process_results": { "aggregation_type": "None", diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py index c19f13b..e4a892b 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/strds_raster_management.py @@ -114,11 +114,11 @@ class STRDSRasterListResponseModel(ProcessingResponseModel): "output": { "name": "/home/soeren/actinia/workspace/temp_db/" "gisdbase_1b72938d2ef54c199f6627b8720f21e1/" - ".tmp/tmptps71vn7" - } + ".tmp/tmptps71vn7", + }, }, - } - } + }, + }, ], "process_log": [ { @@ -137,7 +137,7 @@ class STRDSRasterListResponseModel(ProcessingResponseModel): "run_time": 0.5023984909057617, "stderr": [""], "stdout": "", - } + }, ], "process_results": [ { diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index 241d8b0..f88a4e2 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -192,7 +192,7 @@ class VectorInfoResponseModel(ProcessingResponseModel): "inputs": {"map": "geology@PERMANENT"}, "module": "v.info", }, - } + }, ], "process_log": [ { From 31d3c33d90fa34f2b2e894ba84a89248ad682248 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 11:01:46 +0200 Subject: [PATCH 13/16] lint S108 --- ruff.toml | 7 +++---- .../schemas/raster_layer.py | 2 +- .../schemas/vector_layer.py | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruff.toml b/ruff.toml index 814fe88..3681a32 100644 --- a/ruff.toml +++ b/ruff.toml @@ -2,10 +2,9 @@ lint.ignore = [ "BLE001", # BLE001 Do not catch blind exception: `Exception - "D205", - "E501", # ignore here, flake checks with 88 lines - "RUF012", - "S108", + "D205", # D205 1 blank line required between summary line and description + "E501", # E501 Line too long (ignore here, flake checks with 88 lines) + "RUF012", # RUF012 Mutable class attributes should be annotated with `typing.ClassVar` ] # [lint.per-file-ignores] diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py index 445a14d..c0a579b 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/raster_layer.py @@ -77,7 +77,7 @@ class RasterInfoModel(Schema): 'project="northcarolina_latlong" mapset="\\helena" ' 'output="elev_ned10m" method="cubic" resolution=10"', "creator": '"helena"', - "database": "/tmp/gisdbase_75bc0828", + "database": "/tmp/gisdbase_75bc0828", # noqa: S108 "datatype": "FCELL", "date": '"Tue Nov 7 01:09:51 2006"', "description": '"generated by r.proj"', diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index f88a4e2..a8ee51b 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -114,7 +114,7 @@ class VectorInfoModel(Schema): "centroids": "0", "comment": "", "creator": "soeren", - "database": "/tmp/gisdbase_b83bebdb543440c7b9991e2e5602ba91", + "database": "/tmp/gisdbase_b83bebdb543440c7b9991e2e5602ba91", # noqa: S108 "digitization_threshold": "0.000000", "east": "644375.544828422", "faces": "0", @@ -144,7 +144,7 @@ class VectorInfoModel(Schema): "top": "1.000000", "volumes": "0", "west": "644375.544828422", - "attribute_database": "/tmp/gisdbase_eabed7327ec84d219698670884136c2a/" + "attribute_database": "/tmp/gisdbase_eabed7327ec898670884136c2a/" # noqa: S108 "nc_spm_08/user1/vector/test_layer/sqlite.db", "attribute_database_driver": "sqlite", "attribute_layer_name": "test_layer", From 80061205a94c7d6e8dfaa11ab555ff2bea4900aa Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 11:02:37 +0200 Subject: [PATCH 14/16] lint config --- ruff.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruff.toml b/ruff.toml index 3681a32..3e2b9e2 100644 --- a/ruff.toml +++ b/ruff.toml @@ -9,3 +9,6 @@ lint.ignore = [ # [lint.per-file-ignores] # "src/actinia_grassdata_management_plugin/apidocs/__init__.py" = [ "E501",] + +# Online ignores of +# S108 Probable insecure usage of temporary file or directory From c70439032644513722edabeb6252cb5d4cc7586e Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 11:12:34 +0200 Subject: [PATCH 15/16] super-linter --- .github/workflows/python-publish.yml | 59 +++++++++++---------- README.md | 2 +- RELEASE.md | 6 +-- docker/release/Dockerfile | 36 ------------- docker/release/README.md | 23 -------- docker/release/create_release_with_asset.sh | 28 ---------- renovate.json | 2 +- 7 files changed, 35 insertions(+), 121 deletions(-) delete mode 100644 docker/release/Dockerfile delete mode 100644 docker/release/README.md delete mode 100644 docker/release/create_release_with_asset.sh diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index d3e24c6..b26fb8a 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -1,3 +1,4 @@ +--- name: Upload Python Package on: @@ -10,34 +11,34 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install build - - name: Build package - run: python3 -m build --outdir build . - - name: Release - uses: softprops/action-gh-release@v2 - if: startsWith(github.ref, 'refs/tags/') - with: - files: build/*.whl + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install build + - name: Build package + run: python3 -m build --outdir build . + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') + with: + files: build/*.whl - # - name: Publish package to TestPyPI - # uses: pypa/gh-action-pypi-publish@release/v1 - # with: - # password: ${{ secrets.TEST_PYPI_API_TOKEN }} - # repository_url: https://test.pypi.org/legacy/ - # packages_dir: build/ - # verbose: true + # - name: Publish package to TestPyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # password: ${{ secrets.TEST_PYPI_API_TOKEN }} + # repository_url: https://test.pypi.org/legacy/ + # packages_dir: build/ + # verbose: true - - name: Publish package - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI_API_TOKEN }} - packages_dir: build/ - verbose: true + - name: Publish package + uses: pypa/gh-action-pypi-publish@release/v1 + with: + password: ${{ secrets.PYPI_API_TOKEN }} + packages_dir: build/ + verbose: true diff --git a/README.md b/README.md index 55e3817..24d6efb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -API docs for actinia-core and plugins! +# API docs for actinia-core and plugins OpenAPI is a project used to describe and document RESTful APIs. actinia is using swagger2, version upgrade is on the agena. diff --git a/RELEASE.md b/RELEASE.md index 1801dff..0cb08bd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,16 +1,16 @@ -Steps when releasing actinia-api: +# Steps when releasing actinia-api ## 0. Steps for major updates * If the release is a major update, it needs to be prepared like described in the [WIKI](https://github.com/mundialis/actinia_core/wiki/Versioning). ## 1. Prepare release and version * Run in terminal - ``` + ```bash ESTIMATED_VERSION=3.0.1 gh api repos/mundialis/actinia-api/releases/generate-notes -f tag_name="$ESTIMATED_VERSION" -f target_commitish=main -q .body ``` -* Go to https://github.com/mundialis/actinia-api/releases/new +* Go to [a new release](https://github.com/mundialis/actinia-api/releases/new) page * Copy the output of terminal command to the release description * Change heading `## What's Changed` to `### Changed`, `### Fixed`, `### Added` or what applicable and sort list amongst these headings. * You can [compare manually](https://github.com/mundialis/actinia-api/compare/3.0.0...3.0.1) if all changes are included. If changes were pushed directly to main branch, they are not included. diff --git a/docker/release/Dockerfile b/docker/release/Dockerfile deleted file mode 100644 index ed47afb..0000000 --- a/docker/release/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM alpine:edge as build - -RUN apk add git python3 postgresql-dev gcc python3-dev musl-dev - -RUN pip3 install --upgrade pip pep517 wheel - -# Build -COPY . /src/actinia-api -WORKDIR /src/actinia-api -# TODO: include tests. Currently only running whith actinia_core installed -# RUN pip3 install -r requirements.txt && python3 setup.py test -# build including dependency list from setup.cfg (automatically installed). -# pip3 wheel creates wheels out of all requirements for offline usage -RUN python3 -m pep517.build --out-dir /build . && \ - pip3 wheel -r requirements.txt -w /build - - -FROM alpine:edge - -COPY --from=build /build/actinia*.whl /build/ -COPY docker/release/create_release_with_asset.sh . - -ARG release_url=https://api.github.com/repos/mundialis/actinia-api/releases -ARG tag=0.0 -ARG credentials=dummy:dummy -ARG file=/build/actinia*.whl - -ENV env_release_url=$release_url -ENV env_tag=$tag -ENV env_credentials=$credentials -ENV env_file=$file - -RUN apk add curl jq - -ENTRYPOINT ["/bin/sh"] -CMD ["./create_release_with_asset.sh"] diff --git a/docker/release/README.md b/docker/release/README.md deleted file mode 100644 index a252e19..0000000 --- a/docker/release/README.md +++ /dev/null @@ -1,23 +0,0 @@ -### Only kept for reference - currently travis takes care of building the wheel - -To create a new release, you can use this docker to build the wheel and add -to the release. - -The `docker build` command builds the wheel and integrated the build-args for -the github release. - -The `docker run` command creates the build and uploads the -previously created wheel as asset. - - -``` -git clone git@github.com:mundialis/actinia-api.git -cd actinia-api - -tag=0.0 -credentials=mygithubuser:mygithubpw - -docker build --file docker/release/Dockerfile --build-arg tag=$tag --build-arg credentials=$credentials --tag actinia-api:build . - -docker run --rm actinia-api:build -``` diff --git a/docker/release/create_release_with_asset.sh b/docker/release/create_release_with_asset.sh deleted file mode 100644 index 62745af..0000000 --- a/docker/release/create_release_with_asset.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# needed to be set as ENVs before: -#env_release_url -#env_tag -#env_credentials -#env_file - -filefull=`ls $env_file` -filename=$(basename $filefull) - - -echo "{\"tag_name\": \"$env_tag\",\"target_commitish\": \"master\",\"name\":\"$env_tag\",\"body\": \"Automatically created by CI\",\"draft\": false,\"prerelease\": false}" > /tmp/release_payload.json - -# Create release -curl -u $env_credentials -X POST -H 'Content-Type: application/json' -d @/tmp/release_payload.json $env_release_url > resp.json && cat resp.json - -# parse response to create upload_url -upload_url=`cat resp.json | jq '.upload_url' | tr -d '"' | cut -d '{' -f1` -url=$upload_url?name=$filename - -if [ "$upload_url" == "null" ] -then - echo "Failed to create release, aborting." - exit 1 -fi - -curl -u $env_credentials -H "Accept: application/vnd.github.manifold-preview" -H "Content-Type: application/zip" --data-binary @$filefull "$url" > resp.json && cat resp.json diff --git a/renovate.json b/renovate.json index 39a2b6e..5db72dd 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:recommended" ] } From 670f8f38a1bbf06d339843988e1cc8da4292b985 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 15 May 2025 11:52:06 +0200 Subject: [PATCH 16/16] fix imports --- ruff.toml | 1 + .../apidocs/raster_colors.py | 2 +- .../actinia_grassdata_management_plugin/apidocs/raster_layer.py | 2 +- .../apidocs/strds_management.py | 2 +- .../apidocs/strds_raster_management.py | 2 +- .../actinia_grassdata_management_plugin/apidocs/vector_layer.py | 2 +- .../actinia_grassdata_management_plugin/schemas/vector_layer.py | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruff.toml b/ruff.toml index 3e2b9e2..80fe39d 100644 --- a/ruff.toml +++ b/ruff.toml @@ -5,6 +5,7 @@ lint.ignore = [ "D205", # D205 1 blank line required between summary line and description "E501", # E501 Line too long (ignore here, flake checks with 88 lines) "RUF012", # RUF012 Mutable class attributes should be annotated with `typing.ClassVar` + "RUF100", # RUF100 [*] Unused `noqa` directive (non-enabled: `E501`) - needed for flake8 ] # [lint.per-file-ignores] diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py index 4176582..99f787e 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_colors.py @@ -28,7 +28,7 @@ StringListProcessingResultResponseModel, ) -from actinia_api.swagger2.actinia_core.schemas.raster_colors import ( +from actinia_api.swagger2.actinia_grassdata_management_plugin.schemas.raster_colors import ( # noqa: E501 RasterColorModel, ) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py index b061c32..56bd707 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/raster_layer.py @@ -28,7 +28,7 @@ ) from actinia_api import URL_PREFIX -from actinia_api.swagger2.actinia_core.schemas.raster_layer import ( +from actinia_api.swagger2.actinia_grassdata_management_plugin.schemas.raster_layer import ( # noqa: E501 RasterInfoResponseModel, ) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py index 285e307..ed75289 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_management.py @@ -28,7 +28,7 @@ StringListProcessingResultResponseModel, ) -from actinia_api.swagger2.actinia_core.schemas.strds_management import ( +from actinia_api.swagger2.actinia_grassdata_management_plugin.schemas.strds_management import ( # noqa: E501 STRDSCreationModel, STRDSInfoResponseModel, ) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py index 1ac706b..25f7a05 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/strds_raster_management.py @@ -27,7 +27,7 @@ ProcessingResponseModel, ) -from actinia_api.swagger2.actinia_core.schemas.strds_raster_management import ( +from actinia_api.swagger2.actinia_grassdata_management_plugin.schemas.strds_raster_management import ( # noqa: E501 RasterListRegisterModel, STRDSRasterListResponseModel, ) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py index 456ef23..bf09ba1 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/apidocs/vector_layer.py @@ -28,7 +28,7 @@ ) from actinia_api import URL_PREFIX -from actinia_api.swagger2.actinia_core.schemas.vector_layer import ( +from actinia_api.swagger2.actinia_grassdata_management_plugin.schemas.vector_layer import ( # noqa: E501 VectorInfoResponseModel, VectorRegionCreationModel, ) diff --git a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py index a8ee51b..7f8762a 100644 --- a/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py +++ b/src/actinia_api/swagger2/actinia_grassdata_management_plugin/schemas/vector_layer.py @@ -27,7 +27,7 @@ from actinia_core.models.response_models import ProcessingResponseModel from flask_restful_swagger_2 import Schema -from actinia_api.swagger2.actinia_core.schemas.map_layer_base import ( +from actinia_api.swagger2.actinia_grassdata_management_plugin.schemas.map_layer_base import ( # noqa: E501 SetRegionModel, )