code-loader 1.0.134.dev1__py3-none-any.whl → 1.0.136__py3-none-any.whl

code_loader/default_losses.py

@@ -3,7 +3,6 @@ from enum import Enum
 from code_loader.default_metrics import mean_absolute_percentage_error_dimension_reduced, \
     mean_absolute_error_dimension_reduced, mean_squared_logarithmic_error_dimension_reduced, \
     mean_squared_error_dimension_reduced, categorical_crossentropy, binary_crossentropy
-from code_loader.inner_leap_binder.leapbinder_decorators import tensorleap_custom_loss
 
 
 class LossName(Enum):
@@ -23,9 +22,3 @@ loss_name_to_function = {
     LossName.CategoricalCrossentropy.name: categorical_crossentropy,
     LossName.BinaryCrossentropy.name: binary_crossentropy
 }
-
-
-for loss_name, func in loss_name_to_function.items():
-    @tensorleap_custom_loss(loss_name)
-    def loss_func(ground_truth, prediction):
-        return func(ground_truth, prediction)

code_loader/default_metrics.py

@@ -6,7 +6,17 @@ import numpy as np
 
 from code_loader.contract.datasetclasses import ConfusionMatrixElement  # type: ignore
 from code_loader.contract.enums import ConfusionMatrixValue, MetricDirection  # type: ignore
-from code_loader.inner_leap_binder.leapbinder_decorators import tensorleap_custom_metric
+
+
+class Metric(Enum):
+    MeanSquaredError = 'MeanSquaredError'
+    MeanSquaredLogarithmicError = 'MeanSquaredLogarithmicError'
+    MeanAbsoluteError = 'MeanAbsoluteError'
+    MeanAbsolutePercentageError = 'MeanAbsolutePercentageError'
+    Accuracy = 'Accuracy'
+    ConfusionMatrixClassification = 'ConfusionMatrixClassification'
+    CategoricalCrossentropy = 'CategoricalCrossentropy'
+    BinaryCrossentropy = 'BinaryCrossentropy'
 
 
 def binary_crossentropy(ground_truth: np.array, prediction: np.array) -> np.array:
@@ -24,7 +34,6 @@ def categorical_crossentropy(ground_truth: np.array, prediction: np.array) -> np
     prediction = np.clip(prediction, epsilon, 1.0 - epsilon)
     return -(ground_truth * np.log(prediction)).sum(axis=1).astype(np.float32)
 
-
 def accuracy_reduced(ground_truth: np.array, prediction: np.array) -> np.array:
     ground_truth, prediction = flatten_non_batch_dims(ground_truth, prediction)
     return np.mean((np.round(prediction).astype(np.bool_) == ground_truth.astype(np.bool_)), axis=1)
