physioblocks 1.1.2__tar.gz → 1.1.3__tar.gz

{physioblocks-1.1.2 → physioblocks-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: physioblocks
-Version: 1.1.2
+Version: 1.1.3
 Dynamic: Author
 Dynamic: Author-email
 Dynamic: License

{physioblocks-1.1.2 → physioblocks-1.1.3}/physioblocks/__init__.py

@@ -26,7 +26,7 @@
 
 """Physioblocks package definition"""
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 __copyright__ = "INRIA"
 __license__ = "LGPL-3.0-only"
 __authors__ = [

{physioblocks-1.1.2 → physioblocks-1.1.3}/physioblocks/io/aliases.py

@@ -26,10 +26,16 @@
 
 """Defines methods to load aliases folders."""
 
+import logging
 from pathlib import Path
 
 from physioblocks.configuration.aliases import add_alias
 from physioblocks.io.configuration import read_json
+from physioblocks.utils.exceptions_utils import log_exception
+
+_logger = logging.getLogger(__name__)
+
+_JSON_EXTENSIONS = [".json", ".jsonc"]
 
 
 def load_aliases(path: str) -> None:
@@ -67,7 +73,22 @@ def load_aliases(path: str) -> None:
             # recursivly load child directories
             load_aliases(str(child))
         else:
-            config_alias = read_json(str(child))
-            # get file name without extension as alias id
-            alias_id = child.name.removesuffix(child.suffix)
-            add_alias(alias_id, config_alias)
+            if child.suffix not in _JSON_EXTENSIONS:
+                continue
+
+            try:
+                config_alias = read_json(str(child))
+
+                # get file name without extension as alias id
+                alias_id = child.name.removesuffix(child.suffix)
+                add_alias(alias_id, config_alias)
+            except Exception as error:
+                _logger.warning(
+                    str.format(
+                        "Error while loading alias from: {0}. File skipped.",
+                        str(child.absolute()),
+                    )
+                )
+                log_exception(
+                    _logger, type(error), error, error.__traceback__, logging.WARNING
+                )

{physioblocks-1.1.2 → physioblocks-1.1.3}/tests/tests_io/test_aliases.py

@@ -24,6 +24,7 @@
 # You should have received a copy of the GNU Lesser General Public License along with
 # PhysioBlocks. If not, see <https://www.gnu.org/licenses/>.
 
+from json import JSONDecodeError
 from pathlib import Path
 from unittest.mock import Mock, patch
 
@@ -53,6 +54,47 @@ def test_load_aliases(
     mock_add_alias.assert_called_once_with("alias", True)
 
 
+@patch("physioblocks.io.aliases.add_alias")
+@patch("pathlib.Path.iterdir")
+@patch("pathlib.Path.exists")
+@patch("pathlib.Path.is_dir")
+def test_load_wrong_aliases(
+    mock_path_is_dir: Mock,
+    mock_path_exists: Mock,
+    mock_iter_dir: Mock,
+    mock_add_alias: Mock,
+):
+    folder_path = "aliases"
+    mock_path_is_dir.side_effect = [True, False]
+    mock_path_exists.return_value = True
+    mock_iter_dir.return_value = [Path("alias.any")]
+
+    load_aliases(folder_path)
+    mock_add_alias.assert_not_called()
+
+
+@patch("physioblocks.io.aliases.add_alias")
+@patch("physioblocks.io.aliases.read_json")
+@patch("pathlib.Path.iterdir")
+@patch("pathlib.Path.exists")
+@patch("pathlib.Path.is_dir")
+def test_load_unreadable_alias(
+    mock_path_is_dir: Mock,
+    mock_path_exists: Mock,
+    mock_iter_dir: Mock,
+    mock_read_json: Mock,
+    mock_add_alias: Mock,
+):
+    folder_path = "aliases"
+    mock_path_is_dir.side_effect = [True, False]
+    mock_path_exists.return_value = True
+    mock_iter_dir.return_value = [Path("alias.json")]
+    mock_read_json.side_effect = JSONDecodeError
+
+    load_aliases(folder_path)
+    mock_add_alias.assert_not_called()
+
+
 @patch("pathlib.Path.exists")
 @patch("pathlib.Path.is_dir")
 def test_load_aliases_exceptions(mock_path_is_dir: Mock, mock_path_exists: Mock):