refactor: refer ProMCDA models instead of ranking-service models

kapil-agnihotri · kapil-agnihotri · commit a809166c907e · 2024-09-10T15:28:35.000+02:00
diff --git a/mcda/mcda_ranking_run.py b/mcda/mcda_ranking_run.py
@@ -13,7 +13,6 @@
 from ProMCDA.mcda.utils.utils_for_main import *
 from ProMCDA.mcda.utils.utils_for_plotting import *
 from ProMCDA.mcda.utils.utils_for_parallelization import *
-from ProMCDA.models.configuration import Configuration
 
 log = logging.getLogger(__name__)
 
diff --git a/mcda/mcda_with_robustness.py b/mcda/mcda_with_robustness.py
@@ -7,7 +7,7 @@
 import numpy as np
 
 from ProMCDA.mcda.utils.application_enums import MonteCarloMarginalDistributions
-from ProMCDA.models.configuration import Configuration
+from ProMCDA.mcda.models import Configuration
 
 log = logging.getLogger(__name__)
 
diff --git a/mcda/mcda_without_robustness.py b/mcda/mcda_without_robustness.py
@@ -6,7 +6,7 @@
 from ProMCDA.mcda.configuration.config import Config
 from ProMCDA.mcda.mcda_functions.normalization import Normalization
 from ProMCDA.mcda.mcda_functions.aggregation import Aggregation
-from ProMCDA.models.configuration import Configuration
+from ProMCDA.mcda.models import Configuration
 
 log = logging.getLogger(__name__)
 
diff --git a/mcda/models/__init__.py b/mcda/models/__init__.py
@@ -0,0 +1,6 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from ProMCDA.mcda.models.log_normal_indicator_values import LogNormalIndicatorValues
diff --git a/mcda/models/base_model_.py b/mcda/models/base_model_.py
@@ -3,7 +3,7 @@
 import six
 import typing
 
-from swagger_server import util
+from ProMCDA.mcda import util
 
 T = typing.TypeVar('T')
 
diff --git a/mcda/models/configuration.py b/mcda/models/configuration.py
@@ -5,11 +5,11 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server.models.configuration_monte_carlo_sampling import ConfigurationMonteCarloSampling  # noqa: F401,E501
-from swagger_server.models.configuration_robustness import ConfigurationRobustness  # noqa: F401,E501
-from swagger_server.models.configuration_sensitivity import ConfigurationSensitivity  # noqa: F401,E501
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda.models.configuration_monte_carlo_sampling import ConfigurationMonteCarloSampling  # noqa: F401,E501
+from ProMCDA.mcda.models.configuration_robustness import ConfigurationRobustness  # noqa: F401,E501
+from ProMCDA.mcda.models.configuration_sensitivity import ConfigurationSensitivity  # noqa: F401,E501
+from ProMCDA.mcda import util
 
 
 class Configuration(Model):
diff --git a/mcda/models/configuration_modified_input.py b/mcda/models/configuration_modified_input.py
@@ -5,11 +5,11 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server.models.configuration_modified_input_monte_carlo_sampling import ConfigurationModifiedInputMonteCarloSampling  # noqa: F401,E501
-from swagger_server.models.configuration_modified_input_robustness import ConfigurationModifiedInputRobustness  # noqa: F401,E501
-from swagger_server.models.configuration_modified_input_sensitivity import ConfigurationModifiedInputSensitivity  # noqa: F401,E501
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda.models.configuration_modified_input_monte_carlo_sampling import ConfigurationModifiedInputMonteCarloSampling  # noqa: F401,E501
+from ProMCDA.mcda.models.configuration_modified_input_robustness import ConfigurationModifiedInputRobustness  # noqa: F401,E501
+from ProMCDA.mcda.models.configuration_modified_input_sensitivity import ConfigurationModifiedInputSensitivity  # noqa: F401,E501
+from ProMCDA.mcda import util
 
 
 class ConfigurationModifiedInput(Model):
