code-loader 1.0.157.dev11__tar.gz → 1.0.157.dev12__tar.gz

{code_loader-1.0.157.dev11 → code_loader-1.0.157.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.157.dev11
+Version: 1.0.157.dev12
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT

{code_loader-1.0.157.dev11 → code_loader-1.0.157.dev12}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -11,6 +11,8 @@ from typing import Optional, Union, Callable, List, Dict, get_args, get_origin,
 import numpy as np
 import numpy.typing as npt
 
+from code_loader.utils import get_metadata_type_from_variable
+
 logger = logging.getLogger(__name__)
 
 from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs, \
@@ -19,7 +21,7 @@ from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs
     ConfusionMatrixElement, SamplePreprocessResponse, PredictionTypeHandler, InstanceCallableInterface, ElementInstance, \
     InstanceLengthCallableInterface
 from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMetadataType, DataStateType
-from code_loader import leap_binder
+from code_loader import leap_binder, LeapLoader
 from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConnection
 from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, LeapTextMask, LeapText, LeapGraph, \
     LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap
@@ -1085,6 +1087,12 @@ def tensorleap_element_instance_preprocess(
                 preprocess_response.sample_ids = all_sample_ids
             return result
 
+        def map_dict_to_metadata_types(data: dict) -> dict:
+            return {
+                k: get_metadata_type_from_variable(v)
+                for k, v in data.items()
+            }
+
         def extract_extra_instance_metadata():
             result = user_function()
             for preprocess_response in result:
@@ -1094,24 +1102,24 @@ def tensorleap_element_instance_preprocess(
                         element_instance = instance_mask_encoder(sample_id, preprocess_response, instance_id)
                         instance_metadata = element_instance.instance_metadata
                         if instance_metadata is None:
-                            return {}
+                            return {}, None
                         if instance_metadata is not None and all(value is not None for value in instance_metadata.values()):
-                            return instance_metadata
-            return {}
-
+                            return instance_metadata, map_dict_to_metadata_types(instance_metadata)
+            return {}, None
 
         def builtin_instance_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
             return {'is_instance': '0', 'original_sample_id': idx, 'instance_name': 'none'}
 
-        def builtin_instance_extra_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
-            instance_metadata = extract_extra_instance_metadata()
-            # for key, value in instance_metadata.items():
-            #     instance_metadata[key] = Nonew
-            return instance_metadata
-
         leap_binder.set_preprocess(user_function_instance)
         leap_binder.set_metadata(builtin_instance_metadata, "builtin_instance_metadata")
-        leap_binder.set_metadata(builtin_instance_extra_metadata, "builtin_instance_extra_metadata")
+
+        instance_metadata, instance_metadata_types = extract_extra_instance_metadata()
+        def builtin_instance_extra_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
+            for key, value in instance_metadata.items():
+                instance_metadata[key] = None
+            return instance_metadata
+        if instance_metadata_types is not None:
+            leap_binder.set_metadata(builtin_instance_extra_metadata, "builtin_instance_extra_metadata", instance_metadata_types)
 
         def _validate_input_args(*args, **kwargs):
             assert len(args) == 0 and len(kwargs) == 0, \

{code_loader-1.0.157.dev11 → code_loader-1.0.157.dev12}/code_loader/leaploader.py

@@ -28,7 +28,6 @@ from code_loader.inner_leap_binder.leapbinder import mapping_runtime_mode_env_va
 from code_loader.leaploaderbase import LeapLoaderBase
 from code_loader.utils import get_root_exception_file_and_line_number
 
-
 class LeapLoader(LeapLoaderBase):
     def __init__(self, code_path: str, code_entry_name: str):
         super().__init__(code_path, code_entry_name)

{code_loader-1.0.157.dev11 → code_loader-1.0.157.dev12}/code_loader/utils.py

@@ -8,6 +8,7 @@ import numpy.typing as npt
 
 from code_loader.contract.datasetclasses import SectionCallableInterface, PreprocessResponse, \
     InstanceCallableInterface, ElementInstance
+from code_loader.contract.enums import DatasetMetadataType
 
 
 def to_numpy_return_wrapper(encoder_function: SectionCallableInterface) -> SectionCallableInterface:
@@ -75,4 +76,19 @@ def rescale_min_max(image: npt.NDArray[np.float32]) -> npt.NDArray[np.float32]:
 
     return image
 
+def get_metadata_type_from_variable(variable):
+    metadata_type = type(variable)
+    if metadata_type == int or isinstance(variable,
+                                          (np.unsignedinteger, np.signedinteger)):
+        metadata_type = float
+    if isinstance(variable, str):
+        dataset_metadata_type = DatasetMetadataType.string
+    elif metadata_type == bool or isinstance(variable, np.bool_):
+        dataset_metadata_type = DatasetMetadataType.boolean
+    elif metadata_type == float or isinstance(variable, np.floating):
+        dataset_metadata_type = DatasetMetadataType.float
+    else:
+        raise Exception(f"Unsupported return type of metadata {variable}."
+                        f"The return type should be one of [int, float, str, bool]. Got {metadata_type}")
+    return dataset_metadata_type
 

{code_loader-1.0.157.dev11 → code_loader-1.0.157.dev12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "code-loader"
-version = "1.0.157.dev11"
+version = "1.0.157.dev12"
 description = ""
 authors = ["dorhar <doron.harnoy@tensorleap.ai>"]
 license = "MIT"