Merge pull request #32 from cedadev/conditional_method

Conditional method

Author: rhysrevans3

docs/_build/doctrees/core.doctree

@@ -13,7 +13,7 @@
 project = "Extraction Methods"
 copyright = "2025, Rhys Evans"
 author = "Rhys Evans"
-release = "1.1.1"
+release = "1.1.2"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/_build/doctrees/extraction_methods.core.doctree

@@ -1,7 +1,5 @@
 # encoding: utf-8
-"""
-
-"""
+""" """
 # encoding: utf-8
 """
 ..  _facet-prefix:

docs/_build/doctrees/extraction_methods.plugins.assets.doctree

@@ -26,6 +26,24 @@
 extraction_method_defaults = {}
 
 
+class ExtractionMethodConf(BaseModel):
+    """STAC extraction method model."""
+
+    method: str
+    inputs: Optional[dict[str, Any]] = {}
+
+    _extraction_methods: EntryPoints = entry_points(group="extraction_methods")
+
+    def __repr__(self) -> str:
+        return yaml.dump(self.model_dump())
+
+    def _run(self, body: dict[str, Any]) -> dict[str, Any]:
+        extraction_method = self._extraction_methods[self.method].load()
+        extraction_method = extraction_method(self)
+
+        return extraction_method._run(body)  # type: ignore[no-any-return]
+
+
 def update_input(
     func: Callable[[Any, dict[str, Any]], Any],
 ) -> Callable[[Any, dict[str, Any]], Any]:
@@ -46,7 +64,7 @@ def wrapper(self, body: dict[str, Any]) -> Any:  # type: ignore[no-untyped-def]
     return wrapper
 
 
-def set_extraction_method_defaults(conf_defaults: dict):
+def set_extraction_method_defaults(conf_defaults: dict[str, Any]) -> None:
     """
     Function to set global extraction_method_defaults variable.
     """
@@ -62,7 +80,9 @@ class SetInput:
     input_class: Any = Input
     dummy_input_class: Any = DummyInput
 
-    def __init__(self, extraction_method_conf: dict, *args: Any, **kwargs: Any) -> None:
+    def __init__(
+        self, extraction_method_conf: ExtractionMethodConf, *args: Any, **kwargs: Any
+    ) -> None:
         """
         Set ``input`` attribute to instance of ``dummy_input_class`` with
         default values overrided by kwargs.
@@ -180,21 +200,3 @@ def run(self, body: dict[str, Any]) -> Iterator[dict[str, Any]]:
         :return: updated body dict
         :rtype: dict
         """
-
-
-class ExtractionMethodConf(BaseModel):
-    """STAC extraction method model."""
-
-    method: str
-    inputs: Optional[dict] = {}
-
-    _extraction_methods: EntryPoints = entry_points(group="extraction_methods")
-
-    def __repr__(self):
-        return yaml.dump(self.model_dump())
-
-    def _run(self, body: dict[str, Any]) -> dict[str, Any]:
-        extraction_method = self._extraction_methods[self.method].load()
-        extraction_method = extraction_method(self)
-
-        return extraction_method._run(body)

docs/conf.py

@@ -1,7 +1,5 @@
 # encoding: utf-8
-"""
-
-"""
+""" """
 __author__ = "Richard Smith"
 __date__ = "03 Jun 2021"
 __copyright__ = "Copyright 2018 United Kingdom Research and Innovation"

extraction_methods/__init__.py

@@ -86,7 +86,7 @@ def run(self, body: dict[str, Any]) -> dict[str, Any]:
         for term in self.input.condition.split(" "):
 
             if term[0] == self.input.exists_key:
-                term = body.get(term[1:], term)
+                term = body.get(term[1:], None)
 
                 if isinstance(term, str):
                     term = f"'{term}'"

extraction_methods/core/extraction_method.py

@@ -1,7 +1,5 @@
 # encoding: utf-8
-"""
-
-"""
+""" """
 __author__ = "Richard Smith"
 __date__ = "03 Jun 2021"
 __copyright__ = "Copyright 2018 United Kingdom Research and Innovation"