code-loader 1.0.134.dev1__tar.gz → 1.0.135__tar.gz

{code_loader-1.0.134.dev1 → code_loader-1.0.135}/PKG-INFO

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

{code_loader-1.0.134.dev1 → code_loader-1.0.135}/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-1.0.134.dev1 → code_loader-1.0.135}/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-1.0.134.dev1 → code_loader-1.0.135}/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-1.0.134.dev1 → code_loader-1.0.135}/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 → code_loader-1.0.135}/pyproject.toml

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