code-loader 1.0.153.dev4__tar.gz → 1.0.154.dev0__tar.gz

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.153.dev4
+Version: 1.0.154.dev0
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/code_loader/contract/datasetclasses.py

@@ -82,8 +82,6 @@ class PreprocessResponse:
 class ElementInstance:
     name: str
     mask: npt.NDArray[np.float32]
-    instance_metadata: Dict[str, Union[Optional[str], int, bool, Optional[float]]]
-
 
 SectionCallableInterface = Callable[[Union[int, str], PreprocessResponse], npt.NDArray[np.float32]]
 InstanceCallableInterface = Callable[[Union[int, str], PreprocessResponse, int], Optional[ElementInstance]]

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/code_loader/contract/enums.py

@@ -46,7 +46,8 @@ class DataStateType(Enum):
     training = "training"
     validation = "validation"
     test = "test"
-    unlabeled = "unlabeled"
+    unlabeled = "unlabeled",
+    additional_labeled = "additional_labeled"
 
 
 class DataStateEnum(IntEnum):
@@ -54,6 +55,7 @@ class DataStateEnum(IntEnum):
     validation = 1
     test = 2
     unlabeled = 3
+    additional_labeled = 4
 
 
 class ConfusionMatrixValue(Enum):

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/code_loader/contract/responsedataclasses.py

@@ -11,6 +11,7 @@ class DatasetPreprocess:
     validation_length: int
     test_length: Optional[int] = None
     unlabeled_length: Optional[int] = None
+    additional_labeled_length: Optional[int] = None
 
 
 @dataclass

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -1063,7 +1063,7 @@ def tensorleap_preprocess():
 
 
 def tensorleap_element_instance_preprocess(
-        instance_length_encoder: InstanceLengthCallableInterface, instance_mask_encoder: InstanceCallableInterface):
+        instance_length_encoder: InstanceLengthCallableInterface):
     def decorating_function(user_function: Callable[[], List[PreprocessResponse]]):
         def user_function_instance() -> List[PreprocessResponse]:
             result = user_function()
@@ -1085,33 +1085,11 @@ def tensorleap_element_instance_preprocess(
                 preprocess_response.sample_ids = all_sample_ids
             return result
 
-        def extract_extra_instance_metadata():
-            result = user_function()
-            for preprocess_response in result:
-                for sample_id in preprocess_response.sample_ids:
-                    instances_length = instance_length_encoder(sample_id, preprocess_response)
-                    if instances_length > 0:
-                        element_instance = instance_mask_encoder(sample_id, preprocess_response, 0)
-                        instance_metadata = element_instance.instance_metadata
-                        if instance_metadata is None:
-                            return {}
-                        return instance_metadata
-            return {}
-
-
         def builtin_instance_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
             return {'is_instance': '0', 'original_sample_id': idx, 'instance_name': 'none'}
 
-        def builtin_instance_extra_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
-            instance_metadata = extract_extra_instance_metadata()
-            for key, value in instance_metadata.items():
-                instance_metadata[key] = 'unset'
-            return instance_metadata
-
         leap_binder.set_preprocess(user_function_instance)
         leap_binder.set_metadata(builtin_instance_metadata, "builtin_instance_metadata")
-        leap_binder.set_metadata(builtin_instance_extra_metadata, "builtin_instance_extra_metadata")
-
 
         def _validate_input_args(*args, **kwargs):
             assert len(args) == 0 and len(kwargs) == 0, \
@@ -1226,7 +1204,7 @@ def tensorleap_instances_masks_encoder(name: str):
 def tensorleap_instances_length_encoder(name: str):
     def decorating_function(user_function: InstanceLengthCallableInterface):
         def _validate_input_args(sample_id: str, preprocess_response: PreprocessResponse):
-            assert isinstance(sample_id, (str, int)), \
+            assert isinstance(sample_id, str), \
                 (f'tensorleap_instances_length_encoder validation failed: '
                  f'Argument sample_id should be str. Got {type(sample_id)}.')
             assert isinstance(preprocess_response, PreprocessResponse), \

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/code_loader/leaploader.py

@@ -357,7 +357,8 @@ class LeapLoader(LeapLoaderBase):
             training_length=setup.preprocess.data_length.get(DataStateType.training, 0),
             validation_length=setup.preprocess.data_length.get(DataStateType.validation, 0),
             test_length=setup.preprocess.data_length.get(DataStateType.test),
-            unlabeled_length=unlabeled_length
+            unlabeled_length=unlabeled_length,
+            additional_labeled_length=setup.preprocess.data_length.get(DataStateType.additional_labeled),
         )
 
         inputs = []

{code_loader-1.0.153.dev4 → code_loader-1.0.154.dev0}/pyproject.toml

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