code-loader 1.0.75__tar.gz → 1.0.77.1__tar.gz

{code_loader-1.0.75 → code_loader-1.0.77.1}/PKG-INFO

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

{code_loader-1.0.75 → code_loader-1.0.77.1}/code_loader/contract/datasetclasses.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from typing import Any, Callable, List, Optional, Dict, Union, Type
-
+import re
 import numpy as np
 import numpy.typing as npt
 
@@ -39,6 +39,9 @@ class PreprocessResponse:
     sample_id_type: Optional[Union[Type[str], Type[int]]] = None
 
     def __post_init__(self) -> None:
+        def is_valid_string(s: str) -> bool:
+            return bool(re.match(r'^[A-Za-z0-9_]+$', s))
+
         if self.length is not None and self.sample_ids is None:
             self.sample_ids = [i for i in range(self.length)]
             self.sample_id_type = int
@@ -46,6 +49,11 @@ class PreprocessResponse:
             self.length = len(self.sample_ids)
             if self.sample_id_type is None:
                 self.sample_id_type = str
+            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.75 → code_loader-1.0.77.1}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -30,8 +30,9 @@ def tensorleap_custom_metric(name: str,
 
         def _validate_input_args(*args, **kwargs) -> None:
             for i, arg in enumerate(args):
-                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (f'tensorleap_custom_metric validation failed: '
-                                                     f'Argument #{i} should be a numpy array. Got {type(arg)}.')
+                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
+                    f'tensorleap_custom_metric validation failed: '
+                    f'Argument #{i} should be a numpy array. Got {type(arg)}.')
                 if leap_binder.batch_size_to_validate and isinstance(arg, np.ndarray):
                     assert arg.shape[0] == leap_binder.batch_size_to_validate, \
                         (f'tensorleap_custom_metric validation failed: Argument #{i} '
@@ -39,8 +40,9 @@ def tensorleap_custom_metric(name: str,
                          f'instead of {leap_binder.batch_size_to_validate}')
 
             for _arg_name, arg in kwargs.items():
-                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (f'tensorleap_custom_metric validation failed: '
-                                                     f'Argument {_arg_name} should be a numpy array. Got {type(arg)}.')
+                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
+                    f'tensorleap_custom_metric validation failed: '
+                    f'Argument {_arg_name} should be a numpy array. Got {type(arg)}.')
                 if leap_binder.batch_size_to_validate and isinstance(arg, np.ndarray):
                     assert arg.shape[0] == leap_binder.batch_size_to_validate, \
                         (f'tensorleap_custom_metric validation failed: Argument {_arg_name} '
@@ -58,8 +60,8 @@ def tensorleap_custom_metric(name: str,
                         assert isinstance(single_metric_result[0][0], ConfusionMatrixElement), \
                             f'{supported_types_message}Got List[List[{type(single_metric_result[0][0])}]].'
                     else:
-                        assert isinstance(single_metric_result[0],
-                                          float), f'{supported_types_message}Got List[{type(single_metric_result[0])}].'
+                        assert isinstance(single_metric_result[0], (
+                            float, int, type(None))), f'{supported_types_message}Got List[{type(single_metric_result[0])}].'
                 else:
                     assert isinstance(single_metric_result,
                                       np.ndarray), f'{supported_types_message}Got {type(single_metric_result)}.'
@@ -115,16 +117,18 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
 
         def _validate_input_args(*args, **kwargs):
             for i, arg in enumerate(args):
-                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (f'tensorleap_custom_visualizer validation failed: '
-                                                     f'Argument #{i} should be a numpy array. Got {type(arg)}.')
+                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
+                    f'tensorleap_custom_visualizer validation failed: '
+                    f'Argument #{i} should be a numpy array. Got {type(arg)}.')
                 if leap_binder.batch_size_to_validate and isinstance(arg, np.ndarray):
                     assert arg.shape[0] != leap_binder.batch_size_to_validate, \
                         (f'tensorleap_custom_visualizer validation failed: '
                          f'Argument #{i} should be without batch dimension. ')
 
             for _arg_name, arg in kwargs.items():
-                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (f'tensorleap_custom_visualizer validation failed: '
-                                                     f'Argument {_arg_name} should be a numpy array. Got {type(arg)}.')
+                assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
+                    f'tensorleap_custom_visualizer validation failed: '
+                    f'Argument {_arg_name} should be a numpy array. Got {type(arg)}.')
                 if leap_binder.batch_size_to_validate and isinstance(arg, np.ndarray):
                     assert arg.shape[0] != leap_binder.batch_size_to_validate, \
                         (f'tensorleap_custom_visualizer validation failed: Argument {_arg_name} '

{code_loader-1.0.75 → code_loader-1.0.77.1}/code_loader/leaploader.py

@@ -46,7 +46,7 @@ class LeapLoader(LeapLoaderBase):
 
     def evaluate_module(self) -> None:
         def append_path_recursively(full_path: str) -> None:
-            if '/' not in full_path or full_path == '/':
+            if self.code_path not in full_path or full_path == '/':
                 return
 
             parent_path = str(Path(full_path).parent)

{code_loader-1.0.75 → code_loader-1.0.77.1}/pyproject.toml

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