code-loader 1.0.190__tar.gz → 1.0.191__tar.gz

{code_loader-1.0.190 → code_loader-1.0.191}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: code-loader
-Version: 1.0.190
+Version: 1.0.191
 Summary: 
-Home-page: https://github.com/tensorleap/code-loader
 License: MIT
 Author: dorhar
 Author-email: doron.harnoy@tensorleap.ai
@@ -20,6 +19,7 @@ Requires-Dist: numpy (>=2.3.2,<3.0.0) ; python_version >= "3.11" and python_vers
 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.190 → code_loader-1.0.191}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -26,7 +26,7 @@ from code_loader.contract.enums import MetricDirection, LeapDataType, DatasetMet
 from code_loader import leap_binder, LeapLoader
 from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConnection
 from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, LeapTextMask, LeapText, LeapGraph, \
-    LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap, LeapVideo
+    LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap, LeapVideo, LeapValidationError
 from code_loader.inner_leap_binder.leapbinder import mapping_runtime_mode_env_var_mame
 from code_loader.mixpanel_tracker import clear_integration_events, AnalyticsEvent, emit_integration_event_once
 
@@ -197,11 +197,11 @@ def validate_output_structure(result, func_name: str, expected_type_name="np.nda
 def batch_warning(result, func_name):
     if len(result.shape) > 0 and result.shape[0] == 1:
         warnings.warn(
-            f"{func_name} warning: Tensorleap will add a batch dimension at axis 0 to the output of {func_name}, "
-            f"although the detected size of axis 0 is already 1. "
-            f"This may lead to an extra batch dimension (e.g., shape (1, 1, ...)). "
-            f"Please ensure that the output of '{func_name}' is not already batched "
-            f"to avoid computation errors."
+            f"{func_name} warning: Tensorleap will add a batch dimension at axis 0 of "
+            f"{func_name}'s output, but axis 0 is already size 1 — this can produce a "
+            f"doubly-batched shape (e.g. (1, 1, ...)). If axis 0 is a real dimension "
+            f"(e.g. a single channel) and not an accidental batch, you can ignore this; "
+            f"only fix it if you pre-batched the output."
         )
 
 
@@ -316,16 +316,16 @@ def tensorleap_integration_test():
                     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):
-                        update_env_params_func("code_mapping", "x")
-                        raise (f'Invalid integration code. File {file_name}, line {line_number}: '
-                               f"indexing is supported only on the model's predictions inside the integration test. Please remove this indexing operation usage from the integration test code.")
+                    update_env_params_func("code_mapping", "x")
+                    if isinstance(e, LeapValidationError):
+                        raise Exception(f'Invalid integration code. File {file_name}, line {line_number}: {e}')
+                    elif isinstance(e, TypeError) and 'is not subscriptable' in str(e):
+                        raise Exception(f'Invalid integration code. File {file_name}, line {line_number}: '
+                                        f"indexing is supported only on the model's predictions inside the integration test. Please remove this indexing operation usage from the integration test code.")
                     else:
-                        update_env_params_func("code_mapping", "x")
-
-                        raise (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')
+                        raise Exception(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]
@@ -349,6 +349,14 @@ def _safe_get_item(key):
 
 
 def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]] = _UNSET):
+    """Register the model-loading function.
+
+    ``prediction_types``: declare one ``PredictionTypeHandler`` per model output, in
+    output order. Multi-output models must declare an entry for EVERY output — the
+    count is validated against the model's outputs — so for an output you don't consume
+    as a prediction, pass a throwaway handler to satisfy the count. Omit the argument
+    only when the model has a single prediction output.
+    """
     prediction_types_was_provided = prediction_types is not _UNSET
 
     if not prediction_types_was_provided:
@@ -603,7 +611,9 @@ def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]
 
                 # onnx runtime interface
                 def run(self, output_names, input_dict):
-                    assert output_names is None
+                    if output_names is not None:
+                        raise LeapValidationError("Tensorleap doesn't support selecting outputs by name — "
+                                                  "use model.run(None, inputs) to return all outputs.")
                     assert isinstance(input_dict, dict), \
                         f'Expected input_dict to be a dict, got {type(input_dict)} instead.'
                     for i, (input_key, elem) in enumerate(input_dict.items()):
@@ -2427,12 +2437,12 @@ def tensorleap_status_table():
                     ready = False
                     next_step = row["name"]
 
-        if _crashed["value"]:
-            print(f"\nScript crashed before completing all steps. crashed at function '{_current_func['name']}'.")
+        if code_mapping_failure[0]:
+            print(f"\n{CROSS} {code_mapping_failure_mes}")
             return
 
-        if code_mapping_failure[0]:
-            print(f"\n{CROSS + code_mapping_failure_mes}.")
+        if _crashed["value"]:
+            print(f"\nScript crashed before completing all steps. crashed at function '{_current_func['name']}'.")
             return
 
         print(ready_mess) if ready else print(
@@ -2447,6 +2457,10 @@ def tensorleap_status_table():
             code_mapping_failure[0] = 1
         if status == "v":
             _set_status(name, CHECK)
+            # A decorator that reports success is no longer the "currently running"
+            # one, so clear the pointer. This keeps a later body-level raise from
+            # being blamed on the last decorator that actually succeeded.
+            _current_func["name"] = None
         else:
             _set_status(name, CROSS)
 
@@ -2493,10 +2507,14 @@ def tensorleap_status_table():
     def handle_exception(exc_type, exc_value, exc_traceback):
         _crashed["value"] = True
         crashed_name = _current_func["name"]
-        if crashed_name:
+        if crashed_name and not code_mapping_failure[0]:
             row = _find_row(crashed_name)
             if row:
                 row["Added to integration"] = CROSS
+        elif not crashed_name:
+            # Crash with no decorator currently running = the integration-test body /
+            # code flow itself failed; report that rather than blaming a decorator.
+            code_mapping_failure[0] = 1
 
         traceback.print_exception(exc_type, exc_value, exc_traceback)
         run_on_exit()

{code_loader-1.0.190 → code_loader-1.0.191}/pyproject.toml

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