code-loader 1.0.61.dev1__tar.gz → 1.0.61.dev3__tar.gz

{code_loader-1.0.61.dev1 → code_loader-1.0.61.dev3}/PKG-INFO

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

{code_loader-1.0.61.dev1 → code_loader-1.0.61.dev3}/code_loader/contract/datasetclasses.py

@@ -124,24 +124,34 @@ class CustomLossHandler:
 
 
 @dataclass
-class MetricHandler:
+class MetricHandlerData:
     name: str
-    function: Union[CustomCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs]
     arg_names: List[str]
     direction: Optional[MetricDirection] = MetricDirection.Downward
 
 
+@dataclass
+class MetricHandler:
+    metric_handler_data: MetricHandlerData
+    function: Union[CustomCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs]
+
+
 @dataclass
 class RawInputsForHeatmap:
     raw_input_by_vizualizer_arg_name: Dict[str, npt.NDArray[np.float32]]
 
 
 @dataclass
-class VisualizerHandler:
+class VisualizerHandlerData:
     name: str
-    function: VisualizerCallableInterface
     type: LeapDataType
     arg_names: List[str]
+
+
+@dataclass
+class VisualizerHandler:
+    visualizer_handler_data: VisualizerHandlerData
+    function: VisualizerCallableInterface
     heatmap_function: Optional[Callable[..., npt.NDArray[np.float32]]] = None
 
 

{code_loader-1.0.61.dev1 → code_loader-1.0.61.dev3}/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, LeapData, \
-    CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, RawInputsForHeatmap
+    CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, \
+    RawInputsForHeatmap, VisualizerHandlerData, MetricHandlerData
 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
@@ -127,7 +128,7 @@ class LeapBinder:
                     f'should be {expected_return_type}')
 
         self.setup_container.visualizers.append(
-            VisualizerHandler(name, function, visualizer_type, arg_names, heatmap_visualizer))
+            VisualizerHandler(VisualizerHandlerData(name, visualizer_type, arg_names), function, heatmap_visualizer))
         self._visualizer_names.append(name)
 
     def set_preprocess(self, function: Callable[[], List[PreprocessResponse]]) -> None:
@@ -251,7 +252,7 @@ class LeapBinder:
             leap_binder.add_custom_metric(custom_metric_function, name='custom_metric', direction=MetricDirection.Downward)
         """
         arg_names = inspect.getfullargspec(function)[0]
-        self.setup_container.metrics.append(MetricHandler(name, function, arg_names, direction))
+        self.setup_container.metrics.append(MetricHandler(MetricHandlerData(name, arg_names, direction), function))
 
     def add_prediction(self, name: str, labels: List[str], channel_dim: int = -1) -> None:
         """

{code_loader-1.0.61.dev1 → code_loader-1.0.61.dev3}/code_loader/leaploader.py

@@ -12,7 +12,7 @@ import numpy.typing as npt
 
 from code_loader.contract.datasetclasses import DatasetSample, DatasetBaseHandler, GroundTruthHandler, \
     PreprocessResponse, VisualizerHandler, LeapData, CustomLossHandler, \
-    PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler
+    PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler, VisualizerHandlerData, MetricHandlerData
 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, \
@@ -65,7 +65,16 @@ class LeapLoader(LeapLoaderBase):
         spec.loader.exec_module(file)
 
     @lru_cache()
-    def metric_by_name(self) -> Dict[str, MetricHandler]:
+    def metric_by_name(self) -> Dict[str, MetricHandlerData]:
+        self.exec_script()
+        setup = global_leap_binder.setup_container
+        return {
+            metric_handler.name: metric_handler.metric_handler_data
+            for metric_handler in setup.metrics
+        }
+
+    @lru_cache()
+    def _metric_handler_by_name(self) -> Dict[str, MetricHandler]:
         self.exec_script()
         setup = global_leap_binder.setup_container
         return {
@@ -74,7 +83,16 @@ class LeapLoader(LeapLoaderBase):
         }
 
     @lru_cache()
-    def visualizer_by_name(self) -> Dict[str, VisualizerHandler]:
+    def visualizer_by_name(self) -> Dict[str, VisualizerHandlerData]:
+        self.exec_script()
+        setup = global_leap_binder.setup_container
+        return {
+            visualizer_handler.name: visualizer_handler.visualizer_handler_data
+            for visualizer_handler in setup.visualizers
+        }
+
+    @lru_cache()
+    def _visualizer_handler_by_name(self) -> Dict[str, VisualizerHandler]:
         self.exec_script()
         setup = global_leap_binder.setup_container
         return {
@@ -205,11 +223,11 @@ class LeapLoader(LeapLoaderBase):
         # global param that visualizer is using)
         self._preprocess_result()
 
-        return self.visualizer_by_name()[visualizer_name].function(**input_tensors_by_arg_name)
+        return self._visualizer_handler_by_name()[visualizer_name].function(**input_tensors_by_arg_name)
 
     def run_heatmap_visualizer(self, visualizer_name: str, input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]]
                                ) -> npt.NDArray[np.float32]:
-        heatmap_function = self.visualizer_by_name()[visualizer_name].heatmap_function
+        heatmap_function = self._visualizer_handler_by_name()[visualizer_name].heatmap_function
         if heatmap_function is None:
             assert len(input_tensors_by_arg_name) == 1
             return list(input_tensors_by_arg_name.values())[0]

{code_loader-1.0.61.dev1 → code_loader-1.0.61.dev3}/code_loader/leaploaderbase.py

@@ -7,8 +7,8 @@ from typing import Dict, List, Union, Type
 import numpy as np
 import numpy.typing as npt
 
-from code_loader.contract.datasetclasses import DatasetSample, VisualizerHandler, LeapData, CustomLossHandler, \
-    PredictionTypeHandler, CustomLayerHandler
+from code_loader.contract.datasetclasses import DatasetSample, LeapData, CustomLossHandler, \
+    PredictionTypeHandler, CustomLayerHandler, VisualizerHandlerData, MetricHandlerData
 from code_loader.contract.enums import DataStateEnum
 from code_loader.contract.responsedataclasses import DatasetIntegParseResult, DatasetTestResultPayload, \
     DatasetSetup, ModelSetup
@@ -19,14 +19,12 @@ class LeapLoaderBase:
         self.code_entry_name = code_entry_name
         self.code_path = code_path
 
-        self._preprocess_result_cached = None
-
     @abstractmethod
-    def metric_by_name(self):
+    def metric_by_name(self) -> Dict[str, MetricHandlerData]:
         pass
 
     @abstractmethod
-    def visualizer_by_name(self) -> Dict[str, VisualizerHandler]:
+    def visualizer_by_name(self) -> Dict[str, VisualizerHandlerData]:
         pass
 
     @abstractmethod
@@ -75,3 +73,9 @@ class LeapLoaderBase:
     @abstractmethod
     def get_sample_id_type(self) -> Type:
         pass
+
+    def is_custom_latent_space(self) -> bool:
+        if not self.code_entry_name or not self.code_path:
+            return False
+        custom_layers = self.custom_layers()
+        return any(layer.use_custom_latent_space for layer in custom_layers.values())

{code_loader-1.0.61.dev1 → code_loader-1.0.61.dev3}/pyproject.toml

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