code-loader 1.0.39__tar.gz → 1.0.40a0__tar.gz

{code_loader-1.0.39 → code_loader-1.0.40a0}/PKG-INFO

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

{code_loader-1.0.39 → code_loader-1.0.40a0}/code_loader/contract/datasetclasses.py

@@ -6,7 +6,7 @@ import numpy.typing as npt
 
 from code_loader.contract.enums import DataStateType, DataStateEnum, LeapDataType, ConfusionMatrixValue, MetricDirection
 from code_loader.contract.visualizer_classes import LeapImage, LeapText, LeapGraph, LeapHorizontalBar, \
-    LeapTextMask, LeapImageMask, LeapImageWithBBox, LeapImageWithHeatmap
+    LeapTextMask, LeapImageMask, LeapImageWithBBox
 
 custom_latent_space_attribute = "custom_latent_space"
 
@@ -17,8 +17,16 @@ class PreprocessResponse:
     data: Any
 
 
+@dataclass
+class ElementInstance:
+    name: str
+    mask: npt.NDArray[np.float32]
+
+
 SectionCallableInterface = Callable[[int, PreprocessResponse], npt.NDArray[np.float32]]
 
+InstanceCallableInterface = Callable[[int, PreprocessResponse], List[ElementInstance]]
+
 MetadataSectionCallableInterface = Union[
     Callable[[int, PreprocessResponse], int],
     Callable[[int, PreprocessResponse], Dict[str, int]],
@@ -50,12 +58,11 @@ VisualizerCallableInterface = Union[
     Callable[..., LeapHorizontalBar],
     Callable[..., LeapImageMask],
     Callable[..., LeapTextMask],
-    Callable[..., LeapImageWithBBox],
-    Callable[..., LeapImageWithHeatmap]
+    Callable[..., LeapImageWithBBox]
 ]
 
 VisualizerCallableReturnType = Union[LeapImage, LeapText, LeapGraph, LeapHorizontalBar,
-LeapImageMask, LeapTextMask, LeapImageWithBBox, LeapImageWithHeatmap]
+LeapImageMask, LeapTextMask, LeapImageWithBBox]
 
 CustomCallableInterface = Callable[..., Any]
 
@@ -90,6 +97,7 @@ class MetricHandler:
     arg_names: List[str]
     direction: Optional[MetricDirection] = MetricDirection.Downward
 
+
 @dataclass
 class RawInputsForHeatmap:
     raw_input_by_vizualizer_arg_name: Dict[str, npt.NDArray[np.float32]]
@@ -113,6 +121,7 @@ class DatasetBaseHandler:
 @dataclass
 class InputHandler(DatasetBaseHandler):
     shape: Optional[List[int]] = None
+    instance_function: Optional[InstanceCallableInterface] = None
 
 
 @dataclass

{code_loader-1.0.39 → code_loader-1.0.40a0}/code_loader/contract/enums.py

@@ -26,7 +26,6 @@ class LeapDataType(Enum):
     ImageMask = 'ImageMask'
     TextMask = 'TextMask'
     ImageWithBBox = 'ImageWithBBox'
-    ImageWithHeatmap = 'ImageWithHeatmap'
 
 
 class MetricDirection(Enum):

{code_loader-1.0.39 → code_loader-1.0.40a0}/code_loader/contract/visualizer_classes.py

@@ -135,27 +135,6 @@ class LeapTextMask:
             validate_type(type(label), str)
 
 
