From ee04b83d9b7504c241d9de5f0dcc8a7bc4023fe3 Mon Sep 17 00:00:00 2001 From: Carmen Date: Wed, 2 Jun 2021 16:36:30 +0200 Subject: [PATCH 1/2] move actinia_core imports --- actinia_module_plugin/api/actinia_templates.py | 2 +- actinia_module_plugin/api/modules/actinia.py | 2 +- actinia_module_plugin/api/modules/combined.py | 2 +- actinia_module_plugin/api/modules/grass.py | 2 +- actinia_module_plugin/api/processing.py | 10 +++++----- actinia_module_plugin/apidocs/templates.py | 2 +- actinia_module_plugin/core/modules/grass.py | 2 +- actinia_module_plugin/core/modules/processor.py | 6 +++--- actinia_module_plugin/core/templates/user_templates.py | 2 +- .../core/templates/user_templates_redis_interface.py | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/actinia_module_plugin/api/actinia_templates.py b/actinia_module_plugin/api/actinia_templates.py index 2cd70ad..b26abac 100644 --- a/actinia_module_plugin/api/actinia_templates.py +++ b/actinia_module_plugin/api/actinia_templates.py @@ -33,7 +33,7 @@ from flask import jsonify, make_response, request from flask_restful_swagger_2 import swagger -from actinia_core.resources.resource_base import ResourceBase +from actinia_core.rest.resource_base import ResourceBase from actinia_module_plugin.apidocs import templates from actinia_module_plugin.core.templates.user_templates import readAll diff --git a/actinia_module_plugin/api/modules/actinia.py b/actinia_module_plugin/api/modules/actinia.py index 1ee13ed..09be2f1 100644 --- a/actinia_module_plugin/api/modules/actinia.py +++ b/actinia_module_plugin/api/modules/actinia.py @@ -32,7 +32,7 @@ from flask import jsonify, make_response from flask_restful_swagger_2 import swagger from flask_restful import Resource -from actinia_core.resources.resource_base import ResourceBase +from actinia_core.rest.resource_base import ResourceBase from actinia_module_plugin.apidocs import modules from actinia_module_plugin.core.filter import filter diff --git a/actinia_module_plugin/api/modules/combined.py b/actinia_module_plugin/api/modules/combined.py index 2c07b42..643bc9e 100644 --- a/actinia_module_plugin/api/modules/combined.py +++ b/actinia_module_plugin/api/modules/combined.py @@ -31,7 +31,7 @@ from flask import jsonify, make_response, request from flask_restful_swagger_2 import swagger -from actinia_core.resources.resource_base import ResourceBase +from actinia_core.rest.resource_base import ResourceBase from actinia_module_plugin.apidocs import modules from actinia_module_plugin.core.filter import filter diff --git a/actinia_module_plugin/api/modules/grass.py b/actinia_module_plugin/api/modules/grass.py index 072131f..a96ba1f 100644 --- a/actinia_module_plugin/api/modules/grass.py +++ b/actinia_module_plugin/api/modules/grass.py @@ -30,7 +30,7 @@ from flask import jsonify, make_response, request from flask_restful_swagger_2 import swagger -from actinia_core.resources.resource_base import ResourceBase +from actinia_core.rest.resource_base import ResourceBase from actinia_module_plugin.apidocs import modules from actinia_module_plugin.core.filter import filter diff --git a/actinia_module_plugin/api/processing.py b/actinia_module_plugin/api/processing.py index a560c11..5042200 100644 --- a/actinia_module_plugin/api/processing.py +++ b/actinia_module_plugin/api/processing.py @@ -53,16 +53,16 @@ from flask import jsonify, make_response from flask_restful_swagger_2 import swagger -from actinia_core.resources.common.redis_interface import enqueue_job -from actinia_core.resources.common.response_models import \ +from actinia_core.core.common.redis_interface import enqueue_job +from actinia_core.core.common.response_models import \ create_response_from_model -from actinia_core.resources.ephemeral_processing_with_export import \ +from actinia_core.rest.ephemeral_processing_with_export import \ start_job as start_job_ephemeral_processing_with_export, \ SCHEMA_DOC as SCHEMA_DOC_EPHEMERAL_PROCESSING_WITH_EXPORT -from actinia_core.resources.persistent_processing import \ +from actinia_core.rest.persistent_processing import \ start_job as start_job_persistent_processing, \ SCHEMA_DOC as SCHEMA_DOC_PERSISTENT_PROCESSING -from actinia_core.resources.resource_base import ResourceBase +from actinia_core.rest.resource_base import ResourceBase from actinia_module_plugin.core.modules.actinia_global_templates import \ createProcessChainTemplateListFromFileSystem diff --git a/actinia_module_plugin/apidocs/templates.py b/actinia_module_plugin/apidocs/templates.py index 063c56e..7e07a71 100644 --- a/actinia_module_plugin/apidocs/templates.py +++ b/actinia_module_plugin/apidocs/templates.py @@ -28,7 +28,7 @@ import json from flask_restful_swagger_2 import Schema -from actinia_core.resources.common.process_chain import GrassModule +from actinia_core.core.common.process_chain import GrassModule from actinia_module_plugin.model.responseModels import \ SimpleStatusCodeResponseModel diff --git a/actinia_module_plugin/core/modules/grass.py b/actinia_module_plugin/core/modules/grass.py index b33a848..87e0734 100644 --- a/actinia_module_plugin/core/modules/grass.py +++ b/actinia_module_plugin/core/modules/grass.py @@ -28,7 +28,7 @@ import json import time -from actinia_core.resources.common.response_models import \ +from actinia_core.core.common.response_models import \ create_response_from_model from actinia_module_plugin.core.modules.processor import run_process_chain diff --git a/actinia_module_plugin/core/modules/processor.py b/actinia_module_plugin/core/modules/processor.py index ac992a8..1c736e2 100644 --- a/actinia_module_plugin/core/modules/processor.py +++ b/actinia_module_plugin/core/modules/processor.py @@ -52,9 +52,9 @@ import pickle import uuid -from actinia_core.resources.common.config import global_config -from actinia_core.resources.ephemeral_processing import EphemeralProcessing -from actinia_core.resources.common.response_models import \ +from actinia_core.core.common.config import global_config +from actinia_core.rest.ephemeral_processing import EphemeralProcessing +from actinia_core.core.common.response_models import \ StringListProcessingResultResponseModel from actinia_module_plugin.core.common import start_job diff --git a/actinia_module_plugin/core/templates/user_templates.py b/actinia_module_plugin/core/templates/user_templates.py index 29c6cb8..eb63cdb 100644 --- a/actinia_module_plugin/core/templates/user_templates.py +++ b/actinia_module_plugin/core/templates/user_templates.py @@ -26,7 +26,7 @@ __maintainer__ = "Carmen Tawalika" -from actinia_core.resources.common.config import Configuration +from actinia_core.core.common.config import Configuration from actinia_module_plugin.core.templates.user_templates_redis_interface \ import redis_actinia_template_interface diff --git a/actinia_module_plugin/core/templates/user_templates_redis_interface.py b/actinia_module_plugin/core/templates/user_templates_redis_interface.py index 7e8a274..a260806 100644 --- a/actinia_module_plugin/core/templates/user_templates_redis_interface.py +++ b/actinia_module_plugin/core/templates/user_templates_redis_interface.py @@ -28,7 +28,7 @@ import pickle -from actinia_core.resources.common.redis_base import RedisBaseInterface +from actinia_core.core.common.redis_base import RedisBaseInterface class RedisActiniaTemplateInterface(RedisBaseInterface): From 8def725f856300f7f04e785124f70a2b7703fcf1 Mon Sep 17 00:00:00 2001 From: Carmen Date: Wed, 2 Jun 2021 16:53:49 +0200 Subject: [PATCH 2/2] update more module imports --- actinia_module_plugin/api/processing.py | 2 +- actinia_module_plugin/core/modules/grass.py | 2 +- actinia_module_plugin/core/modules/processor.py | 2 +- tests/test_modules.py | 2 +- tests/test_modules_actinia_global.py | 2 +- tests/test_modules_actinia_user.py | 2 +- tests/test_modules_grass.py | 2 +- tests/test_processing_global.py | 2 +- tests/test_processing_user.py | 2 +- tests/test_templates.py | 2 +- tests/testsuite.py | 12 ++++++------ 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/actinia_module_plugin/api/processing.py b/actinia_module_plugin/api/processing.py index 5042200..9c143f4 100644 --- a/actinia_module_plugin/api/processing.py +++ b/actinia_module_plugin/api/processing.py @@ -54,7 +54,7 @@ from flask import jsonify, make_response from flask_restful_swagger_2 import swagger from actinia_core.core.common.redis_interface import enqueue_job -from actinia_core.core.common.response_models import \ +from actinia_core.models.response_models import \ create_response_from_model from actinia_core.rest.ephemeral_processing_with_export import \ start_job as start_job_ephemeral_processing_with_export, \ diff --git a/actinia_module_plugin/core/modules/grass.py b/actinia_module_plugin/core/modules/grass.py index 87e0734..e41eb4e 100644 --- a/actinia_module_plugin/core/modules/grass.py +++ b/actinia_module_plugin/core/modules/grass.py @@ -28,7 +28,7 @@ import json import time -from actinia_core.core.common.response_models import \ +from actinia_core.models.response_models import \ create_response_from_model from actinia_module_plugin.core.modules.processor import run_process_chain diff --git a/actinia_module_plugin/core/modules/processor.py b/actinia_module_plugin/core/modules/processor.py index 1c736e2..a439f2f 100644 --- a/actinia_module_plugin/core/modules/processor.py +++ b/actinia_module_plugin/core/modules/processor.py @@ -54,7 +54,7 @@ from actinia_core.core.common.config import global_config from actinia_core.rest.ephemeral_processing import EphemeralProcessing -from actinia_core.core.common.response_models import \ +from actinia_core.models.response_models import \ StringListProcessingResultResponseModel from actinia_module_plugin.core.common import start_job diff --git a/tests/test_modules.py b/tests/test_modules.py index aeb4de0..c77b3b7 100644 --- a/tests/test_modules.py +++ b/tests/test_modules.py @@ -26,7 +26,7 @@ from flask import Response -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase, compare_module_to_file diff --git a/tests/test_modules_actinia_global.py b/tests/test_modules_actinia_global.py index 64f59c1..1abd185 100644 --- a/tests/test_modules_actinia_global.py +++ b/tests/test_modules_actinia_global.py @@ -26,7 +26,7 @@ from flask import Response -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase, compare_module_to_file diff --git a/tests/test_modules_actinia_user.py b/tests/test_modules_actinia_user.py index 839ff63..2f017d6 100644 --- a/tests/test_modules_actinia_user.py +++ b/tests/test_modules_actinia_user.py @@ -26,7 +26,7 @@ import json from flask import Response -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase, import_user_template, \ delete_user_template diff --git a/tests/test_modules_grass.py b/tests/test_modules_grass.py index d76ba9d..2bb3b20 100644 --- a/tests/test_modules_grass.py +++ b/tests/test_modules_grass.py @@ -28,7 +28,7 @@ from flask import Response -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase, compare_module_to_file diff --git a/tests/test_processing_global.py b/tests/test_processing_global.py index 61bf6d1..ffbdc99 100644 --- a/tests/test_processing_global.py +++ b/tests/test_processing_global.py @@ -27,7 +27,7 @@ from flask import Response import json -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase, check_started_process diff --git a/tests/test_processing_user.py b/tests/test_processing_user.py index 201b38a..2891c72 100644 --- a/tests/test_processing_user.py +++ b/tests/test_processing_user.py @@ -27,7 +27,7 @@ from flask import Response import json -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase, import_user_template, \ delete_user_template, check_started_process diff --git a/tests/test_templates.py b/tests/test_templates.py index 19f721c..dc29fbb 100644 --- a/tests/test_templates.py +++ b/tests/test_templates.py @@ -28,7 +28,7 @@ import json import uuid -from actinia_core.resources.common.app import URL_PREFIX +from actinia_core.core.common.app import URL_PREFIX from testsuite import ActiniaTestCase diff --git a/tests/testsuite.py b/tests/testsuite.py index e4d5f01..c6fcd9d 100644 --- a/tests/testsuite.py +++ b/tests/testsuite.py @@ -55,11 +55,11 @@ from werkzeug.datastructures import Headers from actinia_core.endpoints import create_endpoints -from actinia_core.resources.common import redis_interface -from actinia_core.resources.common.app import flask_app, URL_PREFIX -from actinia_core.resources.common.config import global_config -from actinia_core.resources.common.user import ActiniaUser -from actinia_core.resources.common.response_models import \ +from actinia_core.core.common import redis_interface +from actinia_core.core.common.app import flask_app, URL_PREFIX +from actinia_core.core.common.config import global_config +from actinia_core.core.common.user import ActiniaUser +from actinia_core.models.response_models import \ ProcessingResponseModel @@ -110,7 +110,7 @@ def setUp(self): process_time_limit=4, accessible_datasets=accessible_datasets) # # create process queue - # from actinia_core.resources.common.process_queue import \ + # from actinia_core.core.common.process_queue import \ # create_process_queue # create_process_queue(config=global_config)