openeo-gfmap 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

openeo_gfmap/inference/model_inference.py

@@ -2,6 +2,7 @@
 of inference models on an UDF.
 """
 
+import copy
 import functools
 import inspect
 import logging
@@ -16,6 +17,7 @@ import numpy as np
 import openeo
 import requests
 import xarray as xr
+from openeo.metadata import CollectionMetadata
 from openeo.udf import XarrayDataCube
 from openeo.udf import inspect as udf_inspect
 from openeo.udf.udf_data import UdfData
@@ -123,6 +125,16 @@ class ModelInference(ABC):
         arr = self.execute(arr).transpose("bands", "y", "x")
         return XarrayDataCube(arr)
 
+    def _apply_metadata(
+        self, metadata: CollectionMetadata, parameters: dict
+    ) -> CollectionMetadata:
+        """Apply metadata to the output data. This method will be executed at the very end of the
+        process.
+        """
+        self._parameters = parameters
+
+        return metadata.rename_labels(dimension="bands", target=self.output_labels())
+
     @property
     def epsg(self) -> int:
         """EPSG code of the input data."""
@@ -211,14 +223,14 @@ class ONNXModelInference(ModelInference):
         )
 
 
-def apply_udf_data(udf_data: UdfData) -> XarrayDataCube:
+def apply_udf_data(udf_data: UdfData) -> UdfData:
     model_inference_class = "<model_inference_class>"
 
     model_inference = model_inference_class()
 
     # User-defined, model inference class initialized here
     cube = udf_data.datacube_list[0]
-    parameters = udf_data.user_context
+    parameters = copy.deepcopy(udf_data.user_context)
 
     proj = udf_data.proj
     if proj is not None:
@@ -233,6 +245,14 @@ def apply_udf_data(udf_data: UdfData) -> XarrayDataCube:
     return udf_data
 
 
+def apply_metadata(metadata: CollectionMetadata, context: dict) -> CollectionMetadata:
+    model_inference_class = "<model_inference_class>"
+
+    model_inference = model_inference_class()
+
+    return model_inference._apply_metadata(metadata, parameters=copy.deepcopy(context))
+
+
 def _get_imports() -> str:
     with open(__file__, "r", encoding="UTF-8") as f:
         script_source = f.read()
@@ -260,6 +280,13 @@ def _get_apply_udf_data(model_inference: ModelInference) -> str:
     return source.replace('"<model_inference_class>"', model_inference.__name__)
 
 
+def _get_apply_metadata(model_inference: ModelInference) -> str:
+    source_lines = inspect.getsource(apply_metadata)
+    source = "".join(source_lines)
+    # replace in the source function the `model_inference_class`
+    return source.replace('"<model_inference_class>"', model_inference.__name__)
+
+
 def _generate_udf_code(
     model_inference_class: ModelInference, dependencies: list
 ) -> openeo.UDF:
@@ -286,7 +313,9 @@ def _generate_udf_code(
     udf_code += _get_imports() + "\n\n"
     udf_code += f"{inspect.getsource(ModelInference)}\n\n"
     udf_code += f"{inspect.getsource(model_inference_class)}\n\n"
-    udf_code += _get_apply_udf_data(model_inference_class)
+    udf_code += f"{_get_apply_udf_data(model_inference_class)}\n\n"
+    udf_code += _get_apply_metadata(model_inference_class)
+
     return udf_code
 
 
@@ -304,15 +333,13 @@ def apply_model_inference(
     """
     model_inference = model_inference_class()
     model_inference._parameters = parameters
-    output_labels = model_inference.output_labels()
     dependencies = model_inference.dependencies()
 
     udf_code = _generate_udf_code(model_inference_class, dependencies)
 
     udf = openeo.UDF(code=udf_code, context=parameters)
 
