code-loader 1.0.158.dev0__tar.gz → 1.0.158.dev30__tar.gz

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/PKG-INFO

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

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/code_loader/contract/datasetclasses.py

@@ -82,7 +82,7 @@ class PreprocessResponse:
 class ElementInstance:
     name: str
     mask: npt.NDArray[np.float32]
-    instance_metadata: Dict[str, Union[Optional[str], int, bool, Optional[float]]] = None
+    instance_metadata: Optional[Dict[str, Union[Optional[str], int, bool, Optional[float]]]] = None
 
 SectionCallableInterface = Callable[[Union[int, str], PreprocessResponse], npt.NDArray[np.float32]]
 InstanceCallableInterface = Callable[[Union[int, str], PreprocessResponse, int], Optional[ElementInstance]]

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/code_loader/contract/enums.py

@@ -46,7 +46,7 @@ class DataStateType(Enum):
     training = "training"
     validation = "validation"
     test = "test"
-    unlabeled = "unlabeled",
+    unlabeled = "unlabeled"
     additional = "additional"
 
 

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/code_loader/inner_leap_binder/leapbinder.py

@@ -19,7 +19,7 @@ from code_loader.contract.visualizer_classes import map_leap_data_type_to_visual
 from code_loader.default_losses import loss_name_to_function
 from code_loader.default_metrics import metrics_names_to_functions_and_direction
 from code_loader.utils import to_numpy_return_wrapper, get_shape, to_numpy_return_masks_wrapper, \
-    get_metadata_type_from_variable
+    get_metadata_type_from_variable, map_dict_to_metadata_types
 from code_loader.visualizers.default_visualizers import DefaultVisualizer, \
     default_graph_visualizer, \
     default_image_visualizer, default_horizontal_bar_visualizer, default_word_visualizer, \
@@ -560,11 +560,7 @@ class LeapBinder:
                             continue
 
                         if dataset_base_handler.metadata_type is None:
-                            try:
-                                metadata_type_dict = get_metadata_type_from_variable(raw_result)
-                                dataset_base_handler.metadata_type = metadata_type_dict
-                            except:
-                                raise Exception(f"Metadata {single_metadata_name} is None and no metadata type is provided")
+                            raise Exception(f"Metadata {single_metadata_name} is None and no metadata type is provided")
                         elif isinstance(dataset_base_handler.metadata_type, dict):
                             if single_metadata_name not in dataset_base_handler.metadata_type:
                                 raise Exception(f"Metadata {single_metadata_name} is None and no metadata type is provided")

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/code_loader/leaploader.py

@@ -26,7 +26,8 @@ from code_loader.contract.responsedataclasses import DatasetIntegParseResult, Da
 from code_loader.inner_leap_binder import global_leap_binder
 from code_loader.inner_leap_binder.leapbinder import mapping_runtime_mode_env_var_mame
 from code_loader.leaploaderbase import LeapLoaderBase
-from code_loader.utils import get_root_exception_file_and_line_number
+from code_loader.utils import get_root_exception_file_and_line_number, get_metadata_type_from_variable
+
 
 class LeapLoader(LeapLoaderBase):
     def __init__(self, code_path: str, code_entry_name: str):
@@ -384,19 +385,8 @@ class LeapLoader(LeapLoaderBase):
                 metadata_instances.append(DatasetMetadataInstance(name=handler_test_payload.name,
                                                                   type=dataset_metadata_type))
                 continue
-            metadata_type = type(handler_test_payload.raw_result)
-            if metadata_type == int or isinstance(handler_test_payload.raw_result,
-                                                  (np.unsignedinteger, np.signedinteger)):
-                metadata_type = float
-            if isinstance(handler_test_payload.raw_result, str):
-                dataset_metadata_type = DatasetMetadataType.string
-            elif metadata_type == bool or isinstance(handler_test_payload.raw_result, np.bool_):
-                dataset_metadata_type = DatasetMetadataType.boolean
-            elif metadata_type == float or isinstance(handler_test_payload.raw_result, np.floating):
-                dataset_metadata_type = DatasetMetadataType.float
-            else:
-                raise Exception(f"Unsupported return type of metadata {handler_test_payload.name}."
-                                f"The return type should be one of [int, float, str, bool]. Got {metadata_type}")
+
+            dataset_metadata_type = get_metadata_type_from_variable(handler_test_payload.raw_result)
             metadata_instances.append(DatasetMetadataInstance(name=handler_test_payload.name,
                                                               type=dataset_metadata_type))
 

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/code_loader/utils.py

@@ -1,7 +1,7 @@
 import sys
 from pathlib import Path
 from types import TracebackType
-from typing import List, Union, Tuple, Any, Callable
+from typing import List, Union, Tuple, Any, Callable, Dict, Optional
 import traceback
 import numpy as np
 import numpy.typing as npt
@@ -77,13 +77,15 @@ def rescale_min_max(image: npt.NDArray[np.float32]) -> npt.NDArray[np.float32]:
     return image
 
 
-def map_dict_to_metadata_types(data: dict) -> dict:
+def map_dict_to_metadata_types(data: Optional[Dict[str, Union[Optional[str], int, bool, Optional[float]]]]) -> Optional[Dict[str, DatasetMetadataType]]:
+    if data is None:
+        return None
     return {
         k: get_metadata_type_from_variable(v)
         for k, v in data.items()
     }
 
-def get_metadata_type_from_variable(variable):
+def get_metadata_type_from_variable(variable: Union[Optional[str], int, bool, Optional[float]]) -> DatasetMetadataType:
     metadata_type = type(variable)
     if metadata_type == int or isinstance(variable,
                                           (np.unsignedinteger, np.signedinteger)):

{code_loader-1.0.158.dev0 → code_loader-1.0.158.dev30}/pyproject.toml

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