code-loader 1.0.91.dev6__tar.gz → 1.0.91.dev8__tar.gz

{code_loader-1.0.91.dev6 → code_loader-1.0.91.dev8}/PKG-INFO

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

{code_loader-1.0.91.dev6 → code_loader-1.0.91.dev8}/code_loader/contract/datasetclasses.py

@@ -39,7 +39,7 @@ class PreprocessResponse:
     state: Optional[DataStateType] = None
     sample_id_type: Optional[Union[Type[str], Type[int]]] = None
     sample_ids_to_instance_mappings: Optional[Dict[Union[str, int], Union[List[str], List[int]]]] = None # in use only for element instance
-    instance_to_sample_ids_mappings: Optional[Dict[Union[str, int], Union[List[str], List[int]]]] = None # in use only for element instance
+    instance_to_sample_ids_mappings: Optional[Dict[Union[str, int], Union[str, int]]] = None # in use only for element instance
 
 
     def __post_init__(self) -> None:
@@ -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.dev6 → code_loader-1.0.91.dev8}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -347,7 +347,7 @@ def tensorleap_unlabeled_preprocess():
     return decorating_function
 
 
-def tensorleap_instances_masks_encoder(name: str, model_input_index=None):
+def tensorleap_instances_masks_encoder(name: str):
     def decorating_function(user_function: InstanceCallableInterface):
         leap_binder.set_instance_masks(user_function, name)
 

{code_loader-1.0.91.dev6 → code_loader-1.0.91.dev8}/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)
 
@@ -521,7 +532,7 @@ class LeapLoader(LeapLoaderBase):
 
         return id_type
 
-    def get_instances_data(self, state: DataStateEnum) -> Tuple[Dict[Union[int, str], List[Union[int, str]]], Dict[Union[int, str], List[Union[int, str]]], List[Union[int, str]]]:
+    def get_instances_data(self, state: DataStateEnum) -> Tuple[Dict[Union[int, str], List[Union[int, str]]], Dict[Union[int, str], Union[int, str]], List[Union[int, str]]]:
         """
         This Method get the data state and returns two dictionaries that holds the mapping of the sample ids to their
          instances and the other way around and the sample ids array.

{code_loader-1.0.91.dev6 → code_loader-1.0.91.dev8}/pyproject.toml

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