code-loader 1.0.165.dev2__tar.gz → 1.0.165.dev4__tar.gz

{code_loader-1.0.165.dev2 → code_loader-1.0.165.dev4}/PKG-INFO

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

{code_loader-1.0.165.dev2 → code_loader-1.0.165.dev4}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -678,28 +678,19 @@ def tensorleap_custom_metric(name: str,
                         (f'{user_function.__name__}() validation failed: '
                          f'Keys in the return dict should be of type str. Got {type(key)}.')
 
-                assert direction is _UNSET or isinstance(direction, dict), \
-                    (f'{user_function.__name__}() validation failed: '
-                     f'direction should be a dict when using dict results. Got {type(direction)}.') #TODO - remove this assertion so a single value would controll all directions
-
                 if isinstance(direction, dict):
                     for direction_key in direction:
                         assert direction_key in result, \
                             (f'{user_function.__name__}() validation failed: '
                              f'Keys in the direction mapping should be part of result keys. Got key {direction_key}.')
 
-                if compute_insights is not None:
-                    assert isinstance(compute_insights, dict), \
-                        (f'{user_function.__name__}() validation failed: '
-                         f'compute_insights should be dict if using the dict results. Got {type(compute_insights)}.') #TODO - remove this assertion so a single value would controll all compute_insights
-
-                    if isinstance(compute_insights, dict):
-                        for ci_key in compute_insights:
-                            assert ci_key in result, \
-                                (f'{user_function.__name__}() validation failed: '
-                                 f'Keys in the compute_insights mapping should be part of result keys. Got key {ci_key}.')
+                if isinstance(compute_insights, dict):
+                    for ci_key in compute_insights:
+                        assert ci_key in result, \
+                            (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
+                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())
 
                 if defaulted_direction_keys:
@@ -721,25 +712,33 @@ def tensorleap_custom_metric(name: str,
             else:
                 _validate_single_metric(result)
 
-                if compute_insights is not None:
-                    assert isinstance(compute_insights, bool), \
-                        (f'{user_function.__name__}() validation failed: '
-                         f'compute_insights should be boolean. Got {type(compute_insights)}.')
-                if direction is not _UNSET:
-                    assert isinstance(direction, MetricDirection), \
-                        (f'{user_function.__name__}() validation failed: '
-                         f'direction should be a MetricDirection when using a single result. Got {type(direction)}.')
+                if compute_insights is not None and not isinstance(compute_insights, bool):
+                    warnings.warn(
+                        (f'{user_function.__name__}() unclear intention: '
+                         f'compute_insights should be boolean when using a single result. '
+                         f'Got {type(compute_insights)}. reverting to default behavior compute_insights={True}'),
+                        UserWarning
+                    )
 
-                else:
-                    direction = MetricDirection.Downward
-                    leap_binder.setup_container.metrics[-1].metric_handler_data.direction = direction
-                    if not _call_from_tl_platform and compute_insights is not False:
-                        store_warning_by_param(
-                            param_name="direction",
-                            user_func_name=user_function.__name__,
-                            default_value=direction,
-                            link_to_docs="https://docs.tensorleap.ai/tensorleap-integration/writing-integration-code/custom-metrics"
-                        )
+                if direction is not _UNSET and not isinstance(direction, MetricDirection):
+                    warnings.warn(
+                        (f'{user_function.__name__}() unclear intention: '
+                         f'direction should be a MetricDirection when using a single result. '
+                         f'Got {type(direction)}. reverting to default behavior {MetricDirection.Downward}.'),
+                        UserWarning
+                    )
+                    direction=MetricDirection.Downward
+
+                if not _call_from_tl_platform and compute_insights is not False and direction is _UNSET:
+                    store_warning_by_param(
+                        param_name="direction",
+                        user_func_name=user_function.__name__,
+                        default_value=MetricDirection.Downward,
+                        link_to_docs="https://docs.tensorleap.ai/tensorleap-integration/writing-integration-code/custom-metrics"
+                    )
+                    direction=MetricDirection.Downward
+
+                leap_binder.setup_container.metrics[-1].metric_handler_data.direction = direction
 
         @functools.wraps(user_function)
         def inner_without_validate(*args, **kwargs):

{code_loader-1.0.165.dev2 → code_loader-1.0.165.dev4}/pyproject.toml

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