code-loader 1.0.208.dev6__py3-none-any.whl → 1.0.208.dev8__py3-none-any.whl

code_loader/contract/responsedataclasses.py

@@ -144,7 +144,6 @@ class LeapAnalysisConfiguration:
 class EngineFileContract:
     node_connections: Optional[List[NodeConnection]] = None
     leap_analysis_configuration: Optional[LeapAnalysisConfiguration] = None
-    latent_space_connections: Optional[List[NodeConnection]] = None
 
 
 @dataclass

code_loader/inner_leap_binder/leapbinder.py

@@ -85,11 +85,6 @@ def _reject_stringized_sample_preprocess_response(function: Callable[..., Any],
         "This breaks Tensorleap type detection, so it must be referenced as a real type.")
 
 
-def _reject_stringized_preprocess_response(function: Callable[..., Any], arg_name: str, annotation: Any) -> None:
-    _reject_stringized_annotation(
-        function, arg_name, annotation, PreprocessResponse,
-        "Tensorleap uses that annotation to tell a dataset-computed custom latent space from a "
-        "model-computed one, so it must be a real type.")
 
 
 
@@ -115,7 +110,6 @@ class LeapBinder:
         self._extend_with_default_losses()
 
         self.mapping_connections: List[NodeConnection] = []
-        self.latent_space_connections: List[NodeConnection] = []
         self.integration_test_func: Optional[Callable[[str, PreprocessResponse], Any]] = None
 
         self.batch_size_to_validate: Optional[int] = None

code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -7,6 +7,7 @@ import warnings
 import logging
 from collections import defaultdict
 import functools
+import typing
 from functools import lru_cache
 from pathlib import Path
 from typing import Optional, Union, Callable, List, Dict, Set, Any
@@ -36,7 +37,7 @@ from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, Le
     LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap, LeapVideo, LeapAudio, LeapValidationError, \
     map_leap_data_type_to_visualizer_class
 from code_loader.inner_leap_binder.leapbinder import mapping_runtime_mode_env_var_mame, \
-    _reject_stringized_preprocess_response, _reject_stringized_sample_preprocess_response
+    _reject_stringized_sample_preprocess_response
 from code_loader.mixpanel_tracker import clear_integration_events, AnalyticsEvent, emit_integration_event_once
 
 _called_from_inside_tl_decorator = 0
@@ -1751,15 +1752,32 @@ def tensorleap_metadata(
     return decorating_function
 
 
+def _is_preprocess_response_type(annotation: Any) -> bool:
+    if isinstance(annotation, type):
+        return issubclass(annotation, PreprocessResponse)
+    return any(_is_preprocess_response_type(arg) for arg in get_args(annotation))
+
+
 def _classify_custom_latent_space_signature(user_function) -> str:
-    argspec = inspect.getfullargspec(user_function)
-    params = argspec.args
-    if len(params) != 2:
-        return 'model'
+    """Dataset-computed when a parameter is typed PreprocessResponse (a subclass or an
+    Optional[...] of it included), model-computed otherwise."""
+    params = list(inspect.signature(user_function).parameters.values())
+    hints = typing.get_type_hints(user_function)
+    preprocess_params = [p.name for p in params if _is_preprocess_response_type(hints.get(p.name))]
+    if preprocess_params:
+        positional = [p.name for p in params
+                      if p.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)]
+        if positional[1:2] != preprocess_params[:1] or len(preprocess_params) > 1:
+            raise Exception(
+                f"tensorleap_custom_latent_space validation failed: '{user_function.__name__}' is "
+                f"dataset-computed (it takes a PreprocessResponse), so it is called as "
+                f"{user_function.__name__}(sample_id, preprocess) and its PreprocessResponse must be "
+                f"the second positional parameter, and the only one. Got parameters "
+                f"{[p.name for p in params]} with PreprocessResponse on {preprocess_params}.")
+        return 'dataset'
 
-    second = params[1]
-    first = params[0]
-    if second not in argspec.annotations:
+    if len(params) == 2 and params[1].name not in hints:
+        first, second = params[0].name, params[1].name
         raise Exception(
             f"tensorleap_custom_latent_space validation failed: '{user_function.__name__}' has "
             f"exactly two parameters ('{first}', '{second}') and '{second}' has no type "
@@ -1771,11 +1789,6 @@ def _classify_custom_latent_space_signature(user_function) -> str:
             f"If you are upgrading an existing project, this signature used to be accepted "
             f"unannotated as dataset-computed; add ': PreprocessResponse' to '{second}' to keep "
             f"the previous behavior.")
-
-    annotation = argspec.annotations[second]
-    _reject_stringized_preprocess_response(user_function, second, annotation)
-    if annotation is PreprocessResponse:
-        return 'dataset'
     return 'model'
 
 