-@dataclass
-class LeapImageWithHeatmap:
-    image: npt.NDArray[np.float32]
-    heatmaps: npt.NDArray[np.float32]
-    labels: List[str]
-    type: LeapDataType = LeapDataType.ImageWithHeatmap
-
-    def __post_init__(self) -> None:
-        validate_type(self.type, LeapDataType.ImageWithHeatmap)
-        validate_type(type(self.heatmaps), np.ndarray)
-        validate_type(self.heatmaps.dtype, np.float32)
-        validate_type(type(self.image), np.ndarray)
-        validate_type(self.image.dtype, np.float32)
-        validate_type(type(self.labels), list)
-        for label in self.labels:
-            validate_type(type(label), str)
-        if self.heatmaps.shape[0] != len(self.labels):
-            raise LeapValidationError(
-                'Number of heatmaps and labels must be equal')
-
-
 map_leap_data_type_to_visualizer_class = {
     LeapDataType.Image.value: LeapImage,
     LeapDataType.Graph.value: LeapGraph,
@@ -163,6 +142,5 @@ map_leap_data_type_to_visualizer_class = {
     LeapDataType.HorizontalBar.value: LeapHorizontalBar,
     LeapDataType.ImageMask.value: LeapImageMask,
     LeapDataType.TextMask.value: LeapTextMask,
-    LeapDataType.ImageWithBBox.value: LeapImageWithBBox,
-    LeapDataType.ImageWithHeatmap.value: LeapImageWithHeatmap
+    LeapDataType.ImageWithBBox.value: LeapImageWithBBox
 }

{code_loader-1.0.39 → code_loader-1.0.40a0}/code_loader/inner_leap_binder/leapbinder.py

@@ -9,7 +9,8 @@ from code_loader.contract.datasetclasses import SectionCallableInterface, InputH
     PreprocessHandler, VisualizerCallableInterface, CustomLossHandler, CustomCallableInterface, PredictionTypeHandler, \
     MetadataSectionCallableInterface, UnlabeledDataPreprocessHandler, CustomLayerHandler, MetricHandler, \
     CustomCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, VisualizerCallableReturnType, \
-    CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, RawInputsForHeatmap
+    CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, \
+    RawInputsForHeatmap, InstanceCallableInterface
 from code_loader.contract.enums import LeapDataType, DataStateEnum, DataStateType, MetricDirection
 from code_loader.contract.responsedataclasses import DatasetTestResultPayload
 from code_loader.contract.visualizer_classes import map_leap_data_type_to_visualizer_class
@@ -95,9 +96,10 @@ class LeapBinder:
     def set_unlabeled_data_preprocess(self, function: Callable[[], PreprocessResponse]) -> None:
         self.setup_container.unlabeled_data_preprocess = UnlabeledDataPreprocessHandler(function)
 
-    def set_input(self, function: SectionCallableInterface, name: str) -> None:
+    def set_input(self, function: SectionCallableInterface, name: str,
+                  instance_function: Optional[InstanceCallableInterface] = None) -> None:
         function = to_numpy_return_wrapper(function)
-        self.setup_container.inputs.append(InputHandler(name, function))
+        self.setup_container.inputs.append(InputHandler(name, function, instance_function=instance_function))
 
         self._encoder_names.append(name)
 
@@ -132,7 +134,8 @@ class LeapBinder:
             custom_layer.kernel_index = kernel_index
 
         if use_custom_latent_space and not hasattr(custom_layer, custom_latent_space_attribute):
-            raise Exception(f"{custom_latent_space_attribute} function has not been set for custom layer: {custom_layer.__name__}")
+            raise Exception(
+                f"{custom_latent_space_attribute} function has not been set for custom layer: {custom_layer.__name__}")
 
         init_args = inspect.getfullargspec(custom_layer.__init__)[0][1:]
         call_args = inspect.getfullargspec(custom_layer.call)[0][1:]

{code_loader-1.0.39 → code_loader-1.0.40a0}/code_loader/leaploader.py

@@ -5,14 +5,14 @@ import sys
 from contextlib import redirect_stdout
 from functools import lru_cache
 from pathlib import Path
-from typing import Dict, List, Iterable, Union, Any
+from typing import Dict, List, Iterable, Union, Any, Optional
 
 import numpy as np
 import numpy.typing as npt
 
 from code_loader.contract.datasetclasses import DatasetSample, DatasetBaseHandler, GroundTruthHandler, \
     PreprocessResponse, VisualizerHandler, VisualizerCallableReturnType, CustomLossHandler, \
-    PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler
+    PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler, ElementInstance
 from code_loader.contract.enums import DataStateEnum, TestingSectionEnum, DataStateType, DatasetMetadataType
 from code_loader.contract.exceptions import DatasetScriptException
 from code_loader.contract.responsedataclasses import DatasetIntegParseResult, DatasetTestResultPayload, \
@@ -298,6 +298,15 @@ class LeapLoader:
     def _get_inputs(self, state: DataStateEnum, idx: int) -> Dict[str, npt.NDArray[np.float32]]:
         return self._get_dataset_handlers(global_leap_binder.setup_container.inputs, state, idx)
 
+    def get_instance_elements(self, state: DataStateEnum, idx: int, input_name: str) -> Optional[List[ElementInstance]]:
+        preprocess_result = self._preprocess_result()
+        preprocess_state = preprocess_result[state]
+        for input in global_leap_binder.setup_container.inputs:
+            if input.name == input_name:
+                if input.instance_function is not None:
+                    return input.instance_function(idx, preprocess_state)
+
+
     def _get_gt(self, state: DataStateEnum, idx: int) -> Dict[str, npt.NDArray[np.float32]]:
         return self._get_dataset_handlers(global_leap_binder.setup_container.ground_truths, state, idx)
 

{code_loader-1.0.39 → code_loader-1.0.40a0}/code_loader/visualizers/default_visualizers.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import List
 
 import numpy as np
 import numpy.typing as npt
@@ -17,7 +16,7 @@ class DefaultVisualizer(Enum):
     ImageMask = 'ImageMask'
     TextMask = 'TextMask'
     RawData = 'RawData'
-    
+
 
 def default_image_visualizer(data: npt.NDArray[np.float32]) -> LeapImage:
     rescaled_data = rescale_min_max(data)

{code_loader-1.0.39 → code_loader-1.0.40a0}/pyproject.toml

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