-    cube = cube.apply_neighborhood(process=udf, size=size, overlap=overlap)
-    return cube.rename_labels(dimension="bands", target=output_labels)
+    return cube.apply_neighborhood(process=udf, size=size, overlap=overlap)
 
 
 def apply_model_inference_local(

{openeo_gfmap-0.4.4.dist-info → openeo_gfmap-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openeo_gfmap
-Version: 0.4.4
+Version: 0.4.5
 Summary: OpenEO General Framework for Mapping
 Project-URL: Homepage, https://github.com/Open-EO/openeo-gfmap
 Project-URL: Bug Tracker, https://github.com/Open-EO/openeo-gfmap/issues

{openeo_gfmap-0.4.4.dist-info → openeo_gfmap-0.4.5.dist-info}/RECORD

@@ -12,7 +12,7 @@ openeo_gfmap/fetching/generic.py,sha256=ojSO52cnLsWpC6FAnLRoXxfQmTiC839DzFH8MAok
 openeo_gfmap/fetching/s1.py,sha256=Ek9Ek-GExyKdb-9Ijja6I-izOmVvPY2C9w9gyyGGjII,6360
 openeo_gfmap/fetching/s2.py,sha256=ytjrZiZIwXxrdiky2V0bAKLBU9Dpaa5b2XsHvI6jl1M,7718
 openeo_gfmap/inference/__init__.py,sha256=M6NnKGYCpHNYmRL9OkHi5GmfCtWoJ0wCNR6VXRuDgjE,165
-openeo_gfmap/inference/model_inference.py,sha256=0qPUgrjI1hy5ZnyGwuuvvw5oxnMGdgvvu9Go6-e9LZQ,12550
+openeo_gfmap/inference/model_inference.py,sha256=aBxvjeqCJJATDx6zLYBAEASYs7nolIozOa01fI76Qvc,13511
 openeo_gfmap/manager/__init__.py,sha256=2bckkPiDQBgoBWD9spk1BKXy2UGkWKe50A3HmIwmqrA,795
 openeo_gfmap/manager/job_manager.py,sha256=-MZJBfF_wV94FejoYbFPNviEQx3jLmJXb6XLeHg7egE,27221
 openeo_gfmap/manager/job_splitters.py,sha256=kkGxgiudY3LrA40Ro_9q2eFW_Pjdm5a5VaNOXk2w5qo,10694
@@ -34,7 +34,7 @@ openeo_gfmap/utils/intervals.py,sha256=V6l3ofww50fN_pvWC4NuGQ2ZsyGdhAlTZTiRcC0fo
 openeo_gfmap/utils/netcdf.py,sha256=KkAAxnq-ZCMjDMd82638noYwxqNpMsnpiU04Q-qX26A,698
 openeo_gfmap/utils/split_stac.py,sha256=asjT0jx6ic8GJFqqAisaWxOvQ_suSRv4sxyFOyHFvpI,3895
 openeo_gfmap/utils/tile_processing.py,sha256=QZ9bi5tPmyTVyyNvFZgd26s5dSnMl1grTKq2veK1C90,2068
-openeo_gfmap-0.4.4.dist-info/METADATA,sha256=pdw_BlCH9bg9dOg40eabef7l_jjjSpQv7YUr2QqoqLk,4374
-openeo_gfmap-0.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-openeo_gfmap-0.4.4.dist-info/licenses/LICENSE,sha256=aUuGpjieWiscTNtyLcSaeVsJ4pb6J9c4wUq1bR0e4t4,11349
-openeo_gfmap-0.4.4.dist-info/RECORD,,
+openeo_gfmap-0.4.5.dist-info/METADATA,sha256=5jnfj1lXVeQDH5Kf8uXNzquF2r8f7pWFAQYQQi5NxNY,4374
+openeo_gfmap-0.4.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+openeo_gfmap-0.4.5.dist-info/licenses/LICENSE,sha256=aUuGpjieWiscTNtyLcSaeVsJ4pb6J9c4wUq1bR0e4t4,11349
+openeo_gfmap-0.4.5.dist-info/RECORD,,