@@ -2055,14 +2068,15 @@ def _decorate_model_latent_space(user_function, ls_name, use_ls_for_analysis, re
         ordered_connections = [kwargs[arg_name] for arg_name in arg_names if arg_name in kwargs]
         ordered_connections = list(args) + ordered_connections
 
-        leap_binder.latent_space_connections[:] = [
-            connection for connection in leap_binder.latent_space_connections
-            if connection.node.name != ls_name]
+        leap_binder.mapping_connections[:] = [
+            connection for connection in leap_binder.mapping_connections
+            if not (connection.node.type is NodeMappingType.CustomLatentSpace
+                    and connection.node.name == ls_name)]
         _add_mapping_connection(ls_name, ordered_connections, arg_names, ls_name,
-                                NodeMappingType.CustomLatentSpace,
-                                target_list=leap_binder.latent_space_connections)
+                                NodeMappingType.CustomLatentSpace)
         return None
 
+    @functools.wraps(user_function)
     def final_inner(*args, **kwargs):
         if os.environ.get(mapping_runtime_mode_env_var_mame):
             return mapping_inner(*args, **kwargs)

code_loader/leaploader.py

@@ -55,8 +55,6 @@ class LeapLoader(LeapLoaderBase):
         self._preprocess_result_cached = None
         self._synthetic_lookup: Dict[str, Tuple[PreprocessResponse, Any]] = {}
         self._synthetic_populator: Optional[Callable[[str], None]] = None
-        # Dataset-computed custom LS the engine dropped for this job; get_sample stops computing them.
-        self._skipped_custom_latent_spaces: FrozenSet[str] = frozenset()
 
         try:
             from code_loader.mixpanel_tracker import track_code_loader_loaded
@@ -396,8 +394,7 @@ class LeapLoader(LeapLoaderBase):
                                        print_log=print_log,
                                        engine_file_contract=EngineFileContract(
                                            global_leap_binder.mapping_connections,
-                                           global_leap_binder.leap_analysis_configuration,
-                                           global_leap_binder.latent_space_connections))
+                                           global_leap_binder.leap_analysis_configuration))
 
     def _check_integration_test_exists(self) -> DatasetTestResultPayload:
         test_result = DatasetTestResultPayload('integration_test')
@@ -457,9 +454,10 @@ class LeapLoader(LeapLoaderBase):
             )
         if global_leap_binder.setup_container.unlabeled_data_preprocess is not None:
             gt_bound_names = [
-                connection.node.name for connection in global_leap_binder.latent_space_connections
-                if any(node_input.type == NodeMappingType.GroundTruth
-                       for node_input in (connection.node_inputs or {}).values())
+                connection.node.name for connection in global_leap_binder.mapping_connections
+                if connection.node.type is NodeMappingType.CustomLatentSpace
+                and any(node_input.type == NodeMappingType.GroundTruth
+                        for node_input in (connection.node_inputs or {}).values())
             ]
             if gt_bound_names:
                 test_result.display[TestingSectionEnum.Warnings.name] = (
@@ -1208,10 +1206,17 @@ class LeapLoader(LeapLoaderBase):
             if any(handler.instance_aware for handler in latent_handlers.values()):
                 raise Exception(
                     "instance-aware custom latent spaces are not supported with grouped preprocess responses")
+            # TODO: support model-computed custom latent spaces on grouped datasets (skip them here,
+            # as the per-sample path does, once the grouped metrics path is verified to compute them).
+            model_ls_names = [name for name, handler in latent_handlers.items()
+                              if handler.computed_at == CustomLatentSpaceComputedAt.MODEL]
+            if model_ls_names:
+                raise Exception(
+                    f"model-computed custom latent spaces {model_ls_names} are not supported with "
+                    f"grouped preprocess responses yet")
             custom_latent_spaces = {
                 name: self._to_grouped_list(handler.function(group_ids, preprocess_state))
                 for name, handler in latent_handlers.items()
-                if name not in self._skipped_custom_latent_spaces
             }
 
         return DatasetSample(inputs=inputs, gt=gt, metadata=metadata, metadata_is_none=metadata_is_none,
@@ -1435,8 +1440,7 @@ class LeapLoader(LeapLoaderBase):
             instance_id: Optional[int] = None) -> Optional[Dict[str, npt.NDArray[np.float32]]]:
         handlers = {handler_name: handler for handler_name, handler
                     in global_leap_binder.setup_container.custom_latent_spaces.items()
-                    if handler.computed_at != CustomLatentSpaceComputedAt.MODEL
-                    and handler_name not in self._skipped_custom_latent_spaces}
+                    if handler.computed_at != CustomLatentSpaceComputedAt.MODEL}
         if not handlers:
             return None
         if preprocess.is_grouped:
@@ -1463,10 +1467,6 @@ class LeapLoader(LeapLoaderBase):
         self.exec_script()
         return len(global_leap_binder.setup_container.custom_latent_spaces) > 0
 
