Bug fixes.

Author: rhysrevans3

SECURITY.md

@@ -6,7 +6,7 @@ No version is currently supported as this package is for experimentation.
 
 | Version | Supported             |
 |---------|-----------------------|
-| 1.0.1   | In development        |
+| 1.0.2   | In development        |
 
 ## Reporting a Vulnerability
 

docs/conf.py

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

extraction_methods/plugins/general_function.py

@@ -108,10 +108,10 @@ def run(self, body: dict[str, Any]) -> dict[str, Any]:
 
         function = getattr(module, function_name)
 
-        result = function(*self.input.args, **self.input.kwargs)
+        result = function(*self.input.function.args, **self.input.function.kwargs)
 
         if self.input.output_key:
-            output_body[self.input.output_term] = result
+            output_body[self.input.output_key] = result
 
         elif isinstance(result, dict):
             output_body |= result

extraction_methods/plugins/netcdf.py

@@ -15,6 +15,7 @@
 import logging
 from typing import Any
 
+import cf_xarray
 import xarray
 from pydantic import Field
 

extraction_methods/plugins/regex_rename.py

@@ -98,9 +98,9 @@ def matching_keys(self, keys: KeysView[str], key_regex: str) -> list[str]:
 
         return list(filter(regex.match, keys))
 
-    def rename(
-        self, body: dict[str, Any], key_parts: list[str], output_key: str
-    ) -> dict[str, Any]:
+    def find(
+        self, body: dict[str, Any], key_parts: list[str]
+    ) -> tuple[dict[str, Any], Any]:
         """
         Rename terms
 
@@ -112,16 +112,37 @@ def rename(
         :return: dict
         :rtype: update body
         """
-
+        value = None
         for key in self.matching_keys(body.keys(), key_parts[0]):
-
             if len(key_parts) > 1:
-                body[key] = self.rename(body[key], key_parts[1:], output_key)
+                body[key], value = self.find(body[key], key_parts[1:])
 
             else:
-                body[output_key] = body[key]
+                value = body[key]
                 del body[key]
 
+        return body, value
+
+    def add(
+        self, body: dict[str, Any], key_parts: list[str], value: Any
+    ) -> dict[str, Any]:
+        """
+        Rename terms
+
+        :param body: current body
+        :type body: dict
+        :param key_parts: key parts seperated by delimiter
+        :type key_parts: list
+
+        :return: dict
+        :rtype: update body
+        """
+        if len(key_parts) > 1:
+            body[key_parts[0]] = self.add(body[key_parts[0]], key_parts[1:], value)
+
+        else:
+            body[key_parts[0]] = value
+
         return body
 
     @update_input
@@ -134,6 +155,13 @@ def run(self, body: dict[str, Any]) -> dict[str, Any]:
                 else [swap.regex]
             )
 
-            body = self.rename(body, key_parts, swap.output_key)
+            output_key_parts = (
+                swap.output_key.split(self.input.delimiter)
+                if self.input.delimiter
+                else [swap.output_key]
+            )
+
+            body, value = self.find(body, key_parts)
+            body = self.add(body, output_key_parts, value)
 
         return body

poetry.lock

@@ -1,6 +1,6 @@
 [project]
 name = "extraction-methods"
-version = "1.0.1"
+version = "1.0.2"
 description = "Methods to enable the extraction of metadata"
 authors = [
     {"name" = "rhysrevans3", "email" = "<[email protected]>"},
@@ -29,14 +29,14 @@ dependencies = [
     "idna == 2.10",
     "imagesize == 1.3.0",
     "intake-esm (>=2025.2.3,<2026.0.0)",
-    "jinja2 == 3.1.3",
+    "jinja2 (>=3.1.5,<4.0.0)",
     "jmespath == 0.10.0",
     "jsonschema (>=4.23.0,<5.0.0)",
     "lxml (>=5.3.1,<6.0.0)",
     "multidict == 5.1.0",
     "packaging == 24.1",
     "pika == 1.2.0",
-    "pydantic == 2.1.1",
+    "pydantic (>=2.1.1,<3.0.0)",
     "pygments == 2.17.0",
     "pyparsing == 2.4.7",
     "python-dateutil == 2.8.2",
@@ -49,7 +49,7 @@ dependencies = [
     "six == 1.16.0",
     "snowballstemmer == 2.2.0",
     "tqdm == 4.62.3",
-    "typing-extensions == 4.7.1",
+    "typing-extensions (>=4.7.1,<5.0.0)",
     "urllib3 == 1.26.18",
 ]