nerdd-module 0.3.41__tar.gz → 0.3.42__tar.gz

{nerdd_module-0.3.41 → nerdd_module-0.3.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nerdd-module
-Version: 0.3.41
+Version: 0.3.42
 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.42/nerdd_module/converters/basic_type_converter.py

@@ -0,0 +1,49 @@
+from typing import Any, Callable
+
+from ..config import Module, ResultProperty
+from .converter import Converter
+from .converter_config import ALL, ConverterConfig
+
+__all__ = ["BasicTypeConverter", "basic_data_types"]
+
+basic_data_types = [
+    "int",
+    "float",
+    "string",
+    "bool",
+]
+
+
+class BasicTypeConverter(Converter):
+    def __init__(
+        self,
+        module_config: Module,
+        result_property: ResultProperty,
+        output_format: str,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(module_config, result_property, output_format, **kwargs)
+        self.type = self.result_property.type
+
+        self._f: Callable[[Any], Any]
+        if self.type == "int":
+            self._f = int
+        elif self.type == "float":
+            self._f = float
+        elif self.type == "string":
+            self._f = str
+        elif self.type == "bool":
+            self._f = bool
+        else:
+            self._f = lambda v: v
+
+    def _convert(self, input: Any, context: dict) -> Any:
+        if input is None:
+            return None
+
+        return self._f(input)
+
+    config = ConverterConfig(
+        data_types=basic_data_types,
+        output_formats=ALL,
+    )

{nerdd_module-0.3.41 → nerdd_module-0.3.42}/nerdd_module/tests/predictions.py

@@ -52,13 +52,21 @@ def predictions_atomic_mass_model(representations, version, multiplier):
     "all results are considered",
     target_fixture="subset",
 )
-def subset_without_none(predictions):
+def all_results(predictions):
     return predictions
 
 @when(
     "the subset of the result where the input was not None is considered",
     target_fixture="subset",
 )
-def subset_without_none(predictions):
+def subset_without_input_none(predictions):
     # remove None entries
     return [p for p in predictions if p["input_mol"] is not None]
+
+@when(
+    "the subset of the result where the preprocessed mol was not None is considered",
+    target_fixture="subset",
+)
+def subset_without_preprocessed_none(predictions):
+    # remove None entries
+    return [p for p in predictions if p["preprocessed_mol"] is not None]

{nerdd_module-0.3.41 → nerdd_module-0.3.42}/nerdd_module.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nerdd-module
-Version: 0.3.41
+Version: 0.3.42
 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.41 → nerdd_module-0.3.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nerdd-module"
-version = "0.3.41"
+version = "0.3.42"
 description = "Base package to create NERDD modules"
 readme = "README.md"
 license = "BSD-3-Clause"

nerdd_module-0.3.41/nerdd_module/converters/basic_type_converter.py

@@ -1,23 +0,0 @@
-from typing import Any
-
-from .converter import Converter
-from .converter_config import ALL, ConverterConfig
-
-__all__ = ["BasicTypeConverter", "basic_data_types"]
-
-basic_data_types = [
-    "int",
-    "float",
-    "string",
-    "bool",
-]
-
-
-class BasicTypeConverter(Converter):
-    def _convert(self, input: Any, context: dict) -> Any:
-        return input
-
-    config = ConverterConfig(
-        data_types=basic_data_types,
-        output_formats=ALL,
-    )