-    def set_skipped_custom_latent_spaces(self, names: Iterable[str]) -> None:
-        """Stop computing these dataset-computed custom latent spaces in get_sample(s)."""
-        self._skipped_custom_latent_spaces = frozenset(names)
-
     @lru_cache()
     def get_custom_latent_space_names(self) -> Tuple[str, ...]:
         """Names of all registered custom latent spaces, in registration order.

{code_loader-1.0.208.dev6.dist-info → code_loader-1.0.208.dev8.dist-info}/METADATA

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

{code_loader-1.0.208.dev6.dist-info → code_loader-1.0.208.dev8.dist-info}/RECORD

@@ -5,7 +5,7 @@ code_loader/contract/datasetclasses.py,sha256=yNEPIyZqCO54fKBgmgbFIKEMVBzvpf4n8U
 code_loader/contract/enums.py,sha256=R4Ge9-oSO7-GYjZAKMTB8Ws5FNsxhCQAYAJruxViJxk,1886
 code_loader/contract/exceptions.py,sha256=jWqu5i7t-0IG0jGRsKF4DjJdrsdpJjIYpUkN1F4RiyQ,51
 code_loader/contract/mapping.py,sha256=i-yVyFuGUITL5lchPNfYlu7bhwk-yuoHPacAeFhcYr8,1490
-code_loader/contract/responsedataclasses.py,sha256=5AB9uP7eJt2Oaq2grMwLQeiQLiw2gj1x04HE7gVUaRU,5112
+code_loader/contract/responsedataclasses.py,sha256=2SQCccuIlSeUJT0igyvIJRYtmaWSqqlQwtaAA1iEuSI,5044
 code_loader/contract/sim_config.py,sha256=le8KMALZiP0WU4UcuKnTOSWBW2rNjpnWYfII502NqDM,3493
 code_loader/contract/visualizer_classes.py,sha256=vzX9YcwxKOm3IpYj8OaqsA1odPlRgj2Cfvglwd88Wbw,18213
 code_loader/default_losses.py,sha256=NoOQym1106bDN5dcIk56Elr7ZG5quUHArqfP5-Nyxyo,1139
@@ -21,9 +21,9 @@ code_loader/experiment_api/types.py,sha256=MY8xFARHwdVA7p4dxyhD60ShmttgTvb4qdp1o
 code_loader/experiment_api/utils.py,sha256=XZHtxge12TS4H4-8PjV3sKuhp8Ud6ojAiIzTZJEqBqc,3304
 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=tvIFlSEOW4iaONJreh0EAlF_A9mpE3B13ohXhIUa1f0,63213
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=vPbHSw51hVWdcPe1Vwta35TpW5So4ykW-qkgSuGJq_I,209787
-code_loader/leaploader.py,sha256=qi7Hbk-LyvEm_nGLmpioA4vLf1NEnhHeHj8U2Rq992o,97523
+code_loader/inner_leap_binder/leapbinder.py,sha256=fplNN3TfJHg79YpEPHKK3b6CxrR7W0ugDeHhAZfYty0,62784
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=paUtnncLn-4iFUJhqEOg3rPtKh9DoS3_HVgGUgOz8c4,210906
+code_loader/leaploader.py,sha256=DiVCs076JP21HXBfpKkzs3Qaumg8Cz26q1tIc4C-kcg,97552
 code_loader/leaploaderbase.py,sha256=JzgpEfY-kNUWbWUb_cZ1G1zHo6oSci6QhT7hqw3E1Jg,12371
 code_loader/mixpanel_tracker.py,sha256=rNwRmFifNbdUoqLQvvhhgpKczWpWiEmd8MfyJe27sxw,9131
 code_loader/plot_functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ code_loader/plot_functions/visualize.py,sha256=gsBAYYkwMh7jIpJeDMPS8G4CW-pxwx6Lz
 code_loader/utils.py,sha256=v6VraCdbFADoNwNx5TH89BLnZ6yfPoWMkyJrqQ_usFc,12377
 code_loader/visualizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_loader/visualizers/default_visualizers.py,sha256=grTPin_lCE9aci8i8CqA7DqQwAyXRB7_EamA3na_pls,5438
-code_loader-1.0.208.dev6.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.208.dev6.dist-info/METADATA,sha256=xkhqTPaPoJgUne7-cH7AtBDmKGGQ0aDZC7FbW2aGDsI,1095
-code_loader-1.0.208.dev6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-code_loader-1.0.208.dev6.dist-info/RECORD,,
+code_loader-1.0.208.dev8.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.208.dev8.dist-info/METADATA,sha256=Zv4Z5dCnspuqPU778nnj7nEOkmHqIhxBg44L_ZwRIUw,1095
+code_loader-1.0.208.dev8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+code_loader-1.0.208.dev8.dist-info/RECORD,,