nerdd-module 0.3.18__tar.gz → 0.3.20__tar.gz

{nerdd_module-0.3.18 → nerdd_module-0.3.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nerdd-module
-Version: 0.3.18
+Version: 0.3.20
 Summary: Base package to create NERDD modules
 Author-email: Steffen Hirte <steffen.hirte@univie.ac.at>
 Maintainer-email: Steffen Hirte <steffen.hirte@univie.ac.at>

{nerdd_module-0.3.18 → nerdd_module-0.3.20}/nerdd_module/config/package_configuration.py

@@ -11,23 +11,29 @@ logger = logging.getLogger(__name__)
 
 
 class PackageConfiguration(Configuration):
-    def __init__(self, package: str) -> None:
+    def __init__(self, package: str, filename: str = "nerdd.yml") -> None:
         super().__init__()
 
+        package_path = package.split(".")
+        package_root = package_path[0]
+        remaining_path = package_path[1:]
+
         # get the resource directory
         try:
-            root_dir = files(package)
+            root_dir = files(package_root)
         except ModuleNotFoundError:
             root_dir = None
 
         self.config: Configuration = DictConfiguration({})
         if root_dir is not None:
             # navigate to the config file
-            config_file = root_dir / "nerdd.yml"
+            config_file = root_dir.joinpath(*remaining_path, filename)
 
             if config_file is not None and config_file.is_file():
                 logger.info(f"Found configuration file in package: {config_file}")
-                self.config = YamlConfiguration(config_file.open(), base_path=root_dir)
+                self.config = YamlConfiguration(
+                    config_file.open(), base_path=root_dir.joinpath(*remaining_path)
+                )
             else:
                 self.config = DictConfiguration({})
 

nerdd_module-0.3.20/nerdd_module/converters/problem_list_converter.py

@@ -0,0 +1,39 @@
+import logging
+from typing import Any, List, Union, cast
+
+from ..problem import Problem
+from .converter import Converter
+from .converter_config import ConverterConfig
+
+__all__ = ["ProblemListIdentityConverter", "ProblemListConverter"]
+
+logger = logging.getLogger(__name__)
+
+
+class ProblemListIdentityConverter(Converter):
+    def _convert(self, input: Any, context: dict) -> Any:
+        return input
+
+    config = ConverterConfig(
+        data_types="problem_list",
+        output_formats=["pandas", "iterator", "record_list"],
+    )
+
+
+class ProblemListConverter(Converter):
+    def _convert(self, input: Any, context: dict) -> Any:
+        problem_list: List[Union[Problem, str]] = cast(List[Union[Problem, str]], input)
+
+        def _represent(problem: Union[Problem, str]) -> str:
+            if isinstance(problem, Problem):
+                return f"{problem.type}: {problem.message}"
+            else:
+                logger.warning("Item is not an instance of Problem: %s", problem)
+                return problem
+
+        return "; ".join([_represent(problem) for problem in problem_list])
+
+    config = ConverterConfig(
+        data_types="problem_list",
+        output_formats=["csv", "sdf"],
+    )

{nerdd_module-0.3.18 → nerdd_module-0.3.20}/nerdd_module/model/simple_model.py

@@ -170,7 +170,12 @@ class SimpleModel(Model):
         ]
 
         default_properties_end = [
-            {"name": "problems", "type": "problem_list"},
+            {
+                "name": "problems",
+                "visible_name": "Problems",
+                "type": "problem_list",
+                "visible": False,
+            },
         ]
 
         configs = [

{nerdd_module-0.3.18 → nerdd_module-0.3.20}/nerdd_module.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nerdd-module
-Version: 0.3.18
+Version: 0.3.20
 Summary: Base package to create NERDD modules
 Author-email: Steffen Hirte <steffen.hirte@univie.ac.at>
 Maintainer-email: Steffen Hirte <steffen.hirte@univie.ac.at>

{nerdd_module-0.3.18 → nerdd_module-0.3.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nerdd-module"
-version = "0.3.18"
+version = "0.3.20"
 description = "Base package to create NERDD modules"
 readme = "README.md"
 license = { file = "LICENSE" }

nerdd_module-0.3.18/nerdd_module/converters/problem_list_converter.py

@@ -1,21 +0,0 @@
-from typing import Any, List, cast
-
-from ..problem import Problem
-from .converter import Converter
-from .converter_config import ALL, ConverterConfig
-
-__all__ = ["ProblemListConverter"]
-
-
-class ProblemListConverter(Converter):
-    def _convert(self, input: Any, context: dict) -> Any:
-        if self.output_format in ["pandas", "iterator", "record_list"]:
-            return input
-        else:
-            problem_list: List[Problem] = cast(List[Problem], input)
-            return "; ".join([f"{problem.type}: {problem.message}" for problem in problem_list])
-
-    config = ConverterConfig(
-        data_types="problem_list",
-        output_formats=ALL,
-    )