code-loader 1.0.91.dev10__py3-none-any.whl → 1.0.91.dev12__py3-none-any.whl

code_loader/contract/datasetclasses.py

@@ -68,9 +68,13 @@ class PreprocessResponse:
         assert self.sample_ids is not None
         return len(self.sample_ids)
 
+@dataclass
+class ElementInstance:
+    name: str
+    mask: npt.NDArray[np.float32]
 
 SectionCallableInterface = Callable[[Union[int, str], PreprocessResponse], npt.NDArray[np.float32]]
-InstanceCallableInterface = Callable[[int, PreprocessResponse], List[npt.NDArray[np.float32]]]
+InstanceCallableInterface = Callable[[int, PreprocessResponse], List[ElementInstance]]
 
 MetadataSectionCallableInterface = Union[
     Callable[[Union[int, str], PreprocessResponse], int],
@@ -248,5 +252,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
+    instance_masks: Optional[Dict[str, List[ElementInstance]]] = None
 

code_loader/inner_leap_binder/leapbinder.py

@@ -258,7 +258,6 @@ class LeapBinder:
         function = to_numpy_return_masks_wrapper(function)
         self.setup_container.instance_masks.append(ElementInstanceMasksHandler(name, function))
 
-        self._encoder_names.append(name)
 
     def add_custom_loss(self, function: CustomCallableInterface, name: str) -> None:
         """

code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -279,9 +279,8 @@ def tensorleap_element_instance_preprocess(instance_mask_encoder: Callable[[int,
                 instance_to_sample_ids_mappings = {}
                 all_sample_ids = preprocess_response.sample_ids.copy()
                 for sample_id in preprocess_response.sample_ids:
-                    data_length = len(all_sample_ids)
                     instances_masks = instance_mask_encoder(sample_id, preprocess_response)
-                    instances_ids = list(range(data_length, data_length + len(instances_masks)))
+                    instances_ids = [f'{sample_id}_{instance_id}' for instance_id in range(len(instances_masks))]
                     sample_ids_to_instance_mappings[sample_id] = instances_ids
                     instance_to_sample_ids_mappings[sample_id] = sample_id
                     for instance_id in instances_ids:
@@ -294,6 +293,7 @@ def tensorleap_element_instance_preprocess(instance_mask_encoder: Callable[[int,
 
         leap_binder.set_preprocess(user_function_instance)
 
+
         def _validate_input_args(*args, **kwargs):
             assert len(args) == 0 and len(kwargs) == 0, \
                 (f'tensorleap_preprocess validation failed: '

code_loader/leaploader.py

@@ -14,7 +14,8 @@ import numpy.typing as npt
 from code_loader.contract.datasetclasses import DatasetSample, DatasetBaseHandler, GroundTruthHandler, \
     PreprocessResponse, VisualizerHandler, LeapData, \
     PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler, VisualizerHandlerData, MetricHandlerData, \
-    MetricCallableReturnType, CustomLossHandlerData, CustomLossHandler, RawInputsForHeatmap, SamplePreprocessResponse
+    MetricCallableReturnType, CustomLossHandlerData, CustomLossHandler, RawInputsForHeatmap, SamplePreprocessResponse, \
+    ElementInstance
 from code_loader.contract.enums import DataStateEnum, TestingSectionEnum, DataStateType, DatasetMetadataType
 from code_loader.contract.exceptions import DatasetScriptException
 from code_loader.contract.responsedataclasses import DatasetIntegParseResult, DatasetTestResultPayload, \
@@ -453,7 +454,7 @@ 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]]]:
+    def _get_masks(self, state: DataStateEnum, sample_id: Union[int, str]) -> Dict[str, List[ElementInstance]]:
         preprocess_result = self._preprocess_result()
         preprocess_state = preprocess_result[state]
         result_agg = {}

code_loader/utils.py

@@ -7,7 +7,7 @@ import numpy as np
 import numpy.typing as npt
 
 from code_loader.contract.datasetclasses import SectionCallableInterface, PreprocessResponse, \
-    InstanceCallableInterface
+    InstanceCallableInterface, ElementInstance
 
 
 def to_numpy_return_wrapper(encoder_function: SectionCallableInterface) -> SectionCallableInterface:
@@ -19,11 +19,12 @@ def to_numpy_return_wrapper(encoder_function: SectionCallableInterface) -> Secti
     return numpy_encoder_function
 
 def to_numpy_return_masks_wrapper(encoder_function: InstanceCallableInterface) -> Callable[
-    [Union[int, str], PreprocessResponse], List[npt.NDArray[np.float32]]]:
-    def numpy_encoder_function(idx: Union[int, str], samples: PreprocessResponse) -> List[npt.NDArray[np.float32]]:
+    [Union[int, str], PreprocessResponse], List[ElementInstance]]:
+    def numpy_encoder_function(idx: Union[int, str], samples: PreprocessResponse) -> List[ElementInstance]:
         result = encoder_function(idx, samples)
-        numpy_result: List[npt.NDArray[np.float32]] = [np.array(res) for res in result]
-        return numpy_result
+        for res in result:
+            res.mask = np.array(res.mask)
+        return result
     return numpy_encoder_function
 
 

{code_loader-1.0.91.dev10.dist-info → code_loader-1.0.91.dev12.dist-info}/METADATA

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

{code_loader-1.0.91.dev10.dist-info → code_loader-1.0.91.dev12.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
 code_loader/__init__.py,sha256=6MMWr0ObOU7hkqQKgOqp4Zp3I28L7joGC9iCbQYtAJg,241
 code_loader/contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-code_loader/contract/datasetclasses.py,sha256=-2qnoZVJShsbFV1RMqESHRc7Qrga4OoGRfVMJHhs2Zk,8591
+code_loader/contract/datasetclasses.py,sha256=RWXBIPE35N5dWpgvCYPym3t7h__-9JkUJ9Kj7v8vFr0,8657
 code_loader/contract/enums.py,sha256=GEFkvUMXnCNt-GOoz7NJ9ecQZ2PPDettJNOsxsiM0wk,1622
 code_loader/contract/exceptions.py,sha256=jWqu5i7t-0IG0jGRsKF4DjJdrsdpJjIYpUkN1F4RiyQ,51
 code_loader/contract/mapping.py,sha256=e11h_sprwOyE32PcqgRq9JvyahQrPzwqgkhmbQLKLQY,1165
@@ -20,14 +20,14 @@ code_loader/experiment_api/types.py,sha256=MY8xFARHwdVA7p4dxyhD60ShmttgTvb4qdp1o
 code_loader/experiment_api/utils.py,sha256=XZHtxge12TS4H4-8PjV3sKuhp8Ud6ojAiIzTZJEqBqc,3304
 code_loader/experiment_api/workingspace_config_utils.py,sha256=DLzXQCg4dgTV_YgaSbeTVzq-2ja_SQw4zi7LXwKL9cY,990
 code_loader/inner_leap_binder/__init__.py,sha256=koOlJyMNYzGbEsoIbXathSmQ-L38N_pEXH_HvL7beXU,99
-code_loader/inner_leap_binder/leapbinder.py,sha256=ETTvjFHq6VX1zgKqyyVP3nJLGyUBrfO1uGF89B7sTYo,32807
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=3T9sq9UmrRgfHuTJqJii0uyG6xd060cPKJ98TFFQcrc,28806
-code_loader/leaploader.py,sha256=30Bm9jIrTQPLnHIeL7XhNt1CkuyIWWqlInCWy9IKh38,28831
+code_loader/inner_leap_binder/leapbinder.py,sha256=eHnjPfJvYQDQsBM55sf63kI-NC2M-lOB4cwxjYHNTkk,32766
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=sHiGk9eNuHcobjO9LsF1p-NAo36ib3041nFKjX2s_K4,28770
+code_loader/leaploader.py,sha256=K532J4Z8YUjyBpTagJPff4PD0dkuwT9szgBbwBiWwwY,28846
 code_loader/leaploaderbase.py,sha256=tpMVEd97675b_var4hvesjN7EgQzoCbPEayNBut6AvI,4551
-code_loader/utils.py,sha256=lISPFgQETSXc-P9jsIDq8YhXiaT58sHX0bXMJ4Aavqg,2722
+code_loader/utils.py,sha256=_j8b60pimoNAvWMRj7hEkkT6C76qES6cZoBFHpXHMxA,2698
 code_loader/visualizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_loader/visualizers/default_visualizers.py,sha256=669lBpLISLO6my5Qcgn1FLDDeZgHumPf252m4KHY4YM,2555
-code_loader-1.0.91.dev10.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.91.dev10.dist-info/METADATA,sha256=eExap-3F9NM7hklwwESfU-pUuz_TukNT1inTiGTVJMM,855
-code_loader-1.0.91.dev10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-code_loader-1.0.91.dev10.dist-info/RECORD,,
+code_loader-1.0.91.dev12.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.91.dev12.dist-info/METADATA,sha256=wgzeIciS8KC6M_JTRAgwPEZU3rTAtTeyyWpEAMl4kZE,855
+code_loader-1.0.91.dev12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+code_loader-1.0.91.dev12.dist-info/RECORD,,