code-loader 1.0.89__tar.gz → 1.0.90__tar.gz

{code_loader-1.0.89 → code_loader-1.0.90}/PKG-INFO

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

{code_loader-1.0.89 → code_loader-1.0.90}/code_loader/contract/responsedataclasses.py

@@ -2,7 +2,6 @@ from typing import List, Optional, Dict, Any, Union
 
 from dataclasses import dataclass, field
 from code_loader.contract.enums import DatasetMetadataType, LeapDataType
-from code_loader.contract.mapping import NodeConnection
 
 
 @dataclass
@@ -121,12 +120,6 @@ class BoundingBox:
     metadata: Optional[Dict[str, Union[str, int, float]]] = None
 
 
-
-@dataclass
-class EngineFileContract:
-    node_connections: Optional[List[NodeConnection]] = None
-
-
 @dataclass
 class DatasetIntegParseResult:
     payloads: List[DatasetTestResultPayload]
@@ -136,4 +129,3 @@ class DatasetIntegParseResult:
     model_setup: Optional[ModelSetup] = None
     general_error: Optional[str] = None
     print_log: Optional[str] = None
-    engine_file_contract: Optional[EngineFileContract] = None

{code_loader-1.0.89 → code_loader-1.0.90}/code_loader/inner_leap_binder/leapbinder.py

@@ -12,7 +12,6 @@ from code_loader.contract.datasetclasses import SectionCallableInterface, InputH
     CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, \
     RawInputsForHeatmap, VisualizerHandlerData, MetricHandlerData, CustomLossHandlerData, SamplePreprocessResponse
 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_losses import loss_name_to_function
@@ -44,8 +43,6 @@ class LeapBinder:
         self._extend_with_default_metrics()
         self._extend_with_default_losses()
 
-        self.mapping_connections: List[NodeConnection] = []
-
         self.batch_size_to_validate: Optional[int] = None
 
     def _extend_with_default_visualizers(self) -> None:
@@ -310,7 +307,7 @@ class LeapBinder:
         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, prediction_index: Optional[int]=None) -> None:
+    def add_prediction(self, name: str, labels: List[str], channel_dim: int = -1) -> None:
         """
         Add prediction labels to the setup.
 
@@ -325,11 +322,6 @@ class LeapBinder:
             leap_binder.add_prediction(name='class_labels', labels=['cat', 'dog'])
         """
         self.setup_container.prediction_types.append(PredictionTypeHandler(name, labels, channel_dim))
