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

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

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

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

@@ -117,12 +117,17 @@ MetricCallableReturnType = Union[Any, List[List[ConfusionMatrixElement]]]
 
 
 @dataclass
-class CustomLossHandler:
+class CustomLossHandlerData:
     name: str
-    function: CustomCallableInterface
     arg_names: List[str]
 
 
+@dataclass
+class CustomLossHandler:
+    custom_loss_handler_data: CustomLossHandlerData
+    function: CustomCallableInterface
+
+
 @dataclass
 class MetricHandlerData:
     name: str

{code_loader-1.0.61.dev3 → code_loader-1.0.61.dev5}/code_loader/inner_leap_binder/leapbinder.py

@@ -10,7 +10,7 @@ from code_loader.contract.datasetclasses import SectionCallableInterface, InputH
     MetadataSectionCallableInterface, UnlabeledDataPreprocessHandler, CustomLayerHandler, MetricHandler, \
     CustomCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, LeapData, \
     CustomMultipleReturnCallableInterfaceMultiArgs, DatasetBaseHandler, custom_latent_space_attribute, \
-    RawInputsForHeatmap, VisualizerHandlerData, MetricHandlerData
+    RawInputsForHeatmap, VisualizerHandlerData, MetricHandlerData, CustomLossHandlerData
 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
@@ -226,7 +226,7 @@ class LeapBinder:
             leap_binder.add_custom_loss(custom_loss_function, name='custom_loss')
         """
         arg_names = inspect.getfullargspec(function)[0]
-        self.setup_container.custom_loss_handlers.append(CustomLossHandler(name, function, arg_names))
+        self.setup_container.custom_loss_handlers.append(CustomLossHandler(CustomLossHandlerData(name, arg_names), function))
 
     def add_custom_metric(self,
                           function: Union[CustomCallableInterfaceMultiArgs,

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

@@ -11,8 +11,9 @@ import numpy as np
 import numpy.typing as npt
 
 from code_loader.contract.datasetclasses import DatasetSample, DatasetBaseHandler, GroundTruthHandler, \
-    PreprocessResponse, VisualizerHandler, LeapData, CustomLossHandler, \
-    PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler, VisualizerHandlerData, MetricHandlerData
+    PreprocessResponse, VisualizerHandler, LeapData, \
+    PredictionTypeHandler, MetadataHandler, CustomLayerHandler, MetricHandler, VisualizerHandlerData, MetricHandlerData, \
+    MetricCallableReturnType, CustomLossHandlerData, CustomLossHandler
 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, \
@@ -101,7 +102,16 @@ class LeapLoader(LeapLoaderBase):
         }
 
     @lru_cache()
-    def custom_loss_by_name(self) -> Dict[str, CustomLossHandler]:
+    def custom_loss_by_name(self) -> Dict[str, CustomLossHandlerData]:
+        self.exec_script()
+        setup = global_leap_binder.setup_container
+        return {
+            custom_loss_handler.name: custom_loss_handler.custom_loss_handler_data
+            for custom_loss_handler in setup.custom_loss_handlers
+        }
+
+    @lru_cache()
+    def _custom_loss_handler_by_name(self) -> Dict[str, CustomLossHandler]:
         self.exec_script()
         setup = global_leap_binder.setup_container
         return {
@@ -217,8 +227,16 @@ class LeapLoader(LeapLoaderBase):
         all_dataset_base_handlers.extend(global_leap_binder.setup_container.metadata)
         return all_dataset_base_handlers
 
-    def run_visualizer(self, visualizer_name: str, input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]],
-                       ) -> LeapData:
+    def run_metric(self, metric_name: str,
+                   input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]]) -> MetricCallableReturnType:
+        self._preprocess_result()
+        return self._metric_handler_by_name()[metric_name].function(**input_tensors_by_arg_name)
+
+    def run_custom_loss(self, custom_loss_name: str,
+                        input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]]):
+        return self._custom_loss_handler_by_name()[custom_loss_name].function(**input_tensors_by_arg_name)
+
+    def run_visualizer(self, visualizer_name: str, input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]]) -> LeapData:
         # running preprocessing to sync preprocessing in main thread (can be valuable when preprocess is filling a
         # global param that visualizer is using)
         self._preprocess_result()

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

@@ -7,8 +7,9 @@ from typing import Dict, List, Union, Type
 import numpy as np
 import numpy.typing as npt
 
-from code_loader.contract.datasetclasses import DatasetSample, LeapData, CustomLossHandler, \
-    PredictionTypeHandler, CustomLayerHandler, VisualizerHandlerData, MetricHandlerData
+from code_loader.contract.datasetclasses import DatasetSample, LeapData, \
+    PredictionTypeHandler, CustomLayerHandler, VisualizerHandlerData, MetricHandlerData, MetricCallableReturnType, \
+    CustomLossHandlerData
 from code_loader.contract.enums import DataStateEnum
 from code_loader.contract.responsedataclasses import DatasetIntegParseResult, DatasetTestResultPayload, \
     DatasetSetup, ModelSetup
@@ -28,7 +29,7 @@ class LeapLoaderBase:
         pass
 
     @abstractmethod
-    def custom_loss_by_name(self) -> Dict[str, CustomLossHandler]:
+    def custom_loss_by_name(self) -> Dict[str, CustomLossHandlerData]:
         pass
 
     @abstractmethod
@@ -48,8 +49,12 @@ class LeapLoaderBase:
         pass
 
     @abstractmethod
-    def run_visualizer(self, visualizer_name: str, input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]],
-                       ) -> LeapData:
+    def run_visualizer(self, visualizer_name: str, input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]]) -> LeapData:
+        pass
+
+    @abstractmethod
+    def run_metric(self, metric_name: str,
+                   input_tensors_by_arg_name: Dict[str, npt.NDArray[np.float32]]) -> MetricCallableReturnType:
         pass
 
     @abstractmethod

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

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