code-loader 1.0.78__tar.gz → 1.0.80__tar.gz

{code_loader-1.0.78 → code_loader-1.0.80}/PKG-INFO

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

{code_loader-1.0.78 → code_loader-1.0.80}/code_loader/contract/datasetclasses.py

@@ -142,7 +142,7 @@ class MetricHandlerData:
     name: str
     arg_names: List[str]
     direction: Union[None, MetricDirection, Dict[str, MetricDirection]] = MetricDirection.Downward
-    compute_insights: Union[bool, Dict[str, bool]] = True
+    compute_insights: Optional[Union[bool, Dict[str, bool]]] = None
 
 
 @dataclass

{code_loader-1.0.78 → code_loader-1.0.80}/code_loader/inner_leap_binder/leapbinder.py

@@ -103,7 +103,17 @@ class LeapBinder:
             heatmap_visualizer=image_resize_heatmap_visualizer
         )
         """
-        arg_names = inspect.getfullargspec(function)[0]
+
+        regular_arg_names = inspect.getfullargspec(function)[0]
+        preprocess_response_arg_name = None
+        for arg_name, arg_type in inspect.getfullargspec(function).annotations.items():
+            if arg_type == SamplePreprocessResponse:
+                if preprocess_response_arg_name is not None:
+                    raise Exception("only one argument can be of type SamplePreprocessResponse")
+                preprocess_response_arg_name = arg_name
+                regular_arg_names.remove(arg_name)
+
+        arg_names = regular_arg_names
         if heatmap_visualizer:
             visualizer_arg_names_set = set(arg_names)
             heatmap_visualizer_inspection = inspect.getfullargspec(heatmap_visualizer)
@@ -259,7 +269,7 @@ class LeapBinder:
                           name: str,
                           direction: Optional[
                               Union[MetricDirection, Dict[str, MetricDirection]]] = MetricDirection.Downward,
-                          compute_insights: Union[bool, Dict[str, bool]] = True) -> None:
+                          compute_insights: Optional[Union[bool, Dict[str, bool]]] = None) -> None:
         """
         Add a custom metric to the setup.
 
@@ -282,8 +292,17 @@ class LeapBinder:
 
             leap_binder.add_custom_metric(custom_metric_function, name='custom_metric', direction=MetricDirection.Downward)
         """
-        arg_names = inspect.getfullargspec(function)[0]
-        metric_handler_data = MetricHandlerData(name, arg_names, direction, compute_insights)
+
+        regular_arg_names = inspect.getfullargspec(function)[0]
+        preprocess_response_arg_name = None
+        for arg_name, arg_type in inspect.getfullargspec(function).annotations.items():
+            if arg_type == SamplePreprocessResponse:
+                if preprocess_response_arg_name is not None:
+                    raise Exception("only one argument can be of type SamplePreprocessResponse")
+                preprocess_response_arg_name = arg_name
+                regular_arg_names.remove(arg_name)
+
+        metric_handler_data = MetricHandlerData(name, regular_arg_names, direction, compute_insights)
         self.setup_container.metrics.append(MetricHandler(metric_handler_data, function))
 
     def add_prediction(self, name: str, labels: List[str], channel_dim: int = -1) -> None:
@@ -448,7 +467,12 @@ class LeapBinder:
         if DataStateEnum.validation not in preprocess_result_dict:
             raise Exception("Validation data is required")
 
-        return preprocess_result_dict
+        preprocess_result_dict_in_correct_order = {}
+        for state_enum in DataStateEnum:
+            if state_enum in preprocess_result_dict:
+                preprocess_result_dict_in_correct_order[state_enum] = preprocess_result_dict[state_enum]
+
+        return preprocess_result_dict_in_correct_order
 
     def get_preprocess_unlabeled_result(self) -> Optional[PreprocessResponse]:
         unlabeled_preprocess = self.setup_container.unlabeled_data_preprocess

{code_loader-1.0.78 → code_loader-1.0.80}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -17,7 +17,7 @@ from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, Le
 
 def tensorleap_custom_metric(name: str,
                              direction: Union[MetricDirection, Dict[str, MetricDirection]] = MetricDirection.Downward,
-                             compute_insights: Union[bool, Dict[str, bool]] = True):
+                             compute_insights: Optional[Union[bool, Dict[str, bool]]] = None):
     def decorating_function(user_function: Union[CustomCallableInterfaceMultiArgs,
     CustomMultipleReturnCallableInterfaceMultiArgs,
     ConfusionMatrixCallableInterfaceMultiArgs]):
@@ -85,7 +85,11 @@ def tensorleap_custom_metric(name: str,
                             (f'tensorleap_custom_metric validation failed: '
                              f'Keys in the direction mapping should be part of result keys. Got key {direction_key}.')
 
-                if isinstance(compute_insights, dict):
+                if compute_insights is not None:
+                    assert isinstance(compute_insights, dict), \
+                        (f'tensorleap_custom_metric validation failed: '
+                         f'compute_insights should be dict if using the dict results. Got {type(compute_insights)}.')
+
                     for ci_key in compute_insights:
                         assert ci_key in result, \
                             (f'tensorleap_custom_metric validation failed: '
@@ -94,6 +98,12 @@ def tensorleap_custom_metric(name: str,
             else:
                 _validate_single_metric(result)
 
+                if compute_insights is not None:
+                    assert isinstance(compute_insights, bool), \
+                        (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)
             result = user_function(*args, **kwargs)

{code_loader-1.0.78 → code_loader-1.0.80}/pyproject.toml

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