code-loader 1.0.190.dev0__py3-none-any.whl → 1.0.191__py3-none-any.whl

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
 
@@ -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]
@@ -575,9 +575,6 @@ def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]
                 def get_inputs(self):
                     return self.model.get_inputs()
 
-                def get_outputs(self):
-                    return self.model.get_outputs()
-
             model_placeholder = ModelPlaceholder(prediction_types)
             if not _call_from_tl_platform:
                 update_env_params_func("tensorleap_load_model", "v")
@@ -614,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()):
@@ -642,13 +641,6 @@ def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]
 
                     return FollowInputIndex()
 
-                def get_outputs(self):
-                    # Mapping-mode counterpart of the ONNX-run get_outputs(): in mapping
-                    # mode outputs are reached by index, and get_outputs()[i] resolves to
-                    # Prediction{i} — exactly like run()/__call__, which also return a
-                    # ModelOutputPlaceholder. Reusing it keeps the mapping unchanged.
-                    return ModelOutputPlaceholder()
-
             return ModelPlaceholder()
 
         def final_inner(*args, **kwargs):
@@ -2445,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(
@@ -2465,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)
 
@@ -2511,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/leaploader.py

@@ -320,6 +320,8 @@ class LeapLoader(LeapLoaderBase):
             try:
                 self.exec_script()
 
+                integration_test_test_payload = self._check_integration_test_exists()
+                test_payloads.append(integration_test_test_payload)
                 preprocess_test_payload = self._check_preprocess()
                 test_payloads.append(preprocess_test_payload)
                 handlers_test_payloads = self._check_handlers()
@@ -356,6 +358,23 @@ class LeapLoader(LeapLoaderBase):
                                        engine_file_contract=EngineFileContract(global_leap_binder.mapping_connections,
                                                                                global_leap_binder.leap_analysis_configuration))
 
+    def _check_integration_test_exists(self) -> DatasetTestResultPayload:
+        test_result = DatasetTestResultPayload('integration_test')
+        # Only enforced on the Tensorleap platform (i.e. during a push / inspection,
+        # where IS_TENSORLEAP_PLATFORM=true). Running code-loader locally or in unit
+        # tests must not require the decorator, so pre-decorator integrations and
+        # local check runs keep working unchanged.
+        is_on_platform = os.environ.get('IS_TENSORLEAP_PLATFORM') == 'true'
+        if is_on_platform and global_leap_binder.integration_test_func is None:
+            test_result.is_passed = False
+            test_result.display[TestingSectionEnum.Errors.name] = (
+                "No integration test was found in your integration file. A valid Tensorleap "
+                "integration file must define an integration test function decorated with "
+                "@tensorleap_integration_test. Without it the integration cannot be validated "
+                "and the push is aborted. See the mnist leap_integration.py for a valid example."
+            )
+        return test_result
+
     def _check_preprocess(self) -> DatasetTestResultPayload:
         test_result = DatasetTestResultPayload('preprocess')
         try:

{code_loader-1.0.190.dev0.dist-info → code_loader-1.0.191.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: code-loader
-Version: 1.0.190.dev0
+Version: 1.0.191
 Summary: 
 License: MIT
 Author: dorhar

{code_loader-1.0.190.dev0.dist-info → code_loader-1.0.191.dist-info}/RECORD

@@ -21,8 +21,8 @@ code_loader/experiment_api/utils.py,sha256=XZHtxge12TS4H4-8PjV3sKuhp8Ud6ojAiIzTZ
 code_loader/experiment_api/workingspace_config_utils.py,sha256=DLzXQCg4dgTV_YgaSbeTVzq-2ja_SQw4zi7LXwKL9cY,990
 code_loader/inner_leap_binder/__init__.py,sha256=koOlJyMNYzGbEsoIbXathSmQ-L38N_pEXH_HvL7beXU,99
 code_loader/inner_leap_binder/leapbinder.py,sha256=PAX9cmT1QQV7PWsbY9rMRWktpM7KryfFlwBiSwSskzg,42654
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=lgKJ9cJDuDABscDqLvnqRt7ViU6YeZFcm9996EUosGA,123107
-code_loader/leaploader.py,sha256=K9Q5kiCZ_A2GkS5qOEantAMvWGaz3bmO1X8buXDSpgg,44682
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=yMEROthjXugzqJCCjL5m7Erkv33L56fqACDXaFK2M4c,123503
+code_loader/leaploader.py,sha256=9bUl69X5pk6prgFMCnaoA4MhRoacDb9Ddv3CWgG1F0Y,45968
 code_loader/leaploaderbase.py,sha256=l36qDA00GhZEG5NLKpEtAXgWJA-UQQIhNFGxywK7mUA,6530
 code_loader/mixpanel_tracker.py,sha256=rNwRmFifNbdUoqLQvvhhgpKczWpWiEmd8MfyJe27sxw,9131
 code_loader/plot_functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -31,7 +31,7 @@ code_loader/plot_functions/visualize.py,sha256=gsBAYYkwMh7jIpJeDMPS8G4CW-pxwx6Lz
 code_loader/utils.py,sha256=YecipkdTA-VcE9F0RQcY9cFnY8P3AksPnHM2Db7xUSk,3972
 code_loader/visualizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_loader/visualizers/default_visualizers.py,sha256=onRnLE_TXfgLN4o52hQIOOhUcFexGlqJ3xSpQDVLuZM,2604
-code_loader-1.0.190.dev0.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.190.dev0.dist-info/METADATA,sha256=2Tqb-fK_hBKdjefZN31fYytgQdg3VS9rgcPiwqLsLkc,1107
-code_loader-1.0.190.dev0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-code_loader-1.0.190.dev0.dist-info/RECORD,,
+code_loader-1.0.191.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.191.dist-info/METADATA,sha256=HPzc6iqSgc1a5d-yKe2kUtYbcnqcpVMKfMQxiS9Rb14,1102
+code_loader-1.0.191.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+code_loader-1.0.191.dist-info/RECORD,,