code-loader 1.0.153.dev4__py3-none-any.whl → 1.0.154.dev0__py3-none-any.whl

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/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/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/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/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.dist-info → code_loader-1.0.154.dev0.dist-info}/METADATA

@@ -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.dist-info → code_loader-1.0.154.dev0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
 code_loader/__init__.py,sha256=outxRQ0M-zMfV0QGVJmAed5qWfRmyD0TV6-goEGAzBw,406
 code_loader/contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-code_loader/contract/datasetclasses.py,sha256=IyUwwvu1c53KfUeTiVOYN20ak7aCo-26HYhm5seO6v8,9799
-code_loader/contract/enums.py,sha256=GEFkvUMXnCNt-GOoz7NJ9ecQZ2PPDettJNOsxsiM0wk,1622
+code_loader/contract/datasetclasses.py,sha256=bo1EwOYfSs-mEOIsNawlUGbt5xWPWKeiEBWazCTC5FY,9715
+code_loader/contract/enums.py,sha256=W5N2oydZNf0ZKdV3JNwKpkNk9j3dyS2efQN21smZnpA,1696
 code_loader/contract/exceptions.py,sha256=jWqu5i7t-0IG0jGRsKF4DjJdrsdpJjIYpUkN1F4RiyQ,51
 code_loader/contract/mapping.py,sha256=sWJhpng-IkOzQnWQdMT5w2ZZ3X1Z_OOzSwCLXIS7oxE,1446
-code_loader/contract/responsedataclasses.py,sha256=6-5DJkYBdXb3UB1eNidTTPPBIYxMjEoMdYDkp9VhH8o,4223
+code_loader/contract/responsedataclasses.py,sha256=X-igBPOjUOG14-7FfvGyerRXaBIa_RjRC4_bYSN4XRc,4275
 code_loader/contract/visualizer_classes.py,sha256=Wz9eItmoRaKEHa3p0aW0Ypxx4_xUmaZyLBznnTuxwi0,15425
 code_loader/default_losses.py,sha256=NoOQym1106bDN5dcIk56Elr7ZG5quUHArqfP5-Nyxyo,1139
 code_loader/default_metrics.py,sha256=v16Mrt2Ze1tXPgfKywGVdRSrkaK4CKLNQztN1UdVqIY,5010
@@ -21,8 +21,8 @@ code_loader/experiment_api/utils.py,sha256=XZHtxge12TS4H4-8PjV3sKuhp8Ud6ojAiIzTZ
 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=Q3D9yVM-GNEJfYRFvMV__BoZbcWOgnWKhrZXAv6Tu7o,33232
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=aVMVjZjRmJy8-3_qyQ42RAcVfvajUZ-SupwcmNwhdaI,82000
-code_loader/leaploader.py,sha256=oxtlf7NhWuiUPeIwAO699JaD-mK_7fGM55okKLyKaJg,30582
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=1N_3Rdj-ICoj28RGYGGaFEoHPGg8xo4wlkIh2zkQg18,80846
+code_loader/leaploader.py,sha256=ZnZ6PxvUcTHAEIS89jFD8Bh1ME3OaURZNrPRqXwmss4,30689
 code_loader/leaploaderbase.py,sha256=NXCDIIF7-ziGJccKIE9NszMSYKEE-3bn4Z4Xa3oYYOc,5909
 code_loader/mixpanel_tracker.py,sha256=eKvymkw7X2Ht6iw-a0V9VQm6OnB9kW7hYy35YtwRAvU,8457
 code_loader/plot_functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -31,7 +31,7 @@ code_loader/plot_functions/visualize.py,sha256=gsBAYYkwMh7jIpJeDMPS8G4CW-pxwx6Lz
 code_loader/utils.py,sha256=gXENTYpjdidq2dx0gVbXlErPeHoNs-4TYAZbLRe0y2c,2712
 code_loader/visualizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_loader/visualizers/default_visualizers.py,sha256=onRnLE_TXfgLN4o52hQIOOhUcFexGlqJ3xSpQDVLuZM,2604
-code_loader-1.0.153.dev4.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.153.dev4.dist-info/METADATA,sha256=B4nPV_w3AFdba4SVtC-d03HSfaw_-MobZquctbpytbM,1095
-code_loader-1.0.153.dev4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-code_loader-1.0.153.dev4.dist-info/RECORD,,
+code_loader-1.0.154.dev0.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.154.dev0.dist-info/METADATA,sha256=YEhD5TdWlWQIzz32A-UJC3AjDeeSQdjC7I4P5FCz7z8,1095
+code_loader-1.0.154.dev0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+code_loader-1.0.154.dev0.dist-info/RECORD,,