This is an automated email from the ASF dual-hosted git repository. weichen pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit c32d30dcb2323a1c5e3b156adf7fe538c5b1fe75 Author: cardosolucas <cardosolucas61....@gmail.com> AuthorDate: Wed Aug 26 17:35:26 2020 -0300 Fix heathcheck bug --- .../engine_base/engine_base_action.py | 2 +- .../engine_base/engine_base_data_handler.py | 8 ++++---- python-daemon/marvin_python_daemon/management/engine.py | 2 +- python-daemon/setup.py | 6 +++--- .../tests/engine_base/test_engine_base_action.py | 15 +++++++++------ .../tests/engine_base/test_engine_base_data_handler.py | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/python-daemon/marvin_python_daemon/engine_base/engine_base_action.py b/python-daemon/marvin_python_daemon/engine_base/engine_base_action.py index 485b620..9db5b4f 100644 --- a/python-daemon/marvin_python_daemon/engine_base/engine_base_action.py +++ b/python-daemon/marvin_python_daemon/engine_base/engine_base_action.py @@ -155,7 +155,7 @@ class EngineBaseAction(): try: if request.artifacts: for artifact in request.artifacts.split(","): - if getattr(self, artifact) is None: + if getattr(self, '_{0}'.format(artifact)) is None: return HealthCheckResponse(status=HealthCheckResponse.NOK) return HealthCheckResponse(status=HealthCheckResponse.OK) diff --git a/python-daemon/marvin_python_daemon/engine_base/engine_base_data_handler.py b/python-daemon/marvin_python_daemon/engine_base/engine_base_data_handler.py index 5e0dc8b..e0ace18 100644 --- a/python-daemon/marvin_python_daemon/engine_base/engine_base_data_handler.py +++ b/python-daemon/marvin_python_daemon/engine_base/engine_base_data_handler.py @@ -28,11 +28,11 @@ logger = get_logger('engine_base_data_handler') class EngineBaseDataHandler(EngineBaseBatchAction): __metaclass__ = ABCMeta - _initial_dataset = None + _initialdataset = None _dataset = None def __init__(self, **kwargs): - self._initial_dataset = self._get_arg( + self._initialdataset = self._get_arg( kwargs=kwargs, arg='initial_dataset') self._dataset = self._get_arg(kwargs=kwargs, arg='dataset') super(EngineBaseDataHandler, self).__init__(**kwargs) @@ -40,12 +40,12 @@ class EngineBaseDataHandler(EngineBaseBatchAction): @property def marvin_initial_dataset(self): logger.info("initial_dataset loaded.") - return self._load_obj(object_reference='_initial_dataset') + return self._load_obj(object_reference='_initialdataset') @marvin_initial_dataset.setter def marvin_initial_dataset(self, initial_dataset): logger.info("initial_dataset saved.") - self._save_obj(object_reference='_initial_dataset', + self._save_obj(object_reference='_initialdataset', obj=initial_dataset) @property diff --git a/python-daemon/marvin_python_daemon/management/engine.py b/python-daemon/marvin_python_daemon/management/engine.py index e12c452..425e802 100644 --- a/python-daemon/marvin_python_daemon/management/engine.py +++ b/python-daemon/marvin_python_daemon/management/engine.py @@ -45,7 +45,7 @@ ARTIFACTS = { "AcquisitorAndCleaner": [], "TrainingPreparator": ["initialdataset"], "Trainer": ["dataset"], - "MetricsEvaluator": ["model"], + "MetricsEvaluator": ["dataset", "model"], "PredictionPreparator": ["model", "metrics"], "Predictor": ["model", "metrics"], "Feedback": [] diff --git a/python-daemon/setup.py b/python-daemon/setup.py index 02f4f5d..b293767 100644 --- a/python-daemon/setup.py +++ b/python-daemon/setup.py @@ -27,10 +27,10 @@ from setuptools.command.test import test as TestCommand PACKAGE_NAME = 'marvin_python_daemon' PACKAGE_DESCRIPTION = 'Marvin Python Daemon' -URL = '' +URL = 'marvin.apache.org' -AUTHOR_NAME = 'Lucas Cardoso' -AUTHOR_EMAIL = '' +AUTHOR_NAME = 'Apache Marvin-AI Community' +AUTHOR_EMAIL = 'd...@marvin.apache.org' PYTHON_2 = False PYTHON_3 = True diff --git a/python-daemon/tests/engine_base/test_engine_base_action.py b/python-daemon/tests/engine_base/test_engine_base_action.py index 469c581..66251a9 100644 --- a/python-daemon/tests/engine_base/test_engine_base_action.py +++ b/python-daemon/tests/engine_base/test_engine_base_action.py @@ -139,21 +139,24 @@ class TestEngineBaseAction: assert [1] == engine_action2._params def test_health_check_ok(self, engine_action): - obj1_key = "obj1" - engine_action._save_obj(obj1_key, "check") - request = HealthCheckRequest(artifacts=obj1_key) + obj = "obj1" + obj_key = '_{0}'.format(obj) + engine_action._save_obj(obj_key, "check") + request = HealthCheckRequest(artifacts=obj) expected_response = HealthCheckResponse(status=HealthCheckResponse.OK) response = engine_action._health_check(request=request, context=None) assert expected_response.status == response.status def test_health_check_ok_multiple(self, engine_action): - obj1_key = "obj1" + obj1 = "obj1" + obj1_key = '_{0}'.format(obj1) engine_action._save_obj(obj1_key, "check") - obj2_key = "obj2" + obj2 = "obj2" + obj2_key = '_{0}'.format(obj2) engine_action._save_obj(obj2_key, "check") - request = HealthCheckRequest(artifacts=obj1_key + "," + obj2_key) + request = HealthCheckRequest(artifacts=obj1 + "," + obj2) expected_response = HealthCheckResponse(status=HealthCheckResponse.OK) response = engine_action._health_check(request=request, context=None) diff --git a/python-daemon/tests/engine_base/test_engine_base_data_handler.py b/python-daemon/tests/engine_base/test_engine_base_data_handler.py index 8e93ccc..0fb7a38 100644 --- a/python-daemon/tests/engine_base/test_engine_base_data_handler.py +++ b/python-daemon/tests/engine_base/test_engine_base_data_handler.py @@ -33,7 +33,7 @@ class TestEngineBaseDataHandler: def test_initial_dataset(self, engine_action): engine_action.marvin_initial_dataset = [1] - assert engine_action.marvin_initial_dataset == engine_action._initial_dataset == [ + assert engine_action.marvin_initial_dataset == engine_action._initialdataset == [ 1] def test_dataset(self, engine_action):