code-loader 1.0.94.dev9__tar.gz → 1.0.94.dev11__tar.gz

{code_loader-1.0.94.dev9 → code_loader-1.0.94.dev11}/PKG-INFO

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

{code_loader-1.0.94.dev9 → code_loader-1.0.94.dev11}/code_loader/contract/datasetclasses.py

@@ -40,7 +40,7 @@ class PreprocessResponse:
     sample_id_type: Optional[Union[Type[str], Type[int]]] = None
     sample_ids_to_instance_mappings: Optional[Dict[str, List[str]]] = None # in use only for element instance
     instance_to_sample_ids_mappings: Optional[Dict[str, str]] = None # in use only for element instance
-    instance_id_to_instance_name: Optional[Dict[str, str]] = None # in use only for element instance
+
 
     def __post_init__(self) -> None:
         def is_valid_string(s: str) -> bool:
@@ -48,7 +48,6 @@ class PreprocessResponse:
 
         assert self.sample_ids_to_instance_mappings is None, f"Keep sample_ids_to_instance_mappings None when initializing PreprocessResponse"
         assert self.instance_to_sample_ids_mappings is None, f"Keep instance_to_sample_ids_mappings None when initializing PreprocessResponse"
-        assert self.instance_id_to_instance_name is None, f"Keep instance_id_to_instance_name None when initializing PreprocessResponse"
 
         if self.length is not None and self.sample_ids is None:
             self.sample_ids = [i for i in range(self.length)]

{code_loader-1.0.94.dev9 → code_loader-1.0.94.dev11}/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, InstanceCallableInterface, ElementInstance
+    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
@@ -270,42 +270,31 @@ def tensorleap_preprocess():
 
     return decorating_function
 
-def tensorleap_element_instance_preprocess(instance_mask_encoder: Callable[[int, PreprocessResponse], List[ElementInstance]]):
+def tensorleap_element_instance_preprocess(instance_mask_encoder: Callable[[str, PreprocessResponse], List[PreprocessResponse]]):
     def decorating_function(user_function: Callable[[], List[PreprocessResponse]]):
         def user_function_instance() -> List[PreprocessResponse]:
             result = user_function()
             for preprocess_response in result:
                 sample_ids_to_instance_mappings = {}
                 instance_to_sample_ids_mappings = {}
-                instance_id_to_instance_name = {}
                 all_sample_ids = preprocess_response.sample_ids.copy()
                 for sample_id in preprocess_response.sample_ids:
                     instances_masks = instance_mask_encoder(sample_id, preprocess_response)
-                    instance_names = [instance.name for instance in 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
-                    instance_id_to_instance_name[sample_id] = None
-                    for instance_id, instance_name in zip(instances_ids, instance_names):
+                    for instance_id in instances_ids:
                         instance_to_sample_ids_mappings[instance_id] = sample_id
-                        instance_id_to_instance_name[instance_id] = instance_name
                     all_sample_ids.extend(instances_ids)
                 preprocess_response.sample_ids_to_instance_mappings = sample_ids_to_instance_mappings
                 preprocess_response.instance_to_sample_ids_mappings = instance_to_sample_ids_mappings
-                preprocess_response.instance_id_to_instance_name = instance_id_to_instance_name
                 preprocess_response.sample_ids = all_sample_ids
             return result
 
         def metadata_is_instance(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
-            # return {'is_instance': '0',
-            #         'orig_sample_id': preprocess.instance_to_sample_ids_mappings[idx],
-            #         'instance_name': preprocess.instance_id_to_instance_name[idx]}
-            # return '0'
-            return {'is_instance': '0',
-                    'original_sample_id': idx,
-                    'instance_name': 'none'}
+            return '0'
         leap_binder.set_preprocess(user_function_instance)
-        leap_binder.set_metadata(metadata_is_instance, "builtin_instance_metadata")
+        leap_binder.set_metadata(metadata_is_instance, "metadata_is_instance")
 
         def _validate_input_args(*args, **kwargs):
             assert len(args) == 0 and len(kwargs) == 0, \

{code_loader-1.0.94.dev9 → code_loader-1.0.94.dev11}/code_loader/leaploader.py

@@ -533,7 +533,7 @@ class LeapLoader(LeapLoaderBase):
 
         return id_type
 
-    def get_instances_data(self, state: DataStateEnum) -> Tuple[Dict[str, List[str]], Dict[str, str], Dict[str, 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.
@@ -546,4 +546,4 @@ class LeapLoader(LeapLoaderBase):
         """
         preprocess_result = self._preprocess_result()
         preprocess_state = preprocess_result[state]
-        return preprocess_state.sample_ids_to_instance_mappings, preprocess_state.instance_to_sample_ids_mappings, preprocess_state.instance_id_to_instance_name
+        return preprocess_state.sample_ids_to_instance_mappings, preprocess_state.instance_to_sample_ids_mappings, preprocess_state.sample_ids

{code_loader-1.0.94.dev9 → code_loader-1.0.94.dev11}/pyproject.toml

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