From 481de74893ec1351f1355f10ccb04d646272bb3c Mon Sep 17 00:00:00 2001 From: wajcha Date: Tue, 7 Sep 2021 13:26:20 +0200 Subject: [PATCH] Fix exception type raised on calling missing error on Handler --- neptune/new/handler.py | 6 +++--- tests/neptune/new/test_client.py | 10 +++++----- tests/neptune/new/test_handler.py | 6 +----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/neptune/new/handler.py b/neptune/new/handler.py index cf4e805a5..1b2c24bd5 100644 --- a/neptune/new/handler.py +++ b/neptune/new/handler.py @@ -21,7 +21,7 @@ from neptune.new.attributes.series.float_series import FloatSeries from neptune.new.attributes.series.string_series import StringSeries from neptune.new.attributes.sets.string_set import StringSet -from neptune.new.exceptions import MissingFieldException, NeptuneException +from neptune.new.exceptions import NeptuneException from neptune.new.internal.utils import verify_type, is_collection, verify_collection_type, is_float, is_string, \ is_float_like, is_string_like from neptune.new.internal.utils.paths import join_paths, parse_path @@ -49,12 +49,12 @@ def __getattr__(self, attribute_name): if attr: return getattr(attr, attribute_name) else: - raise MissingFieldException(self._path) + raise AttributeError(f"No such method '{attribute_name}'.") def __getattribute__(self, attribute_name): _docstring_attrs = super().__getattribute__('DOCSTRING_ATTRIBUTES') if attribute_name in _docstring_attrs: - raise AttributeError() + raise AttributeError(f"No such method '{attribute_name}'.") return super().__getattribute__(attribute_name) def assign(self, value, wait: bool = False) -> None: diff --git a/tests/neptune/new/test_client.py b/tests/neptune/new/test_client.py index e29a57d49..c0497ab60 100644 --- a/tests/neptune/new/test_client.py +++ b/tests/neptune/new/test_client.py @@ -27,7 +27,7 @@ from neptune.new.attributes.atoms import String from neptune.new.envs import API_TOKEN_ENV_NAME, PROJECT_ENV_NAME from neptune.new.exceptions import ( - MetadataInconsistency, MissingFieldException, NeptuneOfflineModeFetchException, NeptuneUninitializedException, + MetadataInconsistency, NeptuneOfflineModeFetchException, NeptuneUninitializedException, ) from neptune.new.internal.backends.api_model import ( ApiRun, @@ -141,19 +141,19 @@ def test_entrypoint(self): @patch("neptune.new.internal.utils.source_code.is_ipython", new=lambda: True) def test_entrypoint_in_interactive_python(self): exp = init(mode='debug') - with self.assertRaises(MissingFieldException): + with self.assertRaises(AttributeError): exp["source_code/entrypoint"].get() exp = init(mode='debug', source_files=[]) - with self.assertRaises(MissingFieldException): + with self.assertRaises(AttributeError): exp["source_code/entrypoint"].get() exp = init(mode='debug', source_files=["../*"]) - with self.assertRaises(MissingFieldException): + with self.assertRaises(AttributeError): exp["source_code/entrypoint"].get() exp = init(mode='debug', source_files=["internal/*"]) - with self.assertRaises(MissingFieldException): + with self.assertRaises(AttributeError): exp["source_code/entrypoint"].get() @patch("neptune.new.internal.utils.source_code.sys.argv", ["main.py"]) diff --git a/tests/neptune/new/test_handler.py b/tests/neptune/new/test_handler.py index 4772a980c..e3cc20797 100644 --- a/tests/neptune/new/test_handler.py +++ b/tests/neptune/new/test_handler.py @@ -35,7 +35,7 @@ from neptune.new.attributes.atoms.string import String from neptune.new.attributes.sets.string_set import StringSet from neptune.new.envs import PROJECT_ENV_NAME, API_TOKEN_ENV_NAME -from neptune.new.exceptions import FileNotFound, MissingFieldException +from neptune.new.exceptions import FileNotFound from neptune.new.types import File as FileVal from neptune.new.types.atoms.datetime import Datetime as DatetimeVal from neptune.new.types.atoms.float import Float as FloatVal @@ -317,12 +317,8 @@ def test_lookup(self): def test_attribute_error(self): exp = init(mode="debug", flush_period=0.5) - with self.assertRaises(MissingFieldException): - exp['var'].something() with self.assertRaises(AttributeError): exp['var'].something() - with self.assertRaises(KeyError): - exp['var'].something() def test_float_like_types(self): exp = init(mode="debug", flush_period=0.5)