-        if prediction_index is not None:
-            node_connection = NodeConnection(NodeMapping(name, NodeMappingType.PredictionLabels),
-                                             {'temp': NodeMapping('', NodeMappingType(f'Prediction{prediction_index}'))})
-
-            self.mapping_connections.append(node_connection)
 
     def set_ground_truth(self, function: SectionCallableInterface, name: str) -> None:
         """

{code_loader-1.0.89 → code_loader-1.0.90}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -11,25 +11,13 @@ from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs
     ConfusionMatrixElement, SamplePreprocessResponse
 from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMetadataType
 from code_loader import leap_binder
-from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConnection
 from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, LeapTextMask, LeapText, LeapGraph, \
     LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap
 
 
-def _add_mapping_connections(connects_to, arg_names, node_mapping_type, name):
-    for user_unique_name, connection_destinations in connects_to.items():
-        main_node_mapping = NodeMapping(name, node_mapping_type, user_unique_name, arg_names=arg_names)
-        node_inputs = {}
-        for arg_name, destination in zip(arg_names, connection_destinations):
-            node_inputs[arg_name] = destination.node_mapping
-
-        leap_binder.mapping_connections.append(NodeConnection(main_node_mapping, node_inputs))
-
-
 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):
+                             compute_insights: Optional[Union[bool, Dict[str, bool]]] = None):
     def decorating_function(user_function: Union[CustomCallableInterfaceMultiArgs,
     CustomMultipleReturnCallableInterfaceMultiArgs,
     ConfusionMatrixCallableInterfaceMultiArgs]):
@@ -40,10 +28,6 @@ def tensorleap_custom_metric(name: str,
 
         leap_binder.add_custom_metric(user_function, name, direction, compute_insights)
 
-        if connects_to is not None:
-            arg_names = leap_binder.setup_container.metrics[-1].metric_handler_data.arg_names
-            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Metric, name)
-
         def _validate_input_args(*args, **kwargs) -> None:
             for i, arg in enumerate(args):
                 assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
@@ -132,8 +116,7 @@ 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):
+                                 heatmap_function: Optional[Callable[..., npt.NDArray[np.float32]]] = None):
     def decorating_function(user_function: VisualizerCallableInterface):
         for viz_handler in leap_binder.setup_container.visualizers:
             if viz_handler.visualizer_handler_data.name == name:
@@ -142,10 +125,6 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
 
         leap_binder.set_visualizer(user_function, name, visualizer_type, heatmap_function)
 
-        if connects_to is not None:
-            arg_names = leap_binder.setup_container.visualizers[-1].visualizer_handler_data.arg_names
-            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Visualizer, name)
-
         def _validate_input_args(*args, **kwargs):
             for i, arg in enumerate(args):
                 assert isinstance(arg, (np.ndarray, SamplePreprocessResponse)), (
@@ -296,7 +275,7 @@ def tensorleap_unlabeled_preprocess():
     return decorating_function
 
 
-def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
+def tensorleap_input_encoder(name: str, channel_dim=-1):
     def decorating_function(user_function: SectionCallableInterface):
         for input_handler in leap_binder.setup_container.inputs:
             if input_handler.name == name:
@@ -335,11 +314,6 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
             _validate_result(result)
             return result
 
-        node_mapping_type = NodeMappingType.Input
-        if model_input_index is not None:
-            node_mapping_type = NodeMappingType(f'Input{str(model_input_index)}')
-        inner.node_mapping = NodeMapping(name, node_mapping_type)
-
         return inner
 
     return decorating_function
@@ -380,16 +354,12 @@ def tensorleap_gt_encoder(name: str):
             _validate_result(result)
             return result
 
-        inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
-
         return inner
 
-
-
     return decorating_function
 
 
-def tensorleap_custom_loss(name: str, connects_to=None):
+def tensorleap_custom_loss(name: str):
     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:
@@ -398,11 +368,6 @@ def tensorleap_custom_loss(name: str, connects_to=None):
 
         leap_binder.add_custom_loss(user_function, name)
 
-        if connects_to is not None:
-            arg_names = leap_binder.setup_container.custom_loss_handlers[-1].custom_loss_handler_data.arg_names
-            _add_mapping_connections(connects_to, arg_names, NodeMappingType.CustomLoss, name)
-
-
         valid_types = (np.ndarray, SamplePreprocessResponse)
         try:
             import tensorflow as tf

{code_loader-1.0.89 → code_loader-1.0.90}/code_loader/leaploader.py

@@ -19,8 +19,7 @@ from code_loader.contract.enums import DataStateEnum, TestingSectionEnum, DataSt
 from code_loader.contract.exceptions import DatasetScriptException
 from code_loader.contract.responsedataclasses import DatasetIntegParseResult, DatasetTestResultPayload, \
     DatasetPreprocess, DatasetSetup, DatasetInputInstance, DatasetOutputInstance, DatasetMetadataInstance, \
-    VisualizerInstance, PredictionTypeInstance, ModelSetup, CustomLayerInstance, MetricInstance, CustomLossInstance, \
-    EngineFileContract
+    VisualizerInstance, PredictionTypeInstance, ModelSetup, CustomLayerInstance, MetricInstance, CustomLossInstance
 from code_loader.inner_leap_binder import global_leap_binder
 from code_loader.leaploaderbase import LeapLoaderBase
 from code_loader.utils import get_root_exception_file_and_line_number
@@ -180,8 +179,7 @@ class LeapLoader(LeapLoaderBase):
         return DatasetIntegParseResult(is_valid=is_valid, payloads=test_payloads,
                                        is_valid_for_model=is_valid_for_model, setup=setup_response,
                                        model_setup=model_setup, general_error=general_error,
-                                       print_log=print_log,
-                                       engine_file_contract=EngineFileContract(global_leap_binder.mapping_connections))
+                                       print_log=print_log)
 
     def _check_preprocess(self) -> DatasetTestResultPayload:
         test_result = DatasetTestResultPayload('preprocess')

{code_loader-1.0.89 → code_loader-1.0.90}/code_loader/visualizers/default_visualizers.py

@@ -20,21 +20,21 @@ class DefaultVisualizer(Enum):
     
 
 def default_image_visualizer(data: npt.NDArray[np.float32]) -> LeapImage:
-    rescaled_data = rescale_min_max(data)
+    rescaled_data = rescale_min_max(data[0])
     return LeapImage(rescaled_data)
 
 
 def default_video_visualizer(data: npt.NDArray[np.float32]) -> LeapVideo:
-    return LeapVideo(data)
+    return LeapVideo(data[0])
 
 
 def default_graph_visualizer(data: npt.NDArray[np.float32]) -> LeapGraph:
-    return LeapGraph(data)
+    return LeapGraph(data[0])
 
 
 def default_horizontal_bar_visualizer(data: npt.NDArray[np.float32]) -> LeapHorizontalBar:
     labels = [str(index) for index in range(data.shape[-1])]
-    return LeapHorizontalBar(data, labels)
+    return LeapHorizontalBar(data[0], labels)
 
 
 def default_word_visualizer(data: npt.NDArray[np.float32]) -> LeapText:
@@ -51,6 +51,11 @@ def default_raw_data_visualizer(data: npt.NDArray[np.float32]) -> LeapText:
 
 
 def default_image_mask_visualizer(mask: npt.NDArray[np.float32], image: npt.NDArray[np.float32]) -> LeapImageMask:
+    if image.shape[0] == 1:
+        image = image[0]
+    if mask.shape[0] == 1:
+        mask = mask[0]
+
     n_different_labels = mask.shape[-1]
     labels = [str(i) for i in range(n_different_labels)]
 

{code_loader-1.0.89 → code_loader-1.0.90}/pyproject.toml

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

code_loader-1.0.89/code_loader/contract/mapping.py

@@ -1,56 +0,0 @@
-# mypy: ignore-errors
-
-
-from enum import Enum
-
-from typing import Optional, Dict, Any, List
-from dataclasses import dataclass
-
-
-
-class NodeMappingType(Enum):
-    Visualizer = 'Visualizer'
-    Metric = 'Metric'
-    GroundTruth = 'GroundTruth'
-    Input = 'Input'
-    Layer = 'Layer'
-    Loss = 'Loss'
-    CustomLoss = 'CustomLoss'
-    Optimizer = 'Optimizer'
-    Prediction0 = 'Prediction0'
-    Prediction1 = 'Prediction1'
-    Prediction2 = 'Prediction2'
-    Prediction3 = 'Prediction3'
-    Input0 = 'Input0'
-    Input1 = 'Input1'
-    Input2 = 'Input2'
-    Input3 = 'Input3'
-    Input4 = 'Input4'
-    Input5 = 'Input5'
-    PredictionLabels = 'PredictionLabels'
-
-
-@dataclass
-class NodeMapping:
-    name: str
-    type: NodeMappingType
-    user_unique_name: Optional[str] = None
-    sub_type: Optional[str] = None
-    arg_names: Optional[List[str]] = None
-
-
-@dataclass
-class NodeConnection:
-    node: NodeMapping
-    node_inputs: Optional[Dict[str, NodeMapping]]
-
-
-def leap_output(idx):
-    def dummy():
-        return None
-
-    node_mapping_type = NodeMappingType(f'Prediction{str(idx)}')
-    dummy.node_mapping = NodeMapping('', node_mapping_type)
-
-    return dummy
-