diff --git a/mcda/models/configuration_modified_input_monte_carlo_sampling.py b/mcda/models/configuration_modified_input_monte_carlo_sampling.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConfigurationModifiedInputMonteCarloSampling(Model):
diff --git a/mcda/models/configuration_modified_input_robustness.py b/mcda/models/configuration_modified_input_robustness.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConfigurationModifiedInputRobustness(Model):
diff --git a/mcda/models/configuration_modified_input_sensitivity.py b/mcda/models/configuration_modified_input_sensitivity.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConfigurationModifiedInputSensitivity(Model):
diff --git a/mcda/models/configuration_monte_carlo_sampling.py b/mcda/models/configuration_monte_carlo_sampling.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConfigurationMonteCarloSampling(Model):
diff --git a/mcda/models/configuration_robustness.py b/mcda/models/configuration_robustness.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConfigurationRobustness(Model):
diff --git a/mcda/models/configuration_sensitivity.py b/mcda/models/configuration_sensitivity.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConfigurationSensitivity(Model):
diff --git a/mcda/models/convert_csv_to_json_body.py b/mcda/models/convert_csv_to_json_body.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ConvertCsvToJsonBody(Model):
diff --git a/mcda/models/error.py b/mcda/models/error.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class Error(Model):
diff --git a/mcda/models/exact_indicator_values.py b/mcda/models/exact_indicator_values.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class ExactIndicatorValues(Model):
diff --git a/mcda/models/inline_response200.py b/mcda/models/inline_response200.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class InlineResponse200(Model):
diff --git a/mcda/models/inline_response2001.py b/mcda/models/inline_response2001.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class InlineResponse2001(Model):
diff --git a/mcda/models/inline_response2002.py b/mcda/models/inline_response2002.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class InlineResponse2002(Model):
diff --git a/mcda/models/log_normal_indicator_values.py b/mcda/models/log_normal_indicator_values.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class LogNormalIndicatorValues(Model):
diff --git a/mcda/models/normal_indicator_values.py b/mcda/models/normal_indicator_values.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class NormalIndicatorValues(Model):
diff --git a/mcda/models/poisson_indicator_values.py b/mcda/models/poisson_indicator_values.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class PoissonIndicatorValues(Model):
diff --git a/mcda/models/sensitivity_mcda.py b/mcda/models/sensitivity_mcda.py
@@ -5,9 +5,9 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server.models.sensitivity_ranked_alternatives import SensitivityRankedAlternatives  # noqa: F401,E501
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda.models.sensitivity_ranked_alternatives import SensitivityRankedAlternatives  # noqa: F401,E501
+from ProMCDA.mcda import util
 
 
 class SensitivityMCDA(Model):
diff --git a/mcda/models/sensitivity_pro_mcda.py b/mcda/models/sensitivity_pro_mcda.py
@@ -5,9 +5,9 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server.models.sensitivity_ranked_alternatives import SensitivityRankedAlternatives  # noqa: F401,E501
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda.models.sensitivity_ranked_alternatives import SensitivityRankedAlternatives  # noqa: F401,E501
+from ProMCDA.mcda import util
 
 
 class SensitivityProMCDA(Model):
diff --git a/mcda/models/sensitivity_ranked_alternatives.py b/mcda/models/sensitivity_ranked_alternatives.py
@@ -5,9 +5,9 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server.models.sensitivity_ranked_alternatives_inner import SensitivityRankedAlternativesInner  # noqa: F401,E501
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda.models.sensitivity_ranked_alternatives_inner import SensitivityRankedAlternativesInner  # noqa: F401,E501
+from ProMCDA.mcda import util
 
 
 class SensitivityRankedAlternatives(Model):
diff --git a/mcda/models/sensitivity_ranked_alternatives_inner.py b/mcda/models/sensitivity_ranked_alternatives_inner.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class SensitivityRankedAlternativesInner(Model):
diff --git a/mcda/models/simple_mcda.py b/mcda/models/simple_mcda.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class SimpleMCDA(Model):
diff --git a/mcda/models/simple_pro_mcda.py b/mcda/models/simple_pro_mcda.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class SimpleProMCDA(Model):
diff --git a/mcda/models/uniform_indicator_values.py b/mcda/models/uniform_indicator_values.py
@@ -5,8 +5,8 @@
 
 from typing import List, Dict  # noqa: F401
 
-from swagger_server.models.base_model_ import Model
-from swagger_server import util
+from ProMCDA.mcda.models.base_model_ import Model
+from ProMCDA.mcda import util
 
 
 class UniformIndicatorValues(Model):
diff --git a/mcda/type_util.py b/mcda/type_util.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/mcda/util.py b/mcda/util.py
diff --git a/mcda/utils/utils_for_main.py b/mcda/utils/utils_for_main.py
diff --git a/models/__init__.py b/models/__init__.py
diff --git a/tests/unit_tests/test_mcda_with_robustness.py b/tests/unit_tests/test_mcda_with_robustness.py
diff --git a/tests/unit_tests/test_mcda_without_robustness.py b/tests/unit_tests/test_mcda_without_robustness.py
