code-loader 1.0.135__tar.gz → 1.0.137__tar.gz

{code_loader-1.0.135 → code_loader-1.0.137}/PKG-INFO

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

{code_loader-1.0.135 → code_loader-1.0.137}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -1,6 +1,8 @@
 # mypy: ignore-errors
 import os
+from collections import defaultdict
 from functools import lru_cache
+from pathlib import Path
 from typing import Optional, Union, Callable, List, Dict
 
 import numpy as np
@@ -11,7 +13,7 @@ from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs
     VisualizerCallableInterface, MetadataSectionCallableInterface, PreprocessResponse, SectionCallableInterface, \
     ConfusionMatrixElement, SamplePreprocessResponse, PredictionTypeHandler, InstanceCallableInterface, ElementInstance, \
     InstanceLengthCallableInterface
-from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMetadataType
+from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMetadataType, DataStateType
 from code_loader import leap_binder
 from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConnection
 from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, LeapTextMask, LeapText, LeapGraph, \
@@ -43,7 +45,7 @@ def _add_mapping_connections(connects_to, arg_names, node_mapping_type, name):
         _add_mapping_connection(user_unique_name, connection_destinations, arg_names, name, node_mapping_type)
 
 
-def integration_test():
+def tensorleap_integration_test():
     def decorating_function(integration_test_function: Callable):
         leap_binder.integration_test_func = integration_test_function
 
@@ -55,10 +57,19 @@ def integration_test():
 
                 try:
                     os.environ[mapping_runtime_mode_env_var_mame] = 'True'
-                    integration_test_function(None, None)
+                    integration_test_function(None, PreprocessResponse(state=DataStateType.training, length=0))
                 except Exception as e:
-                    print(f'Error during integration test: Make sure to disable any non tensorleap decorators '
-                          f'functions before pushing a new TL version')
+                    import traceback
+                    first_tb = traceback.extract_tb(e.__traceback__)[-1]
+                    file_name = Path(first_tb.filename).name
+                    line_number = first_tb.lineno
+                    if isinstance(e, TypeError) and 'is not subscriptable' in str(e):
+                        print(f'Invalid integration code. File {file_name}, line {line_number}: '
+                              f'Please remove this indexing operation usage from the integration test code.')
+                    else:
+                        print(f'Invalid integration code. File {file_name}, line {line_number}: '
+                              f'Integration test is only allowed to call Tensorleap decorators. '
+                              f'Ensure any arithmetics, external library use, Python logic is placed within Tensorleap decoders')
                 finally:
                     if mapping_runtime_mode_env_var_mame in os.environ:
                         del os.environ[mapping_runtime_mode_env_var_mame]
@@ -77,7 +88,7 @@ def _safe_get_item(key):
     except ValueError:
         raise Exception(f'Tensorleap currently supports models with no more then 10 inputs')
 
-def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]] = None):
+def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]] = []):
     for i, prediction_type in enumerate(prediction_types):
         leap_binder.add_prediction(prediction_type.name, prediction_type.labels, prediction_type.channel_dim, i)
 
@@ -232,9 +243,11 @@ def tensorleap_custom_metric(name: str,
                              direction: Union[MetricDirection, Dict[str, MetricDirection]] = MetricDirection.Downward,
                              compute_insights: Optional[Union[bool, Dict[str, bool]]] = None,
                              connects_to=None):
-    def decorating_function(user_function: Union[CustomCallableInterfaceMultiArgs,
-    CustomMultipleReturnCallableInterfaceMultiArgs,
-    ConfusionMatrixCallableInterfaceMultiArgs]):
+    name_to_unique_name = defaultdict(set)
+
+    def decorating_function(
+            user_function: Union[CustomCallableInterfaceMultiArgs, 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. '
@@ -354,6 +367,11 @@ def tensorleap_custom_metric(name: str,
 
             ordered_connections = [kwargs[n] for n in mapping_inner.arg_names if n in kwargs]
             ordered_connections = list(args) + ordered_connections
+
+            if user_unique_name in name_to_unique_name[mapping_inner.name]:
+                user_unique_name = f'{user_unique_name}_{len(name_to_unique_name[mapping_inner.name])}'
+            name_to_unique_name[mapping_inner.name].add(user_unique_name)
+
             _add_mapping_connection(user_unique_name, ordered_connections, mapping_inner.arg_names,
                                     mapping_inner.name, NodeMappingType.Metric)
 
@@ -376,6 +394,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,
                                  connects_to=None):
+    name_to_unique_name = defaultdict(set)
+
     def decorating_function(user_function: VisualizerCallableInterface):
         for viz_handler in leap_binder.setup_container.visualizers:
             if viz_handler.visualizer_handler_data.name == name:
@@ -452,6 +472,10 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
             if 'user_unique_name' in kwargs:
                 user_unique_name = kwargs['user_unique_name']
 
+            if user_unique_name in name_to_unique_name[mapping_inner.name]:
+                user_unique_name = f'{user_unique_name}_{len(name_to_unique_name[mapping_inner.name])}'
+            name_to_unique_name[mapping_inner.name].add(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,
@@ -974,6 +998,8 @@ def tensorleap_gt_encoder(name: str):
 
 
 def tensorleap_custom_loss(name: str, connects_to=None):
+    name_to_unique_name = defaultdict(set)
+
     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:
@@ -1042,6 +1068,10 @@ def tensorleap_custom_loss(name: str, connects_to=None):
             if 'user_unique_name' in kwargs:
                 user_unique_name = kwargs['user_unique_name']
 
+            if user_unique_name in name_to_unique_name[mapping_inner.name]:
+                user_unique_name = f'{user_unique_name}_{len(name_to_unique_name[mapping_inner.name])}'
+            name_to_unique_name[mapping_inner.name].add(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,

{code_loader-1.0.135 → code_loader-1.0.137}/code_loader/leaploader.py

@@ -51,7 +51,7 @@ class LeapLoader(LeapLoaderBase):
             os.environ[mapping_runtime_mode_env_var_mame] = 'TRUE'
             self.evaluate_module()
             if global_leap_binder.integration_test_func is not None:
-                global_leap_binder.integration_test_func(None, None)
+                global_leap_binder.integration_test_func(None, PreprocessResponse(state=DataStateType.training, length=0))
         except TypeError as e:
             import traceback
             if "leap_binder.set_metadata(" in traceback.format_exc(5):

{code_loader-1.0.135 → code_loader-1.0.137}/pyproject.toml

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