Merge pull request #31 from cedadev/conditional_method

Bug fixing.

Author: rhysrevans3

docs/conf.py

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

extraction_methods/core/extraction_method.py

@@ -26,26 +26,8 @@
 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) -> Any:
-        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]
+    func: Callable[[Any, dict[str, Any]], Any],
 ) -> Callable[[Any, dict[str, Any]], Any]:
     """
     Wrapper to update inputs with body values before run.
@@ -64,7 +46,7 @@ def wrapper(self, body: dict[str, Any]) -> Any:  # type: ignore[no-untyped-def]
     return wrapper
 
 
-def set_extraction_method_defaults(conf_defaults: dict[str, Any]) -> None:
+def set_extraction_method_defaults(conf_defaults: dict):
     """
     Function to set global extraction_method_defaults variable.
     """
@@ -80,9 +62,7 @@ class SetInput:
     input_class: Any = Input
     dummy_input_class: Any = DummyInput
 
-    def __init__(
-        self, extraction_method_conf: ExtractionMethodConf, *args: Any, **kwargs: Any
-    ) -> None:
+    def __init__(self, extraction_method_conf: dict, *args: Any, **kwargs: Any) -> None:
         """
         Set ``input`` attribute to instance of ``dummy_input_class`` with
         default values overrided by kwargs.
@@ -200,3 +180,21 @@ 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)

extraction_methods/core/types.py

@@ -122,7 +122,7 @@ def update_attrs(self, body: dict[str, Any]) -> None:
         :param body: current generated properties
         :type body: dict
         """
-        for key, value in self.dict(exclude={"exists_key"}).items():
+        for key, value in self.model_dump(exclude={"exists_key"}).items():
             setattr(self, key, self.update_attr(value, body))
 
 
@@ -131,7 +131,7 @@ class Backend(BaseModel):
     Model for Backend configuration.
     """
 
-    name: str = Field(
+    method: str = Field(
         description="Name of backend.",
     )
     inputs: dict[str, Any] = Field(

extraction_methods/plugins/assets/assets.py

@@ -44,10 +44,6 @@ class AssetInput(Input):
         default="assets",
         description="term for method to output to.",
     )
-    href_term: str = Field(
-        default="path",
-        description="term to use for href.",
-    )
 
 
 class AssetExtract(SetEntryPointsMixin, ExtractionMethod):
@@ -88,8 +84,8 @@ class AssetExtract(SetEntryPointsMixin, ExtractionMethod):
     def run(self, body: dict[str, Any]) -> dict[str, Any]:
 
         output = {}
-        backend_entry_point = self.entry_points[self.input.backend.name].load()
-        backend = backend_entry_point(**self.input.backend.inputs)
+        backend_entry_point = self.entry_points[self.input.backend.method].load()
+        backend = backend_entry_point(self.input.backend)
         assets = backend._run(body)
 
         for asset in assets:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "extraction-methods"
-version = "1.1.0"
+version = "1.1.1"
 description = "Methods to enable the extraction of metadata"
 authors = [
     {"name" = "rhysrevans3", "email" = "<[email protected]>"},