code-loader 1.0.205.dev2__py3-none-any.whl → 1.0.206.dev1__py3-none-any.whl

code_loader/contract/responsedataclasses.py

@@ -86,8 +86,6 @@ class DatasetSetup:
     custom_losses: List[CustomLossInstance]
     metrics: List[MetricInstance] = field(default_factory=list)
     simulations: List[SimulationInstance] = field(default_factory=list)
-    # Structural: the integration registered an element-instance mask encoder.
-    has_element_instances: bool = False
 
 
 @dataclass

code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -2981,11 +2981,49 @@ def tensorleap_simulation(name: str, sim_params: dict):
 
 
 def tensorleap_element_instance_preprocess(
-        instance_length_encoder: InstanceLengthCallableInterface, instance_mask_encoder: InstanceCallableInterface):
+        instance_length_encoder: InstanceLengthCallableInterface,
+        instance_mask_encoder: InstanceCallableInterface,
+        instance_metadata_types: Optional[Dict[str, DatasetMetadataType]] = None):
     def decorating_function(user_function: Callable[[], List[PreprocessResponse]]):
+        def register_instance_extra_metadata(metadata_types: Dict[str, DatasetMetadataType]) -> None:
+            # Idempotent: set_metadata appends without deduping, and the probe path runs inside
+            # preprocess, so a second preprocess call would register a duplicate handler.
+            if any(handler.name == "builtin_instance_extra_metadata"
+                   for handler in leap_binder.setup_container.metadata):
+                return
+            names = list(metadata_types)
+
+            def builtin_instance_extra_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, None]:
+                # Sample rows declare the columns without claiming values; the engine injects the
+                # real per-instance ones. A fresh dict, because nulling the probed
+                # ElementInstance's own dict in place destroyed any encoder that returned a
+                # reference into preprocess.data.
+                return {name: None for name in names}
+
+            leap_binder.set_metadata(builtin_instance_extra_metadata,
+                                     "builtin_instance_extra_metadata", metadata_types)
+
+        def probe_instance_metadata_types(sample_id: Union[int, str], preprocess_response: PreprocessResponse,
+                                          idx: int) -> Optional[Dict[str, DatasetMetadataType]]:
+            # Fallback when the types are not declared: infer them from one probed instance. A
+            # None there carries no type, so name the fields and point at the declaration.
+            element_instance = instance_mask_encoder(sample_id, preprocess_response, idx)
+            element_instance_metadata = getattr(element_instance, 'instance_metadata', None)
+            if element_instance_metadata is None:
+                return None
+            not_inferable = [name for name, value in element_instance_metadata.items() if value is None]
+            if not_inferable:
+                raise Exception(
+                    f"tensorleap_element_instance_preprocess validation failed: cannot infer the "
+                    f"type of instance metadata {not_inferable} from instance {idx} of sample "
+                    f"{sample_id!r}, because it is None on that instance. The type cannot come from "
+                    f"the value, so declare it: tensorleap_element_instance_preprocess(..., "
+                    f"instance_metadata_types={{'{not_inferable[0]}': DatasetMetadataType.float}}).")
+            return map_dict_to_metadata_types(element_instance_metadata)
+
         def user_function_instance() -> List[PreprocessResponse]:
             result = user_function()
