code-loader 1.0.92.dev5__tar.gz → 1.0.93.dev2__tar.gz

{code_loader-1.0.92.dev5 → code_loader-1.0.93.dev2}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.92.dev5
+Version: 1.0.93.dev2
 Summary: 
+Home-page: https://github.com/tensorleap/code-loader
 License: MIT
 Author: dorhar
 Author-email: doron.harnoy@tensorleap.ai
@@ -16,7 +17,6 @@ Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: psutil (>=5.9.5,<6.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
-Project-URL: Homepage, https://github.com/tensorleap/code-loader
 Project-URL: Repository, https://github.com/tensorleap/code-loader
 Description-Content-Type: text/markdown
 

{code_loader-1.0.92.dev5 → code_loader-1.0.93.dev2}/code_loader/contract/visualizer_classes.py

@@ -121,23 +121,19 @@ class LeapGraph:
         x_label = 'Frequency [Seconds]'
         y_label = 'Amplitude [Voltage]'
         x_range = (0.1, 3.0)
-        legend = ['experiment1', 'experiment2', 'experiment3']
-        leap_graph = LeapGraph(data=graph_data, x_label=x_label, y_label=y_label, x_range=x_range, legend=legend)
+        leap_graph = LeapGraph(data=graph_data, x_label=x_label, y_label=y_label, x_range=x_range)
     """
     data: npt.NDArray[np.float32]
     type: LeapDataType = LeapDataType.Graph
     x_label: Optional[str] = None
     y_label: Optional[str] = None
     x_range: Optional[Tuple[float,float]] = None
-    legend: Optional[List[str]] = None
 
     def __post_init__(self) -> None:
         validate_type(self.type, LeapDataType.Graph)
         validate_type(type(self.data), np.ndarray)
         validate_type(self.data.dtype, np.float32)
-        validate_type(len(self.data.shape), 2, f'Graph must be of shape 2')
-        if self.legend:
-            validate_type(self.data.shape[1], len(self.legend), 'Number of labels supplied should equal the number of graphs')
+        validate_type(len(self.data.shape), 2, 'Graph must be of shape 2')
         validate_type(type(self.x_label), [str, type(None)], 'x_label must be a string or None')
         validate_type(type(self.y_label), [str, type(None)], 'y_label must be a string or None')
         validate_type(type(self.x_range), [tuple, type(None)], 'x_range must be a tuple or None')

{code_loader-1.0.92.dev5 → code_loader-1.0.93.dev2}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -1,5 +1,5 @@
 # mypy: ignore-errors
-
+import os
 from typing import Optional, Union, Callable, List, Dict
 
 import numpy as np
@@ -16,14 +16,74 @@ from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, Le
     LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap
 
 
+mapping_runtime_mode_env_var_mame = '__mapping_runtime_mode__'
+
+
+def _add_mapping_connection(user_unique_name, connection_destinations, arg_names, name, node_mapping_type):
+    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 _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
+        _add_mapping_connection(user_unique_name, connection_destinations, arg_names, name, node_mapping_type)
+
+
+
+
+def tensorleap_load_model():
+    def decorating_function(load_model_func):
+        class TempMapping:
+            pass
+
+        def mapping_inner():
+            class ModelOutputPlaceholder:
+                def __init__(self):
+                    self.node_mapping = NodeMapping('', NodeMappingType.Prediction0)
+
+                def __getitem__(self, key):
+                    assert isinstance(key, int), \
+                        f'Expected key to be an int, got {type(key)} instead.'
+
+                    ret = TempMapping()
+                    ret.node_mapping = NodeMapping('', NodeMappingType(f'Prediction{str(key)}'))
+                    return ret
+
+            class ModelPlaceholder:
+                #keras interface
+                def __call__(self, arg):
+                    if isinstance(arg, list):
+                        for i, elem in enumerate(arg):
+                            elem.node_mapping.type = NodeMappingType[f'Input{str(i)}']
+                    else:
+                        arg.node_mapping.type = NodeMappingType.Input0
+
+                    return ModelOutputPlaceholder()
+
+                # onnx runtime interface
+                def run(self, output_names, input_dict):
+                    assert output_names is None
+                    assert isinstance(input_dict, dict), \
+                        f'Expected input_dict to be a dict, got {type(input_dict)} instead.'
+                    for i, elem in enumerate(input_dict.values()):
+                        elem.node_mapping.type = NodeMappingType[f'Input{str(i)}']
+
+                    return ModelOutputPlaceholder()
+
+            return ModelPlaceholder()
+
+
+        if os.environ[mapping_runtime_mode_env_var_mame]:
+            return mapping_inner
+        else:
+            return load_model_func
+
+    return decorating_function
 
-        leap_binder.mapping_connections.append(NodeConnection(main_node_mapping, node_inputs))
 
 
 def tensorleap_custom_metric(name: str,
@@ -31,8 +91,8 @@ def tensorleap_custom_metric(name: str,
                              compute_insights: Optional[Union[bool, Dict[str, bool]]] = None,
                              connects_to=None):
     def decorating_function(user_function: Union[CustomCallableInterfaceMultiArgs,
-    CustomMultipleReturnCallableInterfaceMultiArgs,
-    ConfusionMatrixCallableInterfaceMultiArgs]):
+            CustomMultipleReturnCallableInterfaceMultiArgs,
+            ConfusionMatrixCallableInterfaceMultiArgs]):
         for metric_handler in leap_binder.setup_container.metrics:
             if metric_handler.metric_handler_data.name == name:
                 raise Exception(f'Metric with name {name} already exists. '
@@ -119,14 +179,31 @@ def tensorleap_custom_metric(name: str,
                         (f'tensorleap_custom_metric validation failed: '
                          f'compute_insights should be boolean. Got {type(compute_insights)}.')
 
-
         def inner(*args, **kwargs):
             _validate_input_args(*args, **kwargs)
             result = user_function(*args, **kwargs)
             _validate_result(result)
             return result
 
-        return inner
+        def mapping_inner(*args, **kwargs):
+            user_unique_name = mapping_inner.name
+            if 'user_unique_name' in kwargs:
+                user_unique_name = kwargs['user_unique_name']
+
+            ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
+            ordered_connections = list(args) + ordered_connections
+            _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,
+                                    mapping_inner.name,  NodeMappingType.Metric)
+
+            return None
+
+        mapping_inner.arg_names = leap_binder.setup_container.metrics[-1].metric_handler_data.arg_names
+        mapping_inner.name = name
+
+        if os.environ[mapping_runtime_mode_env_var_mame]:
+            return mapping_inner
+        else:
+            return inner
 
     return decorating_function
 
@@ -186,7 +263,25 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
             _validate_result(result)
             return result
 
-        return inner
+        def mapping_inner(*args, **kwargs):
+            user_unique_name = mapping_inner.name
+            if 'user_unique_name' in kwargs:
+                user_unique_name = kwargs['user_unique_name']
+
+            ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
+            ordered_connections = list(args) + ordered_connections
+            _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,
+                                    mapping_inner.name, NodeMappingType.Visualizer)
+
+            return None
+
+        mapping_inner.arg_names = leap_binder.setup_container.visualizers[-1].visualizer_handler_data.arg_names
+        mapping_inner.name = name
+
+        if os.environ[mapping_runtime_mode_env_var_mame]:
+            return mapping_inner
+        else:
+            return inner
 
     return decorating_function
 
@@ -340,7 +435,21 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
             node_mapping_type = NodeMappingType(f'Input{str(model_input_index)}')
         inner.node_mapping = NodeMapping(name, node_mapping_type)
 
-        return inner
+
+        def mapping_inner(*args, **kwargs):
+            class TempMapping:
+                pass
+            ret = TempMapping()
+            ret.node_mapping = mapping_inner.node_mapping
+
+            return ret
+
+        mapping_inner.node_mapping = NodeMapping(name, node_mapping_type)
+
+        if os.environ[mapping_runtime_mode_env_var_mame]:
+            return mapping_inner
+        else:
+            return inner
 
     return decorating_function
 
@@ -382,9 +491,20 @@ def tensorleap_gt_encoder(name: str):
 
         inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
 
-        return inner
+        def mapping_inner(*args, **kwargs):
+            class TempMapping:
+                pass
+            ret = TempMapping()
+            ret.node_mapping = mapping_inner.node_mapping
+
+            return ret
 
+        mapping_inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
 
+        if os.environ[mapping_runtime_mode_env_var_mame]:
+            return mapping_inner
+        else:
+            return inner
 
     return decorating_function
 
@@ -440,7 +560,25 @@ def tensorleap_custom_loss(name: str, connects_to=None):
             _validate_result(result)
             return result
 
-        return inner
+        def mapping_inner(*args, **kwargs):
+            user_unique_name = mapping_inner.name
+            if 'user_unique_name' in kwargs:
+                user_unique_name = kwargs['user_unique_name']
+
+            ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
+            ordered_connections = list(args) + ordered_connections
+            _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,
+                                    mapping_inner.name, NodeMappingType.CustomLoss)
+
+            return None
+
+        mapping_inner.arg_names = leap_binder.setup_container.custom_loss_handlers[-1].custom_loss_handler_data.arg_names
+        mapping_inner.name = name
+
+        if os.environ[mapping_runtime_mode_env_var_mame]:
+            return mapping_inner
+        else:
+            return inner
 
     return decorating_function
 

{code_loader-1.0.92.dev5 → code_loader-1.0.93.dev2}/pyproject.toml

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