Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/actinia-tiling-plugin-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM mundialis/actinia-core:latest as actinia_test

Check warning on line 1 in docker/actinia-tiling-plugin-test/Dockerfile

View workflow job for this annotation

GitHub Actions / integration-tests

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

LABEL authors="Carmen Tawalika,Anika Weinmann"
LABEL maintainer="tawalika@mundialis.de,weinmann@mundialis.de"

ENV ACTINIA_CUSTOM_TEST_CFG /etc/default/actinia-tiling-plugin-test

Check warning on line 6 in docker/actinia-tiling-plugin-test/Dockerfile

View workflow job for this annotation

GitHub Actions / integration-tests

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# TODO do not set DEFAULT_CONFIG_PATH if this is fixed
ENV DEFAULT_CONFIG_PATH /etc/default/actinia-tiling-plugin-test

Check warning on line 9 in docker/actinia-tiling-plugin-test/Dockerfile

View workflow job for this annotation

GitHub Actions / integration-tests

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# install things only for tests
RUN apk add valkey valkey-cli
Expand All @@ -32,6 +32,6 @@

WORKDIR /src/actinia-tiling-plugin/

RUN make install
RUN pip install .

# RUN make test
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ grass_gis_start_script = /usr/local/bin/grass
grass_addon_path = /root/.grass8/addons/

[API]
plugins = ["actinia_tiling_plugin"]
plugins = ["actinia_tiling_plugin", "actinia_grassdata_management_plugin"]
force_https_urls = True

[KVDB]
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ keywords = [
]

dependencies = [
"actinia-grassdata-management-plugin",
"colorlog>=4.2.1",
]

Expand Down
5 changes: 2 additions & 3 deletions src/actinia_tiling_plugin/api/merge/patch_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@


from actinia_core.core.common.config import global_config
from actinia_core.processing.actinia_processing.ephemeral.\
persistent_processing import PersistentProcessing
from actinia_core.rest.base.resource_base import ResourceBase
from actinia_processing_lib.persistent_processing import PersistentProcessing
from actinia_rest_lib.resource_base import ResourceBase
from actinia_core.core.common.kvdb_interface import enqueue_job
from actinia_core.processing.actinia_processing.persistent.mapset_management \
import (
Expand Down
2 changes: 1 addition & 1 deletion src/actinia_tiling_plugin/api/merge_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from copy import deepcopy
from flask import jsonify, make_response
from flask_restful_swagger_2 import swagger
from actinia_core.rest.base.resource_base import ResourceBase
from actinia_rest_lib.resource_base import ResourceBase

from actinia_tiling_plugin.apidocs import merge
from actinia_tiling_plugin.models.response_models.merge import \
Expand Down
5 changes: 2 additions & 3 deletions src/actinia_tiling_plugin/api/tiling/tiling_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
from uuid import uuid4
from copy import deepcopy

from actinia_core.processing.actinia_processing.ephemeral.\
persistent_processing import PersistentProcessing
from actinia_core.rest.base.resource_base import ResourceBase
from actinia_processing_lib.persistent_processing import PersistentProcessing
from actinia_rest_lib.resource_base import ResourceBase
from actinia_core.core.common.kvdb_interface import enqueue_job
from actinia_core.core.common.process_chain import ProcessChainConverter

Expand Down
2 changes: 1 addition & 1 deletion src/actinia_tiling_plugin/api/tiling_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from copy import deepcopy
from flask import jsonify, make_response
from flask_restful_swagger_2 import swagger
from actinia_core.rest.base.resource_base import ResourceBase
from actinia_rest_lib.resource_base import ResourceBase

from actinia_tiling_plugin.apidocs import tiling
from actinia_tiling_plugin.models.response_models.tiling import \
Expand Down
15 changes: 14 additions & 1 deletion src/actinia_tiling_plugin/endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
__copyright__ = "Copyright 2022 mundialis GmbH & Co. KG"
__maintainer__ = "mundialis GmbH % Co. KG"

from actinia_core.endpoints import get_endpoint_class_name
from flask_restful_swagger_2 import Resource

from actinia_tiling_plugin.api.tiling_list import TilingListResource
from actinia_tiling_plugin.api.tiling.tiling_grid import \
Expand All @@ -34,6 +34,19 @@
AsyncMergeProcessPatchResource


def get_endpoint_class_name(
endpoint_class: Resource,
projects_url_part: str = "projects",
) -> str:
"""Create the name for the given endpoint class."""
endpoint_class_name = endpoint_class.__name__.lower()
if projects_url_part != "projects":
name = f"{endpoint_class_name}_{projects_url_part}"
else:
name = endpoint_class_name
return name


# endpoints loaded if run as actinia-core plugin as well as standalone app
def create_project_endpoints(flask_api, projects_url_part="projects"):
"""
Expand Down