-            found_instance_metadata = False
+            found_instance_metadata = instance_metadata_types is not None
             for preprocess_response in result:
                 if preprocess_response.is_grouped:
                     raise Exception(
@@ -3009,15 +3047,10 @@ def tensorleap_element_instance_preprocess(
                     # "Index <id> with sample_id: <id> cannot be found!".
                     for idx, instance_id in enumerate(instances_ids):
                         if not found_instance_metadata:
-                            element_instance = instance_mask_encoder(sample_id, preprocess_response, idx)
-                            element_instance_metadata = element_instance.instance_metadata
-                            if element_instance_metadata is not None:
-                                element_instance_metadata_types = map_dict_to_metadata_types(element_instance_metadata)
-                                def builtin_instance_extra_metadata(idx: str, preprocess: PreprocessResponse) -> Dict[str, str]:
-                                    for k, v in element_instance_metadata.items():
-                                        element_instance_metadata[k] = None
-                                    return element_instance_metadata
-                                leap_binder.set_metadata(builtin_instance_extra_metadata,"builtin_instance_extra_metadata", element_instance_metadata_types)
+                            probed_types = probe_instance_metadata_types(
+                                sample_id, preprocess_response, idx)
+                            if probed_types is not None:
+                                register_instance_extra_metadata(probed_types)
                             found_instance_metadata = True
 
                         instance_to_sample_ids_mappings[instance_id] = sample_id
@@ -3033,6 +3066,8 @@ def tensorleap_element_instance_preprocess(
 
         leap_binder.set_preprocess(user_function_instance)
         leap_binder.set_metadata(builtin_instance_metadata, "builtin_instance_metadata")
+        if instance_metadata_types is not None:
+            register_instance_extra_metadata(instance_metadata_types)
 
         def _validate_input_args(*args, **kwargs):
             assert len(args) == 0 and len(kwargs) == 0, \

code_loader/leaploader.py

@@ -935,23 +935,7 @@ class LeapLoader(LeapLoaderBase):
 
         return DatasetSetup(preprocess=dataset_preprocess, inputs=inputs, outputs=ground_truths,
                             metadata=metadata_instances, visualizers=visualizers, prediction_types=prediction_types,
-                            custom_losses=custom_losses, metrics=metrics, simulations=simulations,
-                            has_element_instances=self._has_element_instances())
-
-    def _has_element_instances(self) -> bool:
-        """Does this dataset have element instances? Both halves, because either alone lies.
-
-        A registered mask encoder without instance mappings is an integration that declares
-        instances and produces none: the engine would take the pooling path with nothing to pool,
-        and ask the UI to visualize an instance population that does not exist. Mappings without an
-        encoder cannot be masked. Preprocessing has already run by the time this is called (the
-        lengths above come from it), so reading the mappings costs nothing extra.
-        """
-        setup = global_leap_binder.setup_container
-        if not setup.instance_masks:
-            return False
-        return any(response.instance_to_sample_ids_mappings
-                   for response in self._preprocess_result().values())
+                            custom_losses=custom_losses, metrics=metrics, simulations=simulations)
 
     def get_model_setup_response(self) -> ModelSetup:
         setup = global_leap_binder.setup_container

{code_loader-1.0.205.dev2.dist-info → code_loader-1.0.206.dev1.dist-info}/METADATA

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

{code_loader-1.0.205.dev2.dist-info → code_loader-1.0.206.dev1.dist-info}/RECORD

@@ -5,7 +5,7 @@ code_loader/contract/datasetclasses.py,sha256=ySmO5Ld4fyfUWOJxUdnH2qCMota4dtwtgM
 code_loader/contract/enums.py,sha256=__GkPkwAXi2agmDGtEQgbMucPm4-n80maG6n_MmObPA,1691
 code_loader/contract/exceptions.py,sha256=jWqu5i7t-0IG0jGRsKF4DjJdrsdpJjIYpUkN1F4RiyQ,51
 code_loader/contract/mapping.py,sha256=sWJhpng-IkOzQnWQdMT5w2ZZ3X1Z_OOzSwCLXIS7oxE,1446
-code_loader/contract/responsedataclasses.py,sha256=2SQCccuIlSeUJT0igyvIJRYtmaWSqqlQwtaAA1iEuSI,5044
+code_loader/contract/responsedataclasses.py,sha256=5VFgGjRubMW8ItMPils3rkBNejunCGLaa192AIi-xko,4925
 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
@@ -22,8 +22,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=mWcjx31fnrtRfV5agveW79lcMGJhwhDfLz7brpexBv0,60408
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=qmFozDAWYWtQwNcAkyb9zs0gCh7nS6ZJNFAaIEFX4J8,193104
-code_loader/leaploader.py,sha256=Ksm0ASezQ9t9dQzKR0iGVkwD_6mSpEgSCc3rgZEMP5Y,92254
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=lM2wFqzxdTVoe9lwC5YFdgnY8UwvY5r9foDnKJpQ7Mc,195252
+code_loader/leaploader.py,sha256=JjC5ljuofrtUP4qMh2KzRQLrIWvSTpR8ep6om92c3qc,91308
 code_loader/leaploaderbase.py,sha256=Aa8wCcxojf8EBn_14W5I1gKI4OMBdpdEcNAZ_6E2eV4,10940
 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=mlwr-4ZeeEMMIRdMAL7JF0b-5ko7QSRhbKZ64DqKbTY,11452
 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.205.dev2.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.205.dev2.dist-info/METADATA,sha256=absRO9KyVArGALeMt_X5LtJZ-jnT3B5OnJuVy6eM5uY,1095
-code_loader-1.0.205.dev2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-code_loader-1.0.205.dev2.dist-info/RECORD,,
+code_loader-1.0.206.dev1.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.206.dev1.dist-info/METADATA,sha256=v7DbX7F0l3-_L0R5gieoiNSAff1YAA9dqnJ9ncCD2yE,1095
+code_loader-1.0.206.dev1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+code_loader-1.0.206.dev1.dist-info/RECORD,,

{code_loader-1.0.205.dev2.dist-info → code_loader-1.0.206.dev1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any