code-loader 1.0.87a0__tar.gz → 1.0.87a2__tar.gz

{code_loader-1.0.87a0 → code_loader-1.0.87a2}/PKG-INFO

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

{code_loader-1.0.87a0 → code_loader-1.0.87a2}/code_loader/inner_leap_binder/leapbinder.py

@@ -16,7 +16,7 @@ from code_loader.contract.responsedataclasses import DatasetTestResultPayload
 from code_loader.contract.visualizer_classes import map_leap_data_type_to_visualizer_class
 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
+from code_loader.utils import to_numpy_return_wrapper, get_shape, flatten
 from code_loader.visualizers.default_visualizers import DefaultVisualizer, \
     default_graph_visualizer, \
     default_image_visualizer, default_horizontal_bar_visualizer, default_word_visualizer, \
@@ -353,7 +353,8 @@ class LeapBinder:
         self._encoder_names.append(name)
 
     def set_metadata(self, function: MetadataSectionCallableInterface, name: str,
-                     metadata_type: Optional[Union[DatasetMetadataType, Dict[str, DatasetMetadataType]]] = None) -> None:
+                     metadata_type: Optional[
+                         Union[DatasetMetadataType, Dict[str, DatasetMetadataType]]] = None) -> None:
         """
         Set the metadata handler function. This function is used for measuring and analyzing external variable values per sample, which is recommended for analysis within the Tensorleap platform.
 
@@ -490,39 +491,41 @@ class LeapBinder:
     @staticmethod
     def check_handler(
             preprocess_response: PreprocessResponse, test_result: List[DatasetTestResultPayload],
-            dataset_base_handler: Union[DatasetBaseHandler, MetadataHandler], state: DataStateEnum) -> List[DatasetTestResultPayload]:
+            dataset_base_handler: Union[DatasetBaseHandler, MetadataHandler], state: DataStateEnum) -> List[
+        DatasetTestResultPayload]:
         assert preprocess_response.sample_ids is not None
         raw_result = dataset_base_handler.function(preprocess_response.sample_ids[0], preprocess_response)
         handler_type = 'metadata' if isinstance(dataset_base_handler, MetadataHandler) else None
         if isinstance(dataset_base_handler, MetadataHandler):
             if isinstance(raw_result, dict):
-                metadata_test_result_payloads = [
-                    DatasetTestResultPayload(f'{dataset_base_handler.name}_{single_metadata_name}')
-                    for single_metadata_name, single_metadata_result in raw_result.items()
-                ]
-                for i, (single_metadata_name, single_metadata_result) in enumerate(raw_result.items()):
-                    metadata_test_result = metadata_test_result_payloads[i]
+                metadata_test_result_payloads = []
+                for i, (flat_name, flat_result) in enumerate(flatten(raw_result, prefix=dataset_base_handler.name)):
+                    result_payload = DatasetTestResultPayload(flat_name)
 
                     metadata_type = None
-                    if single_metadata_result is None:
-                        if state != DataStateEnum.training and test_result[i].name == f'{dataset_base_handler.name}_{single_metadata_name}':
-                            metadata_test_result_payloads[i] = test_result[i]
+                    if flat_result is None:
+                        if state != DataStateEnum.training and test_result[i].name == flat_name:
+                            result_payload = test_result[i]
+                            metadata_test_result_payloads.append(result_payload)
                             continue
 
                         if dataset_base_handler.metadata_type is None:
-                            raise Exception(f"Metadata {single_metadata_name} is None and no metadata type is provided")
+                            raise Exception(f"Metadata {flat_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")
-                            metadata_type = dataset_base_handler.metadata_type[single_metadata_name]
+                            if flat_name not in dataset_base_handler.metadata_type:
+                                raise Exception(
+                                    f"Metadata {flat_name} is None and was not found in the provided metadata type")
+                            metadata_type = dataset_base_handler.metadata_type[flat_name]
                         else:
-                            raise Exception(f"Metadata {single_metadata_name} is None and no metadata type is provided")
+                            raise Exception(f"Metadata {flat_name} is None and was not found in the provided metadata "
+                                            f"type, metadata_type: {dataset_base_handler.metadata_type}")
+
+                    result_shape = get_shape(flat_result)
+                    result_payload.shape = result_shape
+                    result_payload.raw_result = flat_result if flat_result is not None else metadata_type
+                    result_payload.handler_type = handler_type
+                    metadata_test_result_payloads.append(result_payload)
 
-                    result_shape = get_shape(single_metadata_result)
-                    metadata_test_result.shape = result_shape
-                    metadata_test_result.raw_result = (
-                        single_metadata_result) if single_metadata_result is not None else metadata_type
-                    metadata_test_result.handler_type = handler_type
                 test_result = metadata_test_result_payloads
             else:
                 if raw_result is None:
@@ -530,9 +533,11 @@ class LeapBinder:
                         return test_result
 
                     if dataset_base_handler.metadata_type is None:
-                        raise Exception(f"Metadata {dataset_base_handler.name} is None and no metadata type is provided")
+                        raise Exception(
+                            f"Metadata {dataset_base_handler.name} is None and no metadata type is provided")
                     elif isinstance(dataset_base_handler.metadata_type, dict):
-                        raise Exception(f"Metadata {dataset_base_handler.name} is None and no metadata type is provided")
+                        raise Exception(
+                            f"Metadata {dataset_base_handler.name} is None and no metadata type is provided")
                     metadata_type = dataset_base_handler.metadata_type
 
                 result_shape = get_shape(raw_result)

{code_loader-1.0.87a0 → code_loader-1.0.87a2}/code_loader/leaploader.py

@@ -447,6 +447,10 @@ class LeapLoader(LeapLoaderBase):
 
     def _convert_metadata_to_correct_type(self, metadata_name: str, value: Any) -> Tuple[Any, bool]:
         metadata_name_to_type = self._metadata_name_to_type()
+        if metadata_name not in metadata_name_to_type:
+            raise Exception(f"metadata {metadata_name} not found in metadata type map, "
+                            f"metadata_name_to_type:{metadata_name_to_type}")
+
         metadata_type_to_python_type = {
             DatasetMetadataType.float: float,
             DatasetMetadataType.string: str,

{code_loader-1.0.87a0 → code_loader-1.0.87a2}/pyproject.toml

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