code-loader 1.0.77.dev1__tar.gz → 1.0.77.dev2__tar.gz

{code_loader-1.0.77.dev1 → code_loader-1.0.77.dev2}/PKG-INFO

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

{code_loader-1.0.77.dev1 → code_loader-1.0.77.dev2}/code_loader/inner_leap_binder/leapbinder.py

@@ -466,7 +466,7 @@ class LeapBinder:
     @staticmethod
     def check_handler(
             preprocess_response: PreprocessResponse, test_result: List[DatasetTestResultPayload],
-            dataset_base_handler: Union[DatasetBaseHandler, MetadataHandler]) -> 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
@@ -481,6 +481,10 @@ class LeapBinder:
 
                     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]
+                            continue
+
                         if dataset_base_handler.metadata_type is None:
                             raise Exception(f"Metadata {single_metadata_name} is None and no metadata type is provided")
                         elif isinstance(dataset_base_handler.metadata_type, dict):
@@ -498,6 +502,9 @@ class LeapBinder:
                 test_result = metadata_test_result_payloads
             else:
                 if raw_result is None:
+                    if state != DataStateEnum.training:
+                        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")
                     elif isinstance(dataset_base_handler.metadata_type, dict):

{code_loader-1.0.77.dev1 → code_loader-1.0.77.dev2}/code_loader/leaploader.py

@@ -210,7 +210,7 @@ class LeapLoader(LeapLoaderBase):
                 state_name = state.name
                 try:
                     test_result = global_leap_binder.check_handler(
-                        preprocess_response, test_result, dataset_base_handler)
+                        preprocess_response, test_result, dataset_base_handler, state)
                 except Exception as e:
                     line_number, file_name, stacktrace = get_root_exception_file_and_line_number()
                     test_result[0].display[
@@ -339,6 +339,11 @@ class LeapLoader(LeapLoaderBase):
                 continue
             if hasattr(handler_test_payload.raw_result, 'tolist'):
                 handler_test_payload.raw_result = handler_test_payload.raw_result.tolist()
+            if isinstance(handler_test_payload.raw_result, DatasetMetadataType):
+                dataset_metadata_type = handler_test_payload.raw_result
+                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)):
@@ -447,21 +452,22 @@ class LeapLoader(LeapLoaderBase):
             DatasetMetadataType.int: int
         }
         metadata_type_to_default_value = {
-            DatasetMetadataType.float: -1,
-            DatasetMetadataType.string: "",
-            DatasetMetadataType.boolean: False,
-            DatasetMetadataType.int: -1
+            DatasetMetadataType.float: np.nan,
+            DatasetMetadataType.string: 'None',
+            DatasetMetadataType.boolean: np.nan,
+            DatasetMetadataType.int: np.nan
         }
 
         try:
+            if value is None:
+                raise ValueError()
             converted_value = metadata_type_to_python_type[metadata_name_to_type[metadata_name]](value)
         except ValueError:
             converted_value = metadata_type_to_default_value[metadata_name_to_type[metadata_name]]
 
         return converted_value
 
-    def _get_metadata(self, state: DataStateEnum, sample_id: Union[int, str]) -> Dict[
-        str, Union[str, int, bool, float]]:
+    def _get_metadata(self, state: DataStateEnum, sample_id: Union[int, str]) -> Dict[str, Union[str, int, bool, float]]:
         result_agg = {}
         preprocess_result = self._preprocess_result()
         preprocess_state = preprocess_result[state]

{code_loader-1.0.77.dev1 → code_loader-1.0.77.dev2}/pyproject.toml

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