code-loader 1.0.106__tar.gz → 1.0.108__tar.gz

{code_loader-1.0.106 → code_loader-1.0.108}/PKG-INFO

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

{code_loader-1.0.106 → code_loader-1.0.108}/code_loader/contract/datasetclasses.py

@@ -43,9 +43,6 @@ class PreprocessResponse:
     instance_ids_to_names: Optional[Dict[str, str]] = None # in use only for element instance
 
     def __post_init__(self) -> None:
-        def is_valid_string(s: str) -> bool:
-            return bool(re.match(r'^[A-Za-z0-9_]+$', s))
-
         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_ids_to_names is None, f"Keep instance_ids_to_names None when initializing PreprocessResponse"
@@ -60,8 +57,6 @@ class PreprocessResponse:
             if self.sample_id_type == str:
                 for sample_id in self.sample_ids:
                     assert isinstance(sample_id, str), f"Sample id should be of type str. Got: {type(sample_id)}"
-                    if not is_valid_string(sample_id):
-                        raise Exception(f"Sample id should contain only letters (A-Z, a-z), numbers or '_'. Got: {sample_id}")
         else:
             raise Exception("length is deprecated.")
 

{code_loader-1.0.106 → code_loader-1.0.108}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -152,12 +152,6 @@ def tensorleap_custom_metric(name: str,
                 raise Exception(f'Metric with name {name} already exists. '
                                 f'Please choose another')
 
-        leap_binder.add_custom_metric(user_function, name, direction, compute_insights)
-
-        if connects_to is not None:
-            arg_names = leap_binder.setup_container.metrics[-1].metric_handler_data.arg_names
-            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Metric, name)
-
         def _validate_input_args(*args, **kwargs) -> None:
             for i, arg in enumerate(args):
                 assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
@@ -233,9 +227,7 @@ def tensorleap_custom_metric(name: str,
                         (f'tensorleap_custom_metric validation failed: '
                          f'compute_insights should be boolean. Got {type(compute_insights)}.')
 
-        def inner(*args, **kwargs):
-            _validate_input_args(*args, **kwargs)
-
+        def inner_without_validate(*args, **kwargs):
             global _called_from_inside_tl_decorator
             _called_from_inside_tl_decorator += 1
 
@@ -244,6 +236,19 @@ def tensorleap_custom_metric(name: str,
             finally:
                 _called_from_inside_tl_decorator -= 1
 
+            return result
+
+        leap_binder.add_custom_metric(inner_without_validate, name, direction, compute_insights)
+
+        if connects_to is not None:
+            arg_names = leap_binder.setup_container.metrics[-1].metric_handler_data.arg_names
+            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Metric, name)
+
+        def inner(*args, **kwargs):
+            _validate_input_args(*args, **kwargs)
+
+            result = inner_without_validate(*args, **kwargs)
+
             _validate_result(result)
             return result
 
@@ -284,12 +289,6 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
                 raise Exception(f'Visualizer with name {name} already exists. '
                                 f'Please choose another')
 
-        leap_binder.set_visualizer(user_function, name, visualizer_type, heatmap_function)
-
-        if connects_to is not None:
-            arg_names = leap_binder.setup_container.visualizers[-1].visualizer_handler_data.arg_names
-            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Visualizer, name)
-
         def _validate_input_args(*args, **kwargs):
             for i, arg in enumerate(args):
                 assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
@@ -324,9 +323,8 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
                 (f'tensorleap_custom_visualizer validation failed: '
                  f'The return type should be {result_type_map[visualizer_type]}. Got {type(result)}.')
 
-        def inner(*args, **kwargs):
-            _validate_input_args(*args, **kwargs)
 
+        def inner_without_validate(*args, **kwargs):
             global _called_from_inside_tl_decorator
             _called_from_inside_tl_decorator += 1
 
@@ -335,9 +333,23 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
             finally:
                 _called_from_inside_tl_decorator -= 1
 
+            return result
+
+        leap_binder.set_visualizer(inner_without_validate, name, visualizer_type, heatmap_function)
+
+        if connects_to is not None:
+            arg_names = leap_binder.setup_container.visualizers[-1].visualizer_handler_data.arg_names
+            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Visualizer, name)
+
+        def inner(*args, **kwargs):
+            _validate_input_args(*args, **kwargs)
+
+            result = inner_without_validate()
+
             _validate_result(result)
             return result
 
+
         def mapping_inner(*args, **kwargs):
             user_unique_name = mapping_inner.name
             if 'user_unique_name' in kwargs:
