code-loader 1.0.91.dev5__tar.gz → 1.0.91.dev7__tar.gz

{code_loader-1.0.91.dev5 → code_loader-1.0.91.dev7}/PKG-INFO

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

{code_loader-1.0.91.dev5 → code_loader-1.0.91.dev7}/code_loader/contract/datasetclasses.py

@@ -248,3 +248,5 @@ class DatasetSample:
     metadata_is_none: Dict[str, bool]
     index: Union[int, str]
     state: DataStateEnum
+    instance_masks: Optional[Dict[str, List[npt.NDArray[np.float32]]]] = None
+

{code_loader-1.0.91.dev5 → code_loader-1.0.91.dev7}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -8,7 +8,7 @@ import numpy.typing as npt
 from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs, \
     CustomMultipleReturnCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, CustomCallableInterface, \
     VisualizerCallableInterface, MetadataSectionCallableInterface, PreprocessResponse, SectionCallableInterface, \
-    ConfusionMatrixElement, SamplePreprocessResponse
+    ConfusionMatrixElement, SamplePreprocessResponse, InstanceCallableInterface
 from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMetadataType
 from code_loader import leap_binder
 from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConnection
@@ -347,23 +347,30 @@ def tensorleap_unlabeled_preprocess():
     return decorating_function
 
 
-def tensorleap_instance_encoder():
-    def decorating_function(user_function: Callable[[], PreprocessResponse]):
-        leap_binder.set_unlabeled_data_preprocess(user_function)
+def tensorleap_instances_masks_encoder(name: str):
+    def decorating_function(user_function: InstanceCallableInterface):
+        leap_binder.set_instance_masks(user_function, name)
 
-        def _validate_input_args(*args, **kwargs):
-            assert len(args) == 0 and len(kwargs) == 0, \
-                (f'tensorleap_instance_encoder validation failed: '
-                 f'The function should not take any arguments. Got {args} and {kwargs}.')
+        def _validate_input_args(sample_id: Union[int, str], preprocess_response: PreprocessResponse):
+            assert isinstance(sample_id, (int, str)), \
+                (f'tensorleap_input_encoder validation failed: '
+                 f'Argument sample_id should be either int or str. Got {type(sample_id)}.')
+            assert isinstance(preprocess_response, PreprocessResponse), \
+                (f'tensorleap_input_encoder validation failed: '
+                 f'Argument preprocess_response should be a PreprocessResponse. Got {type(preprocess_response)}.')
+            assert type(sample_id) == preprocess_response.sample_id_type, \
+                (f'tensorleap_input_encoder validation failed: '
+                 f'Argument sample_id should be as the same type as defined in the preprocess response '
+                 f'{preprocess_response.sample_id_type}. Got {type(sample_id)}.')
 
         def _validate_result(result):
-            assert isinstance(result, PreprocessResponse), \
-                (f'tensorleap_instance_encoder validation failed: '
-                 f'The return type should be a PreprocessResponse. Got {type(result)}.')
+            assert isinstance(result, list), \
+                (f'tensorleap_input_encoder validation failed: '
+                 f'Unsupported return type. Should be a numpy array. Got {type(result)}.')
 
-        def inner(*args, **kwargs):
-            _validate_input_args(*args, **kwargs)
-            result = user_function()
+        def inner(sample_id, preprocess_response):
+            _validate_input_args(sample_id, preprocess_response)
+            result = user_function(sample_id, preprocess_response)
             _validate_result(result)
             return result
 

{code_loader-1.0.91.dev5 → code_loader-1.0.91.dev7}/code_loader/leaploader.py

@@ -150,7 +150,7 @@ class LeapLoader(LeapLoaderBase):
                                state=state)
         return sample
 
-    def get_sample_masks(self, state: DataStateEnum, sample_id: Union[int, str]) -> List[DatasetSample]:
+    def get_sample_with_masks(self, state: DataStateEnum, sample_id: Union[int, str]) -> DatasetSample:
         self.exec_script()
         preprocess_result = self._preprocess_result()
         if state == DataStateEnum.unlabeled and sample_id not in preprocess_result[state].sample_ids:
@@ -162,7 +162,8 @@ class LeapLoader(LeapLoaderBase):
                                metadata=metadata,
                                metadata_is_none=metadata_is_none,
                                index=sample_id,
-                               state=state)
+                               state=state,
+                               instance_masks=self._get_masks(state, sample_id))
         return sample
 
     def check_dataset(self) -> DatasetIntegParseResult:
@@ -452,6 +453,16 @@ class LeapLoader(LeapLoaderBase):
     def _get_inputs(self, state: DataStateEnum, sample_id: Union[int, str]) -> Dict[str, npt.NDArray[np.float32]]:
         return self._get_dataset_handlers(global_leap_binder.setup_container.inputs, state, sample_id)
 
+    def _get_masks(self, state: DataStateEnum, sample_id: Union[int, str]) -> Dict[str, List[npt.NDArray[np.float32]]]:
+        preprocess_result = self._preprocess_result()
+        preprocess_state = preprocess_result[state]
+        result_agg = {}
+        for handler in global_leap_binder.setup_container.instance_masks:
+            handler_result = handler.function(sample_id, preprocess_state)
+            handler_name = handler.name
+            result_agg[handler_name] = handler_result
+        return result_agg
+
     def _get_gt(self, state: DataStateEnum, sample_id: Union[int, str]) -> Dict[str, npt.NDArray[np.float32]]:
         return self._get_dataset_handlers(global_leap_binder.setup_container.ground_truths, state, sample_id)
 

{code_loader-1.0.91.dev5 → code_loader-1.0.91.dev7}/code_loader/utils.py

@@ -5,8 +5,6 @@ from typing import List, Union, Tuple, Any, Callable
 import traceback
 import numpy as np
 import numpy.typing as npt
-from numpy import ndarray, dtype, floating
-from numpy._typing import _32Bit
 
 from code_loader.contract.datasetclasses import SectionCallableInterface, PreprocessResponse, \
     InstanceCallableInterface

{code_loader-1.0.91.dev5 → code_loader-1.0.91.dev7}/pyproject.toml

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