code-loader 1.0.74__tar.gz → 1.0.76__tar.gz

{code_loader-1.0.74 → code_loader-1.0.76}/PKG-INFO

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

{code_loader-1.0.74 → code_loader-1.0.76}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -8,7 +8,7 @@ import numpy.typing as npt
 from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs, \
     CustomMultipleReturnCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, CustomCallableInterface, \
     VisualizerCallableInterface, MetadataSectionCallableInterface, PreprocessResponse, SectionCallableInterface, \
-    ConfusionMatrixElement
+    ConfusionMatrixElement, SamplePreprocessResponse
 from code_loader.contract.enums import MetricDirection, LeapDataType
 from code_loader import leap_binder
 from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, LeapTextMask, LeapText, LeapGraph, \
@@ -30,18 +30,20 @@ def tensorleap_custom_metric(name: str,
 
         def _validate_input_args(*args, **kwargs) -> None:
             for i, arg in enumerate(args):
-                assert isinstance(arg, np.ndarray), (f'tensorleap_custom_metric validation failed: '
-                                                     f'Argument #{i} should be a numpy array. Got {type(arg)}.')
-                if leap_binder.batch_size_to_validate:
+                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} '
                          f'first dim should be as the batch size. Got {arg.shape[0]} '
                          f'instead of {leap_binder.batch_size_to_validate}')
 
             for _arg_name, arg in kwargs.items():
-                assert isinstance(arg, np.ndarray), (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:
+                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} '
                          f'first dim should be as the batch size. Got {arg.shape[0]} '
@@ -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,17 +117,19 @@ 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), (f'tensorleap_custom_visualizer validation failed: '
-                                                     f'Argument #{i} should be a numpy array. Got {type(arg)}.')
-                if leap_binder.batch_size_to_validate:
+                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), (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:
+                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} '
                          f'should be without batch dimension. ')
@@ -353,10 +357,10 @@ def tensorleap_custom_loss(name: str):
 
         leap_binder.add_custom_loss(user_function, name)
 
-        valid_types = np.ndarray
+        valid_types = (np.ndarray, SamplePreprocessResponse)
         try:
             import tensorflow as tf
-            valid_types = (np.ndarray, tf.Tensor)
+            valid_types = (np.ndarray, SamplePreprocessResponse, tf.Tensor)
         except ImportError:
             pass
 

{code_loader-1.0.74 → code_loader-1.0.76}/pyproject.toml

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