code-loader 1.0.99.dev4__tar.gz → 1.0.99.dev5__tar.gz

{code_loader-1.0.99.dev4 → code_loader-1.0.99.dev5}/PKG-INFO

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

{code_loader-1.0.99.dev4 → code_loader-1.0.99.dev5}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -78,10 +78,13 @@ def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]
             return ModelPlaceholder()
 
 
-        if os.environ.get(mapping_runtime_mode_env_var_mame):
-            return mapping_inner
-        else:
-            return load_model_func
+        def final_inner():
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return mapping_inner()
+            else:
+                return load_model_func()
+
+        return final_inner
 
     return decorating_function
 
@@ -201,10 +204,15 @@ def tensorleap_custom_metric(name: str,
         mapping_inner.arg_names = leap_binder.setup_container.metrics[-1].metric_handler_data.arg_names
         mapping_inner.name = name
 
-        if os.environ.get(mapping_runtime_mode_env_var_mame):
-            return mapping_inner
-        else:
-            return inner
+        def final_inner(*args, **kwargs):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return mapping_inner(*args, **kwargs)
+            else:
+                return inner(*args, **kwargs)
+
+
+
+        return final_inner
 
     return decorating_function
 
@@ -279,10 +287,13 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
         mapping_inner.arg_names = leap_binder.setup_container.visualizers[-1].visualizer_handler_data.arg_names
         mapping_inner.name = name
 
-        if os.environ.get(mapping_runtime_mode_env_var_mame):
-            return mapping_inner
-        else:
-            return inner
+        def final_inner(*args, **kwargs):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return mapping_inner(*args, **kwargs)
+            else:
+                return inner(*args, **kwargs)
+
+        return final_inner
 
     return decorating_function
 
@@ -437,7 +448,7 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
         inner.node_mapping = NodeMapping(name, node_mapping_type)
 
 
-        def mapping_inner(*args, **kwargs):
+        def mapping_inner(sample_id, preprocess_response):
             class TempMapping:
                 pass
             ret = TempMapping()
@@ -447,10 +458,15 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
 
         mapping_inner.node_mapping = NodeMapping(name, node_mapping_type)
 
-        if os.environ.get(mapping_runtime_mode_env_var_mame):
-            return mapping_inner
-        else:
-            return inner
+        def final_inner(sample_id, preprocess_response):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return mapping_inner(sample_id, preprocess_response)
+            else:
+                return inner(sample_id, preprocess_response)
+
+        final_inner.node_mapping = NodeMapping(name, node_mapping_type)
+
+        return final_inner
 
     return decorating_function
 
@@ -492,7 +508,7 @@ def tensorleap_gt_encoder(name: str):
 
         inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
 
-        def mapping_inner(*args, **kwargs):
+        def mapping_inner(sample_id, preprocess_response):
             class TempMapping:
                 pass
             ret = TempMapping()
@@ -502,10 +518,15 @@ def tensorleap_gt_encoder(name: str):
 
         mapping_inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
 
-        if os.environ.get(mapping_runtime_mode_env_var_mame):
-            return mapping_inner
-        else:
-            return inner
+        def final_inner(sample_id, preprocess_response):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return mapping_inner(sample_id, preprocess_response)
+            else:
+                return inner(sample_id, preprocess_response)
+
+        final_inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
+
+        return final_inner
 
     return decorating_function
 
@@ -576,10 +597,17 @@ def tensorleap_custom_loss(name: str, connects_to=None):
         mapping_inner.arg_names = leap_binder.setup_container.custom_loss_handlers[-1].custom_loss_handler_data.arg_names
         mapping_inner.name = name
 
-        if os.environ.get(mapping_runtime_mode_env_var_mame):
-            return mapping_inner
-        else:
-            return inner
+        def final_inner(*args, **kwargs):
+            if os.environ.get(mapping_runtime_mode_env_var_mame):
+                return mapping_inner(*args, **kwargs)
+            else:
+                return inner(*args, **kwargs)
+
+        final_inner.arg_names = leap_binder.setup_container.custom_loss_handlers[-1].custom_loss_handler_data.arg_names
+        final_inner.name = name
+
+
+        return final_inner
 
     return decorating_function
 

{code_loader-1.0.99.dev4 → code_loader-1.0.99.dev5}/code_loader/leaploader.py

@@ -33,11 +33,11 @@ class LeapLoader(LeapLoaderBase):
         super().__init__(code_path, code_entry_name)
 
         self._preprocess_result_cached = None
-        os.environ[mapping_runtime_mode_env_var_mame] = 'TRUE'
 
     @lru_cache()
     def exec_script(self) -> None:
         try:
+            os.environ[mapping_runtime_mode_env_var_mame] = 'TRUE'
             self.evaluate_module()
         except TypeError as e:
             import traceback
@@ -47,6 +47,10 @@ class LeapLoader(LeapLoaderBase):
             raise DatasetScriptException(getattr(e, 'message', repr(e))) from e
         except Exception as e:
             raise DatasetScriptException(getattr(e, 'message', repr(e))) from e
+        finally:
+            # ensure that the environment variable is removed after the script execution
+            if mapping_runtime_mode_env_var_mame in os.environ:
+                del os.environ[mapping_runtime_mode_env_var_mame]
 
     def evaluate_module(self) -> None:
         def append_path_recursively(full_path: str) -> None:
@@ -160,28 +164,7 @@ class LeapLoader(LeapLoaderBase):
         stdout_steam = io.StringIO()
         with redirect_stdout(stdout_steam):
             try:
-                # generate mapping
                 self.exec_script()
-                mapping_connections = global_leap_binder.mapping_connections
-                del os.environ[mapping_runtime_mode_env_var_mame]
-
-                # init global leap binder
-                global_leap_binder.__init__()
-                self.exec_script.cache_clear()
-
-                # run parse without mapping.
-                try:
-                    self.exec_script()
-                except DatasetScriptException:
-                    # catch exceptions in script that happens during running the custom test
-                    pass
-
-                os.environ[mapping_runtime_mode_env_var_mame] = 'TRUE'
-
-                # set mapping connections
-                if not global_leap_binder.mapping_connections:
-                    global_leap_binder.mapping_connections = mapping_connections
-
 
                 preprocess_test_payload = self._check_preprocess()
                 test_payloads.append(preprocess_test_payload)

{code_loader-1.0.99.dev4 → code_loader-1.0.99.dev5}/pyproject.toml

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