@@ -79,17 +88,6 @@ def confusion_matrix_classification_metric(ground_truth, prediction) -> List[Lis
     return ret
 
 
-class Metric(Enum):
-    MeanSquaredError = 'MeanSquaredError'
-    MeanSquaredLogarithmicError = 'MeanSquaredLogarithmicError'
-    MeanAbsoluteError = 'MeanAbsoluteError'
-    MeanAbsolutePercentageError = 'MeanAbsolutePercentageError'
-    Accuracy = 'Accuracy'
-    ConfusionMatrixClassification = 'ConfusionMatrixClassification'
-    CategoricalCrossentropy = 'CategoricalCrossentropy'
-    BinaryCrossentropy = 'BinaryCrossentropy'
-
-
 metrics_names_to_functions_and_direction = {
     Metric.MeanSquaredError.name: (mean_squared_error_dimension_reduced, MetricDirection.Downward),
     Metric.MeanSquaredLogarithmicError.name: (
@@ -102,8 +100,3 @@ metrics_names_to_functions_and_direction = {
     Metric.CategoricalCrossentropy.name: (categorical_crossentropy, MetricDirection.Downward),
     Metric.BinaryCrossentropy.name: (binary_crossentropy, MetricDirection.Downward)
 }
-
-for metric_name, (func, direction) in metrics_names_to_functions_and_direction.items():
-    @tensorleap_custom_metric(metric_name, direction)
-    def metric_func(ground_truth, prediction):
-        return func(ground_truth, prediction)

code_loader/inner_leap_binder/leapbinder.py

@@ -1,5 +1,8 @@
 import inspect
-from typing import Callable, Optional, Dict, Any, Type, Union
+from typing import Callable, List, Optional, Dict, Any, Type, Union
+
+import numpy as np
+import numpy.typing as npt
 
 from code_loader.contract.datasetclasses import SectionCallableInterface, InputHandler, \
     GroundTruthHandler, MetadataHandler, DatasetIntegrationSetup, VisualizerHandler, PreprocessResponse, \
@@ -9,16 +12,17 @@ from code_loader.contract.datasetclasses import SectionCallableInterface, InputH
     CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, \
     RawInputsForHeatmap, VisualizerHandlerData, MetricHandlerData, CustomLossHandlerData, SamplePreprocessResponse, \
     ElementInstanceMasksHandler, InstanceCallableInterface, CustomLatentSpaceHandler
-from code_loader.contract.enums import DataStateEnum, DataStateType, DatasetMetadataType
+from code_loader.contract.enums import LeapDataType, DataStateEnum, DataStateType, MetricDirection, DatasetMetadataType
 from code_loader.contract.mapping import NodeConnection, NodeMapping, NodeMappingType
 from code_loader.contract.responsedataclasses import DatasetTestResultPayload
 from code_loader.contract.visualizer_classes import map_leap_data_type_to_visualizer_class
-
-from code_loader.default_metrics import *
-from code_loader.visualizers.default_visualizers import *
-from code_loader.default_losses import *
-
+from code_loader.default_losses import loss_name_to_function
+from code_loader.default_metrics import metrics_names_to_functions_and_direction
 from code_loader.utils import to_numpy_return_wrapper, get_shape, to_numpy_return_masks_wrapper
+from code_loader.visualizers.default_visualizers import DefaultVisualizer, \
+    default_graph_visualizer, \
+    default_image_visualizer, default_horizontal_bar_visualizer, default_word_visualizer, \
+    default_image_mask_visualizer, default_text_mask_visualizer, default_raw_data_visualizer, default_video_visualizer
 
 
 mapping_runtime_mode_env_var_mame = '__MAPPING_RUNTIME_MODE__'
@@ -40,13 +44,40 @@ class LeapBinder:
         self.cache_container: Dict[str, Any] = {"word_to_index": {}}
         self._visualizer_names: List[str] = list()
         self._encoder_names: List[str] = list()
+        self._extend_with_default_visualizers()
+        self._extend_with_default_metrics()
+        self._extend_with_default_losses()
 
         self.mapping_connections: List[NodeConnection] = []
         self.integration_test_func: Optional[Callable[[str, PreprocessResponse], Any]] = None
 
         self.batch_size_to_validate: Optional[int] = None
 
-
+    def _extend_with_default_visualizers(self) -> None:
+        self.set_visualizer(function=default_image_visualizer, name=DefaultVisualizer.Image.value,
+                            visualizer_type=LeapDataType.Image)
+        self.set_visualizer(function=default_video_visualizer, name=DefaultVisualizer.Video.value,
+                            visualizer_type=LeapDataType.Video)
+        self.set_visualizer(function=default_graph_visualizer, name=DefaultVisualizer.Graph.value,
+                            visualizer_type=LeapDataType.Graph)
+        self.set_visualizer(function=default_raw_data_visualizer, name=DefaultVisualizer.RawData.value,
+                            visualizer_type=LeapDataType.Text)
+        self.set_visualizer(function=default_horizontal_bar_visualizer, name=DefaultVisualizer.HorizontalBar.value,
+                            visualizer_type=LeapDataType.HorizontalBar)
+        self.set_visualizer(function=default_word_visualizer, name=DefaultVisualizer.Text.value,
+                            visualizer_type=LeapDataType.Text)
+        self.set_visualizer(function=default_image_mask_visualizer, name=DefaultVisualizer.ImageMask.value,
+                            visualizer_type=LeapDataType.ImageMask)
+        self.set_visualizer(function=default_text_mask_visualizer, name=DefaultVisualizer.TextMask.value,
+                            visualizer_type=LeapDataType.TextMask)
+
+    def _extend_with_default_losses(self) -> None:
+        for loss_name, func in loss_name_to_function.items():
+            self.add_custom_loss(func, loss_name)
+
+    def _extend_with_default_metrics(self) -> None:
+        for metric_name, (func, direction) in metrics_names_to_functions_and_direction.items():
+            self.add_custom_metric(func, metric_name, direction)
 
     def set_visualizer(self, function: VisualizerCallableInterface,
                        name: str,

code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -1,5 +1,6 @@
 # mypy: ignore-errors
 import os
+from collections import defaultdict
 from functools import lru_cache
 from typing import Optional, Union, Callable, List, Dict
 
@@ -232,9 +233,11 @@ def tensorleap_custom_metric(name: str,
                              direction: Union[MetricDirection, Dict[str, MetricDirection]] = MetricDirection.Downward,
                              compute_insights: Optional[Union[bool, Dict[str, bool]]] = None,
                              connects_to=None):
-    def decorating_function(user_function: Union[CustomCallableInterfaceMultiArgs,
-    CustomMultipleReturnCallableInterfaceMultiArgs,
-    ConfusionMatrixCallableInterfaceMultiArgs]):
+    name_to_unique_name = defaultdict(set)
+
+    def decorating_function(
+            user_function: Union[CustomCallableInterfaceMultiArgs, CustomMultipleReturnCallableInterfaceMultiArgs,
+            ConfusionMatrixCallableInterfaceMultiArgs]):
         for metric_handler in leap_binder.setup_container.metrics:
             if metric_handler.metric_handler_data.name == name:
                 raise Exception(f'Metric with name {name} already exists. '
@@ -354,6 +357,11 @@ def tensorleap_custom_metric(name: str,
 
             ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
             ordered_connections = list(args) + ordered_connections
+
+            if user_unique_name in name_to_unique_name[mapping_inner.name]:
+                user_unique_name = f'{user_unique_name}_{len(name_to_unique_name[mapping_inner.name])}'
+            name_to_unique_name[mapping_inner.name].add(user_unique_name)
+
             _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,
                                     mapping_inner.name, NodeMappingType.Metric)
 
@@ -376,6 +384,8 @@ def tensorleap_custom_metric(name: str,
 def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
                                  heatmap_function: Optional[Callable[..., npt.NDArray[np.float32]]] = None,
                                  connects_to=None):
+    name_to_unique_name = defaultdict(set)
+
     def decorating_function(user_function: VisualizerCallableInterface):
         for viz_handler in leap_binder.setup_container.visualizers:
             if viz_handler.visualizer_handler_data.name == name:
@@ -452,6 +462,10 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
             if 'user_unique_name' in kwargs:
                 user_unique_name = kwargs['user_unique_name']
 
+            if user_unique_name in name_to_unique_name[mapping_inner.name]:
+                user_unique_name = f'{user_unique_name}_{len(name_to_unique_name[mapping_inner.name])}'
+            name_to_unique_name[mapping_inner.name].add(user_unique_name)
+
             ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
             ordered_connections = list(args) + ordered_connections
             _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,
@@ -974,6 +988,8 @@ def tensorleap_gt_encoder(name: str):
 
 
 def tensorleap_custom_loss(name: str, connects_to=None):
+    name_to_unique_name = defaultdict(set)
+
     def decorating_function(user_function: CustomCallableInterface):
         for loss_handler in leap_binder.setup_container.custom_loss_handlers:
             if loss_handler.custom_loss_handler_data.name == name:
@@ -1042,6 +1058,10 @@ def tensorleap_custom_loss(name: str, connects_to=None):
             if 'user_unique_name' in kwargs:
                 user_unique_name = kwargs['user_unique_name']
 
+            if user_unique_name in name_to_unique_name[mapping_inner.name]:
+                user_unique_name = f'{user_unique_name}_{len(name_to_unique_name[mapping_inner.name])}'
+            name_to_unique_name[mapping_inner.name].add(user_unique_name)
+
             ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
             ordered_connections = list(args) + ordered_connections
             _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,

code_loader/visualizers/default_visualizers.py

@@ -1,36 +1,42 @@
+from enum import Enum
+
 import numpy as np
 import numpy.typing as npt
 
-from code_loader.contract.enums import LeapDataType
 from code_loader.contract.visualizer_classes import LeapImage, LeapGraph, LeapHorizontalBar, LeapText, \
     LeapImageMask, LeapTextMask, LeapVideo
-from code_loader.inner_leap_binder.leapbinder_decorators import tensorleap_custom_visualizer
 from code_loader.utils import rescale_min_max
 
 
+class DefaultVisualizer(Enum):
+    Image = 'Image'
+    Video = 'Video'
+    Graph = 'Graph'
+    HorizontalBar = 'HorizontalBar'
+    Text = 'Text'
+    ImageMask = 'ImageMask'
+    TextMask = 'TextMask'
+    RawData = 'RawData'
     
 
-
-@tensorleap_custom_visualizer('Image', LeapDataType.Image)
 def default_image_visualizer(data: npt.NDArray[np.float32]) -> LeapImage:
     rescaled_data = rescale_min_max(data[0])
     return LeapImage(rescaled_data)
 
-@tensorleap_custom_visualizer('Video', LeapDataType.Video)
+
 def default_video_visualizer(data: npt.NDArray[np.float32]) -> LeapVideo:
     return LeapVideo(data[0])
 
-@tensorleap_custom_visualizer('Graph', LeapDataType.Graph)
+
 def default_graph_visualizer(data: npt.NDArray[np.float32]) -> LeapGraph:
     return LeapGraph(data[0])
 
-@tensorleap_custom_visualizer('HorizontalBar', LeapDataType.HorizontalBar)
+
 def default_horizontal_bar_visualizer(data: npt.NDArray[np.float32]) -> LeapHorizontalBar:
     labels = [str(index) for index in range(data.shape[-1])]
     return LeapHorizontalBar(data[0], labels)
 
 
-@tensorleap_custom_visualizer('Text', LeapDataType.Text)
 def default_word_visualizer(data: npt.NDArray[np.float32]) -> LeapText:
     if len(data.shape) == 2 and data.shape[0] == 1:
         data = data[0]
@@ -39,11 +45,11 @@ def default_word_visualizer(data: npt.NDArray[np.float32]) -> LeapText:
     words = [str(index[0]) if type(index) is list else str(index) for index in data]
     return LeapText(words)
 
-@tensorleap_custom_visualizer('RawData', LeapDataType.Text)
+
 def default_raw_data_visualizer(data: npt.NDArray[np.float32]) -> LeapText:
     return LeapText([str(data)])
 
-@tensorleap_custom_visualizer('ImageMask', LeapDataType.ImageMask)
+
 def default_image_mask_visualizer(mask: npt.NDArray[np.float32], image: npt.NDArray[np.float32]) -> LeapImageMask:
     if image.shape[0] == 1:
         image = image[0]
@@ -62,7 +68,6 @@ def default_image_mask_visualizer(mask: npt.NDArray[np.float32], image: npt.NDAr
     return LeapImageMask(mask.astype(np.uint8), image.astype(np.float32), labels)
 
 
-@tensorleap_custom_visualizer('TextMask', LeapDataType.TextMask)
 def default_text_mask_visualizer(mask: npt.NDArray[np.float32], text_data: npt.NDArray[np.float32]) -> LeapTextMask:
     mask = mask[0]
     text_data = text_data[0]

{code_loader-1.0.134.dev1.dist-info → code_loader-1.0.136.dist-info}/METADATA

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

{code_loader-1.0.134.dev1.dist-info → code_loader-1.0.136.dist-info}/RECORD

@@ -7,8 +7,8 @@ code_loader/contract/exceptions.py,sha256=jWqu5i7t-0IG0jGRsKF4DjJdrsdpJjIYpUkN1F
 code_loader/contract/mapping.py,sha256=sWJhpng-IkOzQnWQdMT5w2ZZ3X1Z_OOzSwCLXIS7oxE,1446
 code_loader/contract/responsedataclasses.py,sha256=6-5DJkYBdXb3UB1eNidTTPPBIYxMjEoMdYDkp9VhH8o,4223
 code_loader/contract/visualizer_classes.py,sha256=Wz9eItmoRaKEHa3p0aW0Ypxx4_xUmaZyLBznnTuxwi0,15425
-code_loader/default_losses.py,sha256=mfup6TruVUxU-M_v-TXSNihDDg6tIFjNlZMW19fyprI,1412
-code_loader/default_metrics.py,sha256=StPWgd4Ok-h1Oac8QyNYLZPrM1ccP3wOze5tHWvggyY,5336
+code_loader/default_losses.py,sha256=NoOQym1106bDN5dcIk56Elr7ZG5quUHArqfP5-Nyxyo,1139
+code_loader/default_metrics.py,sha256=v16Mrt2Ze1tXPgfKywGVdRSrkaK4CKLNQztN1UdVqIY,5010
 code_loader/experiment_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_loader/experiment_api/api.py,sha256=a7wh6Hhe7IaVxu46eV2soSz-yxnmXG3ipU1BBtsEAaQ,2493
 code_loader/experiment_api/cli_config_utils.py,sha256=n6JMyNrquxql3KKxHhAP8jAzezlRT-PV2KWI95kKsm0,1140
@@ -20,8 +20,8 @@ code_loader/experiment_api/types.py,sha256=MY8xFARHwdVA7p4dxyhD60ShmttgTvb4qdp1o
 code_loader/experiment_api/utils.py,sha256=XZHtxge12TS4H4-8PjV3sKuhp8Ud6ojAiIzTZJEqBqc,3304
 code_loader/experiment_api/workingspace_config_utils.py,sha256=DLzXQCg4dgTV_YgaSbeTVzq-2ja_SQw4zi7LXwKL9cY,990
 code_loader/inner_leap_binder/__init__.py,sha256=koOlJyMNYzGbEsoIbXathSmQ-L38N_pEXH_HvL7beXU,99
-code_loader/inner_leap_binder/leapbinder.py,sha256=YFfYpZjje7rCf2uQpBPtuWt4tkKmczOvuKEouHsyaOc,30908
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=9gS1nttSiFHvzIIcdlBIt4vcLUjEOLel1YvUaT79pxI,50030
+code_loader/inner_leap_binder/leapbinder.py,sha256=Q3D9yVM-GNEJfYRFvMV__BoZbcWOgnWKhrZXAv6Tu7o,33232
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=EptQhu4dPVXmAfUnv_Whzmess0ueRYy5RLpm7WYe6Ho,50981
 code_loader/leaploader.py,sha256=85XUWd7Y8kup76xeqefgd8db7pGaeHMhE7QlmYlNFMw,29747
 code_loader/leaploaderbase.py,sha256=LIFcC6xo6V_iiGN3BjibXETu_l84EWM_WIOKAvkfTiM,4458
 code_loader/mixpanel_tracker.py,sha256=l9z_szKKQ7apEbdNZpGH1TKAiT_TsBHb9AQnePaWTyo,4942
@@ -30,8 +30,8 @@ code_loader/plot_functions/plot_functions.py,sha256=VyVWxd7R3lALIo2z8oZlYybbN0Ip
 code_loader/plot_functions/visualize.py,sha256=gsBAYYkwMh7jIpJeDMPS8G4CW-pxwx6LznoQIvi4vpo,657
 code_loader/utils.py,sha256=gXENTYpjdidq2dx0gVbXlErPeHoNs-4TYAZbLRe0y2c,2712
 code_loader/visualizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-code_loader/visualizers/default_visualizers.py,sha256=JHcCJ9_GThbvQVyLQ8H--3yfZU7X0x99bAYigH7RfVw,3000
-code_loader-1.0.134.dev1.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.134.dev1.dist-info/METADATA,sha256=69D87OK4h_zzQWDQ2RLCB0bAvKyGe6mXT9_b9FE2pHw,1095
-code_loader-1.0.134.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-code_loader-1.0.134.dev1.dist-info/RECORD,,
+code_loader/visualizers/default_visualizers.py,sha256=onRnLE_TXfgLN4o52hQIOOhUcFexGlqJ3xSpQDVLuZM,2604
+code_loader-1.0.136.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.136.dist-info/METADATA,sha256=pNpIswJBMtQtorkL80niuBszYQ38F9repsK8WOCHRJ8,1090
+code_loader-1.0.136.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+code_loader-1.0.136.dist-info/RECORD,,