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

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

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

{code_loader-1.0.87.dev1 → code_loader-1.0.87.dev3}/code_loader/contract/mapping.py

@@ -39,4 +39,14 @@ class NodeMapping:
 class NodeConnection:
     node: NodeMapping
     node_inputs: Optional[Dict[str, NodeMapping]]
-    prediction_type_name: Optional[str] = None
+    prediction_type_name: Optional[str] = None
+
+
+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

{code_loader-1.0.87.dev1 → code_loader-1.0.87.dev3}/code_loader/contract/responsedataclasses.py

@@ -2,6 +2,7 @@ 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
@@ -74,7 +75,6 @@ class DatasetSetup:
     metadata: List[DatasetMetadataInstance]
     outputs: List[DatasetOutputInstance]
     visualizers: List[VisualizerInstance]
-    prediction_types: List[PredictionTypeInstance]
     custom_losses: List[CustomLossInstance]
     metrics: List[MetricInstance] = field(default_factory=list)
 
@@ -120,6 +120,12 @@ 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]
@@ -129,3 +135,4 @@ 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.87.dev1 → code_loader-1.0.87.dev3}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -16,6 +16,16 @@ from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, Le
     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,
@@ -32,15 +42,7 @@ def tensorleap_custom_metric(name: str,
 
         if connects_to is not None:
             arg_names = leap_binder.setup_container.metrics[-1].metric_handler_data.arg_names
-            for user_unique_name, connection_destinations in connects_to.items():
-                main_node_mapping = NodeMapping(name, NodeMappingType.Metric, 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))
-
-
+            _add_mapping_connections(connects_to, arg_names, NodeMappingType.Metric, name)
 
         def _validate_input_args(*args, **kwargs) -> None:
             for i, arg in enumerate(args):
@@ -130,7 +132,8 @@ def tensorleap_custom_metric(name: str,
 
 
 def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
-                                 heatmap_function: Optional[Callable[..., npt.NDArray[np.float32]]] = None):
+                                 heatmap_function: Optional[Callable[..., npt.NDArray[np.float32]]] = None,
+                                 connects_to=None):
     def decorating_function(user_function: VisualizerCallableInterface):
         for viz_handler in leap_binder.setup_container.visualizers:
             if viz_handler.visualizer_handler_data.name == name:
@@ -139,6 +142,10 @@ 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)), (
@@ -328,6 +335,8 @@ def tensorleap_input_encoder(name: str, channel_dim=-1):
             _validate_result(result)
             return result
 
+        inner.node_mapping = NodeMapping(name, NodeMappingType.Input)
+
         return inner
 
     return decorating_function
@@ -377,7 +386,7 @@ def tensorleap_gt_encoder(name: str):
     return decorating_function
 
 
-def tensorleap_custom_loss(name: str):
+def tensorleap_custom_loss(name: str, connects_to=None):
     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:
@@ -386,6 +395,11 @@ def tensorleap_custom_loss(name: str):
 
         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.87.dev1 → code_loader-1.0.87.dev3}/code_loader/leaploader.py

@@ -179,7 +179,8 @@ 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)
+                                       print_log=print_log,
+                                       engine_file_contract=global_leap_binder.mapping_connections)
 
     def _check_preprocess(self) -> DatasetTestResultPayload:
         test_result = DatasetTestResultPayload('preprocess')

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

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