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

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

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

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

@@ -175,7 +175,12 @@ def normalize_metric_handler_settings(
         return direction, compute_insights
 
     normalized_direction = direction
-    if isinstance(direction, MetricDirection):
+    if direction is None:
+        normalized_direction = {
+            key: MetricDirection.Downward
+            for key in ordered_result_keys
+        }
+    elif isinstance(direction, MetricDirection):
         normalized_direction = {key: direction for key in ordered_result_keys}
     elif isinstance(direction, dict):
         normalized_direction = {
@@ -184,7 +189,9 @@ def normalize_metric_handler_settings(
         }
 
     normalized_compute_insights = compute_insights
-    if isinstance(compute_insights, bool):
+    if compute_insights is None:
+        normalized_compute_insights = {}
+    elif isinstance(compute_insights, bool):
         normalized_compute_insights = {key: compute_insights for key in ordered_result_keys}
     elif isinstance(compute_insights, dict):
         normalized_compute_insights = {

{code_loader-1.0.172.dev1 → code_loader-1.0.172.dev3}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -19,7 +19,7 @@ from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs
     CustomMultipleReturnCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, CustomCallableInterface, \
     VisualizerCallableInterface, MetadataSectionCallableInterface, PreprocessResponse, SectionCallableInterface, \
     ConfusionMatrixElement, SamplePreprocessResponse, PredictionTypeHandler, InstanceCallableInterface, ElementInstance, \
-    InstanceLengthCallableInterface
+    InstanceLengthCallableInterface, normalize_metric_handler_settings
 from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMetadataType, DataStateType
 from code_loader import leap_binder, LeapLoader
 from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConnection
@@ -699,21 +699,21 @@ def tensorleap_custom_metric(name: str,
                             (f'{user_function.__name__}() validation failed: '
                              f'Keys in the compute_insights mapping should be part of result keys. Got key {ci_key}.')
 
-                effective_direction = {} if direction is _UNSET else direction if isinstance(direction, dict) else {k:direction for k in result_keys}
-                defaulted_direction_keys = result_keys.difference(effective_direction.keys())
+                normalized_direction_input = None if direction is _UNSET else direction
+                effective_direction, effective_compute_insights = normalize_metric_handler_settings(
+                    normalized_direction_input,
+                    compute_insights,
+                    result.keys(),
+                )
 
-                if defaulted_direction_keys:
-                    effective_direction = {key: effective_direction.get(key, MetricDirection.Downward) for key in result}
+                defaulted_direction_keys = set()
+                if isinstance(direction, dict):
+                    defaulted_direction_keys = result_keys.difference(direction.keys())
 
                 leap_binder.setup_container.metrics[-1].metric_handler_data.direction = effective_direction
+                leap_binder.setup_container.metrics[-1].metric_handler_data.compute_insights = effective_compute_insights
 
                 if defaulted_direction_keys and not _call_from_tl_platform:
-                    if compute_insights is None:
-                        effective_compute_insights = {}
-                    elif isinstance(compute_insights, dict):
-                        effective_compute_insights = compute_insights
-                    else:
-                        effective_compute_insights = {k: compute_insights for k in result_keys}
                     warning_keys = {key for key in defaulted_direction_keys if effective_compute_insights.get(key, True)}
                     if warning_keys:
                         store_warning_by_param(
@@ -1814,4 +1814,3 @@ if not _call_from_tl_platform:
 
 
 
-

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

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