code-loader 1.0.105.dev0__tar.gz → 1.0.106__tar.gz

{code_loader-1.0.105.dev0 → code_loader-1.0.106}/PKG-INFO

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

{code_loader-1.0.105.dev0 → code_loader-1.0.106}/code_loader/contract/datasetclasses.py

@@ -43,6 +43,9 @@ 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"
@@ -57,6 +60,8 @@ 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.105.dev0 → code_loader-1.0.106}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -601,8 +601,6 @@ 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: '
@@ -639,6 +637,14 @@ 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:
@@ -670,7 +676,6 @@ 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)), \
@@ -701,6 +706,14 @@ 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):

{code_loader-1.0.105.dev0 → code_loader-1.0.106}/pyproject.toml

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