@@ -372,8 +384,6 @@ def tensorleap_metadata(
                 raise Exception(f'Metadata with name {name} already exists. '
                                 f'Please choose another')
 
-        leap_binder.set_metadata(user_function, name, metadata_type)
-
         def _validate_input_args(sample_id: Union[int, str], preprocess_response: PreprocessResponse):
             assert isinstance(sample_id, (int, str)), \
                 (f'tensorleap_metadata validation failed: '
@@ -401,11 +411,7 @@ def tensorleap_metadata(
                         (f'tensorleap_metadata validation failed: '
                          f'Values in the return dict should be of type {str(supported_result_types)}. Got {type(value)}.')
 
-        def inner(sample_id, preprocess_response):
-            if os.environ.get(mapping_runtime_mode_env_var_mame):
-                return None
-
-            _validate_input_args(sample_id, preprocess_response)
+        def inner_without_validate(sample_id, preprocess_response):
 
             global _called_from_inside_tl_decorator
             _called_from_inside_tl_decorator += 1
@@ -415,6 +421,19 @@ def tensorleap_metadata(
             finally:
                 _called_from_inside_tl_decorator -= 1
 
+            return result
+
+
+        leap_binder.set_metadata(inner_without_validate, name, metadata_type)
+
+        def inner(sample_id, preprocess_response):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return None
+
+            _validate_input_args(sample_id, preprocess_response)
+
+            result = inner_without_validate(sample_id, preprocess_response)
+
             _validate_result(result)
             return result
 
@@ -549,8 +568,6 @@ def tensorleap_unlabeled_preprocess():
 
 def tensorleap_instances_masks_encoder(name: str):
     def decorating_function(user_function: InstanceCallableInterface):
-        leap_binder.set_instance_masks(user_function, name)
-
         def _validate_input_args(sample_id: str, preprocess_response: PreprocessResponse):
             assert isinstance(sample_id, str), \
                 (f'tensorleap_instances_masks_encoder validation failed: '
@@ -568,13 +585,7 @@ def tensorleap_instances_masks_encoder(name: str):
                 (f'tensorleap_instances_masks_encoder validation failed: '
                  f'Unsupported return type. Should be a numpy array. Got {type(result)}.')
 
-
-        def inner(sample_id, preprocess_response):
-            if os.environ.get(mapping_runtime_mode_env_var_mame):
-                return None
-
-            _validate_input_args(sample_id, preprocess_response)
-
+        def inner_without_validate(sample_id, preprocess_response):
             global _called_from_inside_tl_decorator
             _called_from_inside_tl_decorator += 1
 
@@ -583,6 +594,19 @@ def tensorleap_instances_masks_encoder(name: str):
             finally:
                 _called_from_inside_tl_decorator -= 1
 
+            return result
+
+        leap_binder.set_instance_masks(inner_without_validate, name)
+
+
+        def inner(sample_id, preprocess_response):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return None
+
+            _validate_input_args(sample_id, preprocess_response)
+
+            result = inner_without_validate(sample_id, preprocess_response)
+
             _validate_result(result)
             return result
 
@@ -601,6 +625,8 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
         if channel_dim <= 0 and channel_dim != -1:
             raise Exception(f"Channel dim for input {name} is expected to be either -1 or positive")
 
+        leap_binder.set_input(user_function, name, channel_dim=channel_dim)
+
         def _validate_input_args(sample_id: Union[int, str], preprocess_response: PreprocessResponse):
             assert isinstance(sample_id, (int, str)), \
                 (f'tensorleap_input_encoder validation failed: '
@@ -637,14 +663,6 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
             node_mapping_type = NodeMappingType(f'Input{str(model_input_index)}')
         inner.node_mapping = NodeMapping(name, node_mapping_type)
 
-        def inner_without_validate(sample_id, preprocess_response):
-            result = user_function(sample_id, preprocess_response)
-            if _called_from_inside_tl_decorator == 0:
-                result = np.expand_dims(result, axis=0)
-            return result
-
-        leap_binder.set_input(inner_without_validate, name, channel_dim=channel_dim)
-
 
         def mapping_inner(sample_id, preprocess_response):
             class TempMapping:
@@ -676,6 +694,7 @@ def tensorleap_gt_encoder(name: str):
                 raise Exception(f'GT with name {name} already exists. '
                                 f'Please choose another')
 
+        leap_binder.set_ground_truth(user_function, name)
 
         def _validate_input_args(sample_id: Union[int, str], preprocess_response: PreprocessResponse):
             assert isinstance(sample_id, (int, str)), \
@@ -706,14 +725,6 @@ def tensorleap_gt_encoder(name: str):
                 result = np.expand_dims(result, axis=0)
             return result
 
-        def inner_without_validate(sample_id, preprocess_response):
-            result = user_function(sample_id, preprocess_response)
-            if _called_from_inside_tl_decorator == 0:
-                result = np.expand_dims(result, axis=0)
-            return result
-
-        leap_binder.set_ground_truth(inner_without_validate, name)
-
         inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
 
         def mapping_inner(sample_id, preprocess_response):
@@ -746,12 +757,6 @@ def tensorleap_custom_loss(name: str, connects_to=None):
                 raise Exception(f'Custom loss with name {name} already exists. '
                                 f'Please choose another')
 
-        leap_binder.add_custom_loss(user_function, name)
-
-        if connects_to is not None:
-            arg_names = leap_binder.setup_container.custom_loss_handlers[-1].custom_loss_handler_data.arg_names
-            _add_mapping_connections(connects_to, arg_names, NodeMappingType.CustomLoss, name)
-
 
         valid_types = (np.ndarray, SamplePreprocessResponse)
         try:
@@ -784,9 +789,7 @@ def tensorleap_custom_loss(name: str, connects_to=None):
                 (f'tensorleap_custom_loss validation failed: '
                  f'The return type should be a numpy array. Got {type(result)}.')
 
-        def inner(*args, **kwargs):
-            _validate_input_args(*args, **kwargs)
-
+        def inner_without_validate(*args, **kwargs):
             global _called_from_inside_tl_decorator
             _called_from_inside_tl_decorator += 1
 
@@ -795,6 +798,19 @@ def tensorleap_custom_loss(name: str, connects_to=None):
             finally:
                 _called_from_inside_tl_decorator -= 1
 
+            return result
+
+        leap_binder.add_custom_loss(inner_without_validate, name)
+
+        if connects_to is not None:
+            arg_names = leap_binder.setup_container.custom_loss_handlers[-1].custom_loss_handler_data.arg_names
+            _add_mapping_connections(connects_to, arg_names, NodeMappingType.CustomLoss, name)
+
+        def inner(*args, **kwargs):
+            _validate_input_args(*args, **kwargs)
+
+            result = inner_without_validate(*args, **kwargs)
+
             _validate_result(result)
             return result
 

{code_loader-1.0.106 → code_loader-1.0.108}/pyproject.toml

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